diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-06-07 17:32:17 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-06-07 17:32:17 +0300 |
| commit | 9254885a9571162920889f47adb41eaf1e555c21 (patch) | |
| tree | b8845f88154ecb7e2bf5d0325850089d4cdf3272 | |
| parent | aecbbd57c1929116cf4898336e43d81479535ca0 (diff) | |
| download | emacs-9254885a9571162920889f47adb41eaf1e555c21.tar.gz | |
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)
| -rw-r--r-- | lisp/display-line-numbers.el | 4 | ||||
| -rw-r--r-- | 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 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))) |