Fix alignment of columns in Dired display with ls-lisp

* lisp/dired.el (dired-align-file): Don't realign the first column
of file's data.  (Bug#67953)

diff --git a/lisp/dired.el b/lisp/dired.el
index 357787b64958726e8f98539346618ea8f0906fe6..5239e568de14da251d42ff7dfba942ad3416b1f2 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1613,14 +1613,21 @@ BEG..END is the line where the file info is located."
                 ;; the beginning or the end of the next field, depending on
                 ;; whether this field is left or right aligned).
                 (align-pt-offset
-                 (save-excursion
-                   (goto-char other)
-                   (move-to-column curcol)
-                   (when (looking-at
-                          (concat
-                           (if (eq (char-before) ?\s) " *" "[^ ]* *")
-                           (if num-align "[0-9][^ ]*")))
-                     (- (match-end 0) (match-beginning 0)))))
+                  ;; It is never TRT to realign the first column of
+                  ;; file's data.  But the code below does attempt to
+                  ;; realign the first column if there's no whitespace
+                  ;; before it, so we force it to let the first column
+                  ;; alone.
+                  (if (zerop curcol)
+                      0
+                   (save-excursion
+                     (goto-char other)
+                     (move-to-column curcol)
+                     (when (looking-at
+                            (concat
+                             (if (eq (char-before) ?\s) " *" "[^ ]* *")
+                             (if num-align "[0-9][^ ]*")))
+                       (- (match-end 0) (match-beginning 0))))))
                 ;; Now, the number of spaces to insert is align-pt-offset
                 ;; minus the distance to the equivalent point on the
                 ;; current line.