branch: externals-release/org
commit e316377767a3662daf848f8cef87e7568b14d195
Merge: 62dc49509c 92a40cf7a1
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
Merge branch 'km/from-emacs-29' into bugfix
---
lisp/org-capture.el | 2 +-
lisp/org-element.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index b26afeb036..4e65706315 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -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.
diff --git a/lisp/org-element.el b/lisp/org-element.el
index ace1cc1a98..aa618a088a 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -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',
