[6602] use \ifinner in \itemizeitem

[Gavin D. Smith]

Revision: 6602
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6602
Author:   gavin
Date:     2015-09-06 19:57:12 +0000 (Sun, 06 Sep 2015)
Log Message:
-----------
use \ifinner in \itemizeitem

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-09-06 19:15:07 UTC (rev 6601)
+++ trunk/ChangeLog     2015-09-06 19:57:12 UTC (rev 6602)
@@ -1,5 +1,10 @@
-2015-09-05  Gavin Smith  <address@hidden>
+2015-09-06  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\itemizeitem): Check not in inner mode before 
+       using \vadjust.
+
+2015-09-06  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\macroargctxt): Do \catcode`\^^M=\other, to 
        preserve newlines in a macro argument.
        (\parsemargdef): Put \processmacroarg instead of \xeatspaces in 
@@ -27,7 +32,7 @@
        Some of these changes are to handle better macros in the GNU tar 
        manual.
 
-2015-09-05  Gavin Smith  <address@hidden>
+2015-09-06  Gavin Smith  <address@hidden>
 
        * doc/texinfo.texi: Re-add "@setfilename" line, required by 
        Automake 1.15.  Reported by Stefan Husmann.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-09-06 19:15:07 UTC (rev 6601)
+++ trunk/doc/texinfo.tex       2015-09-06 19:57:12 UTC (rev 6602)
@@ -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-09-06.21}
+\def\texinfoversion{2015-09-06.22}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -3713,7 +3713,12 @@
    \noindent
    \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
    %
-   \vadjust{\penalty 1200}}% not good to break after first line of item.
+   \ifinner\else
+     \vadjust{\penalty 1200}% not good to break after first line of item.
+   \fi
+   % We can be in inner vertical mode in a footnote, although an
+   % @itemize looks awful there.
+  }%
   \flushcr
 }