[7317] disable marks in whole of \entry

[gavinsmith0123]

Revision: 7317
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7317
Author:   gavin
Date:     2016-08-16 19:37:43 +0000 (Tue, 16 Aug 2016)
Log Message:
-----------
disable marks in whole of \entry

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-08-14 08:57:36 UTC (rev 7316)
+++ trunk/ChangeLog     2016-08-16 19:37:43 UTC (rev 7317)
@@ -1,3 +1,10 @@
+2016-08-16  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\entry): Disable output of marks for whole 
+       entry, instead of just for the page number.  This is intended to 
+       prevent an infinite loop in \ourunvbox when @uref is used in an 
+       index entry (reported by Karl Berry for latex refman manual).
+
 2016-08-14  Gavin Smith  <address@hidden>
 
        * README-hacking: Mention gnulib import in XSParagraph subdirectory.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-08-14 08:57:36 UTC (rev 7316)
+++ trunk/doc/texinfo.tex       2016-08-16 19:37:43 UTC (rev 7317)
@@ -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-08-09.22}
+\def\texinfoversion{2016-08-16.19}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5642,6 +5642,12 @@
 \def\entry{%
   \begingroup
     %
+    % For pdfTeX and XeTeX.
+    % The redefinifion of \domark stops marks being added in \pdflink to 
+    % preserve coloured links across page boundaries.  Otherwise the marks
+    % would get in the way of \lastbox in \insertindexentrybox.
+    \let\domark\relax
+    %
     % Start a new paragraph if necessary, so our assignments below can't
     % affect previous text.
     \par
@@ -5688,20 +5694,13 @@
       %
       \ifpdf
         \pdfgettoks#1.%
-        \bgroup\let\domark\relax
-          \hskip\skip\thinshrinkable\the\toksA
-        \egroup
-        % The redefinion of \domark stops marks being added in \pdflink to 
-        % preserve coloured links across page boundaries.  Otherwise the marks
-        % would get in the way of \lastbox in \insertindexentrybox.
+        \hskip\skip\thinshrinkable\the\toksA
       \else
         \ifx\XeTeXrevision\thisisundefined
           \hskip\skip\thinshrinkable #1%
         \else
           \pdfgettoks#1.%
-          \bgroup\let\domark\relax
-            \hskip\skip\thinshrinkable\the\toksA
-          \egroup
+          \hskip\skip\thinshrinkable\the\toksA
         \fi
       \fi
     \fi