aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-02-02 19:12:29 -0800
committerGlenn Morris2014-02-02 19:12:29 -0800
commitbe445cf2abe016f00c59964268d6d46c3b5da421 (patch)
treed7bf75452e21a9528d6f389a278424e90f403254 /doc
parentf16a3d523afc1a0c6bf7095f5f755ca16f8419d0 (diff)
downloademacs-be445cf2abe016f00c59964268d6d46c3b5da421.tar.gz
emacs-be445cf2abe016f00c59964268d6d46c3b5da421.zip
Some doc for desktop-auto-save-timeout
* doc/emacs/misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout. * lisp/desktop.el (desktop-save-mode): Doc fix. * etc/NEWS: Related edit.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/misc.texi8
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4478e4bd72c..c8508c39280 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12014-02-03 Glenn Morris <rgm@gnu.org>
2
3 * misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout.
4
12014-02-02 Glenn Morris <rgm@gnu.org> 52014-02-02 Glenn Morris <rgm@gnu.org>
2 6
3 * regs.texi (Registers): Mention previewing. 7 * regs.texi (Registers): Mention previewing.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index e2151e9144c..f89ebabd27a 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2141,7 +2141,8 @@ subsequent Emacs sessions reload the saved desktop.
2141@vindex desktop-save-mode 2141@vindex desktop-save-mode
2142 You can save the desktop manually with the command @kbd{M-x 2142 You can save the desktop manually with the command @kbd{M-x
2143desktop-save}. You can also enable automatic saving of the desktop 2143desktop-save}. You can also enable automatic saving of the desktop
2144when you exit Emacs, and automatic restoration of the last saved 2144at regular intervals and when you exit Emacs, and automatic restoration
2145of the last saved
2145desktop when Emacs starts: use the Customization buffer (@pxref{Easy 2146desktop when Emacs starts: use the Customization buffer (@pxref{Easy
2146Customization}) to set @code{desktop-save-mode} to @code{t} for future 2147Customization}) to set @code{desktop-save-mode} to @code{t} for future
2147sessions, or add this line in your init file (@pxref{Init File}): 2148sessions, or add this line in your init file (@pxref{Init File}):
@@ -2150,6 +2151,11 @@ sessions, or add this line in your init file (@pxref{Init File}):
2150(desktop-save-mode 1) 2151(desktop-save-mode 1)
2151@end example 2152@end example
2152 2153
2154@vindex desktop-auto-save-timeout
2155@noindent
2156Emacs then auto-saves the desktop every @code{desktop-auto-save-timeout}
2157seconds, if that is non-@code{nil} and non-zero.
2158
2153@findex desktop-change-dir 2159@findex desktop-change-dir
2154@findex desktop-revert 2160@findex desktop-revert
2155@vindex desktop-path 2161@vindex desktop-path