Mercurial > emacs
diff lisp/find-dired.el @ 80422:9b3620a67bcb
Fix last fix.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Tue, 01 Apr 2008 17:32:02 +0000 |
parents | 2c7b83cbf547 |
children |
line wrap: on
line diff
--- a/lisp/find-dired.el Tue Apr 01 17:28:26 2008 +0000 +++ b/lisp/find-dired.el Tue Apr 01 17:32:02 2008 +0000 @@ -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.