* lisp/org/ox-texinfo.el (org-texinfo-template): Fix direntry format

Apparently I was confused and `* FILE.  DESCRIPTION` is not
a valid format, so always use the longer form.

(cherry picked from commit 5923d8ebef93075e053cf50e17b86d34731fe777)

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