[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Emacs CVS: find-file.el - Line up all columns in output
From: |
Jari Aalto |
Subject: |
[PATCH] Emacs CVS: find-file.el - Line up all columns in output |
Date: |
Mon, 08 Oct 2007 01:16:08 +0300 |
Patch against CVS 2007-10-07 22:15 UTC
Current output of M-x find-file:
-rw-r--r-- 1 root None 123166 Sep 30 00:23 dir/test.tst
-rw-r--r-- 1 root None 18 Oct 7 17:49 tmp/1
After the "line up" fix, where the size columns are placed evenly
to make the rest of the line, namely the file names, line up.
-rw-r--r-- 1 root None 123166 Sep 30 00:23 dir/test.tst
-rw-r--r-- 1 root None 18 Oct 7 17:49 tmp/1
2007-10-08 Jari Aalto <jari.aalto AT cante.net>
* find-dired.el (find-dired-filter): Make output line up by
adjusting the position of file sizes at column 5.
diff --git a/find-dired.el b/find-dired.el
index 0a3de85..79b0c13 100644
--- a/find-dired.el
+++ b/find-dired.el
@@ -232,7 +232,12 @@ Thus ARG can also contain additional grep options."
(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 (concat
+ "^ *[^ \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)
@@ -246,6 +251,7 @@ Thus ARG can also contain additional grep options."
(goto-char end)
(or (looking-at "^")
(forward-line 1))
+ (goto-char (line-beginning-position))
(while (looking-at "^")
(insert " ")
(forward-line 1))
@@ -255,6 +261,19 @@ Thus ARG can also contain additional grep options."
(goto-char (- end 3)) ; no error if < 0
(while (search-forward " ./" nil t)
(delete-region (point) (- (point) 2)))
+ ;; Make output "line up" by adjusting the file size at column 5
+ ;; -rw-r----x 1 foo foo 2425 Dec 5 2005 file.txt
+ ;; -rw-r----x 1 foo foo 25 Dec 5 2005 test.tmp
+ (if l-opt
+ (progn
+ (goto-char (- end 3))
+ (if (re-search-forward size-regexp nil t)
+ (replace-match
+ (format "%6s" (match-string 1))
+ (not 'fixcase)
+ (not 'literal)
+ (not 'string)
+ 1))))
;; Find all the complete lines in the unprocessed
;; output and process it to add text properties.
(goto-char (point-max))
- [PATCH] Emacs CVS: find-file.el - Line up all columns in output,
Jari Aalto <=