changeset 104900:a5fc0cde652e

* startup.el (command-line-normalize-file-name): On Windows and MS-DOS, also convert C:\/ and C:\\ (two backslashes) into C:/.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 10 Sep 2009 02:25:53 +0000
parents 3514d8f689c3
children 94b864b983d4
files lisp/ChangeLog lisp/startup.el
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Sep 10 00:58:15 2009 +0000
+++ b/lisp/ChangeLog	Thu Sep 10 02:25:53 2009 +0000
@@ -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
--- a/lisp/startup.el	Thu Sep 10 00:58:15 2009 +0000
+++ b/lisp/startup.el	Thu Sep 10 02:25:53 2009 +0000
@@ -2352,6 +2352,9 @@
     ;; 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))