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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-10-16 13:24:37 +02:00
parent fb5003ea63 b1e7b86fda
commit 61e4f1b2c8
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org-element.el
View File

@ -1230,9 +1230,10 @@ CONTENTS is the contents of the element."
(throw 'exit (sort struct 'car-less-than-car)))))) (throw 'exit (sort struct 'car-less-than-car))))))
;; Skip blocks (any type) and drawers contents. ;; Skip blocks (any type) and drawers contents.
(cond (cond
((and (looking-at "#\\+BEGIN\\(:[ \t]*$\\|_\\S-\\)+") ((and (looking-at "#\\+BEGIN\\(:\\|_\\S-+\\)")
(re-search-forward (re-search-forward
(format "^[ \t]*#\\+END%s[ \t]*$" (match-string 1)) (format "^[ \t]*#\\+END%s[ \t]*$"
(match-string-no-properties 1))
limit t))) limit t)))
((and (looking-at drawers-re) ((and (looking-at drawers-re)
(re-search-forward "^[ \t]*:END:[ \t]*$" limit t)))) (re-search-forward "^[ \t]*:END:[ \t]*$" limit t))))

8
testing/lisp/test-org-element.el
View File

@ -1127,7 +1127,13 @@ DEADLINE: <2012-03-29 thu.>"
(equal '(("- item")) (equal '(("- item"))
(org-test-with-temp-text "- - item" (org-test-with-temp-text "- - item"
(org-element-map (org-element-map
(org-element-parse-buffer) 'paragraph 'org-element-contents))))) (org-element-parse-buffer) 'paragraph 'org-element-contents))))
;; Block in an item: ignore indentation within the block.
(should
(org-test-with-temp-text "- item\n #+begin_src emacs-lisp\n(+ 1 1)\n #+end_src"
(forward-char)
(goto-char (org-element-property :end (org-element-at-point)))
(eobp))))
;;;; Keyword ;;;; Keyword