Merge from origin/emacs-25

c3489d0 * lisp/w32-fns.el (set-message-beep, w32-get-locale-info) (w3...
a4d882c Correct old cell name unbinding when renaming cell.
6c12c53 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into...
0be6725 Document problem: slow screen refresh on missing font.
853b9b9 * admin/admin.el (add-release-logs): Basic check of existing ...
5fa80cf * build-aux/gitlog-to-emacslog: Handle empty generated Change...
3c79e51 * admin/admin.el (add-release-logs): Generate ChangeLog if ne...
42275df * doc/misc/texinfo.tex: Revert previous change (Bug#23611).
3f4a9d9 * admin/authors.el (authors): First update the ChangeLog.
897fb6f ; 'Changes from the pre-25.1 API' copyedits
825ca25 Rename vc-stay-local back to vc-cvs-stay-local
4efb3e8 * doc/emacs/files.texi (Comparing Files): * doc/emacs/trouble...
b995d1e * doc/misc/eww.texi (Advanced): Fix xref.
2e589c0 Fix cross-references between manuals
f3d2ded * doc/misc/vhdl-mode.texi (Sample Init File): Rename node to ...
906c810 ; * admin/release-process: Move etc/HISTORY from here... ; * ...
bea1b65 * admin/admin.el (add-release-logs): Also update etc/HISTORY.
503e752 ; * CONTRIBUTE: Fix a typo.
fbfd478 Avoid aborting due to errors in arguments of 'set-face-attrib...
bdfbe6d ; * admin/release-process: Copyedits.
44a6aed ; * test/automated/data-tests.el: Standardize license notice.
c33ed39 ; * test/automated/viper-tests.el: Standardize license notice.
df4a14b Add automated test for viper-tests.el
c0139e3 Fix viper undo breakage from undo-boundary changes
920d76c Fix reference to obsolete fn ps-eval-switch
18a9bc1 Do not trash symlinks to init file
2671179 Don't print the "decomposition" line for control chars in wha...
869092c Bring back xterm pasting with middle mouse
5ab0830 Provide workaround for xftfont rendering problem
c9f7ec7 * lisp/desktop.el: Disable restore frameset if in non-graphic...
30989a0 Mention GTK+ problems in etc/PROBLEMS
421e3c4 * lisp/emacs-lisp/package.el (package-refresh-contents):
dadfc30 Revert "epg: Add a way to detect gpg1 executable for tests"
e41a5cb Avoid errors with Czech and Slovak input methods
d4ae6d7 epg: Add a way to detect gpg1 executable for tests
ebc3a94 * lisp/emacs-lisp/package.el: Fix free variable warnings.
6e71295 * lisp/emacs-lisp/package.el (package--with-response-buffer):
c45d9f6 Improve documentation of 'server-name'
3b5e38c Modernize ASLR advice in etc/PROBLEMS
1fe1e0a * lisp/char-fold.el: Rename from character-fold.el.

7 files changed, 38 insertions, 50 deletions

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index fd4fd4f3798..8eee9e1d869 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2290,7 +2290,7 @@ is actually typical for regexp syntax.)
 @cindex Recursive search/replace operations
 
 Dired mode (@kbd{M-x dired @key{RET}}, or @kbd{C-x d}) supports the
-command @code{dired-do-query-replace-regexp} (@kbd{Q}), which allows
+command @code{dired-do-find-regexp-and-replace} (@kbd{Q}), which allows
 users to replace regular expressions in multiple files.
 
 You can use this command to perform search/replace operations on
@@ -2315,7 +2315,7 @@ To accept all replacements in each file, hit @kbd{!}.
 Another way to do the same thing is to use the ``tags'' feature of
 Emacs: it includes the command @code{tags-query-replace} which performs
 a query-replace across all the files mentioned in the @file{TAGS} file.
-@xref{Tags Search,,, emacs, The GNU Emacs Manual}.
+@xref{Identifier Search,,, emacs, The GNU Emacs Manual}.
 
 @node Documentation for etags
 @section Where is the documentation for @code{etags}?
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index f15e2f2518e..81f97a9db85 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -261,7 +261,7 @@ variables @code{shr-color-visible-distance-min} and
   In addition to maintaining the history at run-time, EWW will also
 save the partial state of its buffers (the URIs and the titles of the
 pages visited) in the desktop file if one is used.  @xref{Saving Emacs
-Sessions, , emacs, The GNU Emacs Manual}.
+Sessions,,, emacs, The GNU Emacs Manual}.
 
 @vindex eww-desktop-remove-duplicates
   EWW history may sensibly contain multiple entries for the same page
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index a8684a40b3a..fd88c88c7eb 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -874,9 +874,9 @@ command, like this:
 @end example
 @end defun
 
-These commands are often more accurate than the @code{find-tag}
-command (@pxref{Tags,,,emacs,Emacs manual}), because the Semantic
-Analyzer is context-sensitive.
+These commands are often more accurate than the @code{xref-find-definitions}
+command (@pxref{Looking Up Identifiers,,,emacs,Emacs manual}), because
+the Semantic Analyzer is context-sensitive.
 
 You can also use @kbd{C-c , j} (@code{semantic-complete-jump-local})
 and @kbd{C-c , J} (@code{semantic-complete-jump}) to navigate tags.
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 314063cafe1..37e2de896ec 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2016-05-07.20}
+\def\texinfoversion{2016-04-14.07}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -67,10 +67,6 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-% LaTeX's \typeout.  This ensures that the messages it is used for
-% are identical in format to the corresponding ones from latex/pdflatex.
-\def\typeout{\immediate\write17}%
-
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -1538,6 +1534,7 @@ output) for that.)}
   %
   % PDF outline support
   %
+  \pdfmakepagedesttrue \relax
   % Emulate the primitive of pdfTeX
   \def\pdfdest name#1 xyz{%
     \special{pdf:dest (name#1) [@thispage /XYZ @xpos @ypos]}%
@@ -3273,8 +3270,8 @@ end
 % @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
 % Unless we're in typewriter, use \ecfont because the CM text fonts do
 % not have braces, and we don't want to switch into math.
-\def\mylbrace{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
-\def\myrbrace{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
+\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
+\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
 \let\{=\mylbrace \let\lbracechar=\{
 \let\}=\myrbrace \let\rbracechar=\}
 \begingroup
@@ -4756,7 +4753,7 @@ end
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx}
 \def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
 
-% Used when writing an index entry out to an index file to prevent
+% Used when writing an index entry out to an index file, to prevent
 % expansion of Texinfo commands that can appear in an index entry.
 %
 \def\indexdummies{%
@@ -4892,9 +4889,12 @@ end
   %
   % We want to disable all macros so that they are not expanded by \write.
   \macrolist
-  \definedummyword\value
   %
   \normalturnoffactive
+  %
+  % Handle some cases of @value -- where it does not contain any
+  % (non-fully-expandable) commands.
+  \makevalueexpandable
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
@@ -5159,10 +5159,9 @@ end
   \ifx\suffix\indexisfl\def\suffix{f1}\fi
   % Open the file
   \immediate\openout\csname#1indfile\endcsname \jobname.\suffix
-  % Using \immediate above here prevents an object entering into the current 
-  % box, which could confound checks such as those in \safewhatsit for
-  % preceding skips.
-  \typeout{Writing index file \jobname.\suffix}%
+  % Using \immediate here prevents an object entering into the current box,
+  % which could confound checks such as those in \safewhatsit for preceding
+  % skips.
 \fi}
 \def\indexisfl{fl}
 
@@ -5370,7 +5369,6 @@ end
     % index.  The easiest way to prevent this problem is to make sure
     % there is some text.
     \putwordIndexNonexistent
-    \typeout{No file \jobname.\indexname s.}%
   \else
     \catcode`\\ = 0
     %
@@ -6684,14 +6682,7 @@ end
   % 1 and 2 (the page numbers aren't printed), and so are the first
   % two pages of the document.  Thus, we'd have two destinations named
   % `1', and two named `2'.
-  \ifpdf
-    \global\pdfmakepagedesttrue
-  \else
-    \ifx\XeTeXrevision\thisisundefined
-    \else
-      \global\pdfmakepagedesttrue
-    \fi
-  \fi
+  \ifpdf \global\pdfmakepagedesttrue \fi
 }
 
 
@@ -8871,7 +8862,6 @@ end
     % include an _ in the xref name, etc.
     \indexnofonts
     \turnoffactive
-    \def\value##1{##1}%
     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
       \csname XR#1-title\endcsname
   }%
@@ -9012,14 +9002,14 @@ end
   \fi\fi\fi
 }
 
-% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME.  SUFFIX 
-% is output afterwards if non-empty.
+% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
+% If its value is nonempty, SUFFIX is output afterward.
+%
 \def\refx#1#2{%
   \requireauxfile
   {%
     \indexnofonts
     \otherbackslash
-    \def\value##1{##1}%
     \expandafter\global\expandafter\let\expandafter\thisrefX
       \csname XR#1\endcsname
   }%
@@ -9044,18 +9034,16 @@ end
   #2% Output the suffix in any case.
 }
 
-% This is the macro invoked by entries in the aux file.  Define a control 
-% sequence for a cross-reference target (we prepend XR to the control sequence 
-% name to avoid collisions).  The value is the page number.  If this is a float 
-% type, we have more work to do.
+% This is the macro invoked by entries in the aux file.  Usually it's
+% just a \def (we prepend XR to the control sequence name to avoid
+% collisions).  But if this is a float type, we have more work to do.
 %
 \def\xrdef#1#2{%
-  {% Expand the node or anchor name to remove control sequences.
-   % \turnoffactive stops 8-bit characters being changed to commands
-   % like @'e.  \refx does the same to retrieve the value in the definition.
+  {% The node name might contain 8-bit characters, which in our current
+   % implementation are changed to commands like @'e.  Don't let these
+   % mess up the control sequence name.
     \indexnofonts
     \turnoffactive
-    \def\value##1{##1}%
     \xdef\safexrefname{#1}%
   }%
   %
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 097f626e718..06d2e559c38 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -828,12 +828,12 @@ The file transfer protocol.  @xref{file/ftp}.
 
 @item ssh
 @cindex ssh
-The secure shell protocol.  @xref{Inline Methods,,, tramp, The Tramp
+The secure shell protocol.  @xref{Inline methods,,, tramp, The Tramp
 Manual}.
 
 @item scp
 @cindex scp
-The secure file copy protocol.  @xref{External Methods,,, tramp, The
+The secure file copy protocol.  @xref{External methods,,, tramp, The
 Tramp Manual}.
 
 @item rsync
diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi
index ec83b7e62ee..e26ec5277c0 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -65,7 +65,7 @@ modify this GNU manual.''
 * Syntactic Symbols::
 * Frequently Asked Questions::
 * Getting the latest VHDL Mode release::
-* Sample .emacs File::
+* Sample Init File::
 * Limitations and Known Bugs::
 * Mailing Lists and Submitting Bug Reports::
 * GNU Free Documentation License:: The license for this documentation.
@@ -484,7 +484,7 @@ Here's a simplified example of what you can add to your @file{.emacs}
 file to make the changes described in the previous section
 (@ref{Interactive Customization}) more permanent.  See the Emacs
 manuals for more information on customizing Emacs via hooks.
-@xref{Sample .emacs File}, for a more complete sample @file{.emacs} file.
+@xref{Sample Init File}, for a more complete sample @file{.emacs} file.
 
 @example
 @group
@@ -600,7 +600,7 @@ optional third argument, which if non-@code{nil}, automatically
 institutes the new style in the current buffer.
 
 The sample @file{.emacs} file provides a concrete example of how a new
-style can be added and automatically set.  @xref{Sample .emacs File}.
+style can be added and automatically set.  @xref{Sample Init File}.
 
 @node     File Styles
 @subsection  File Styles
@@ -874,7 +874,7 @@ simply add the following to the top of your @file{.emacs} file:
 
 @end example
 
-See the sample @file{.emacs} file @ref{Sample .emacs File} for
+See the sample @file{.emacs} file @ref{Sample Init File} for
 details.
 
 @end quotation
@@ -894,9 +894,9 @@ either of these lists.
 The official Emacs VHDL Mode Home Page can be found at
 @uref{http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html}.
 
-@node  Sample .emacs File
-@chapter  Sample @file{.emacs} file
-@cindex   Sample @file{.emacs} file
+@node  Sample Init File
+@chapter  Sample Init File
+@cindex   Sample init file
 
 Most customizations can be done using the ``Customize'' entry in the
 VHDL Mode menu, which requires no editing of the .emacs file.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 6b169f3c8e6..6b82653c629 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -2568,7 +2568,7 @@ above block should be commented out.
 
 Even though these commands are sometimes useful, they are no substitute for
 the powerful @emph{tag table} facility of Emacs.  Viper's @kbd{:tag} command
-in a primitive interface to Emacs tags.  @xref{Tags,Tags,Tags,emacs,
+in a primitive interface to Emacs tags.  @xref{Tags Tables,,,emacs,
 The GNU Emacs Manual}, for more information on tags.
 
 The following two commands are normally bound to a mouse click and are part