Commit 15baaea8 authored by Glenn Morris's avatar Glenn Morris
Browse files

Revert earlier desktop-auto-save doc changes

I don't understand this feature.
parent ce0ef8fe
2014-02-03 Glenn Morris <rgm@gnu.org>
* misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout.
2014-02-02 Glenn Morris <rgm@gnu.org>
* regs.texi (Registers): Mention previewing.
......
......@@ -2141,8 +2141,7 @@ subsequent Emacs sessions reload the saved desktop.
@vindex desktop-save-mode
You can save the desktop manually with the command @kbd{M-x
desktop-save}. You can also enable automatic saving of the desktop
at regular intervals and when you exit Emacs, and automatic restoration
of the last saved
when you exit Emacs, and automatic restoration of the last saved
desktop when Emacs starts: use the Customization buffer (@pxref{Easy
Customization}) to set @code{desktop-save-mode} to @code{t} for future
sessions, 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}):
(desktop-save-mode 1)
@end example
@vindex desktop-auto-save-timeout
@noindent
Emacs then auto-saves the desktop every @code{desktop-auto-save-timeout}
seconds, if that is non-@code{nil} and non-zero.
@findex desktop-change-dir
@findex desktop-revert
@vindex desktop-path
......
......@@ -458,9 +458,8 @@ if your version doesn't support that option. See option `cfengine-cf-promises'.
** Desktop
+++
*** By default, the desktop is now auto-saved after `desktop-auto-save-timeout'.
To disable this, customize that option to nil (or zero).
*** `desktop-auto-save-timeout' defines the number of seconds idle time
before auto-save of the desktop.
*** `desktop-restore-frames', enabled by default, allows saving and
restoring the frame/window configuration (frameset). Additional options
......
2014-02-03 Glenn Morris <rgm@gnu.org>
* desktop.el (desktop-save-mode): Doc fix.
* frameset.el (frameset-to-register):
* kmacro.el (kmacro-to-register):
* register.el (increment-register):
......
......@@ -160,9 +160,7 @@ the mode if ARG is omitted or nil.
If Desktop Save mode is enabled, the state of Emacs is saved from
one session to another. See variable `desktop-save' and function
`desktop-read' for details.
For options you can set, browse the `desktop' customization group."
`desktop-read' for details."
:global t
:group 'desktop)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment