Merge branch 'maint' of orgmode.org:org-mode into maint
This commit is contained in:
commit
4f2c79cb49
|
@ -814,86 +814,6 @@ trying to find the :END: marker."
|
||||||
(should (search-forward "[[file:foo][bar]]" nil t))
|
(should (search-forward "[[file:foo][bar]]" nil t))
|
||||||
(should (search-forward "[[file:foo][foo]]" nil t))))
|
(should (search-forward "[[file:foo][foo]]" nil t))))
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-wrap ()
|
|
||||||
"Test `org-babel-remove-result' with :results wrap."
|
|
||||||
(test-ob-verify-result-and-removed-result
|
|
||||||
":RESULTS:
|
|
||||||
hello there
|
|
||||||
:END:"
|
|
||||||
|
|
||||||
"* org-babel-remove-result
|
|
||||||
|
|
||||||
#+begin_src emacs-lisp :results wrap
|
|
||||||
\"hello there\"
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
* next heading"))
|
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-org ()
|
|
||||||
"Test `org-babel-remove-result' with :results org."
|
|
||||||
(test-ob-verify-result-and-removed-result
|
|
||||||
"#+BEGIN_ORG
|
|
||||||
* heading
|
|
||||||
** subheading
|
|
||||||
content
|
|
||||||
#+END_ORG"
|
|
||||||
|
|
||||||
"* org-babel-remove-result
|
|
||||||
#+begin_src emacs-lisp :results org
|
|
||||||
\"* heading
|
|
||||||
** subheading
|
|
||||||
content\"
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
* next heading"))
|
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-html ()
|
|
||||||
"Test `org-babel-remove-result' with :results html."
|
|
||||||
(test-ob-verify-result-and-removed-result
|
|
||||||
"#+BEGIN_HTML
|
|
||||||
<head><body></body></head>
|
|
||||||
#+END_HTML"
|
|
||||||
|
|
||||||
"* org-babel-remove-result
|
|
||||||
#+begin_src emacs-lisp :results html
|
|
||||||
\"<head><body></body></head>\"
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
* next heading"))
|
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-latex ()
|
|
||||||
"Test `org-babel-remove-result' with :results latex."
|
|
||||||
(test-ob-verify-result-and-removed-result
|
|
||||||
"#+BEGIN_LaTeX
|
|
||||||
Line 1
|
|
||||||
Line 2
|
|
||||||
Line 3
|
|
||||||
#+END_LaTeX"
|
|
||||||
|
|
||||||
"* org-babel-remove-result
|
|
||||||
#+begin_src emacs-lisp :results latex
|
|
||||||
\"Line 1
|
|
||||||
Line 2
|
|
||||||
Line 3\"
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
* next heading"))
|
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-code ()
|
|
||||||
"Test `org-babel-remove-result' with :results code."
|
|
||||||
|
|
||||||
(test-ob-verify-result-and-removed-result
|
|
||||||
"#+BEGIN_SRC emacs-lisp
|
|
||||||
\"I am working!\"
|
|
||||||
#+END_SRC"
|
|
||||||
|
|
||||||
"* org-babel-remove-result
|
|
||||||
#+begin_src emacs-lisp :results code
|
|
||||||
(message \"I am working!\")
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
* next heading"))
|
|
||||||
|
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-pp ()
|
(ert-deftest test-ob/org-babel-remove-result--results-pp ()
|
||||||
"Test `org-babel-remove-result' with :results pp."
|
"Test `org-babel-remove-result' with :results pp."
|
||||||
(test-ob-verify-result-and-removed-result
|
(test-ob-verify-result-and-removed-result
|
||||||
|
@ -1009,11 +929,11 @@ hello there
|
||||||
(ert-deftest test-ob/org-babel-remove-result--results-org ()
|
(ert-deftest test-ob/org-babel-remove-result--results-org ()
|
||||||
"Test `org-babel-remove-result' with :results org."
|
"Test `org-babel-remove-result' with :results org."
|
||||||
(test-ob-verify-result-and-removed-result
|
(test-ob-verify-result-and-removed-result
|
||||||
"#+BEGIN_ORG
|
"#+BEGIN_SRC org
|
||||||
* heading
|
* heading
|
||||||
** subheading
|
** subheading
|
||||||
content
|
content
|
||||||
#+END_ORG"
|
#+END_SRC"
|
||||||
|
|
||||||
"* org-babel-remove-result
|
"* org-babel-remove-result
|
||||||
#+begin_src emacs-lisp :results org
|
#+begin_src emacs-lisp :results org
|
||||||
|
|
Loading…
Reference in New Issue