diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-09-19 21:06:29 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-09-19 21:06:29 -0400 |
| commit | 78054a469de3f8942d96eaf8c024070700ac9bae (patch) | |
| tree | 076801842c97d47143edb28cb1d959fe376f9b84 /lisp/pcomplete.el | |
| parent | 207c12ef2a59d5d61cef416283634f0b2e3bf24c (diff) | |
| download | emacs-78054a469de3f8942d96eaf8c024070700ac9bae.tar.gz | |
* lisp/minibuffer.el (completion-file-name-table): Keep track of errors.
(completion-table-with-predicate): Handle the case where pred1 is nil.
* lisp/pcomplete.el (pcomplete-completions-at-point): Simplify.
Fixes: debbugs:9160
Diffstat (limited to 'lisp/pcomplete.el')
| -rw-r--r-- | lisp/pcomplete.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index bdf2dadd16c..1a95fb28206 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -515,14 +515,13 @@ Same as `pcomplete' but using the standard completion UI." (pred ;; Pare it down, if applicable. (when (and pcomplete-use-paring pcomplete-seen) - (setq pcomplete-seen - (mapcar (lambda (f) - (funcall pcomplete-norm-func - (directory-file-name f))) - pcomplete-seen)) ;; Capture the dynbound values for later use. (let ((norm-func pcomplete-norm-func) - (seen pcomplete-seen)) + (seen + (mapcar (lambda (f) + (funcall pcomplete-norm-func + (directory-file-name f))) + pcomplete-seen))) (lambda (f) (not (member (funcall norm-func (directory-file-name f)) |