# HG changeset patch # User Stefan Monnier # Date 1208812687 0 # Node ID 185747659a29d997db0fd6ad12a07078cca3c167 # Parent 701d10a19a8ff831c927db97aa1d5f991850fcf1 (PC-complete-as-file-name, PC-read-file-name-internal): Treat minibuffer-completion-predicate as a predicate. diff -r 701d10a19a8f -r 185747659a29 lisp/ChangeLog --- 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 + * 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 -r 701d10a19a8f -r 185747659a29 lisp/complete.el --- 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)