emacs-diffs
[Top][All Lists]
Advanced

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

master 88b025f815: pcomplete-parse-arguments: Fix last change


From: Dmitry Gutov
Subject: master 88b025f815: pcomplete-parse-arguments: Fix last change
Date: Tue, 7 Jun 2022 18:08:57 -0400 (EDT)

branch: master
commit 88b025f8151f5552580b4fe8ace0897aac56ca71
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    pcomplete-parse-arguments: Fix last change
    
    * lisp/pcomplete.el (pcomplete-parse-arguments):
    Throw the previous value of 'pcomplete-stub' (a list) rather than
    the newly constructed one (bug#50470).
---
 lisp/pcomplete.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 3393c322e3..15b9880df8 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -806,7 +806,7 @@ this is `comint-dynamic-complete-functions'."
             ;; completions computed during parsing, e.g. Eshell uses
             ;; that to turn globs into lists of completions.
            (if (not pcomplete-allow-modifications)
-               (progn
+               (let ((completions pcomplete-stub))
                  ;; FIXME: The mapping from what's in the buffer to the list
                   ;; of completions can be arbitrary and will often fail to be
                   ;; understood by the completion style.  See bug#50470.
@@ -816,7 +816,7 @@ this is `comint-dynamic-complete-functions'."
                   ;; "~/Down*" completion pattern since the completion
                   ;; is neither told that it's a file nor a global pattern.
                  (setq pcomplete-stub (buffer-substring begin (point)))
-                  (throw 'pcomplete-completions pcomplete-stub))
+                  (throw 'pcomplete-completions completions))
              (let* ((completions pcomplete-stub)
                     (common-prefix (try-completion "" completions))
                     (len (length common-prefix)))



reply via email to

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