[Emacs-diffs] emacs-25 1229cc4: Document that desktop file overrides frame parameters

[Eli Zaretskii]

branch: emacs-25
commit 1229cc4ae640ea1fd9fafbb0bd64e72fc07994f8
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Document that desktop file overrides frame parameters
    
    * doc/emacs/misc.texi (Saving Emacs Sessions):
    * doc/emacs/frames.texi (Frame Parameters): Document that frame
    parameters restored by desktop.el take precedence over the
    customizations in the init file, and explain how to countermand
    that.  For the details of the issue, see
    http://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00318.html.
---
 doc/emacs/frames.texi |    8 ++++++++
 doc/emacs/misc.texi   |   11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 7e60062..99926dc 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -913,6 +913,14 @@ the initial frame, by customizing the variable
 specify colors and fonts don't affect menus and the menu bar, since
 those are drawn by the toolkit and not directly by Emacs.
 
+  Note that if you are using the desktop library to save and restore
+your sessions, the frames to be restored are recorded in the desktop
+file, together with their parameters.  When these frames are restored,
+the recorded parameters take precedence over the frame parameters
+specified by @code{default-frame-alist} and @code{initial-frame-alist}
+in your init file.  @xref{Saving Emacs Sessions}, for how to avoid
+that.
+
 @node Scroll Bars
 @section Scroll Bars
 @cindex Scroll Bar mode
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 853b978..a1f611c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2325,6 +2325,17 @@ To disable this, set @code{desktop-restore-frames} to 
@code{nil}.
 (See that variable's documentation for some related options
 that you can customize to fine-tune this behavior.)
 
address@hidden frameset-filter-alist
+   When the desktop restores the frame and window configuration, it
+uses the recorded values of frame parameters, disregarding any
+settings for those parameters you have in your init file (@pxref{Init
+File}).  This means that frame parameters such as fonts and faces for
+the restored frames will come from the desktop file, where they were
+saved when you exited your previous Emacs session; any settings for
+those parameters in your init file will be ignored.  To disable this,
+customize the value of @code{frameset-filter-alist} to filter out the
+frame parameters you don't want to be restored.
+
 @findex desktop-save
 @vindex desktop-save-mode
   You can save the desktop manually with the command @kbd{M-x