[6707] \xprocessmacroarg definition for \image

[Gavin D. Smith]

Revision: 6707
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6707
Author:   gavin
Date:     2015-10-17 11:44:04 +0000 (Sat, 17 Oct 2015)
Log Message:
-----------
\xprocessmacroarg definition for \image

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-10-16 18:57:53 UTC (rev 6706)
+++ trunk/ChangeLog     2015-10-17 11:44:04 UTC (rev 6707)
@@ -1,3 +1,8 @@
+2015-10-17  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\image): Give \xprocessmacroarg a definition, 
+       to try to stop an error when \image is used via a macro.
+
 2015-10-16  Gavin Smith  <address@hidden>
 
        * gnulib: Run gnulib-tool for updated Gnulib.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-10-16 18:57:53 UTC (rev 6706)
+++ trunk/doc/texinfo.tex       2015-10-17 11:44:04 UTC (rev 6707)
@@ -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{2015-10-14.18}
+\def\texinfoversion{2015-10-17.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8976,6 +8976,7 @@
 \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
   \catcode`\^^M = 5     % in case we're inside an example
   \normalturnoffactive  % allow _ et al. in names
+  \def\xprocessmacroarg{\eatspaces}% in case we are being used via a macro
   % If the image is by itself, center it.
   \ifvmode
     \imagevmodetrue