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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-15 08:05:02 +01:00
parent e77f26e121 c0675b478e
commit c8452bfca0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
testing/lisp/test-org-src.el
View File

@ -80,22 +80,22 @@
(ert-deftest test-org-src/blank-line-block () (ert-deftest test-org-src/blank-line-block ()
"Editing block with just a blank line." "Editing block with just a blank line."
(org-test-with-temp-text (org-test-with-temp-text-in-file
" "
#+begin_src emacs-lisp #+begin_src emacs-lisp
#+end_src #+end_src
" "
(goto-line 3) (progn
(org-edit-special) (goto-line 3)
(insert "blah") (org-edit-special)
(org-edit-src-exit) (insert "blah")
(should (equal (buffer-string) " (org-edit-src-exit)
(should (equal (buffer-string) "
#+begin_src emacs-lisp #+begin_src emacs-lisp
blah blah
#+end_src #+end_src
")) ")))))
(should (equal (word-at-point) "blah"))))
(provide 'test-org-src) (provide 'test-org-src)
;;; test-org-src.el ends here ;;; test-org-src.el ends here

2
testing/org-test.el
View File

@ -201,7 +201,7 @@ otherwise place the point at the beginning of the inserted text."
(goto-char ,(match-beginning 0))) (goto-char ,(match-beginning 0)))
`(progn (insert ,inside-text) `(progn (insert ,inside-text)
(goto-char (point-min))))) (goto-char (point-min)))))
(prog1 ,@body (kill-buffer))))) ,@body)))
(def-edebug-spec org-test-with-temp-text (form body)) (def-edebug-spec org-test-with-temp-text (form body))
(defmacro org-test-with-temp-text-in-file (text &rest body) (defmacro org-test-with-temp-text-in-file (text &rest body)