]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix last fix.
authorChong Yidong <cyd@stupidchicken.com>
Tue, 1 Apr 2008 17:32:02 +0000 (17:32 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 1 Apr 2008 17:32:02 +0000 (17:32 +0000)
lisp/find-dired.el

index 87676fe71bc41024598c1699b1f4880a26469407..79a6a3b18c32e091e92ca0ee4c842d42d9c4f142 100644 (file)
@@ -248,9 +248,8 @@ Thus ARG can also contain additional grep options."
                  (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 @@ Thus ARG can also contain additional grep options."
              (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.