aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-04-01 17:32:02 +0000
committerChong Yidong2008-04-01 17:32:02 +0000
commit103334cd2106d2cb1357664bb07a305df22c82ae (patch)
tree4a899906944d8c6dd6787628cc45179fe7d682ee
parent8203444546dd77da11a67c8aa1590801d20dc8f5 (diff)
downloademacs-103334cd2106d2cb1357664bb07a305df22c82ae.tar.gz
emacs-103334cd2106d2cb1357664bb07a305df22c82ae.zip
Fix last fix.
-rw-r--r--lisp/find-dired.el15
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 87676fe71bc..79a6a3b18c3 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -248,9 +248,8 @@ Thus ARG can also contain additional grep options."
248 (beg (point-max)) 248 (beg (point-max))
249 (l-opt (and (consp find-ls-option) 249 (l-opt (and (consp find-ls-option)
250 (string-match "l" (cdr find-ls-option)))) 250 (string-match "l" (cdr find-ls-option))))
251 (links-regexp "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\)") 251 (ls-regexp (concat "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\) +"
252 (size-regexp 252 "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+\\)")))
253 "^ +[^ \t\r\n]+ +[^ \t\r\n]+ +[^ \t\r\n]+ +[^ \t\r\n]+\\( +[0-9]+\\)"))
254 (goto-char beg) 253 (goto-char beg)
255 (insert string) 254 (insert string)
256 (goto-char beg) 255 (goto-char beg)
@@ -271,15 +270,11 @@ Thus ARG can also contain additional grep options."
271 (when l-opt 270 (when l-opt
272 (goto-char beg) 271 (goto-char beg)
273 (goto-char (line-beginning-position)) 272 (goto-char (line-beginning-position))
274 (while (re-search-forward links-regexp nil t) 273 (while (re-search-forward ls-regexp nil t)
275 (replace-match (format "%4s" (match-string 1)) 274 (replace-match (format "%4s" (match-string 1))
276 nil nil nil 1) 275 nil nil nil 1)
277 (forward-line 1)) 276 (replace-match (format "%9s" (match-string 2))
278 (goto-char beg) 277 nil nil nil 2)
279 (goto-char (line-beginning-position))
280 (while (re-search-forward size-regexp nil t)
281 (replace-match (format "%9s" (match-string 1))
282 nil nil nil 1)
283 (forward-line 1))) 278 (forward-line 1)))
284 ;; Find all the complete lines in the unprocessed 279 ;; Find all the complete lines in the unprocessed
285 ;; output and process it to add text properties. 280 ;; output and process it to add text properties.