Revert earlier desktop-auto-save doc changes

I don't understand this feature.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c8508c3..4478e4b 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,7 +1,3 @@
-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.

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index f89ebab..e2151e9 100644 (file)
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -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

diff --git a/etc/NEWS b/etc/NEWS
index b8251c9..cfcb74c 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc6e8ac..b4391a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,5 @@
 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):

diff --git a/lisp/desktop.el b/lisp/desktop.el
index f603a41..78ecc2f 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -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)