* startup.el (command-line-normalize-file-name): On Windows and

  MS-DOS, also convert C:\/ and C:\\ (two backslashes) into C:/.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05bcd0ad18bebc21a425249281afe749101ee7f4..ad989d8d0a3d61fb82973b5ee60cc7d7953050c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-10  Juanma Barranquero  <lekktu@gmail.com>
+
+       * startup.el (command-line-normalize-file-name): On Windows and
+       MS-DOS, also convert C:\/ and C:\\ (two backslashes) into C:/.
+
 2009-09-10  Juri Linkov  <juri@jurta.org>
 
        * isearch.el (isearch-text-char-description): Propertize escape

diff --git a/lisp/startup.el b/lisp/startup.el
index fa4a25460750d71ae3fd92ece258c31d4ef38e31..1d534d12e09654b427fe73c68750d0295e1315c8 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2352,6 +2352,9 @@ A fancy display is used on graphic displays, normal otherwise."
     ;; However, /// at the beginning is supposed to mean just /, not //.
     (if (string-match "^///+" file)
        (setq file (replace-match "/" t t file)))
+    (and (memq system-type '(ms-dos windows-nt))
+        (string-match "^[A-Za-z]:\\(\\\\[\\\\/]\\)" file) ; C:\/ or C:\\
+        (setq file (replace-match "/" t t file 1)))
     (while (string-match "//+" file 1)
       (setq file (replace-match "/" t t file)))
     file))