ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-01-01 15:58:56 +03:00
parent 24740a9e84 9cee879b36
commit d5b8180e72
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
4 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-capture.el
View File

@ -1700,7 +1700,7 @@ Expansion occurs in a temporary Org mode buffer."
(condition-case error (condition-case error
(insert-file-contents filename) (insert-file-contents filename)
(error (error
(insert (format "%%![couldn not insert %s: %s]" (insert (format "%%![could not insert %s: %s]"
filename filename
error)))))))) error))))))))
;; Mark %() embedded elisp for later evaluation. ;; Mark %() embedded elisp for later evaluation.

2
lisp/org-element.el
View File

@ -5299,7 +5299,7 @@ indentation removed from its contents."
;; mechanism is robust enough to preserve total order among elements ;; mechanism is robust enough to preserve total order among elements
;; even when the tree is only partially synchronized. ;; 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 ;; state is often hard to reproduce. An extensive diagnostics
;; functionality is built into the cache code to assist hunting bugs. ;; functionality is built into the cache code to assist hunting bugs.
;; See `org-element--cache-self-verify', `org-element--cache-self-verify-frequency', ;; See `org-element--cache-self-verify', `org-element--cache-self-verify-frequency',

8
lisp/org-macs.el
View File

@ -74,13 +74,15 @@ Version mismatch is commonly encountered in the following situations:
loading of the newer Org version. loading of the newer Org version.
It is recommended to put It is recommended to put
(straight-use-package %sorg)
%s
early in the config. Ideally, right after the straight.el early in the config. Ideally, right after the straight.el
bootstrap. Moving `use-package' :straight declaration may not be bootstrap. Moving `use-package' :straight declaration may not be
sufficient if the corresponding `use-package' statement is sufficient if the corresponding `use-package' statement is
deferring the loading." deferring the loading."
"'" ; Avoid `warn' replacing "'" with "’" (see `format-message'). ;; Avoid `warn' replacing "'" with "’" (see `format-message').
) "(straight-use-package 'org)")
(error "Org version mismatch. Make sure that correct `load-path' is set early in init.el"))) (error "Org version mismatch. Make sure that correct `load-path' is set early in init.el")))
;; We rely on org-macs when generating Org version. Checking Org ;; We rely on org-macs when generating Org version. Checking Org

18
testing/lisp/test-ob-octave.el
View File

@ -79,12 +79,6 @@ sombrero;
(org-babel-execute-src-block) (org-babel-execute-src-block)
(should (search-forward (format "[[file:%s]]" file) nil nil)) (should (search-forward (format "[[file:%s]]" file) nil nil))
(should (file-readable-p file)) (should (file-readable-p file))
(should (or (> (file-attribute-size (file-attributes file)) 0)
;; Avoid race condition on slow machines.
;; https://orgmode.org/list/87r0wk29dz.fsf@localhost
(progn
(sleep-for 1)
(> (file-attribute-size (file-attributes file)) 0))))
(should-not (get-buffer "*Org-Babel Error Output*"))) (should-not (get-buffer "*Org-Babel Error Output*")))
;; clean-up ;; clean-up
(delete-file file) (delete-file file)
@ -105,12 +99,6 @@ sombrero;
(should (get-buffer "*Inferior Octave*")) (should (get-buffer "*Inferior Octave*"))
(should (search-forward (format "[[file:%s]]" file) nil nil)) (should (search-forward (format "[[file:%s]]" file) nil nil))
(should (file-readable-p file)) (should (file-readable-p file))
(or (> (file-attribute-size (file-attributes file)) 0)
;; Avoid race condition on slow machines.
;; https://orgmode.org/list/87r0wk29dz.fsf@localhost
(progn
(sleep-for 1)
(> (file-attribute-size (file-attributes file)) 0)))
(should-not (get-buffer "*Org-Babel Error Output*"))) (should-not (get-buffer "*Org-Babel Error Output*")))
;; clean-up ;; clean-up
(delete-file file) (delete-file file)
@ -131,12 +119,6 @@ sombrero;
(org-babel-execute-src-block) (org-babel-execute-src-block)
(should (search-forward (format "[[file:%s]]" file) nil nil)) (should (search-forward (format "[[file:%s]]" file) nil nil))
(should (file-readable-p file)) (should (file-readable-p file))
(or (> (file-attribute-size (file-attributes file)) 0)
;; Avoid race condition on slow machines.
;; https://orgmode.org/list/87r0wk29dz.fsf@localhost
(progn
(sleep-for 1)
(> (file-attribute-size (file-attributes file)) 0)))
(should-not (get-buffer "*Org-Babel Error Output*"))) (should-not (get-buffer "*Org-Babel Error Output*")))
;; clean-up ;; clean-up
(delete-file file) (delete-file file)