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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      08/04/01 17:32:02

Index: find-dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/find-dired.el,v
retrieving revision 1.55.2.6
retrieving revision 1.55.2.7
diff -u -b -r1.55.2.6 -r1.55.2.7
--- find-dired.el       1 Apr 2008 17:28:26 -0000       1.55.2.6
+++ find-dired.el       1 Apr 2008 17:32:02 -0000       1.55.2.7
@@ -248,9 +248,8 @@
                  (beg (point-max))
                  (l-opt (and (consp find-ls-option)
                              (string-match "l" (cdr find-ls-option))))
-                 (links-regexp "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\)")
-                 (size-regexp
-                  "^ +[^ \t\r\n]+ +[^ \t\r\n]+ +[^ \t\r\n]+ +[^ \t\r\n]+\\( 
+[0-9]+\\)"))
+                 (ls-regexp (concat "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\) +"
+                                    "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+\\)")))
              (goto-char beg)
              (insert string)
              (goto-char beg)
@@ -271,15 +270,11 @@
              (when l-opt
                (goto-char beg)
                (goto-char (line-beginning-position))
-               (while (re-search-forward links-regexp nil t)
+               (while (re-search-forward ls-regexp nil t)
                  (replace-match (format "%4s" (match-string 1))
                                 nil nil nil 1)
-                 (forward-line 1))
-               (goto-char beg)
-               (goto-char (line-beginning-position))
-               (while (re-search-forward size-regexp nil t)
-                 (replace-match (format "%9s" (match-string 1))
-                                nil nil nil 1)
+                 (replace-match (format "%9s" (match-string 2))
+                                nil nil nil 2)
                  (forward-line 1)))
              ;; Find all the complete lines in the unprocessed
              ;; output and process it to add text properties.