summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorXue Fuqiao <xfq@gnu.org>2014-02-28 09:05:49 +0800
committerXue Fuqiao <xfq@gnu.org>2014-02-28 09:05:49 +0800
commit3e557f5988c5f52dabce3fae470703d693ba6b5a (patch)
tree18b101a00bde9fe9ca2aee092c688fd414e2bb23 /doc
parent653b6ea317969d0e78f13e7e84e970c4032a298a (diff)
downloademacs-3e557f5988c5f52dabce3fae470703d693ba6b5a.tar.gz
Some desktop doc.
* doc/emacs/misc.texi (Saving Emacs Sessions): Document some new desktop user options.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/misc.texi26
2 files changed, 30 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2433e3c8b8f..7138f59d242 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-28 Xue Fuqiao <xfq@gnu.org>
+
+ * misc.texi (Saving Emacs Sessions): Document some new desktop user options.
+
2014-02-27 Xue Fuqiao <xfq@gnu.org>
* programs.texi (Basic Indent):
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d9bfcca3ca3..801d9f9e4e6 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2193,6 +2193,32 @@ preserve certain buffers, customize the variable
@code{desktop-clear-preserve-buffers-regexp}, whose value is a regular
expression matching the names of buffers not to kill.
+@vindex desktop-restore-frames
+@code{desktop-restore-frames}, enabled by default, a non-@code{nil}
+means save frames (@pxref{Frames}) to desktop file.
+
+@vindex desktop-restore-in-current-display
+If the value of @code{desktop-restore-in-current-display} is @code{t},
+frames are restored in the current display. If @code{nil} (the
+default), frames are restored in their original displays if possible.
+If @samp{delete}, frames on other displays are deleted instead of
+restored.
+
+@vindex desktop-restore-reuses-frames
+If the value of @code{desktop-restore-reuses-frames} is @code{t} (the
+default), restoring frames will reuse existing frames. If @code{nil},
+existing frames are deleted. If @samp{:keep}, existing frames are
+kept but not reused.
+
+@vindex desktop-restore-forces-onscreen
+If the value of @code{desktop-restore-forces-onscreen} is @code{t}
+(the default), offscreen frames are restored onscreen. If
+@samp{:all}, frames that are partially offscreen are also forced
+onscreen. @strong{Notice:} Checking of frame boundaries is
+approximate. It may not reliably detect frames whose
+onscreen/offscreen state depends on a few pixels, especially near the
+right and/or bottom borders of the screen.
+
If you want to save minibuffer history from one session to
another, use the @code{savehist} library.