(PC-do-completion): If completing on file name,

reproduce str by concatenating its directory and basename parts.

diff --git a/lisp/complete.el b/lisp/complete.el
index 6b5cc3d59000d81f83b05c2ff961661a9c51467f..c755f725c57b854e40e3083207ba0fd90078c53f 100644 (file)
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -446,7 +446,11 @@ of `minibuffer-completion-table' and the minibuffer contents.")
              (setq basestr (substring str incname)
                    dirname (substring str 0 incname))
            (setq basestr (file-name-nondirectory str)
-                 dirname (file-name-directory str)))
+                 dirname (file-name-directory str))
+           ;; Make sure str is consistent with its directory and basename
+           ;; parts.  This is important on DOZe'NT systems when str only
+           ;; includes a drive letter, like in "d:".
+           (setq str (concat dirname basestr)))
        (setq basestr str))
 
       ;; Convert search pattern to a standard regular expression