From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 7 Jun 2019 14:32:17 +0000 (+0300)
Subject: Resurrect display-line-number-mode in client frames
X-Git-Tag: emacs-26.2.90~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9254885;p=emacs.git

Resurrect display-line-number-mode in client frames

* lisp/linum.el (linum-on): Mention bug#35726 in a comment.
* lisp/display-line-numbers.el
(display-line-numbers--turn-on): Don't check for daemon.
(Bug#35726)
---

diff --git a/lisp/display-line-numbers.el b/lisp/display-line-numbers.el
index d38f2e69635..f17f8e5ca18 100644
--- a/lisp/display-line-numbers.el
+++ b/lisp/display-line-numbers.el
@@ -92,9 +92,7 @@ the mode is on, set `display-line-numbers' directly."
 
 (defun display-line-numbers--turn-on ()
   "Turn on `display-line-numbers-mode'."
-  (unless (or (minibufferp)
-              ;; taken from linum.el
-              (and (daemonp) (null (frame-parameter nil 'client))))
+  (unless (minibufferp)
     (display-line-numbers-mode)))
 
 ;;;###autoload
diff --git a/lisp/linum.el b/lisp/linum.el
index 789b5aadd07..cdbc55dc8b8 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -121,6 +121,10 @@ Linum mode is a buffer-local minor mode."
               ;; if some large buffer was under linum-mode when
               ;; desktop was saved.  So we disable linum-mode for
               ;; non-client frames in a daemon session.
+
+              ;; Note that nowadays, this actually doesn't show line
+              ;; numbers in client frames at all, because we visit the
+              ;; file before creating the client frame.  See bug#35726.
               (and (daemonp) (null (frame-parameter nil 'client))))
     (linum-mode 1)))