branch: externals-release/org commit 906fb5eb54cdfd4295d8e321134559c8fd827efc Author: Stefan Monnier <monn...@iro.umontreal.ca> Commit: Kyle Meyer <k...@kyleam.com>
Backport commit 55303a6bc from Emacs * lisp/ox-texinfo.el (org-texinfo-template): Fix Info format (bug#74844) 55303a6bc0a06d32ec757b6291d40e8f28565946 Stefan Monnier Sun Dec 15 17:08:25 2024 -0500 --- lisp/ox-texinfo.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index 6adee9fca3..8bb07feb81 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/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