[elpa] externals/consult 484c92893c 3/3: consult-info--candidates: Simplify

[ELPA Syncer]

branch: externals/consult
commit 484c92893c51d8f1ad223d023fddeb6ddc436c67
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    consult-info--candidates: Simplify
---
 consult-info.el | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/consult-info.el b/consult-info.el
index 26dcc4b531..b602bd15c5 100644
--- a/consult-info.el
+++ b/consult-info.el
@@ -32,20 +32,19 @@
 
 (defun consult-info--candidates (manuals input)
   "Dynamically find lines in MANUALS matching INPUT."
-  (let (candidates)
+  (pcase-let ((`(,regexps . ,hl)
+               (funcall consult--regexp-compiler input 'emacs t))
+              (candidates nil))
     (pcase-dolist (`(,manual . ,buffer) manuals)
       (with-current-buffer buffer
         (widen)
         (goto-char (point-min))
-        (pcase-let ((`(,regexps . ,hl)
-                     (funcall consult--regexp-compiler input 'emacs t)))
-          ;; TODO subfile support?!
-          (while (ignore-errors (re-search-forward (car regexps) nil t))
-            (let ((bol (pos-bol))
-                  (eol (pos-eol))
-                  (current-node nil))
-              (when
-                  (save-excursion
+        ;; TODO subfile support?!
+        (while (ignore-errors (re-search-forward (car regexps) nil t))
+          (let ((bol (pos-bol))
+                (eol (pos-eol))
+                node cand)
+            (when (save-excursion
                     (goto-char bol)
                     (and
                      (>= (- (point) 2) (point-min))
@@ -69,22 +68,21 @@
                            (forward-line 1))))
                      ;; Node name
                      (re-search-forward "Node:[ \t]*" nil t)
-                     (setq current-node
-                           (buffer-substring-no-properties
-                            (point)
-                            (progn
-                              (skip-chars-forward "^,\t\n")
-                              (point))))))
-                (let* ((node (format "(%s)%s" manual current-node))
-                       (cand (concat
-                              node ":"
-                              (funcall hl (buffer-substring-no-properties bol 
eol)))))
-                  (add-text-properties 0 (length node)
-                                       (list 'consult--info-position (cons 
buffer bol)
-                                             'face 'consult-file
-                                             'consult--prefix-group node)
-                                       cand)
-                  (push cand candidates))))))))
+                     (setq node
+                           (format "(%s)%s" manual
+                                   (buffer-substring-no-properties
+                                    (point)
+                                    (progn
+                                      (skip-chars-forward "^,\t\n")
+                                      (point)))))))
+              (setq cand (concat node ":"
+                                 (funcall hl (buffer-substring-no-properties 
bol eol))))
+              (add-text-properties 0 (length node)
+                                   (list 'consult--info-position (cons buffer 
bol)
+                                         'face 'consult-file
+                                         'consult--prefix-group node)
+                                   cand)
+              (push cand candidates))))))
     (nreverse candidates)))
 
 (defun consult-info--position (cand)