[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.120 emacs/lisp/dired-aux.el:1.121
*** emacs/lisp/dired-aux.el:1.120       Mon Jun  7 21:24:31 2004
--- emacs/lisp/dired-aux.el     Wed Jun  9 00:25:30 2004
***************
*** 1852,1870 ****
                          (> (dired-get-subdir-min elt1)
                             (dired-get-subdir-min elt2)))))))
  
! (defun dired-kill-tree (dirname &optional remember-marks)
    "Kill all proper subdirs of DIRNAME, excluding DIRNAME itself.
! With optional arg REMEMBER-MARKS, return an alist of marked files."
!   (interactive "DKill tree below directory: ")
!   (setq dirname (expand-file-name dirname))
    (let ((s-alist dired-subdir-alist) dir m-alist)
      (while s-alist
        (setq dir (car (car s-alist))
            s-alist (cdr s-alist))
!       (if (and (not (string-equal dir dirname))
!              (dired-in-this-tree dir dirname)
!              (dired-goto-subdir dir))
!         (setq m-alist (nconc (dired-kill-subdir remember-marks) m-alist))))
      m-alist))
  
  (defun dired-insert-subdir-newpos (new-dir)
--- 1852,1874 ----
                          (> (dired-get-subdir-min elt1)
                             (dired-get-subdir-min elt2)))))))
  
! (defun dired-kill-tree (dirname &optional remember-marks kill-root)
    "Kill all proper subdirs of DIRNAME, excluding DIRNAME itself.
! Interactively, you can kill DIRNAME as well by using a prefix argument.
! In interactive use, the command prompts for DIRNAME.
! 
! When called from Lisp, if REMEMBER-MARKS is non-nil, return an alist
! of marked files.  If KILL-ROOT is non-nil, kill DIRNAME as well."
!   (interactive "DKill tree below directory: \ni\nP")
!   (setq dirname (file-name-as-directory (expand-file-name dirname)))
    (let ((s-alist dired-subdir-alist) dir m-alist)
      (while s-alist
        (setq dir (car (car s-alist))
            s-alist (cdr s-alist))
!       (and (or kill-root (not (string-equal dir dirname)))
!          (dired-in-this-tree dir dirname)
!          (dired-goto-subdir dir)
!          (setq m-alist (nconc (dired-kill-subdir remember-marks) m-alist))))
      m-alist))
  
  (defun dired-insert-subdir-newpos (new-dir)