mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 15:32:52 +00:00
Merge branch 'km/from-emacs-29' into bugfix
This commit is contained in:
commit
e316377767
|
@ -1700,7 +1700,7 @@ Expansion occurs in a temporary Org mode buffer."
|
|||
(condition-case error
|
||||
(insert-file-contents filename)
|
||||
(error
|
||||
(insert (format "%%![couldn not insert %s: %s]"
|
||||
(insert (format "%%![could not insert %s: %s]"
|
||||
filename
|
||||
error))))))))
|
||||
;; Mark %() embedded elisp for later evaluation.
|
||||
|
|
|
@ -5299,7 +5299,7 @@ indentation removed from its contents."
|
|||
;; mechanism is robust enough to preserve total order among elements
|
||||
;; even when the tree is only partially synchronized.
|
||||
;;
|
||||
;; The cache code debuggin is fairly complex because cache request
|
||||
;; The cache code debugging is fairly complex because cache request
|
||||
;; state is often hard to reproduce. An extensive diagnostics
|
||||
;; functionality is built into the cache code to assist hunting bugs.
|
||||
;; See `org-element--cache-self-verify', `org-element--cache-self-verify-frequency',
|
||||
|
|
Loading…
Reference in a new issue