Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-11-20 09:38:13 +01:00
commit b06259357a
1 changed files with 5 additions and 5 deletions

View File

@ -26,15 +26,15 @@ should still return the link."
(should (should
(let ((default-directory temporary-file-directory)) (let ((default-directory temporary-file-directory))
(org-test-with-temp-text (org-test-with-temp-text
" "
* Test * Test
#+<point>BEGIN_SRC emacs-lisp :file test.txt :cache yes #+<point>BEGIN_SRC emacs-lisp :file test.txt :cache yes
(message \"test\") (message \"test\")
#+END_SRC" #+END_SRC"
;; Execute twice as the first time creates the cache. ;; Execute twice as the first time creates the cache.
(org-babel-execute-src-block) (org-babel-execute-src-block)
(string= (concat default-directory "test.txt") (string= (expand-file-name "test.txt")
(org-babel-execute-src-block)))))) (org-babel-execute-src-block))))))
(ert-deftest test-ob/multi-line-header-regexp () (ert-deftest test-ob/multi-line-header-regexp ()
(should(equal "^[ \t]*#\\+headers?:[ \t]*\\([^\n]*\\)$" (should(equal "^[ \t]*#\\+headers?:[ \t]*\\([^\n]*\\)$"