From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mats Lidell Newsgroups: gmane.emacs.bugs Subject: bug#74042: [PATCH] Accept texi2any for version identification Date: Sun, 27 Oct 2024 09:35:45 +0100 Message-ID: <87jzduaqou.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36709"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 74042@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Oct 27 09:36:47 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t4ylS-0009Rc-OB for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 27 Oct 2024 09:36:46 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4ylD-0006ug-0N; Sun, 27 Oct 2024 04:36:31 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4ylB-0006uI-Dw for bug-gnu-emacs@gnu.org; Sun, 27 Oct 2024 04:36:29 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4ylB-0008UT-5T for bug-gnu-emacs@gnu.org; Sun, 27 Oct 2024 04:36:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=O5wMvgJ4b8gqqUUyHeiXu2b0Z8SsSqAYqgoEI3DR7k0=; b=HYIeI1+a7Z7wylcnDu5cFmj9ID7pPLuCH+j/zsUZ+Lx8hAGW7wBT7fb+5zG9Qd+f/BOSr5iQsG7J/5UkRyzZjoPVSXsOYC6Wi4P/Fl/xULbkyP4EUvPgNLuYOuayOzW8wseXbXTU5F0inXAmTTYbRB+7r6UoLW8+WlkLXcZ6iOLZ1H0oWaJ3/paRt2FQtf4zzNJeWY2Rhtvb+bmOWnwYhkNt7dZgKnT9UKwkIZN8azcTBQuEz1t88dtITsgsWjtAHogNbVGqO28LBY81fPLstwKzC2R8PxJ3r8Wa+D2PihHYnY3v8er3G1f0quxVoz12tUZPq4WDRBTmA7q09/AjAA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4yli-0000rr-Hh for bug-gnu-emacs@gnu.org; Sun, 27 Oct 2024 04:37:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mats Lidell Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 27 Oct 2024 08:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74042 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.17300181873288 (code B ref -1); Sun, 27 Oct 2024 08:37:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Oct 2024 08:36:27 +0000 Original-Received: from localhost ([127.0.0.1]:43725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4yl9-0000qx-As for submit@debbugs.gnu.org; Sun, 27 Oct 2024 04:36:27 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:48344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4yl6-0000qm-R0 for submit@debbugs.gnu.org; Sun, 27 Oct 2024 04:36:26 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4ykY-0006s8-1M for bug-gnu-emacs@gnu.org; Sun, 27 Oct 2024 04:35:50 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4ykX-0008U2-Pn for bug-gnu-emacs@gnu.org; Sun, 27 Oct 2024 04:35:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=O5wMvgJ4b8gqqUUyHeiXu2b0Z8SsSqAYqgoEI3DR7k0=; b=fBlq6tb0A6zA5l bJ5tsGODrp+7VqioT+OlExpnvhwofyHmOlDXUEusonI9cHJY1dvjuymjG9i6FH+4vsFF2HDUtQORZ tI+etm7C4zlO6IrpUO4dhOfavCHmn8plIhzYboAyYbF9b+3cKSAJA3JpjqSiKk667Es7KyBTbuL2M UBRMDEPZpdgBSZdI564mYGB5KfLK6K8gwuuoimq/56C4P0CDLsFUreXnm0PKlX7700woK+ZpPkm6y y4k3Jm71QD0WWxCfWTCHQR/QUdHyglMEZFzVakH6kKGD/0uXehurqe4+lKhruQjEZUzTBiMH1wuej AXwCmoKmS66+JoRap1GQ==; X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:294309 Archived-At: --=-=-= Content-Type: text/plain 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' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Accept-texi2any-for-version-identification.patch >From 53c87778acb33d82f6fff64048e1e9d6372e5238 Mon Sep 17 00:00:00 2001 From: Mats Lidell 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 --=-=-=--