diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-27 15:04:57 -0500 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-27 15:04:57 -0500 |
commit | 07976ae3b816dea4fd541bbba862603d3132eb2c (patch) | |
tree | 4a437b7cb3abb01fb144530a130c991882a1b7f2 /lisp/dired.el | |
parent | 9610796712a3bc43730c99005906571a2c0bccbd (diff) | |
parent | 402c8a49571227f8a4e678d4a6cdd6ba7841aef9 (diff) | |
download | emacs-07976ae3b816dea4fd541bbba862603d3132eb2c.tar.gz emacs-07976ae3b816dea4fd541bbba862603d3132eb2c.tar.bz2 emacs-07976ae3b816dea4fd541bbba862603d3132eb2c.zip |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/dired.el')
-rw-r--r-- | lisp/dired.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index bd3fb531d77..104cf4970ad 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2011,6 +2011,14 @@ Otherwise, an error occurs in these cases." ;; with quotation marks in their names. (while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file) (setq file (replace-match "\\\"" nil t file 1))) + + (when (eq system-type 'windows-nt) + (save-match-data + (let ((start 0)) + (while (string-match "\\\\" file start) + (aset file (match-beginning 0) ?/) + (setq start (match-end 0)))))) + (setq file (read (concat "\"" file "\""))) ;; The above `read' will return a unibyte string if FILE ;; contains eight-bit-control/graphic characters. |