Merge from origin/emacs-25

cf9e174 Document the optional zlib library in MS-Windows builds
84eb144 ; * admin/notes/unicode: Mention BidiCharacterTest.txt.
73c67dd Fix tagging of DEFUN by etags
ea1960b Avoid resetting track-mouse by mouse clicks
505fef3 Improve nt/README.W32 instructions
1229cc4 Document that desktop file overrides frame parameters
f0eb70d ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 release

# Conflicts:
#	ChangeLog.2
#	admin/notes/unicode
#	lisp/ldefs-boot.el

2 files changed, 19 insertions, 0 deletions

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 03172b62cf5..082de3796c1 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -925,6 +925,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 502ccad1382..f38a797b36c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2371,6 +2371,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.)
 
+@vindex 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