branch master updated: * doc/texinfo.tex (\tocentry): Fix setting of \entrycontskip to work with last change.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 56a995515d * doc/texinfo.tex (\tocentry): Fix setting of 
\entrycontskip to work with last change.
56a995515d is described below

commit 56a995515dffafabe442289ad41dc578734eab42
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Jul 26 16:49:48 2023 +0100

    * doc/texinfo.tex (\tocentry): Fix setting of \entrycontskip
    to work with last change.
---
 ChangeLog       |  5 +++++
 doc/texinfo.tex | 18 ++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 724bb649ae..4fe17dcfc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-07-26  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\tocentry): Fix setting of \entrycontskip
+       to work with last change.
+
 2023-07-26  Gavin Smith <gavinsmith0123@gmail.com>
 
        TOC section number alignment
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index f0fda5ba88..7840ffc571 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -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{2023-07-26.14}
+\def\texinfoversion{2023-07-26.15}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -6996,16 +6996,14 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \ifx\empty\secno
     \entry{#1}{#3}%
   \else
-    \setbox0=\hbox{#2\labelspace}%
+    \ifdim 0pt=\secnowidth
+      \setbox0=\hbox{#2\labelspace}%
+    \else
+      \advance\secnowidth by 1em
+      \setbox0=\hbox to \secnowidth{#2\labelspace\hfill}%
+    \fi
     \entrycontskip=\wd0
-    \entry{%
-      \ifdim 0pt=\secnowidth
-        #2%
-      \else
-        \hbox to \secnowidth{#2\hfill}%
-      \fi
-      \labelspace#1%
-    }{#3}%
+    \entry{\box0 #1}{#3}%
   \fi
 }