aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2014-02-02 19:12:29 -0800
committerGlenn Morris2014-02-02 19:12:29 -0800
commitbe445cf2abe016f00c59964268d6d46c3b5da421 (patch)
treed7bf75452e21a9528d6f389a278424e90f403254 /lisp
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 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/desktop.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4391a165d3..cc6e8ac5805 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-02-03 Glenn Morris <rgm@gnu.org> 12014-02-03 Glenn Morris <rgm@gnu.org>
2 2
3 * desktop.el (desktop-save-mode): Doc fix.
4
3 * frameset.el (frameset-to-register): 5 * frameset.el (frameset-to-register):
4 * kmacro.el (kmacro-to-register): 6 * kmacro.el (kmacro-to-register):
5 * register.el (increment-register): 7 * register.el (increment-register):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 78ecc2f5376..f603a413a82 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -160,7 +160,9 @@ the mode if ARG is omitted or nil.
160 160
161If Desktop Save mode is enabled, the state of Emacs is saved from 161If Desktop Save mode is enabled, the state of Emacs is saved from
162one session to another. See variable `desktop-save' and function 162one session to another. See variable `desktop-save' and function
163`desktop-read' for details." 163`desktop-read' for details.
164
165For options you can set, browse the `desktop' customization group."
164 :global t 166 :global t
165 :group 'desktop) 167 :group 'desktop)
166 168