diff options
| author | Luc Teirlinck | 2004-06-10 19:10:09 +0000 |
|---|---|---|
| committer | Luc Teirlinck | 2004-06-10 19:10:09 +0000 |
| commit | f817c0fbc4b197cf31b07db511fdfac471f9467d (patch) | |
| tree | d3a05748f583e4444208e23c40d1bbd7d9b202ce | |
| parent | 081e43973f868bb7d9542fa21540a225765c6052 (diff) | |
| download | emacs-f817c0fbc4b197cf31b07db511fdfac471f9467d.tar.gz emacs-f817c0fbc4b197cf31b07db511fdfac471f9467d.zip | |
(dired-insert-old-subdirs): Adapt to fact that the R switch is no
longer stored in `dired-switches-alist'.
| -rw-r--r-- | lisp/dired.el | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index f206b03cd26..3d3fd34b5ac 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -970,14 +970,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." | |||
| 970 | (condition-case () | 970 | (condition-case () |
| 971 | (progn | 971 | (progn |
| 972 | (dired-uncache dir) | 972 | (dired-uncache dir) |
| 973 | (dired-insert-subdir dir) | 973 | (dired-insert-subdir dir)) |
| 974 | (let ((switches (cdr (assoc-string dir dired-switches-alist)))) | ||
| 975 | (and switches | ||
| 976 | (string-match "R" switches) | ||
| 977 | (dolist (cur-ass (copy-sequence old-subdir-alist)) | ||
| 978 | (when (dired-in-this-tree (car cur-ass) dir) | ||
| 979 | (setq old-subdir-alist | ||
| 980 | (delete cur-ass old-subdir-alist))))))) | ||
| 981 | (error nil)))))) | 974 | (error nil)))))) |
| 982 | 975 | ||
| 983 | (defun dired-uncache (dir) | 976 | (defun dired-uncache (dir) |