emacs-diffs
[Top][All Lists]
Advanced

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

master 59c343b: Don't optimize away star patterns in minibuffer file nam


From: Lars Ingebrigtsen
Subject: master 59c343b: Don't optimize away star patterns in minibuffer file name completion
Date: Wed, 30 Sep 2020 23:07:16 -0400 (EDT)

branch: master
commit 59c343ba0d0a760e01892c980ec8e427d42ed3cc
Author: Pip Cet <pipcet@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Don't optimize away star patterns in minibuffer file name completion
    
    * lisp/minibuffer.el (completion-pcm--optimize-pattern): Keep
    'star in the pattern (bug#41705).
---
 lisp/minibuffer.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 3e23c05..427636e 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3110,12 +3110,12 @@ or a symbol, see `completion-pcm--merge-completions'."
     (while p
       (pcase p
         (`(,(or 'any 'any-delim) point . ,rest) (setq p `(point . ,rest)))
-        ;; This is not just a performance improvement: it also turns
-        ;; a terminating `point' into an implicit `any', which
-        ;; affects the final position of point (because `point' gets
-        ;; turned into a non-greedy ".*?" regexp whereas we need
-        ;; it the be greedy when it's at the end, see bug#38458).
-        (`(,(pred symbolp)) (setq p nil)) ;Implicit terminating `any'.
+        ;; This is not just a performance improvement: it turns a
+        ;; terminating `point' into an implicit `any', which affects
+        ;; the final position of point (because `point' gets turned
+        ;; into a non-greedy ".*?" regexp whereas we need it to be
+        ;; greedy when it's at the end, see bug#38458).
+        (`(point) (setq p nil)) ;Implicit terminating `any'.
         (_ (push (pop p) n))))
     (nreverse n)))
 



reply via email to

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