procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resurrect display-line-number-mode in client frames

Browse source 
* 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)
This commit is contained in:
Eli Zaretskii 2019-06-07 17:32:17 +03:00
parent aecbbd57c1
commit 9254885a95
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/display-line-numbers.el
View file

@ -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

4
lisp/linum.el
View file

@ -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)))