branch master updated: * doc/texinfo.tex (\newlineloadsconf): Hook into definitions made with \envdef as well as ends-of-lines and commands defined with \parsearg. Werner Lemberg reported an error when a @tex block followed "\input texinfo" immediately.

[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 576784696c * doc/texinfo.tex (\newlineloadsconf): Hook into 
definitions made with \envdef as well as ends-of-lines and commands defined 
with \parsearg.  Werner Lemberg reported an error when a @tex block followed 
"\input texinfo" immediately.
576784696c is described below

commit 576784696c8f97f2b94399fd88692f1e1a28bb65
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Sep 12 18:37:05 2023 +0100

    * doc/texinfo.tex (\newlineloadsconf): Hook into definitions
    made with \envdef as well as ends-of-lines and commands defined
    with \parsearg.  Werner Lemberg reported an error when a @tex block
    followed "\input texinfo" immediately.
---
 ChangeLog       | 7 +++++++
 doc/texinfo.tex | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b8b9deb15..b6386e3e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-09-12  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\newlineloadsconf): Hook into definitions
+       made with \envdef as well as ends-of-lines and commands defined
+       with \parsearg.  Werner Lemberg reported an error when a @tex block
+       followed "\input texinfo" immediately.
+
 2023-09-11  Gavin Smith <gavinsmith0123@gmail.com>
 
        pretest 7.0.91
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 44004c14bd..cc562fc8e0 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-08-13.14}
+\def\texinfoversion{2023-09-12.17}
 %
 % Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
@@ -11867,9 +11867,13 @@ directory should work if nowhere else does.}
   \def\c{\loadconf\c}%
   % Definition for the first newline read in the file
   \def ^^M{\loadconf}%
-  % In case the first line has a whole-line command on it
+  % In case the first line has a whole-line or environment command on it
   \let\originalparsearg\parsearg%
   \def\parsearg{\loadconf\originalparsearg}%
+  %
+  % \startenvironment is in the expansion of commands defined with \envdef
+  \let\originalstartenvironment\startenvironment%
+  \def\startenvironment{\loadconf\startenvironment}%
 }}
 
 
@@ -11897,6 +11901,7 @@ directory should work if nowhere else does.}
   \enableemergencynewline
   \let\c=\comment
   \let\parsearg\originalparsearg
+  \let\startenvironment\originalstartenvironment
   %
   % Also turn back on active characters that might appear in the input
   % file name, in case not using a pre-dumped format.