[Emacs-diffs] Changes to emacs/lisp/dired-aux.el

[Luc Teirlinck]

Index: emacs/lisp/dired-aux.el
diff -c emacs/lisp/dired-aux.el:1.122 emacs/lisp/dired-aux.el:1.123
*** emacs/lisp/dired-aux.el:1.122       Wed Jun  9 01:04:28 2004
--- emacs/lisp/dired-aux.el     Thu Jun 10 19:06:14 2004
***************
*** 1812,1821 ****
        (push (cons dirname switches) dired-switches-alist)))
      (when switches-have-R
        (dired-build-subdir-alist switches)
        (dolist (cur-ass dired-subdir-alist)
        (let ((cur-dir (car cur-ass)))
          (and (dired-in-this-tree cur-dir dirname)
-              (not (string= cur-dir dirname))
               (let ((cur-cons (assoc-string cur-dir dired-switches-alist)))
                 (if cur-cons
                     (setcdr cur-cons switches)
--- 1812,1821 ----
        (push (cons dirname switches) dired-switches-alist)))
      (when switches-have-R
        (dired-build-subdir-alist switches)
+       (setq switches (dired-replace-in-string "R" "" switches))
        (dolist (cur-ass dired-subdir-alist)
        (let ((cur-dir (car cur-ass)))
          (and (dired-in-this-tree cur-dir dirname)
               (let ((cur-cons (assoc-string cur-dir dired-switches-alist)))
                 (if cur-cons
                     (setcdr cur-cons switches)