branch master updated: * doc/texinfo.tex: Disable "@set indexescapeisbackslash" so that index files will use @ as the escape character rather than \. * NEWS, TODO: update.

[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 c6dbbcbd70 * doc/texinfo.tex: Disable "@set indexescapeisbackslash" so 
that index files will use @ as the escape character rather than \. * NEWS, 
TODO: update.
c6dbbcbd70 is described below

commit c6dbbcbd705e9396008f6ebd65289f710bf3b6a8
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Oct 19 20:13:50 2023 +0100

    * doc/texinfo.tex: Disable "@set indexescapeisbackslash" so that
    index files will use @ as the escape character rather than \.
    * NEWS, TODO: update.
---
 ChangeLog       |  6 ++++++
 NEWS            |  6 ++++++
 TODO            |  4 ++--
 doc/texinfo.tex | 16 ++++++++--------
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a85bc4b630..007f774fbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-19  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex: Disable "@set indexescapeisbackslash" so that
+       index files will use @ as the escape character rather than \.
+       * NEWS, TODO: update.
+
 2023-10-19  Gavin Smith <gavinsmith0123@gmail.com>
 
        * AUTHORS: add credits for js/*
diff --git a/NEWS b/NEWS
index 745f94bb0b..70e711775e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,12 @@ See the manual for detailed information.
 
 ------------------------------------------------------------------------------
 
+* texinfo.tex
+ . use @ as the escape character in all index files.  this requires
+   new enough texi2dvi (Texinfo 6.7, 2019) for index files to be properly
+   processed.
+
+
 7.1 (18 October 2023)
 * Language
  . new generic definition commands, @defblock, @defline and @deftypeline,
diff --git a/TODO b/TODO
index a57ad66bf6..a8d029ea7b 100644
--- a/TODO
+++ b/TODO
@@ -72,8 +72,8 @@ If you are interested in working on any of these, email 
bug-texinfo@gnu.org.
   - Include hyperlink \special's in the DVI output for xdvi, etc.
   - PDF: make each letter of the index (A, B, ...) a section in the TOC.
     From Carsten Dominik.
-  - Use @ as the escape character in index files by default,
-    after new texi2dvi is deployed (2022?).
+  - clear out support for \ as the index file escape character (instead
+    of @).
 
 * Doc:
   - Verify/proofread Documentation of the HTML customization.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index c96d4d7b28..bd8668c490 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-09-19.19}
+\def\texinfoversion{2023-10-19.19}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -5238,14 +5238,14 @@ $$%
 % the current value of \escapechar.
 \def\escapeisbackslash{\escapechar=`\\}
 
-% Use \ in index files by default.  texi2dvi didn't support @ as the escape 
-% character (as it checked for "\entry" in the files, and not "@entry").  When 
-% the new version of texi2dvi has had a chance to become more prevalent, then 
-% the escape character can change back to @ again.  This should be an easy 
-% change to make now because both @ and \ are only used as escape characters 
in 
-% index files, never standing for themselves. 
+% Uncomment to use \ in index files by default.  Old texi2dvi (before 2019)
+% didn't support @ as the escape character (as it checked for "\entry" in
+% the files, and not "@entry").
+%   In the future we can remove this flag and simplify the code for
+% index files and backslashes, once the support is no longer likely to be
+% useful.
 %
-\set txiindexescapeisbackslash
+% \set txiindexescapeisbackslash
 
 % Write the entry in \indextext to the index file.
 %