[Emacs-diffs] /srv/bzr/emacs/trunk r106860: * lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.

[Glenn Morris]

------------------------------------------------------------
revno: 106860
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-01-13 21:07:49 -0500
message:
  * lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.
modified:
  lisp/ChangeLog
  lisp/dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-13 23:09:28 +0000
+++ b/lisp/ChangeLog    2012-01-14 02:07:49 +0000
@@ -1,3 +1,7 @@
+2012-01-14  Glenn Morris  <address@hidden>
+
+       * dired.el (dired-get-filename): Fix 'verbatim case of previous change.
+
 2012-01-13  Glenn Morris  <address@hidden>
 
        * dired.el (dired-switches-escape-p): New function.

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2012-01-13 23:09:28 +0000
+++ b/lisp/dired.el     2012-01-14 02:07:49 +0000
@@ -2107,10 +2107,15 @@
           ;; Unescape any spaces escaped by ls -b (bug#10469).
           ;; Other -b quotes, eg \t, \n, work transparently.
           (if (dired-switches-escape-p dired-actual-switches)
-              (let ((start 0))
+              (let ((start 0)
+                    (rep "")
+                    (shift -1))
+                (if (eq localp 'verbatim)
+                    (setq rep "\\\\"
+                          shift +1))
                 (while (string-match "\\(\\\\\\) " file start)
-                  (setq file (replace-match "" nil t file 1)
-                        start (1- (match-end 0))))))
+                  (setq file (replace-match rep nil t file 1)
+                        start (+ shift (match-end 0))))))
          (when (eq system-type 'windows-nt)
            (save-match-data
              (let ((start 0))