Subject: [PATCH] Accept texi2any for version identification
From: Mats Lidell <[email-masked]>
To: [email-masked]
Date: Sun, 27 Oct 2024 09:35:45 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Although according to docs texi2any is identical to makeinfo it outputs its
name in the first line which the version check in
`Info-file-supports-index-cookies' does not account for. The submitted patch
allows both makeinfo and texi2any to be in the version string.

In GNU Emacs 31.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.41, cairo version 1.18.2) of 2024-10-27 built on ethel
Repository revision: 523aade3ea11c188e30e3889f031d1848129cf82
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12101013
System Description: Gentoo Linux

Configured using:
 'configure --prefix=/home/matsl --with-mailutils --with-native-compilation --with-tree-sitter'

From 53c87778acb33d82f6fff64048e1e9d6372e5238 Mon Sep 17 00:00:00 2001
From: Mats Lidell <[email-masked]>
Date: Sun, 27 Oct 2024 09:11:16 +0100
Subject: [PATCH] Accept texi2any for version identification

---
 lisp/info.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/info.el b/lisp/info.el
index 1ad1677c6ce..6a5fe6f1fbc 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -667,7 +667,7 @@ Info-file-supports-index-cookies
 	  (goto-char (point-min))
 	  (condition-case ()
 	      (if (and (re-search-forward
-			"makeinfo[ \n]version[ \n]\\([0-9]+.[0-9]+\\)"
+			"\\(?:makeinfo\\|texi2any\\)[ \n]version[ \n]\\([0-9]+.[0-9]+\\)"
 			(line-beginning-position 4) t)
 		       (not (version< (match-string 1) "4.7")))
 		  (setq found t))
-- 
2.45.2