From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 9 Aug 1999 08:56:31 +0000 (+0000)
Subject: (PC-do-completion): If completing on file name,
X-Git-Tag: emacs-pretest-21.0.90~7234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b38d1cc78ed57ed1b89c349d2af3a20583b5fadf;p=emacs.git

(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 6b5cc3d5900..c755f725c57 100644
--- 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