mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-31 20:02:42 +00:00
Code Issues Releases Activity

(pcomplete-std-complete): Don't try to complete past the last element.

Browse Source
This commit is contained in:
Stefan Monnier 2009-12-01 19:39:52 +00:00
parent 4e14547fd4
commit a2877f1d6f
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2009-12-01 Stefan Monnier <monnier@iro.umontreal.ca>
* pcomplete.el (pcomplete-std-complete): Don't try to complete past
the last element.
* simple.el (normal-erase-is-backspace-mode): Fix thinko in message.
2009-12-01 Glenn Morris <rgm@gnu.org>

31
lisp/pcomplete.el
View File

@ -480,28 +480,31 @@ Same as `pcomplete' but using the standard completion UI."
(pcomplete-begin)))
(buftext (buffer-substring beg (point)))
(table
(if (not (equal pcomplete-stub buftext))
;; This isn't always strictly right (e.g. if
;; FOO="toto/$FOO", then completion of /$FOO/bar may
;; result in something incorrect), but given the lack of
;; any other info, it's about as good as it gets, and in
;; practice it should work just fine (fingers crossed).
(let ((prefixes (pcomplete--common-quoted-suffix
pcomplete-stub buftext)))
(apply-partially
'pcomplete--table-subvert
completions
(cdr prefixes) (car prefixes)))
(cond
((null completions) nil)
((not (equal pcomplete-stub buftext))
;; This isn't always strictly right (e.g. if
;; FOO="toto/$FOO", then completion of /$FOO/bar may
;; result in something incorrect), but given the lack of
;; any other info, it's about as good as it gets, and in
;; practice it should work just fine (fingers crossed).
(let ((prefixes (pcomplete--common-quoted-suffix
pcomplete-stub buftext)))
(apply-partially
'pcomplete--table-subvert
completions
(cdr prefixes) (car prefixes))))
(t
(lexical-let ((completions completions))
(lambda (string pred action)
(let ((res (complete-with-action
action completions string pred)))
(if (stringp res)
(pcomplete-quote-argument res)
res))))))
res)))))))
(pred
;; pare it down, if applicable
(when (and pcomplete-use-paring pcomplete-seen)
(when (and table pcomplete-use-paring pcomplete-seen)
(setq pcomplete-seen
(mapcar (lambda (f)
(funcall pcomplete-norm-func