mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

pcomplete.el: Fix part of bug#50470

Browse source 
Try and handle the case where `pcomplete-parse-arguments-function`
directly returns a list of completions.

* lisp/pcomplete.el (pcomplete-parse-arguments): Don't modify the
buffer if we're not allowed to.  Instead use the buffer's current
content as the "pattern to be completed" and return the list
of completions as is.  Also, use `try-completions` to simplify the
previous code.
This commit is contained in:
Stefan Monnier 2022-06-05 19:51:29 -04:00
parent f5e8e7a7b9
commit 0a36671f41
1 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lisp/pcomplete.el
View file

@ -802,25 +802,30 @@ this is `comint-dynamic-complete-functions'."
(let ((begin (pcomplete-begin 'last)))
(if (and (listp pcomplete-stub) ;??
(not pcomplete-expand-only-p))
(let* ((completions pcomplete-stub) ;??
(common-stub (car completions))
(c completions)
(len (length common-stub)))
(while (and c (> len 0))
(while (and (> len 0)
(not (string=
(substring common-stub 0 len)
(substring (car c) 0
(min (length (car c))
len)))))
(setq len (1- len)))
(setq c (cdr c)))
(setq pcomplete-stub (substring common-stub 0 len)
pcomplete-autolist t)
(when (and begin (> len 0) (not pcomplete-show-list))
(delete-region begin (point))
(pcomplete-insert-entry "" pcomplete-stub))
(throw 'pcomplete-completions completions))
;; If `pcomplete-stub' is a list, it means it's a list of
;; completions computed during parsing, e.g. Eshell uses
;; that to turn globs into lists of completions.
(if (not pcomplete-allow-modifications)
(progn
;; 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.
;; E.g. `pcomplete-stub' may end up being "~/Down*"
;; while the completions contain entries like
;; "/home/<foo>/Downloads" which will fail to match the
;; "~/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))
(let* ((completions pcomplete-stub)
(common-prefix (try-completion "" completions))
(len (length common-prefix)))
(setq pcomplete-stub common-prefix
pcomplete-autolist t)
(when (and begin (> len 0) (not pcomplete-show-list))
(delete-region begin (point))
(pcomplete-insert-entry "" pcomplete-stub))
(throw 'pcomplete-completions completions)))
(when expand-p
(if (stringp pcomplete-stub)
(when begin