aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
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