[Emacs-diffs] Changes to emacs/lisp/dired.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/09/24 20:37:13

Index: dired.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired.el,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -b -r1.350 -r1.351
--- dired.el    8 Sep 2006 11:58:18 -0000       1.350
+++ dired.el    24 Sep 2006 20:37:13 -0000      1.351
@@ -2204,14 +2204,14 @@
                 (concat "\\`" (match-string 1 default-directory)))))
       (goto-char (point-min))
       (setq dired-subdir-alist nil)
-      (while (and (re-search-forward dired-subdir-regexp nil t)
+      (while (re-search-forward dired-subdir-regexp nil t)
                  ;; Avoid taking a file name ending in a colon
                  ;; as a subdir name.
-                 (not (save-excursion
+       (unless (save-excursion
                         (goto-char (match-beginning 0))
                         (beginning-of-line)
                         (forward-char 2)
-                        (save-match-data (looking-at dired-re-perms)))))
+                 (save-match-data (looking-at dired-re-perms)))
        (save-excursion
          (goto-char (match-beginning 1))
          (setq new-dir-name
@@ -2225,7 +2225,7 @@
                              (substring new-dir-name (match-end 0)))
                    (expand-file-name new-dir-name))))
          (delete-region (point) (match-end 1))
-         (insert new-dir-name))
+           (insert new-dir-name)))
        (setq count (1+ count))
        (dired-alist-add-1 new-dir-name
                           ;; Place a sub directory boundary between lines.
@@ -2234,10 +2234,10 @@
                             (beginning-of-line)
                             (point-marker))))
       (if (and (> count 1) (interactive-p))
-         (message "Buffer includes %d directories" count))
+         (message "Buffer includes %d directories" count)))
       ;; We don't need to sort it because it is in buffer order per
       ;; constructionem.  Return new alist:
-      dired-subdir-alist)))
+    dired-subdir-alist))
 
 (defun dired-alist-add-1 (dir new-marker)
   ;; Add new DIR at NEW-MARKER.  Don't sort.