[Emacs-diffs] emacs/lisp ChangeLog startup.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/10 02:25:57

Modified files:
        lisp           : ChangeLog startup.el 

Log message:
        * startup.el (command-line-normalize-file-name): On Windows and
          MS-DOS, also convert C:\/ and C:\\ (two backslashes) into C:/.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16117&r2=1.16118
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.536&r2=1.537

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16117
retrieving revision 1.16118
diff -u -b -r1.16117 -r1.16118
--- ChangeLog   10 Sep 2009 00:58:15 -0000      1.16117
+++ ChangeLog   10 Sep 2009 02:25:53 -0000      1.16118
@@ -1,3 +1,8 @@
+2009-09-10  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * isearch.el (isearch-text-char-description): Propertize escape

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -b -r1.536 -r1.537
--- startup.el  3 Sep 2009 06:55:01 -0000       1.536
+++ startup.el  10 Sep 2009 02:25:56 -0000      1.537
@@ -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))