diff options
| author | Juanma Barranquero | 2009-09-10 02:25:53 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-09-10 02:25:53 +0000 |
| commit | 50405cd07fc312c5e0c75776067b53e965d3faf4 (patch) | |
| tree | ddaa4920dcf430620d6a39a938d3ba6af361bef3 | |
| parent | 7ae624301eaf097a367628a4ccac6cbc756aa5ba (diff) | |
| download | emacs-50405cd07fc312c5e0c75776067b53e965d3faf4.tar.gz emacs-50405cd07fc312c5e0c75776067b53e965d3faf4.zip | |
* startup.el (command-line-normalize-file-name): On Windows and
MS-DOS, also convert C:\/ and C:\\ (two backslashes) into C:/.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05bcd0ad18b..ad989d8d0a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-09-10 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * startup.el (command-line-normalize-file-name): On Windows and | ||
| 4 | MS-DOS, also convert C:\/ and C:\\ (two backslashes) into C:/. | ||
| 5 | |||
| 1 | 2009-09-10 Juri Linkov <juri@jurta.org> | 6 | 2009-09-10 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * isearch.el (isearch-text-char-description): Propertize escape | 8 | * 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." | |||
| 2352 | ;; However, /// at the beginning is supposed to mean just /, not //. | 2352 | ;; However, /// at the beginning is supposed to mean just /, not //. |
| 2353 | (if (string-match "^///+" file) | 2353 | (if (string-match "^///+" file) |
| 2354 | (setq file (replace-match "/" t t file))) | 2354 | (setq file (replace-match "/" t t file))) |
| 2355 | (and (memq system-type '(ms-dos windows-nt)) | ||
| 2356 | (string-match "^[A-Za-z]:\\(\\\\[\\\\/]\\)" file) ; C:\/ or C:\\ | ||
| 2357 | (setq file (replace-match "/" t t file 1))) | ||
| 2355 | (while (string-match "//+" file 1) | 2358 | (while (string-match "//+" file 1) |
| 2356 | (setq file (replace-match "/" t t file))) | 2359 | (setq file (replace-match "/" t t file))) |
| 2357 | file)) | 2360 | file)) |