Commit 61dcf9bc authored by Glenn Morris's avatar Glenn Morris

* lisp/desktop.el (after-init-hook): Disable startup frame restoration

in non-graphical situations.

Fixes: debbugs:17693
parent 50426c32
2014-07-16 Glenn Morris <rgm@gnu.org>
* desktop.el (after-init-hook): Disable startup frame restoration
in non-graphical situations. (Bug#17693)
2014-07-14 Glenn Morris <rgm@gnu.org>
* vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer
......
......@@ -1516,8 +1516,15 @@ If there are no buffers left to create, kill the timer."
(setq command-line-args (delete key command-line-args))
(desktop-save-mode 0)))
(when desktop-save-mode
(desktop-read)
(setq inhibit-startup-screen t))))
;; People don't expect emacs -nw, or --daemon,
;; to create graphical frames (bug#17693).
;; TODO perhaps there should be a separate value
;; for desktop-restore-frames to control this startup behavior?
(let ((desktop-restore-frames (and desktop-restore-frames
initial-window-system
(not (daemonp)))))
(desktop-read)
(setq inhibit-startup-screen t)))))
;; So we can restore vc-dir buffers.
(autoload 'vc-dir-mode "vc-dir" nil t)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment