From: Juanma Barranquero Date: Thu, 10 Sep 2009 02:25:53 +0000 (+0000) Subject: * startup.el (command-line-normalize-file-name): On Windows and X-Git-Tag: emacs-pretest-23.1.90~1432 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50405cd07fc312c5e0c75776067b53e965d3faf4;p=emacs.git * 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 05bcd0ad18b..ad989d8d0a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-09-10 Juanma Barranquero + + * 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 * isearch.el (isearch-text-char-description): Propertize escape diff --git a/lisp/startup.el b/lisp/startup.el index fa4a2546075..1d534d12e09 100644 --- 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))