[Emacs-diffs] master 3354582 9/9: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 3354582b368eb1d054d39409360f874c346065cc
Merge: 198ce5b c695fb3
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    c695fb3 ; Spelling fixes
    03750c0 * doc/misc/texinfo.tex: Sync from gnulib.
    42fed3b * lisp/isearch.el (isearch-forward-symbol-at-point): Add isea...
---
 doc/misc/texinfo.tex      |   20 ++++++++++++++++----
 lisp/emacs-lisp/syntax.el |    2 +-
 lisp/faces.el             |    2 +-
 lisp/isearch.el           |    1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index d164d45..37e2de8 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-03-29.15}
+\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,
@@ -5371,7 +5371,6 @@ end
     \putwordIndexNonexistent
   \else
     \catcode`\\ = 0
-    \escapechar = `\\
     %
     % If the index file exists but is empty, then \openin leaves \ifeof
     % false.  We have to make TeX try to read something from the file, so
@@ -6943,7 +6942,6 @@ end
   \catcode `\>=\other
   \catcode `\`=\other
   \catcode `\'=\other
-  \escapechar=`\\
   %
   % ' is active in math mode (mathcode"8000).  So reset it, and all our
   % other math active characters (just in case), to plain's definitions.
@@ -7921,14 +7919,28 @@ end
 % alias because \c means cedilla in @tex or @math
 \let\texinfoc=\c
 
+\newcount\savedcatcodeone
+\newcount\savedcatcodetwo
+
 % Used at the time of macro expansion.
 % Argument is macro body with arguments substituted
 \def\scanmacro#1{%
   \newlinechar`\^^M
   \def\xeatspaces{\eatspaces}%
   %
+  % Temporarily undo catcode changes of \printindex.  Set catcode of @ to
+  % 0 so that @-commands in macro expansions aren't printed literally when 
+  % formatting an index file, where \ is used as the escape character.
+  \savedcatcodeone=\catcode`\@
+  \savedcatcodetwo=\catcode`\\
+  address@hidden
+  \catcode`\\=\active
+  %
   % Process the macro body under the current catcode regime.
-  \scantokens{#1\texinfoc}\aftermacro%
+  address@hidden
+  %
+  address@hidden
+  \catcode`\\=\savedcatcodetwo
   %
   % The \texinfoc is to remove the \newlinechar added by \scantokens, and
   % can be noticed by \parsearg.
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index ae682ec..31fc67e 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -274,7 +274,7 @@ Note: back-references in REGEXPs do not work."
 (defun syntax-propertize-via-font-lock (keywords)
   "Propertize for syntax using font-lock syntax.
 KEYWORDS obeys the format used in `font-lock-syntactic-keywords'.
-The return value is a function (with two paremeters, START and
+The return value is a function (with two parameters, START and
 END) suitable for `syntax-propertize-function'."
   (lambda (start end)
     (with-no-warnings
diff --git a/lisp/faces.el b/lisp/faces.el
index 3e26eadc..71c94e5 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2320,7 +2320,7 @@ If you set `term-file-prefix' to nil, this function does 
nothing."
 
 (defface variable-pitch
   '((((type w32))
-     ;; This is a kludgey workaround for an issue discussed in
+     ;; This is a kludgy workaround for an issue discussed in
      ;; http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html.
      :font "-outline-Arial-normal-normal-normal-sans-*-*-*-*-p-*-iso8859-1")
     (t :family "Sans Serif"))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b2223e7..418d9ea 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -837,6 +837,7 @@ See the command `isearch-forward-symbol' for more 
information."
        (buffer-substring-no-properties (car bounds) (cdr bounds))))
      (t
       (setq isearch-error "No symbol at point")
+      (isearch-push-state)
       (isearch-update)))))