[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/dired-aux.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/dired-aux.el [emacs-unicode-2] |
Date: |
Fri, 23 Jul 2004 00:56:36 -0400 |
Index: emacs/lisp/dired-aux.el
diff -c emacs/lisp/dired-aux.el:1.110.6.2 emacs/lisp/dired-aux.el:1.110.6.3
*** emacs/lisp/dired-aux.el:1.110.6.2 Mon Jun 28 07:28:28 2004
--- emacs/lisp/dired-aux.el Fri Jul 23 04:30:38 2004
***************
*** 163,170 ****
(unless (let ((list list2))
(while (and list
(not (let* ((file2 (car list))
! (fa1 (caddr file1))
! (fa2 (caddr file2))
(size1 (nth 7 fa1))
(size2 (nth 7 fa2))
(mtime1 (float-time (nth 5 fa1)))
--- 163,170 ----
(unless (let ((list list2))
(while (and list
(not (let* ((file2 (car list))
! (fa1 (car (cddr file1)))
! (fa2 (car (cddr file2)))
(size1 (nth 7 fa1))
(size2 (nth 7 fa2))
(mtime1 (float-time (nth 5 fa1)))
***************
*** 627,635 ****
(defun dired-do-kill-lines (&optional arg fmt)
"Kill all marked lines (not the files).
With a prefix argument, kill that many lines starting with the current line.
! \(A negative argument kills lines before the current line.)
! To kill an entire subdirectory, go to its directory header line
! and use this command with a prefix argument (the value does not matter)."
;; Returns count of killed lines. FMT="" suppresses message.
(interactive "P")
(if arg
--- 627,640 ----
(defun dired-do-kill-lines (&optional arg fmt)
"Kill all marked lines (not the files).
With a prefix argument, kill that many lines starting with the current line.
! \(A negative argument kills backward.)
! If you use this command with a prefix argument to kill the line
! for a file that is a directory, which you have inserted in the
! Dired buffer as a subdirectory, then it deletes that subdirectory
! from the buffer as well.
! To kill an entire subdirectory \(without killing its line in the
! parent directory), go to its directory header line and use this
! command with a prefix argument (the value does not matter)."
;; Returns count of killed lines. FMT="" suppresses message.
(interactive "P")
(if arg
***************
*** 638,660 ****
(dired-kill-line arg))
(save-excursion
(goto-char (point-min))
! (let (buffer-read-only (count 0))
! (if (not arg) ; kill marked lines
! (let ((regexp (dired-marker-regexp)))
! (while (and (not (eobp))
! (re-search-forward regexp nil t))
! (setq count (1+ count))
! (delete-region (progn (beginning-of-line) (point))
! (progn (forward-line 1) (point)))))
! ;; else kill unmarked lines
! (while (not (eobp))
! (if (or (dired-between-files)
! (not (looking-at "^ ")))
! (forward-line 1)
! (setq count (1+ count))
! (delete-region (point) (save-excursion
! (forward-line 1)
! (point))))))
(or (equal "" fmt)
(message (or fmt "Killed %d line%s.") count (dired-plural-s count)))
count))))
--- 643,656 ----
(dired-kill-line arg))
(save-excursion
(goto-char (point-min))
! (let (buffer-read-only
! (count 0)
! (regexp (dired-marker-regexp)))
! (while (and (not (eobp))
! (re-search-forward regexp nil t))
! (setq count (1+ count))
! (delete-region (progn (beginning-of-line) (point))
! (progn (forward-line 1) (point))))
(or (equal "" fmt)
(message (or fmt "Killed %d line%s.") count (dired-plural-s count)))
count))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/dired-aux.el [emacs-unicode-2],
Miles Bader <=