branch: externals-release/org
commit b73a10fc9427494e423a8b497febd63b0776fc42
Merge: 9729c60eb4 9afe1e0947
Author: Kyle Meyer <[email protected]>
Commit: Kyle Meyer <[email protected]>
Merge branch 'km/from-emacs-30' into bugfix
---
lisp/org-element.el | 2 +-
lisp/ox-texinfo.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index f119ed739d..0a2346c779 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7260,7 +7260,7 @@ that range. See `after-change-functions' for more
information."
#'org-element--cache-after-change -1 t)))
(defvar org-element--cache-avoid-synchronous-headline-re-parsing nil
- "This variable controls how buffer changes are handled by the cache.
+ "How buffer changes are handled by the cache.
By default (when this variable is nil), cache re-parses modified
headlines immediately after modification preserving all the unaffected
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index 30f0ca8549..29d7c21bb8 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
