forked from mirrors/org-mode
Merge branch 'origin-hotfix-7.8.06'
This commit is contained in:
commit
a4efcc3a39
|
@ -1878,7 +1878,8 @@ code ---- the results are extracted in the syntax of the source
|
||||||
(flet ((wrap (start finish)
|
(flet ((wrap (start finish)
|
||||||
(goto-char end) (insert (concat finish "\n"))
|
(goto-char end) (insert (concat finish "\n"))
|
||||||
(goto-char beg) (insert (concat start "\n"))
|
(goto-char beg) (insert (concat start "\n"))
|
||||||
(goto-char end) (setq end (point-marker)))
|
(goto-char end) (goto-char (point-at-eol))
|
||||||
|
(setq end (point-marker)))
|
||||||
(proper-list-p (it) (and (listp it) (null (cdr (last it))))))
|
(proper-list-p (it) (and (listp it) (null (cdr (last it))))))
|
||||||
;; insert results based on type
|
;; insert results based on type
|
||||||
(cond
|
(cond
|
||||||
|
|
|
@ -763,6 +763,19 @@ replacement happens correctly."
|
||||||
|
|
||||||
* next heading"))
|
* next heading"))
|
||||||
|
|
||||||
|
(ert-deftest test-ob/org-babel-results-indented-wrap ()
|
||||||
|
"Ensure that wrapped results are inserted correction when indented.
|
||||||
|
If not inserted correctly then the second evaluation will fail
|
||||||
|
trying to find the :END: marker."
|
||||||
|
(org-test-with-temp-text
|
||||||
|
"- indented
|
||||||
|
#+begin_src sh :results file wrap
|
||||||
|
echo test.txt
|
||||||
|
#+end_src"
|
||||||
|
(org-babel-next-src-block 1)
|
||||||
|
(org-babel-execute-src-block)
|
||||||
|
(org-babel-execute-src-block)))
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-wrap ()
|
(ert-deftest test-ob/org-babel-remove-result--results-wrap ()
|
||||||
"Test `org-babel-remove-result' with :results wrap."
|
"Test `org-babel-remove-result' with :results wrap."
|
||||||
(test-ob-verify-result-and-removed-result
|
(test-ob-verify-result-and-removed-result
|
||||||
|
|
Loading…
Reference in New Issue