[Emacs-diffs] trunk r116587: Some desktop doc.

[Xue Fuqiao]

------------------------------------------------------------
revno: 116587 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-28 09:07:17 +0800
message:
  Some desktop doc.
  
  * doc/emacs/misc.texi (Saving Emacs Sessions): Document some new desktop user 
options.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/misc.texi            misc.texi-20091113204419-o5vbwnq5f7feedwu-6267
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-02-27 11:59:35 +0000
+++ b/doc/emacs/ChangeLog       2014-02-28 01:05:49 +0000
@@ -1,3 +1,7 @@
+2014-02-28  Xue Fuqiao  <address@hidden>
+
+       * misc.texi (Saving Emacs Sessions): Document some new desktop user 
options.
+
 2014-02-27  Xue Fuqiao  <address@hidden>
 
        * programs.texi (Basic Indent):

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2014-02-18 01:33:30 +0000
+++ b/doc/emacs/misc.texi       2014-02-28 01:05:49 +0000
@@ -2193,6 +2193,32 @@
 @code{desktop-clear-preserve-buffers-regexp}, whose value is a regular
 expression matching the names of buffers not to kill.
 
address@hidden desktop-restore-frames
address@hidden, enabled by default, a address@hidden
+means save frames (@pxref{Frames}) to desktop file.
+
address@hidden desktop-restore-in-current-display
+If the value of @code{desktop-restore-in-current-display} is @code{t},
+frames are restored in the current display.  If @code{nil} (the
+default), frames are restored in their original displays if possible.
+If @samp{delete}, frames on other displays are deleted instead of
+restored.
+
address@hidden desktop-restore-reuses-frames
+If the value of @code{desktop-restore-reuses-frames} is @code{t} (the
+default), restoring frames will reuse existing frames.  If @code{nil},
+existing frames are deleted.  If @samp{:keep}, existing frames are
+kept but not reused.
+
address@hidden desktop-restore-forces-onscreen
+If the value of @code{desktop-restore-forces-onscreen} is @code{t}
+(the default), offscreen frames are restored onscreen.  If
address@hidden:all}, frames that are partially offscreen are also forced
+onscreen.  @strong{Notice:} Checking of frame boundaries is
+approximate.  It may not reliably detect frames whose
+onscreen/offscreen state depends on a few pixels, especially near the
+right and/or bottom borders of the screen.
+
   If you want to save minibuffer history from one session to
 another, use the @code{savehist} library.
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-02-27 14:10:55 +0000
+++ b/etc/NEWS  2014-02-28 01:05:49 +0000
@@ -537,6 +537,7 @@
 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
 `desktop-restore-in-current-display', `desktop-restore-reuses-frames'