branch: externals/cape commit 545f6d9023fdbac41f408a6d9065679b89fa2ab6 Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
cape-wrap-debug: Minor cleanup --- cape.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cape.el b/cape.el index bd9f46a61d..08d198802f 100644 --- a/cape.el +++ b/cape.el @@ -903,15 +903,17 @@ changed. The function `cape-company-to-capf' is experimental." (let ((name (if (symbolp capf) (symbol-name capf) "capf"))) (pcase (funcall capf) (`(,beg ,end ,table . ,plist) - (let* ((count 0) - (cands (all-completions "" table - (lambda (&rest _) - (<= (cl-incf count) cape--debug-length))))) + (let* (completion-ignore-case completion-regexp-list + (limit cape--debug-length) + (cands (all-completions + "" table + (lambda (&rest _) + (>= (cl-decf limit) 0))))) (message - "%s() => beg=%s end=%s candidates=(%s%s)%s" + "%s() => beg=%s end=%s table=(%s%s)%s" name beg end (string-join (mapcar #'prin1-to-string cands) " ") - (and (> count cape--debug-length) " ...") + (and (< limit 0) " ...") (if plist (format " plist=%s" (cape--debug-print plist t)) ""))) `(,beg ,end ,(cape--debug-table table name) . ,plist)) (result