aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-02-02 23:35:44 -0800
committerGlenn Morris2014-02-02 23:35:44 -0800
commit15baaea8e763b5df8a7dee722c20293852845bd5 (patch)
tree267312818b067aa9ce4aefa4f2b2c8a652f4e26d /doc
parentce0ef8febf40acb27f86e57ac82c7409d13d21ab (diff)
downloademacs-15baaea8e763b5df8a7dee722c20293852845bd5.tar.gz
emacs-15baaea8e763b5df8a7dee722c20293852845bd5.zip
Revert earlier desktop-auto-save doc changes
I don't understand this feature.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/misc.texi8
2 files changed, 1 insertions, 11 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c8508c39280..4478e4bd72c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,7 +1,3 @@
12014-02-03 Glenn Morris <rgm@gnu.org>
2
3 * misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout.
4
52014-02-02 Glenn Morris <rgm@gnu.org> 12014-02-02 Glenn Morris <rgm@gnu.org>
6 2
7 * regs.texi (Registers): Mention previewing. 3 * regs.texi (Registers): Mention previewing.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index f89ebabd27a..e2151e9144c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2141,8 +2141,7 @@ 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
2144at regular intervals and when you exit Emacs, and automatic restoration 2144when you exit Emacs, and automatic restoration of the last saved
2145of the last saved
2146desktop when Emacs starts: use the Customization buffer (@pxref{Easy 2145desktop when Emacs starts: use the Customization buffer (@pxref{Easy
2147Customization}) to set @code{desktop-save-mode} to @code{t} for future 2146Customization}) to set @code{desktop-save-mode} to @code{t} for future
2148sessions, or add this line in your init file (@pxref{Init File}): 2147sessions, or add this line in your init file (@pxref{Init File}):
@@ -2151,11 +2150,6 @@ sessions, or add this line in your init file (@pxref{Init File}):
2151(desktop-save-mode 1) 2150(desktop-save-mode 1)
2152@end example 2151@end example
2153 2152
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
2159@findex desktop-change-dir 2153@findex desktop-change-dir
2160@findex desktop-revert 2154@findex desktop-revert
2161@vindex desktop-path 2155@vindex desktop-path