summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorK. Handa <handa@gnu.org>2016-06-01 09:16:32 +0900
committerK. Handa <handa@gnu.org>2016-06-01 09:16:32 +0900
commit8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6 (patch)
tree98c0480e0765c4f2b3d24ff5a1617e64a9109d80 /lisp/desktop.el
parent6d66089127313a1c5b5c5584eaf3e9edec010955 (diff)
parent25cc0f2aada3e321e5f1c6d1e492a93d16da45b2 (diff)
downloademacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.tar.gz
emacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.tar.bz2
emacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index dba3277c091..1f460b7a3ed 100644
--- 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).