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

no file completion, even if substitute-in-file-name changed
the string (bug#4708).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ddb0a35a0f9335e2d28b88ba71c4969f7f7d8b5..83dd29242c04d8f53bd690c4ad85409a25c16533 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * files-x.el (read-file-local-variable-value): Don't filter out
@@ -277,7 +283,7 @@
 
 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.
 
 2009-10-05  Juanma Barranquero  <lekktu@gmail.com>

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 8f2de068444827ceb22ec1742f2ba08eccf14a83..48a3ac01138c8c2fb3179675d184c04e1944f709 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1078,16 +1078,18 @@ variables.")
        ((null action)
         (let ((comp (file-name-completion name realdir
                                           read-file-name-predicate)))
-          (if (stringp comp)
-              ;; Requote the $s before returning the completion.
-              (minibuffer--double-dollars (concat specdir comp))
+          (cond
+           ((stringp comp)
+            ;; Requote the $s before returning the completion.
+            (minibuffer--double-dollars (concat specdir comp)))
+           (comp
             ;; Requote the $s before checking for changes.
             (setq str (minibuffer--double-dollars str))
             (if (string-equal string str)
                 comp
               ;; If there's no real completion, but substitute-in-file-name
               ;; changed the string, then return the new string.
-              str))))
+              str)))))
 
        ((eq action t)
         (let ((all (file-name-all-completions name realdir)))