From 78054a469de3f8942d96eaf8c024070700ac9bae Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 19 Sep 2011 21:06:29 -0400 Subject: * 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 --- lisp/pcomplete.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lisp/pcomplete.el') 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)) -- cgit v1.2.1