From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 19 Aug 2017 10:52:02 +0000 (+0300)
Subject: ; Fix last change
X-Git-Tag: emacs-26.0.90~406
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5070717802d9be51085d187a10a5f4930b9a1471;p=emacs.git

; Fix last change

* lisp/emacs-lisp/tabulated-list.el
(tabulated-list-line-number-width): Fix last change.
---

diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index a0a74ce7f92..f900354b3f2 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -195,7 +195,7 @@ Populated by `tabulated-list-init-header'.")
     (if (window-live-p cbuf-window)
         (with-selected-window cbuf-window
           (+ (line-number-display-width) 2))
-      4)))
+      (if display-line-numbers 4 0))))
 
 (defun tabulated-list-init-header ()
   "Set up header line for the Tabulated List buffer."
@@ -422,11 +422,12 @@ of column descriptors."
   (let ((beg   (point))
 	(x     (max tabulated-list-padding 0))
 	(ncols (length tabulated-list-format))
+        (lnum-width (tabulated-list-line-number-width))
 	(inhibit-read-only t))
     (if display-line-numbers
-        (setq x (+ x (tabulated-list-line-number-width))))
+        (setq x (+ x lnum-width)))
     (if (> tabulated-list-padding 0)
-	(insert (make-string x ?\s)))
+	(insert (make-string (- x lnum-width) ?\s)))
     (let ((tabulated-list--near-rows ; Bind it if not bound yet (Bug#25506).
            (or (bound-and-true-p tabulated-list--near-rows)
                (list (or (tabulated-list-get-entry (point-at-bol 0))