[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 c9f7ec7: * lisp/desktop.el: Disable restore frame
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-25 c9f7ec7: * lisp/desktop.el: Disable restore frameset if in non-graphic display. |
Date: |
Sat, 21 May 2016 19:35:48 +0000 (UTC) |
branch: emacs-25
commit c9f7ec736b78bef5359b6da03296277c535e8e89
Author: Jun Hao <address@hidden>
Commit: Paul Eggert <address@hidden>
* lisp/desktop.el: Disable restore frameset if in non-graphic display.
Fixes: debbugs:17693
---
lisp/desktop.el | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 822db05..dba3277 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1163,7 +1163,7 @@ This function also sets `desktop-dirname' to nil."
"Restore the state of a set of frames.
This function depends on the value of `desktop-saved-frameset'
being set (usually, by reading it from the desktop)."
- (when (desktop-restoring-frameset-p)
+ (when (and (display-graphic-p) (desktop-restoring-frameset-p))
(frameset-restore desktop-saved-frameset
:reuse-frames (eq desktop-restore-reuses-frames t)
:cleanup-frames (not (eq desktop-restore-reuses-frames
'keep))
@@ -1634,15 +1634,8 @@ 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
- ;; 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)))))
+ (desktop-read)
+ (setq inhibit-startup-screen t))))
(provide 'desktop)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 c9f7ec7: * lisp/desktop.el: Disable restore frameset if in non-graphic display.,
Paul Eggert <=