From: Stephen Berman <stephen.berman@gmx.net>
Date: Tue, 14 Jun 2022 13:37:53 +0000 (+0200)
Subject: Fix errors when aligning text in find-dired
X-Git-Tag: emacs-29.0.90~1910^2~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b090dbdae802b72c6c6de60c61c8487539acf197;p=emacs.git

Fix errors when aligning text in find-dired

* lisp/find-dired.el (find-dired-filter): Don't error out while
trying to align the text (by just removing that code) (bug#46218).
---

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 8c1e684b7ea..61e626080ea 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -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))