[6872] remove \global qualifier from assignment

[Gavin D. Smith]

Revision: 6872
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6872
Author:   gavin
Date:     2015-12-19 14:50:38 +0000 (Sat, 19 Dec 2015)
Log Message:
-----------
remove \global qualifier from assignment

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-12-19 14:45:59 UTC (rev 6871)
+++ trunk/ChangeLog     2015-12-19 14:50:38 UTC (rev 6872)
@@ -1,5 +1,12 @@
 2015-12-19  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\begindoublecolumns): Remove \global 
+       qualifier from an assignment to \vsize.
+       (\enddoublecolumns): Some comments updated to reflect the fact 
+       that \balancecolumns now saves its output in a box.
+
+2015-12-19  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <misc commands>: If command
        @indent or @noindent is seen, start a new paragraph after the 
        spaces following the command.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-12-19 14:45:59 UTC (rev 6871)
+++ trunk/doc/texinfo.tex       2015-12-19 14:50:38 UTC (rev 6872)
@@ -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-12-17.20}
+\def\texinfoversion{2015-12-19.14}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5467,7 +5467,7 @@
   % since nobody clobbers \vsize.)
   \global\doublecolumntopgap = \topskip
   \global\advance\doublecolumntopgap by -1\baselineskip
-  \global\advance\vsize by -1\doublecolumntopgap
+  \advance\vsize by -1\doublecolumntopgap
   \vsize = 2\vsize
   \topskip=0pt
   \global\entrylinedepth=0pt\relax
@@ -5537,23 +5537,20 @@
   \penalty0
   %
   \output = {%
-    % Split the last of the double-column material.  Leave it on the
-    % current page, no automatic page break.
+    % Split the last of the double-column material.
     \savemarks
     \balancecolumns
     %
-    % If we end up splitting too much material for the current page,
-    % though, there will be another page break right after this \output
-    % invocation ends.  Having called \balancecolumns once, we do not
+    % Having called \balancecolumns once, we do not
     % want to call it again.  Therefore, reset \output to its normal
-    % definition right away.  (We hope \balancecolumns will never be
-    % called on to balance too much material, but if it is, this makes
-    % the output somewhat more palatable.)
+    % definition right away.
     \global\output = {\onepageout{\pagecontents\PAGE}}%
   }%
   \eject
   \endgroup % started in \begindoublecolumns
   \restoremarks
+  % Leave the double-column material on the current page, no automatic
+  % page break.
   \box\balancedcolumns
   %
   % \pagegoal was set to the doubled \vsize above, since we restarted