aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-10-02 03:08:47 +0000
committerRichard M. Stallman2006-10-02 03:08:47 +0000
commit7de3f9a41ef976056cf40f98c4b6903ef9bcad57 (patch)
treed3b0f4ecbc621a8f1c742d1f00009141de454129
parent1f8a132d060bc079ff723466518b5ac4ef4ba6b6 (diff)
downloademacs-7de3f9a41ef976056cf40f98c4b6903ef9bcad57.tar.gz
emacs-7de3f9a41ef976056cf40f98c4b6903ef9bcad57.zip
(dired-build-subdir-alist): Fix previous change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired.el16
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9deec93eb24..6ef8170c2a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-10-01 Chris Moore <christopher.ian.moore@gmail.com> (tiny change)
2
3 * dired.el (dired-build-subdir-alist): Fix previous change.
4
12006-10-01 Johan Bockg,Ae(Brd <bojohan+mail@dd.chalmers.se> 52006-10-01 Johan Bockg,Ae(Brd <bojohan+mail@dd.chalmers.se>
2 6
3 * simple.el (undo-elt-crosses-region): Fix the inequalities. 7 * simple.el (undo-elt-crosses-region): Fix the inequalities.
diff --git a/lisp/dired.el b/lisp/dired.el
index dd7cdcdb522..491ef261c11 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2225,14 +2225,14 @@ instead of `dired-actual-switches'."
2225 (substring new-dir-name (match-end 0))) 2225 (substring new-dir-name (match-end 0)))
2226 (expand-file-name new-dir-name)))) 2226 (expand-file-name new-dir-name))))
2227 (delete-region (point) (match-end 1)) 2227 (delete-region (point) (match-end 1))
2228 (insert new-dir-name))) 2228 (insert new-dir-name))
2229 (setq count (1+ count)) 2229 (setq count (1+ count))
2230 (dired-alist-add-1 new-dir-name 2230 (dired-alist-add-1 new-dir-name
2231 ;; Place a sub directory boundary between lines. 2231 ;; Place a sub directory boundary between lines.
2232 (save-excursion 2232 (save-excursion
2233 (goto-char (match-beginning 0)) 2233 (goto-char (match-beginning 0))
2234 (beginning-of-line) 2234 (beginning-of-line)
2235 (point-marker)))) 2235 (point-marker)))))
2236 (if (and (> count 1) (interactive-p)) 2236 (if (and (> count 1) (interactive-p))
2237 (message "Buffer includes %d directories" count))) 2237 (message "Buffer includes %d directories" count)))
2238 ;; We don't need to sort it because it is in buffer order per 2238 ;; We don't need to sort it because it is in buffer order per