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

ChangeLog.2

@@ -1,3 +1,110 @@
+2016-09-26  Nicolas Petton  <nicolas@petton.fr>
+
+	* Version 25.1 released.
+
+2016-09-26  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Regenerate the AUTHORS file
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Update admin/authors.el
+
+	* admin/authors.el (authors-fixed-entries): Add an entry for Bob
+	Weiner.
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Update Antinews in ELisp manual
+
+	* doc/lispref/anti.texi (Antinews): Update for Emacs 25.1.
+	* doc/lispref/elisp.texi (Top): Update the main menu entry for
+	Antinews.
+
+2016-09-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix comments on window height macros
+
+	* src/window.h (WINDOW_MODE_LINE_HEIGHT, WINDOW_HEADER_LINE_HEIGHT): Fix
+	confusing claim that "height is in pixels and in lines"; in fact it's in
+	pixels.
+
+2016-09-26  Toke Høiland-Jørgensen  <toke@toke.dk>  (tiny change)
+
+	Fix 'url-http-create-request' when cookies are used
+
+	* lisp/url/url-http.el (url-http-create-request): Make sure the
+	cookie headers are a unibyte string.  For the details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00202.html.
+
+2016-09-26  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix cross reference in frames.texi
+
+	* doc/lispref/frames.texi (Minibuffers and Frames): Fix cross
+	reference.
+
+2016-09-26  immerrr  <immerrr@gmail.com>
+
+	Fix regexp-opt documentation (bug #17862)
+
+	* lisp/emacs-lisp/regexp-opt.el (regexp-opt):
+	* doc/lispref/searching.texi (Regexp Functions): Update PAREN doc.
+
+2016-09-26  Nicolas Richard  <youngfrog@members.fsf.org>
+
+	* lisp/emacs-lisp/gv.el (gv-ref): Fix example of PLACE in docstring.
+
+2016-09-26  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix tags-query-replace docstring
+
+	* lisp/progmodes/etags.el (tags-query-replace): Remove incorrect info
+	regarding non-existent parameters.
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify documentation of precision in format specs
+
+	* doc/lispref/strings.texi (Formatting Strings): Be less
+	definitive wrt what precision means in format specs other than
+	floating-point, %s and %S.  (Bug#24314)
+
+2016-09-26  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve and clarify documentation of subprocesses
+
+	* doc/lispref/processes.texi (Subprocess Creation, Shell Arguments):
+	Mention 'make-process' rather than 'start-process'.  Update wrt
+	standard destinations of standard output/error streams and due to
+	different formats of arguments accepted by 'make-process'.
+	(Processes): Mention process objects that represent connections.
+	(Synchronous Processes): Minor clarifications.
+	(Asynchronous Processes): Describe 'make-process' and
+	'make-pipe-process' before 'start-process'.  Update and expand the
+	documentation.
+	(Deleting Processes, Process Information, Input to Processes)
+	(Signals to Processes, Query Before Exit, Network): Update and
+	expand the documentation, especially wrt process objects that
+	represent connections.
+	(Output from Processes): Mention the possibility of separating
+	stderr via 'make-process'.
+	(Filter Functions): Mention that stderr by default arrives at the
+	filter function together with stdout.  (Bug#24287)
+
+	* src/process.c (Fprocess_id, Fprocess_command)
+	(Fprocess_contact, Fprocess_type, Fstop_process): Doc fixes for
+	process objects that represent connections.
+
+2016-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* etc/PROBLEMS: Mention gnutls-cli 3.5.3 (Bug#24247).
+
+2016-09-26  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update the AUTHORS file
+
+2016-09-26  Philipp Stephani  <phst@google.com>
 2016-08-22  Philipp Stephani  <phst@google.com>
 
 	Some assorted documentation clarifications
@@ -37627,6 +37734,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
+2016-09-26c9cef49b0fceb3c5e904837ea5675fe4306ac (inclusive).
 2016-08-22bb813cfea53e4162409f2adc0a793ab301894 (inclusive).
 2016-08-05faead6df626b3737c10f98e9c4964232aa6b9 (inclusive).
 2016-06-19d77d8dbd5b051bb681bacaee4a6faffbbdde9 (inclusive).

admin/notes/unicode

@@ -15,11 +15,12 @@ Emacs uses the following files from the Unicode Character Database
   . BidiBrackets.txt
   . IVD_Sequences.txt
   . NormalizationTest.txt
+  . BidiCharacterTest.txt
 
-First, these files need to be copied into admin/unidata/, and then
-Emacs should be rebuilt for them to take effect.  Rebuilding Emacs
-updates several derived files elsewhere in the Emacs source tree,
-mainly in lisp/international/.
+First, the first 6 files need to be copied into admin/unidata/, and
+then Emacs should be rebuilt for them to take effect.  Rebuilding
+Emacs updates several derived files elsewhere in the Emacs source
+tree, mainly in lisp/international/.
 
 When Emacs is rebuilt for the first time after importing the new
 files, pay attention to any warning or error messages.  In particular,
@@ -49,14 +50,18 @@ might need to be updated because it knows about used and unused ranges
 of Unicode codepoints, which a new release of the Unicode Standard
 could change.
 
-Finally, test normalization functions against NormalizationTests.txt,
+Next, test normalization functions against NormalizationTests.txt,
 in the test/ directory run:
 
   make lisp/international/ucs-normalize-tests
 
 See commentary in test/lisp/international/ucs-normalize-tests.el
 regarding failing lines.
 
+The file BidiCharacterTest.txt should be copied to the test suite, and
+if its format has changed, the file biditest.el there should be
+modified to follow suit.
+
 Problems, fixmes and other unicode-related issues
 -------------------------------------------------------------
 

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

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

etc/HISTORY

@@ -207,6 +207,8 @@ GNU Emacs 24.4 (2014-10-20) emacs-24.4
 
 GNU Emacs 24.5 (2015-04-10) emacs-24.5
 
+GNU Emacs 25.1 (2016-09-16) emacs-25.1
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.

lib-src/etags.c

@@ -3595,13 +3595,27 @@ C_entries (int c_ext, FILE *inf)
 			      int off = tokoff;
 			      int len = toklen;
 
-			      /* Rewrite the tag so that emacs lisp DEFUNs
-				 can be found by their elisp name */
 			      if (defun)
 				{
 				  off += 1;
 				  len -= 1;
+
+				  /* First, tag it as its C name */
+				  linebuffer_setlen (&token_name, toklen);
+				  memcpy (token_name.buffer,
+					  newlb.buffer + tokoff, toklen);
+				  token_name.buffer[toklen] = '\0';
+				  token.named = true;
+				  token.lineno = lineno;
+				  token.offset = tokoff;
+				  token.length = toklen;
+				  token.line = newlb.buffer;
+				  token.linepos = newlinepos;
+				  token.valid = true;
+				  make_C_tag (funorvar);
 				}
+			      /* Rewrite the tag so that emacs lisp DEFUNs
+				 can be found also by their elisp name */
 			      linebuffer_setlen (&token_name, len);
 			      memcpy (token_name.buffer,
 				      newlb.buffer + off, len);

lisp/mouse.el

@@ -493,7 +493,8 @@ must be one of the symbols `header', `mode', or `vertical'."
 						(window-pixel-height window)))))
 		  (setq dragged t)
 		  (adjust-window-trailing-edge window growth nil t))
-		(setq last-position position))))))
+		(setq last-position position)))))
+           (old-track-mouse track-mouse))
       ;; Start tracking.  The special value 'dragging' signals the
       ;; display engine to freeze the mouse pointer shape for as long
       ;; as we drag.
@@ -526,7 +527,7 @@ must be one of the symbols `header', `mode', or `vertical'."
 	       (define-key map [right-divider] map)
 	       (define-key map [bottom-divider] map)
 	       map)
-	     t (lambda () (setq track-mouse nil)))))))
+	     t (lambda () (setq track-mouse old-track-mouse)))))))
 
 (defun mouse-drag-mode-line (start-event)
   "Change the height of a window by dragging on the mode line."
@@ -853,7 +854,8 @@ The region will be defined with mark and point."
 	 (click-count (1- (event-click-count start-event)))
 	 ;; Suppress automatic hscrolling, because that is a nuisance
 	 ;; when setting point near the right fringe (but see below).
-	 (auto-hscroll-mode-saved auto-hscroll-mode))
+	 (auto-hscroll-mode-saved auto-hscroll-mode)
+         (old-track-mouse track-mouse))
 
     (setq mouse-selection-click-count click-count)
     ;; In case the down click is in the middle of some intangible text,
@@ -905,7 +907,7 @@ The region will be defined with mark and point."
                                       nil start-point))))))))
        map)
      t (lambda ()
-         (setq track-mouse nil)
+         (setq track-mouse old-track-mouse)
          (setq auto-hscroll-mode auto-hscroll-mode-saved)
           (deactivate-mark)
          (pop-mark)))))

nt/INSTALL

@@ -784,6 +784,15 @@ build will run on Windows 9X and newer systems).
   You need the libiconv-X.Y.Z-N-mingw32-dev.tar.lzma tarball from that
   site.
 
+* Optional support for decompressing text
+
+  Emacs can decompress text if compiled with the zlib library.
+  Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
+  available from the ezwinports site; see above for the URL.
+
+  (This library is also a prerequisite for several image libraries, so
+  you may already have it; look for zlib1.dll or libz-1.dll.)
+
 
 This file is part of GNU Emacs.
 

nt/INSTALL.W64

@@ -64,13 +64,15 @@ packages (you can copy and paste it into the shell with Shift + Insert):
   mingw-w64-x86_64-libjpeg-turbo \
   mingw-w64-x86_64-librsvg \
   mingw-w64-x86_64-libxml2 \
-  mingw-w64-x86_64-gnutls
+  mingw-w64-x86_64-gnutls \
+  mingw-w64-x86_64-zlib
 
 The packages include the base developer tools (autoconf, automake, grep, make,
 etc.), the compiler toolchain (gcc, gdb, etc.), several image libraries, an
-XML library, and the GnuTLS (transport layer security) library.  Only the
-first three packages are required (base-devel, toolchain, xpm-nox); the rest
-are optional.
+XML library, the GnuTLS (transport layer security) library, and zlib for
+decompressing text.  Only the first three packages are required (base-devel,
+toolchain, xpm-nox); the rest are optional.  You can select only part of the
+libraries if you don't need them all.
 
 You now have a complete build environment for Emacs.