[Emacs-diffs] trunk r116253: Revert earlier desktop-auto-save doc changes

[Glenn Morris]

------------------------------------------------------------
revno: 116253
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-02 23:35:44 -0800
message:
  Revert earlier desktop-auto-save doc changes
  
  I don't understand this feature.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/misc.texi            misc.texi-20091113204419-o5vbwnq5f7feedwu-6267
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-02-03 03:12:29 +0000
+++ b/doc/emacs/ChangeLog       2014-02-03 07:35:44 +0000
@@ -1,7 +1,3 @@
-2014-02-03  Glenn Morris  <address@hidden>
-
-       * misc.texi (Saving Emacs Sessions): Mention desktop-auto-save-timeout.
-
 2014-02-02  Glenn Morris  <address@hidden>
 
        * regs.texi (Registers): Mention previewing.

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2014-02-03 03:12:29 +0000
+++ b/doc/emacs/misc.texi       2014-02-03 07:35:44 +0000
@@ -2141,8 +2141,7 @@
 @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 @@
 (desktop-save-mode 1)
 @end example
 
address@hidden desktop-auto-save-timeout
address@hidden
-Emacs then auto-saves the desktop every @code{desktop-auto-save-timeout}
-seconds, if that is address@hidden and non-zero.
-
 @findex desktop-change-dir
 @findex desktop-revert
 @vindex desktop-path

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-02-03 03:12:29 +0000
+++ b/etc/NEWS  2014-02-03 07:35:44 +0000
@@ -458,9 +458,8 @@
 
 ** 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-03 03:12:29 +0000
+++ b/lisp/ChangeLog    2014-02-03 07:35:44 +0000
@@ -1,7 +1,5 @@
 2014-02-03  Glenn Morris  <address@hidden>
 
-       * desktop.el (desktop-save-mode): Doc fix.
-
        * frameset.el (frameset-to-register):
        * kmacro.el (kmacro-to-register):
        * register.el (increment-register):

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2014-02-03 03:12:29 +0000
+++ b/lisp/desktop.el   2014-02-03 07:35:44 +0000
@@ -160,9 +160,7 @@
 
 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)