aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-06-10 19:06:14 +0000
committerLuc Teirlinck2004-06-10 19:06:14 +0000
commit081e43973f868bb7d9542fa21540a225765c6052 (patch)
tree2335e5e6394512d2e0be2aa1d325ffc897daf322
parentd82baff9bd95b64b89e3a10072f292647f8b2b87 (diff)
downloademacs-081e43973f868bb7d9542fa21540a225765c6052.tar.gz
emacs-081e43973f868bb7d9542fa21540a225765c6052.zip
(dired-insert-subdir): Do not store R switch in `dired-switches-alist'.
-rw-r--r--lisp/dired-aux.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7e96f1673ed..a58b62498ca 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1812,10 +1812,10 @@ This function takes some pains to conform to `ls -lR' output."
1812 (push (cons dirname switches) dired-switches-alist))) 1812 (push (cons dirname switches) dired-switches-alist)))
1813 (when switches-have-R 1813 (when switches-have-R
1814 (dired-build-subdir-alist switches) 1814 (dired-build-subdir-alist switches)
1815 (setq switches (dired-replace-in-string "R" "" switches))
1815 (dolist (cur-ass dired-subdir-alist) 1816 (dolist (cur-ass dired-subdir-alist)
1816 (let ((cur-dir (car cur-ass))) 1817 (let ((cur-dir (car cur-ass)))
1817 (and (dired-in-this-tree cur-dir dirname) 1818 (and (dired-in-this-tree cur-dir dirname)
1818 (not (string= cur-dir dirname))
1819 (let ((cur-cons (assoc-string cur-dir dired-switches-alist))) 1819 (let ((cur-cons (assoc-string cur-dir dired-switches-alist)))
1820 (if cur-cons 1820 (if cur-cons
1821 (setcdr cur-cons switches) 1821 (setcdr cur-cons switches)