diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-07 07:50:49 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-07 07:50:49 -0700 |
| commit | 348657cc2155f1d27338dc169634dc74caf9a0a3 (patch) | |
| tree | 79725bbf23d87b76cf2ec9615f9e5b8ee52296ee /lisp/linum.el | |
| parent | 6bee17e4474cce4175f0289961f1f1fc40ba800e (diff) | |
| parent | 9254885a9571162920889f47adb41eaf1e555c21 (diff) | |
| download | emacs-348657cc2155f1d27338dc169634dc74caf9a0a3.tar.gz emacs-348657cc2155f1d27338dc169634dc74caf9a0a3.tar.bz2 emacs-348657cc2155f1d27338dc169634dc74caf9a0a3.zip | |
Merge from origin/emacs-26
9254885 (origin/emacs-26) Resurrect display-line-number-mode in clien...
aecbbd5 * src/fns.c (Fmapconcat): Doc fix. (Bug#35710)
8e5fc38 Fix typo
ee21b40 * lisp/term/w32-win.el ([noname]): Bind to 'ignore'. (Bug#36...
f68b33f Fix styling of Unicode codepoints in manuals
ff7ec6f Fix a few uses of quotes in user manual
b67042b More minor copyedits in the Emacs manual
9734b5c Fix minor issues in the Emacs manual
c153250 Try to improve text on atomic windows in Elisp manual
fb314ba Don't recommend insert-before-markers in process filters
Diffstat (limited to 'lisp/linum.el')
| -rw-r--r-- | lisp/linum.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/linum.el b/lisp/linum.el index 0b4b0083ed6..0a5d8bb2c0b 100644 --- a/lisp/linum.el +++ b/lisp/linum.el @@ -119,6 +119,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))) |