[Emacs-diffs] emacs-26 9254885: Resurrect display-line-number-mode in client frames

[Eli Zaretskii]

branch: emacs-26
commit 9254885a9571162920889f47adb41eaf1e555c21
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 lisp/display-line-numbers.el | 4 +---
 lisp/linum.el                | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/display-line-numbers.el b/lisp/display-line-numbers.el
index d38f2e6..f17f8e5 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 789b5aa..cdbc55d 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)))