[Emacs-diffs] emacs-24 r117380: * lisp/desktop.el (after-init-hook): Disable startup frame restoration

[Glenn Morris]

------------------------------------------------------------
revno: 117380
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17693
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-07-15 21:28:42 -0700
message:
  * lisp/desktop.el (after-init-hook): Disable startup frame restoration
  in non-graphical situations.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-14 19:29:29 +0000
+++ b/lisp/ChangeLog    2014-07-16 04:28:42 +0000
@@ -1,3 +1,8 @@
+2014-07-16  Glenn Morris  <address@hidden>
+
+       * desktop.el (after-init-hook): Disable startup frame restoration
+       in non-graphical situations.  (Bug#17693)
+
 2014-07-14  Glenn Morris  <address@hidden>
 
        * vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2014-07-03 23:48:24 +0000
+++ b/lisp/desktop.el   2014-07-16 04:28:42 +0000
@@ -1516,8 +1516,15 @@
         (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)