[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.119 emacs/lisp/dired-aux.el:1.120
*** emacs/lisp/dired-aux.el:1.119       Sun Jun  6 02:26:46 2004
--- emacs/lisp/dired-aux.el     Mon Jun  7 21:24:31 2004
***************
*** 891,897 ****
  (defun dired-do-redisplay (&optional arg test-for-subdir)
    "Redisplay all marked (or next ARG) files.
  If on a subdir line, redisplay that subdirectory.  In that case,
! a prefix arg lets you edit the `ls' switches used for the new listing."
    ;; Moves point if the next ARG files are redisplayed.
    (interactive "P\np")
    (if (and test-for-subdir (dired-get-subdir))
--- 891,904 ----
  (defun dired-do-redisplay (&optional arg test-for-subdir)
    "Redisplay all marked (or next ARG) files.
  If on a subdir line, redisplay that subdirectory.  In that case,
! a prefix arg lets you edit the `ls' switches used for the new listing.
! 
! Dired remembers switches specified with a prefix arg, so that reverting
! the buffer will not reset them.  However, using `dired-undo' to re-insert
! or delete subdirectories can bypass this machinery.  Hence, you sometimes
! may have to reset some subdirectory switches after a `dired-undo'.
! You can reset all subdirectory switches to the default using
! \\<dired-mode-map>\\[dired-reset-subdir-switches]."
    ;; Moves point if the next ARG files are redisplayed.
    (interactive "P\np")
    (if (and test-for-subdir (dired-get-subdir))
***************
*** 914,919 ****
--- 921,932 ----
                          arg)
      (dired-move-to-filename)
      (message "Redisplaying...done")))
+ 
+ (defun dired-reset-subdir-switches ()
+   "Set `dired-switches-alist' to nil and revert dired buffer."
+   (interactive)
+   (setq dired-switches-alist nil)
+   (revert-buffer))
  
  (defun dired-update-file-line (file)
    ;; Delete the current line, and insert an entry for FILE.
***************
*** 1727,1733 ****
  With a prefix arg, you may edit the ls switches used for this listing.
    You can add `R' to the switches to expand the whole tree starting at
    this subdirectory.
! This function takes some pains to conform to `ls -lR' output."
    (interactive
     (list (dired-get-filename)
         (if current-prefix-arg
--- 1740,1753 ----
  With a prefix arg, you may edit the ls switches used for this listing.
    You can add `R' to the switches to expand the whole tree starting at
    this subdirectory.
! This function takes some pains to conform to `ls -lR' output.
! 
! Dired remembers switches specified with a prefix arg, so that reverting
! the buffer will not reset them.  However, using `dired-undo' to re-insert
! or delete subdirectories can bypass this machinery.  Hence, you sometimes
! may have to reset some subdirectory switches after a `dired-undo'.
! You can reset all subdirectory switches to the default using
! \\<dired-mode-map>\\[dired-reset-subdir-switches]."
    (interactive
     (list (dired-get-filename)
         (if current-prefix-arg