From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#74844: m-buffer: Broken Top Directory node in Info manual due to malformed Texinfo direntry Date: Fri, 13 Dec 2024 16:50:02 -0500 Message-ID: References: <87zfl0bc7o.fsf@gmail.com> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11583"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 74844@debbugs.gnu.org To: Suhail Singh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 13 22:51:25 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 1tMDZE-0002rD-Kv for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 13 Dec 2024 22:51:25 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMDYv-0002vY-Ek; Fri, 13 Dec 2024 16:51:05 -0500 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 1tMDYt-0002v5-DH for bug-gnu-emacs@gnu.org; Fri, 13 Dec 2024 16:51:03 -0500 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 1tMDYt-0007Vl-4H for bug-gnu-emacs@gnu.org; Fri, 13 Dec 2024 16:51:03 -0500 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:References:In-Reply-To:From:To:Subject; bh=h0GrMD6rPyhP2W4gLNDZKCKntRH8NXAFgrvk+716pfc=; b=BeUqoMfCh7ruCvIBLt+yDC5JnISdVZmWfNVnl9/Q7Piy6ND81LNugie5NWLextXqGCaSuoZJGlZ0JbNgaqBOGY0Obf00llhzj+OSIBERh6up36ioSP7cT1sis289x0rSyvv+Uj0Klu9j+LGUKhCiLCtCOCJC6tehECfGI+lbwW3HYdPcga0jnrQj71TBBwNeQfAt5Cf+5JYWtKnxKI9zIPnRS0wv5mvAVSg3D/np5HteX4ubRXAAvpQ5pl212fkwxsOwLxUc+m5mgbrrEs9MwmbjYOJ+14yf83LhDeZjtID6MKy0XzIJr9oBBJ8Dx1vRqSIj7S7OCqk2eNpMc7SXrg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMDYr-0006KJ-Vp for bug-gnu-emacs@gnu.org; Fri, 13 Dec 2024 16:51:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Dec 2024 21:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74844 X-GNU-PR-Package: emacs Original-Received: via spool by 74844-submit@debbugs.gnu.org id=B74844.173412661824257 (code B ref 74844); Fri, 13 Dec 2024 21:51:01 +0000 Original-Received: (at 74844) by debbugs.gnu.org; 13 Dec 2024 21:50:18 +0000 Original-Received: from localhost ([127.0.0.1]:44438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMDY9-0006JA-BG for submit@debbugs.gnu.org; Fri, 13 Dec 2024 16:50:17 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:24208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMDY3-0006Es-IR for 74844@debbugs.gnu.org; Fri, 13 Dec 2024 16:50:15 -0500 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 0B95844347A; Fri, 13 Dec 2024 16:50:05 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1734126604; bh=+M/VySizuz0x6tC7pX4OdtYcotXhi/kHB/ZSQtI9GuM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=YEMXmx2BfSPfmZyfggWY7kZy01gLSg1DvGaV++qRVRRwU2IM4bXbxpY/nXYbcGBRR 79Cef/i9GA+F2te6zu5eXgtlhrPVwnQS37dXRkdTesxXNWHvTXOdVzGPxve5sJ5Q23 NpOrsYBLaEfneQMCj1JqurmxEoQlea4DeKxeugCxg15siEdyPr0+H1GcyAS2BpUCXb iN0zgbhQ/65Wo4SWOVEz+9q/yP+oqPXkcxnoIGMtPhpxwwzqvC3RFOSLKevOC3taHM CR7i7FI127+W0bhD49JYusLD9tzlumhEYPOF/t7yoC7I8y/GOgkxBhSiQnMf0CNjFi fqgykjHc2XtYg== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id EA3D54433CB; Fri, 13 Dec 2024 16:50:03 -0500 (EST) Original-Received: from alfajor (104-195-225-43.cpe.teksavvy.com [104.195.225.43]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id B9D2E12041D; Fri, 13 Dec 2024 16:50:03 -0500 (EST) In-Reply-To: <87zfl0bc7o.fsf@gmail.com> (Suhail Singh's message of "Thu, 12 Dec 2024 20:31:23 -0500") 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:296994 Archived-At: > However, the @direntry as > noted in the "dir" and "m-buffer-doc.info" files is "* m-buffer.doc." Hmm... yup. I pushed to Emacs a fix for the generation of that Texinfo element in `ox-texinfo.el` and to `m-buffer` I pushed another change which tries to workaround that bug (for when it's used with an older Emacs). The patch for `ox-texinfo.el` is below. It's "obviously safe", but I suspect it's too late for Emacs-30. Eli? Stefan diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el index 6adee9fca3f..deceeca8947 100644 --- a/lisp/org/ox-texinfo.el +++ b/lisp/org/ox-texinfo.el @@ -826,9 +826,7 @@ org-texinfo-template ;; `dn' is presumed to be just the DIRNAME part, so generate ;; either `* DIRNAME: (FILENAME).' or `* FILENAME.', whichever ;; is shortest. - ((and dn (not (equal dn file))) - (format "* %s: (%s)." dn (or file dn))) - (t (format "* %s." file))))) + (t (format "* %s: (%s)." (or dn file) (or file dn)))))) (concat "@dircategory " dircat "\n" "@direntry\n" (let ((dirdesc