procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(PC-complete-as-file-name, PC-read-file-name-internal):

Browse source 
Treat minibuffer-completion-predicate as a predicate.
This commit is contained in:
Stefan Monnier 2008-04-21 21:18:07 +00:00
parent f50e56f0e1
commit c023a34f05
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

6
lisp/complete.el
View file

@ -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)