From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 30308 invoked from network); 16 Jun 2023 03:14:09 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 16 Jun 2023 03:14:09 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1686885250; b=RKJygWk1Uy48QGeo+wJywFmzEZTzVjmqrksmv5RfDJ3CgTRmBHfRMGe10vnSK4P0Nog3wAGJbk qqg6fQuTJ+lQUHhNCd063g7g5YGKhP8vvmcBK8h93wvBwJ8kz4spqSDZJv3TqahkSr1W5Wddfb Ohy3xzNMaO2OK3PPDTIgaJrajdUwnvVUTDCuQAvmRTvpVAcCywRUSHUAYAatS5UR5O+ab81Xah TlmrW4biIR29QAllz2BTsL9ZchI3X/mY0h7tDArje+C5UVuaUKbVqFn9SMywj/3qisKi22qIJI GWxoPC4Z8G376I2St7sH1i7Zxwtp1zt/fPC25MmzI+OROg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (snd01007-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.23; dmarc=none header.from=kba.biglobe.ne.jp; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1686885250; bh=jcdQ0fOqNaoxL+0UrTe+a4OplRm2KDf/I6LHNyPLyVs=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:To:Date:Message-ID:Subject:MIME-Version: Content-Transfer-Encoding:Content-Type:From:DKIM-Signature; b=fziWAq9A9BzvlS+aAQkqgZshhU19oZFoyF7+VfeFa//D4v17igSfsClkctFp0n2e8RtZKiBsEK y7IQKjvKlw/uLXGYJ0fdec6QacSoq01dt5qkbqZ/T8RxWTv+FiFpt9yRTF6MxuL05n6nt93Gsj LpKT/NNl1GWZ0UJEN3gTN4rmoHYf3mbW6tOsQElLkni02oIudPJiR8mPl3YytxOmImA0RvjwOU tiCGplntdc2bqCXkpeC8vzhoGdAzApoUqbVZ+2hepYAz4pkswDFBEVJdJnEPV77Q0FsdLhFFyg BCXh4n9qjWMrL2ZjjMQkNQjlo0bw4Zj9UkZsKtsM1Me03Q==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:To:Date:Message-Id:Subject: Mime-Version:Content-Transfer-Encoding:Content-Type:From:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=I9OWp1Ujm8MD4ubZG7U97Q6AvoyfHP6HnmBCgf4R7CM=; b=pw8gopSwBlsLwqD+AApWT9ZtfF FPZ/DHP1khy/2AYfNbKz7O2TBOVAokC5naO1I4+lvAwLRYfa2X9h7YxXpFF8D2z5MwCGdcn38DgoB UHaMiyCZfwK2gZu206FBGAsBPSg+mVJCjWVsKw+3ZMYAvV8ey7Jpbk4JPnjfCQx0e8LzvVX/+LRwa ujf1Wqi5CqQPg2z6LgHVRwkX7/2dLkz59/NqAZArjFVTOw9oExTZklQd8NiPII3an0E+oNchK+V5w iQDzrvA8OEK6CT6yEhECV2hH0k+o716O1jhUBIFfCav3XJjhuYEFj2PY9REtPIHldyWoWV9Ry9F7R waNSiSAQ==; Received: by zero.zsh.org with local id 1q9zua-000CSf-Nx; Fri, 16 Jun 2023 03:14:08 +0000 Authentication-Results: zsh.org; iprev=pass (snd01007-bg.im.kddi.ne.jp) smtp.remote-ip=27.86.113.23; dmarc=none header.from=kba.biglobe.ne.jp; arc=none Received: from snd01007-bg.im.kddi.ne.jp ([27.86.113.23]:28579 helo=dfmta1029.biglobe.ne.jp) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1q9zty-000C8u-JY; Fri, 16 Jun 2023 03:13:33 +0000 Received: from mail.biglobe.ne.jp by omta1029.biglobe.ne.jp with ESMTP id <20230616031323732.TWVJ.120363.mail.biglobe.ne.jp@biglobe.ne.jp> for ; Fri, 16 Jun 2023 12:13:23 +0900 From: Jun T Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.21\)) Subject: [PATCH] support texinfo-7.0 Message-Id: Date: Fri, 16 Jun 2023 12:13:22 +0900 To: zsh-workers@zsh.org X-Mailer: Apple Mail (2.3445.104.21) X-Biglobe-Sender: takimoto-j@kba.biglobe.ne.jp X-Seq: 51862 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: texinfo-7.0 was released about a half year ago, and Arch Linux already uses it. But with 7.0, 'make html' gives the following warning: texi2any -c TEXI2HTML=3D1 --output . --ifinfo --split=3Dchapter = --node-files \ --init-file texi2html.conf ./zsh.texi texi2any: warning: error loading ./texi2html.conf: Undefined subroutine = &Texinfo::Config::set_from_init_file called at ./texi2html.conf line 1. Compilation failed in require at /usr/share/texinfo/Texinfo/Config.pm = line 130. It seems set_from_init_file was renamed texinfo_set_from_init_file. diff --git a/Doc/Makefile.in b/Doc/Makefile.in index 136b080d6..dabe11fe3 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -43,6 +43,7 @@ TEXI2DVI =3D @TEXI2DVI@ DVIPS =3D dvips TEXI2PDF =3D @TEXI2PDF@ TEXI2HTML =3D @TEXI2HTML@ +SET_TEXI2ANY_VAR =3D @SET_TEXI2ANY_VAR@ PAPERSIZE =3D @PAPERSIZE@ =20 .SUFFIXES: .yo .1 @@ -266,7 +267,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk d=3D`echo $(VERSION_DATE)`; \ v=3D"Zsh version $(VERSION), released on = $$d."; \ case '$(TEXI2HTML)' in \ - *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" = ;; \ + *texi2any*) echo = "$(SET_TEXI2ANY_VAR)('PRE_BODY_CLOSE','$$v');" ;; \ *) echo "\$$PRE_BODY_CLOSE =3D '$$v';" ;; \ esac > $@ =20 diff --git a/configure.ac b/configure.ac index 4710d1659..ba76f9a60 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,12 @@ fi =20 if test x"$TEXI2HTML" =3D xtexi2any; then TEXI2HTML=3D'texi2any -c TEXI2HTML=3D1' + case `texi2any --version 2>/dev/null | sed -e 's/^.*) *//' -e 1q` in + [[1-6]].*) SET_TEXI2ANY_VAR=3Dset_from_init_file ;; + *) SET_TEXI2ANY_VAR=3Dtexinfo_set_from_init_file ;; + esac fi +AC_SUBST(SET_TEXI2ANY_VAR) =20 case "$LC_PAPER" in ??_US*) PAPERSIZE=3Dus ;;