Commit 40ba9882 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(completion--file-name-table): Return nil if there's

no file completion, even if substitute-in-file-name changed
the string (bug#4708).
parent 04e0f59b
2009-10-14 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (completion--file-name-table): Return nil if there's
no file completion, even if substitute-in-file-name changed
the string (bug#4708).
2009-10-13 Juri Linkov <juri@jurta.org> 2009-10-13 Juri Linkov <juri@jurta.org>
* files-x.el (read-file-local-variable-value): Don't filter out * files-x.el (read-file-local-variable-value): Don't filter out
...@@ -277,7 +283,7 @@ ...@@ -277,7 +283,7 @@
2009-10-05 Stefan Monnier <monnier@iro.umontreal.ca> 2009-10-05 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (describe-function-1): Don't burp is the function is not * help-fns.el (describe-function-1): Don't burp if the function is not
a symbol. a symbol.
2009-10-05 Juanma Barranquero <lekktu@gmail.com> 2009-10-05 Juanma Barranquero <lekktu@gmail.com>
......
...@@ -1078,16 +1078,18 @@ variables.") ...@@ -1078,16 +1078,18 @@ variables.")
((null action) ((null action)
(let ((comp (file-name-completion name realdir (let ((comp (file-name-completion name realdir
read-file-name-predicate))) read-file-name-predicate)))
(if (stringp comp) (cond
;; Requote the $s before returning the completion. ((stringp comp)
(minibuffer--double-dollars (concat specdir comp)) ;; Requote the $s before returning the completion.
(minibuffer--double-dollars (concat specdir comp)))
(comp
;; Requote the $s before checking for changes. ;; Requote the $s before checking for changes.
(setq str (minibuffer--double-dollars str)) (setq str (minibuffer--double-dollars str))
(if (string-equal string str) (if (string-equal string str)
comp comp
;; If there's no real completion, but substitute-in-file-name ;; If there's no real completion, but substitute-in-file-name
;; changed the string, then return the new string. ;; changed the string, then return the new string.
str)))) str)))))
((eq action t) ((eq action t)
(let ((all (file-name-all-completions name realdir))) (let ((all (file-name-all-completions name realdir)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment