[Emacs-diffs] trunk r116250: Some doc for desktop-auto-save-timeout

[Glenn Morris]

------------------------------------------------------------
revno: 116250
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-02 19:12:29 -0800
message:
  Some doc for desktop-auto-save-timeout
  
  * doc/emacs/misc.texi (Saving Emacs Sessions):
  Mention desktop-auto-save-timeout.
  
  * lisp/desktop.el (desktop-save-mode): Doc fix.
  
  * etc/NEWS: Related edit.
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-02 01:04:08 +0000
+++ b/doc/emacs/ChangeLog       2014-02-03 03:12:29 +0000
@@ -1,3 +1,7 @@
+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-01-26 01:11:10 +0000
+++ b/doc/emacs/misc.texi       2014-02-03 03:12:29 +0000
@@ -2141,7 +2141,8 @@
 @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
-when you exit Emacs, and automatic restoration of the last saved
+at regular intervals and 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}):
@@ -2150,6 +2151,11 @@
 (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 02:58:13 +0000
+++ b/etc/NEWS  2014-02-03 03:12:29 +0000
@@ -458,8 +458,9 @@
 
 ** Desktop
 
-*** `desktop-auto-save-timeout' defines the number of seconds idle time
-before auto-save of the 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-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 00:40:49 +0000
+++ b/lisp/ChangeLog    2014-02-03 03:12:29 +0000
@@ -1,5 +1,7 @@
 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-01-01 07:43:34 +0000
+++ b/lisp/desktop.el   2014-02-03 03:12:29 +0000
@@ -160,7 +160,9 @@
 
 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."
+`desktop-read' for details.
+
+For options you can set, browse the `desktop' customization group."
   :global t
   :group 'desktop)