From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 15 Dec 2024 22:08:25 +0000 (-0500)
Subject: * lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844)
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~194
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55303a6bc0a06d32ec757b6291d40e8f28565946;p=emacs.git

* lisp/org/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844)
---

diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 6adee9fca3f..8bb07feb81e 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -826,9 +826,9 @@ holding export options."
               ;; `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)))
+              (dn
                (format "* %s: (%s)." dn (or file dn)))
-              (t (format "* %s." file)))))
+              (t (format "* (%s)." file)))))
        (concat "@dircategory " dircat "\n"
 	       "@direntry\n"
 	       (let ((dirdesc