emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/orderless 3b2741737b 042/204: Fix regression bug on no


From: ELPA Syncer
Subject: [elpa] externals/orderless 3b2741737b 042/204: Fix regression bug on no matches
Date: Tue, 11 Jan 2022 12:58:16 -0500 (EST)

branch: externals/orderless
commit 3b2741737b9e411362e6a8612487da3fe58132ab
Author: Omar Antolín <omar.antolin@gmail.com>
Commit: Omar Antolín <omar.antolin@gmail.com>

    Fix regression bug on no matches
---
 orderless.el | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/orderless.el b/orderless.el
index c2500545b2..67f71a7e16 100644
--- a/orderless.el
+++ b/orderless.el
@@ -123,25 +123,26 @@ This function is part of the `orderless' completion 
style."
                               orderless-regexp-separator
                               t))
                (completions (all-completions prefix table pred)))
-          (when minibuffer-completing-file-name
-            (setq completions
-                  (completion-pcm--filename-try-filter completions)))
-          (nconc
-           (cl-loop for candidate in completions
-                    collect (orderless--highlight-matches
-                             completion-regexp-list
-                             candidate))
-           limit)))
+          (when completions
+            (when minibuffer-completing-file-name
+              (setq completions
+                    (completion-pcm--filename-try-filter completions)))
+            (nconc
+             (cl-loop for candidate in completions
+                      collect (orderless--highlight-matches
+                               completion-regexp-list
+                               candidate))
+             limit))))
     (invalid-regexp nil)))
 
 (defun orderless-try-completion (string table pred point &optional _metadata)
   "Complete STRING to unique matching entry in TABLE.
 This uses `orderless-all-completions' to find matches for STRING
-in TABLE among entries satisfying PRED (that function ignores
-POINT).  If there is only one match, it completes to that match.
-If there are no matches, it returns nil.  In any other case it
-\"completes\" STRING to itself.  This function is part of the
-`orderless' completion style."
+in TABLE among entries satisfying PRED.  If there is only one
+match, it completes to that match.  If there are no matches, it
+returns nil.  In any other case it \"completes\" STRING to
+itself, without moving POINT.
+This function is part of the `orderless' completion style."
   (let* ((limit (car (completion-boundaries string table pred "")))
          (prefix (substring string 0 limit))
          (all (orderless-all-completions string table pred point)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]