From b41749959c73e2c85e711c0d8f98829cb74af6dd Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 6 Jan 2019 22:04:13 +0000
Subject: glossaries (6jan19)

git-svn-id: svn://tug.org/texlive/trunk@49619 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/tools/multicol.dtx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Master/texmf-dist/source/latex/tools/multicol.dtx')

diff --git a/Master/texmf-dist/source/latex/tools/multicol.dtx b/Master/texmf-dist/source/latex/tools/multicol.dtx
index 1962ec24e59..fd77d6247dc 100644
--- a/Master/texmf-dist/source/latex/tools/multicol.dtx
+++ b/Master/texmf-dist/source/latex/tools/multicol.dtx
@@ -98,7 +98,7 @@
 %<driver> \ProvidesFile{multicol.drv}
 % \fi
 %         \ProvidesFile{multicol.dtx}
-          [2018/11/09 v1.8u  multicolumn formatting (FMi)]
+          [2018/12/27 v1.8v  multicolumn formatting (FMi)]
 %
 %
 %%
@@ -2265,13 +2265,18 @@
 %    user has issue a |\enlargethispage| command then the height the
 %    |\@kludgeins| box will be the negation of the size by which the
 %    page should be enlarged. If the star form of this command has
-%    been used then we also need to shrink the resulting column. As we
-%    don't know whether or not shrinking is already generally
-%    requested with save the current value of |\ifshr@king| and
-%    restore it afterwards.
+%    been used then we also need to shrink the resulting column.
+
+%    That local change will be reverted at the end of the output
+%   routine So for the next page the original state will be
+%   reestablished. However, in theorey there is a possibility to sneak
+%   in a whoe multicols environment into the running header
+%   definition. If that happens then it will also be affected by this
+%   change---too bad I think.   
 % \changes{v1.8a}{2011/12/20}{Support for \cs{enlargethispage}}
+% \changes{v1.8v}{2018/12/27}{Removed dead code, the case where this
+%   can go wrong is too obscure to worry about it (gh/101)}
 %    \begin{macrocode}
-   \let\ifshr@kingsaved\ifshr@king
    \ifvbox \@kludgeins
      \advance \dimen@ -\ht\@kludgeins
 %    \end{macrocode}
@@ -2332,11 +2337,6 @@
           {\unvbox\mult@rightbox
            \ifshr@nking\vfilmaxdepth\fi}%
 %    \end{macrocode}
-%    Now that we are done with the boxes, we restored the current
-%    setting for shrinking in case it got changed:
-%    \begin{macrocode}
-   \let\ifshr@king\ifshr@kingsaved
-%    \end{macrocode}
 %    Having done this we hope that box 255 is emptied. If not, we
 %    reinsert its contents.
 % \changes{v1.8a}{2011/12/20}{Only re-add output penalty if it was
-- 
cgit v1.2.3

