[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 16:48:25

Index: find-dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/find-dired.el,v
retrieving revision 1.55.2.4
retrieving revision 1.55.2.5
diff -u -b -r1.55.2.4 -r1.55.2.5
--- find-dired.el       7 Jan 2008 02:44:48 -0000       1.55.2.4
+++ find-dired.el       1 Apr 2008 16:48:24 -0000       1.55.2.5
@@ -239,7 +239,11 @@
 (defun find-dired-filter (proc string)
   ;; Filter for \\[find-dired] processes.
   (let ((buf (process-buffer proc))
-       (inhibit-read-only t))
+       (inhibit-read-only t)
+       (l-opt (and (consp find-ls-option)
+                   (string-match "l" (cdr find-ls-option))))
+       (size-regexp
+        "^ +[^ \t\r\n]+ +[^ \t\r\n]+ +[^ \t\r\n]+ +[^ \t\r\n]+ +\\([0-9]+\\)"))
     (if (buffer-name buf)              ; not killed?
        (save-excursion
          (set-buffer buf)
@@ -262,6 +266,12 @@
                (goto-char (- end 3))   ; no error if < 0
                (while (search-forward " ./" nil t)
                  (delete-region (point) (- (point) 2)))
+               ;; Make output line up by padding the file size
+               (when l-opt
+                 (goto-char (- end 3))
+                 (when (re-search-forward size-regexp nil t)
+                   (replace-match (format "%10s" (match-string 1))
+                                  nil nil nil 1)))
                ;; Find all the complete lines in the unprocessed
                ;; output and process it to add text properties.
                (goto-char (point-max))
@@ -269,8 +279,7 @@
                    (progn
                      (dired-insert-set-properties (process-mark proc)
                                                   (1+ (point)))
-                     (move-marker (process-mark proc) (1+ (point)))))
-               ))))
+                     (move-marker (process-mark proc) (1+ (point)))))))))
       ;; The buffer has been killed.
       (delete-process proc))))