mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-26 10:32:51 +00:00
Merge branch 'bugfix'
This commit is contained in:
commit
d5b8180e72
|
@ -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',
|
||||
|
|
|
@ -74,13 +74,15 @@ Version mismatch is commonly encountered in the following situations:
|
|||
loading of the newer Org version.
|
||||
|
||||
It is recommended to put
|
||||
(straight-use-package %sorg)
|
||||
|
||||
%s
|
||||
|
||||
early in the config. Ideally, right after the straight.el
|
||||
bootstrap. Moving `use-package' :straight declaration may not be
|
||||
sufficient if the corresponding `use-package' statement is
|
||||
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")))
|
||||
|
||||
;; We rely on org-macs when generating Org version. Checking Org
|
||||
|
|
|
@ -79,12 +79,6 @@ sombrero;
|
|||
(org-babel-execute-src-block)
|
||||
(should (search-forward (format "[[file:%s]]" file) nil nil))
|
||||
(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*")))
|
||||
;; clean-up
|
||||
(delete-file file)
|
||||
|
@ -105,12 +99,6 @@ sombrero;
|
|||
(should (get-buffer "*Inferior Octave*"))
|
||||
(should (search-forward (format "[[file:%s]]" file) nil nil))
|
||||
(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*")))
|
||||
;; clean-up
|
||||
(delete-file file)
|
||||
|
@ -131,12 +119,6 @@ sombrero;
|
|||
(org-babel-execute-src-block)
|
||||
(should (search-forward (format "[[file:%s]]" file) nil nil))
|
||||
(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*")))
|
||||
;; clean-up
|
||||
(delete-file file)
|
||||
|
|
Loading…
Reference in a new issue