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-06-25 17:38:43 +02:00
parent ec8f3f987e 838e849bf7
commit acb00702d5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-element.el
View File

@ -3900,7 +3900,7 @@ element it has to parse."
(cond (cond
;; Jumping over affiliated keywords put point off-limits. ;; Jumping over affiliated keywords put point off-limits.
;; Parse them as regular keywords. ;; Parse them as regular keywords.
((>= (point) limit) ((and (cdr affiliated) (>= (point) limit))
(goto-char (car affiliated)) (goto-char (car affiliated))
(org-element-keyword-parser limit nil)) (org-element-keyword-parser limit nil))
;; LaTeX Environment. ;; LaTeX Environment.

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

@ -2848,7 +2848,12 @@ Paragraph \\alpha."
"- outer\n #+begin_center\n - inner\n #+end_center" "- outer\n #+begin_center\n - inner\n #+end_center"
(search-forward "inner") (search-forward "inner")
(beginning-of-line) (beginning-of-line)
(org-element-type (org-element-at-point)))))) (org-element-type (org-element-at-point)))))
;; Do not error at eob on an empty line.
(should
(org-test-with-temp-text "* H\n"
(forward-line)
(or (org-element-at-point) t))))
(ert-deftest test-org-element/context () (ert-deftest test-org-element/context ()
"Test `org-element-context' specifications." "Test `org-element-context' specifications."