From: Stefan Monnier Date: Mon, 21 Apr 2008 21:18:07 +0000 (+0000) Subject: (PC-complete-as-file-name, PC-read-file-name-internal): X-Git-Tag: emacs-pretest-23.0.90~6153 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c023a34f05a3cca887d0d3e21b27c7ad720ba795;p=emacs.git (PC-complete-as-file-name, PC-read-file-name-internal): Treat minibuffer-completion-predicate as a predicate. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a77a8e7c72..0b0435db5c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-04-21 Stefan Monnier + * 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. diff --git a/lisp/complete.el b/lisp/complete.el index 0050ecf7b90..3c4385273d1 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -966,7 +966,7 @@ or properties are considered." (+ (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 @@ absolute rather than relative to some directory on the SEARCH-PATH." (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 @@ This is only used by " ((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)