Mercurial > emacs
changeset 94219:185747659a29
(PC-complete-as-file-name, PC-read-file-name-internal):
Treat minibuffer-completion-predicate as a predicate.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 21 Apr 2008 21:18:07 +0000 |
| parents | 701d10a19a8f |
| children | 47134e6f8c9b |
| files | lisp/ChangeLog lisp/complete.el |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Apr 21 21:16:13 2008 +0000 +++ b/lisp/ChangeLog Mon Apr 21 21:18:07 2008 +0000 @@ -1,5 +1,8 @@ 2008-04-21 Stefan Monnier <monnier@iro.umontreal.ca> + * complete.el (PC-complete-as-file-name, PC-read-file-name-internal): + Treat minibuffer-completion-predicate as a predicate. + * minibuffer.el (completion--file-name-table): Accept both the old `dir' arg or the new `pred' arg.
--- a/lisp/complete.el Mon Apr 21 21:16:13 2008 +0000 +++ b/lisp/complete.el Mon Apr 21 21:18:07 2008 +0000 @@ -966,7 +966,7 @@ (+ (point) 2) (point-min))) (minibuffer-completion-table 'PC-read-file-name-internal) - (minibuffer-completion-predicate "") + (minibuffer-completion-predicate nil) (PC-not-minibuffer t)) (goto-char end) (PC-do-completion nil beg end))) @@ -1096,7 +1096,7 @@ (setq sorted (cdr sorted))) compressed)))) -(defun PC-read-file-name-internal (string dir action) +(defun PC-read-file-name-internal (string pred action) "Extend `read-file-name-internal' to handle include files. This is only used by " (if (string-match "<\\([^\"<>]*\\)>?\\'" string) @@ -1112,7 +1112,7 @@ ((eq action 'lambda) (test-completion str2 completion-table nil)) ((eq action nil) (PC-try-completion str2 completion-table nil)) ((eq action t) (all-completions str2 completion-table nil)))) - (read-file-name-internal string dir action))) + (read-file-name-internal string pred action))) (provide 'complete)