Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

3 files changed, 15 insertions, 2 deletions

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 39dc92fabe2..540d0e3b11d 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -733,6 +733,10 @@ if different)."
         (condition-case err
             (unless (or (eq frame this)
                         (eq frame mini)
+                        ;; Don't delete daemon's initial frame, or
+                        ;; we'll never be able to close the last
+                        ;; client's frame (Bug#26912).
+                        (if (daemonp) (not (frame-parameter frame 'client)))
                         (frame-parameter frame 'desktop-dont-clear))
               (delete-frame frame))
           (error
diff --git a/lisp/linum.el b/lisp/linum.el
index 8baa263f0b3..9cfb94dab68 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -112,7 +112,16 @@ Linum mode is a buffer-local minor mode."
 (define-globalized-minor-mode global-linum-mode linum-mode linum-on)
 
 (defun linum-on ()
-  (unless (minibufferp)
+  (unless (or (minibufferp)
+              ;; Turning linum-mode in the daemon's initial frame
+              ;; could significantly slow down startup, if the buffer
+              ;; in which this is done is large, because Emacs thinks
+              ;; the "window" spans the entire buffer then.  This
+              ;; could happen when restoring session via desktop.el,
+              ;; 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.
+              (and (daemonp) (null (frame-parameter nil 'client))))
     (linum-mode 1)))
 
 (defun linum-delete-overlays ()
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 6c6fb925040..b3f452ca5b9 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1372,7 +1372,7 @@ or elsewhere, return a 1-line docstring."
                                 (condition-case nil (documentation sym t)
                                   (invalid-function nil))
                                 sym))
-                     (car doc))
+                     (substitute-command-keys (car doc)))
                     (t (help-function-arglist sym)))))
              ;; Stringify, and store before highlighting, downcasing, etc.
              (elisp--last-data-store sym (elisp-function-argstring args)