Restore frames into the current display by default

* lisp/desktop.el (desktop-restore-in-current-display):
Default to t, not nil (Bug#23604).
* etc/NEWS: Mention the change.

diff --git a/etc/NEWS b/etc/NEWS
index 670465f2ab852060aed14c4d713f80601aa3d3f9..00515f579f204ace805505caa05dcc6e52795c05 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -361,6 +361,10 @@ recommended to do this as soon as you have firmly upgraded to Emacs
 25.1 (or later).  Should you ever need to downgrade your desktop file
 to version 206, you can do this with 'C-u C-u M-x desktop-save'.
 
+---
+*** desktop-restore-in-current-display now defaults to t, not nil.
+That is, Emacs by default now restores frames into the current display.
+
 +++
 ** New function 'bookmark-set-no-overwrite' bound to 'C-x r M'.
 It raises an error if a bookmark of that name already exists,

diff --git a/lisp/desktop.el b/lisp/desktop.el
index dba3277c0911e3f1e92c57373382de892586b095..1f460b7a3ede4f9537f5a530cd8009300e225544 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -408,7 +408,7 @@ See related options `desktop-restore-reuses-frames',
   :group 'desktop
   :version "24.4")
 
-(defcustom desktop-restore-in-current-display nil
+(defcustom desktop-restore-in-current-display t
   "Controls how restoring of frames treats displays.
 If t, restores frames into the current display.
 If nil, restores frames into their original displays (if possible).