From: Dmitry Gutov Date: Tue, 7 Jun 2022 22:08:22 +0000 (+0300) Subject: pcomplete-parse-arguments: Fix last change X-Git-Tag: emacs-29.0.90~1910^2~163 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88b025f8151f5552580b4fe8ace0897aac56ca71;p=emacs.git 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). --- diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 3393c322e30..15b9880df85 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)))