branch master updated: * doc/texinfo.tex (\defindex, \defidx): Rename to \defidx to avoid clash with @defindex command.

[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 8c476c1ee8 * doc/texinfo.tex (\defindex, \defidx): Rename to \defidx 
to avoid clash with @defindex command.
8c476c1ee8 is described below

commit 8c476c1ee80de6ec374e78bfcd33d349746abce6
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Dec 17 15:26:02 2022 +0000

    * doc/texinfo.tex (\defindex, \defidx): Rename to
    \defidx to avoid clash with @defindex command.
---
 ChangeLog       |  5 +++++
 doc/texinfo.tex | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44125bae9d..ede440cc61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-17  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\defindex, \defidx): Rename to
+       \defidx to avoid clash with @defindex command.
+
 2022-12-17  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Turn off hyphenation for tt fonts completely.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index ae151f4ba5..0401bdf93d 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{2022-12-17.13}
+\def\texinfoversion{2022-12-17.15}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -7595,10 +7595,10 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \exdentamount=\defbodyindent
 }
 
-\newtoks\defindex
+\newtoks\defidx
 \newtoks\deftext
 
-\def\useindex#1{\defindex={#1}\ignorespaces}
+\def\useindex#1{\defidx={#1}\ignorespaces}
 
 % Called as \printdefunline \deffooheader{text}
 %
@@ -7608,7 +7608,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
     % call \deffooheader:
     #1#2 \endheader
     % create the index entry
-    \edef\temp{\noexpand\doind{\the\defindex}{\the\deftext}}%
+    \edef\temp{\noexpand\doind{\the\defidx}{\the\deftext}}%
     \temp
     % common ending:
     \interlinepenalty = 10000
@@ -7676,7 +7676,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 }
 
 \def\defind#1#2{
-  \defindex={#1}%
+  \defidx={#1}%
   \deftext={#2}%
 }