]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix errors when aligning text in find-dired
authorStephen Berman <stephen.berman@gmx.net>
Tue, 14 Jun 2022 13:37:53 +0000 (15:37 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 14 Jun 2022 13:37:53 +0000 (15:37 +0200)
* lisp/find-dired.el (find-dired-filter): Don't error out while
trying to align the text (by just removing that code) (bug#46218).

lisp/find-dired.el

index 8c1e684b7eaddfd603b60d2fb595a48d92753754..61e626080ea6d412e97af9ce8dfb7d29d056fad4 100644 (file)
@@ -325,11 +325,7 @@ specifies what to use in place of \"-ls\" as the final argument."
            (save-restriction
              (widen)
              (let ((buffer-read-only nil)
-                   (beg (point-max))
-                   (l-opt (and (consp find-ls-option)
-                               (string-match "l" (cdr find-ls-option))))
-                   (ls-regexp (concat "^ +[^ \t\r\n]+\\( +[^ \t\r\n]+\\) +"
-                                      "[^ \t\r\n]+ +[^ \t\r\n]+\\( +[^[:space:]]+\\)")))
+                   (beg (point-max)))
                (goto-char beg)
                (insert string)
                (goto-char beg)
@@ -344,18 +340,6 @@ specifies what to use in place of \"-ls\" as the final argument."
                (goto-char (- beg 3))   ; no error if < 0
                (while (search-forward " ./" nil t)
                  (delete-region (point) (- (point) 2)))
-               ;; Pad the number of links and file size.  This is a
-               ;; quick and dirty way of getting the columns to line up
-               ;; most of the time, but it's not foolproof.
-               (when l-opt
-                 (goto-char beg)
-                 (goto-char (line-beginning-position))
-                 (while (re-search-forward ls-regexp nil t)
-                   (replace-match (format "%4s" (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.
                (goto-char (point-max))