diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-06-25 17:38:43 +0200 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-06-25 17:38:43 +0200 |
commit | acb00702d57a6cc2f7e4bc7db2587b2d9a3ab042 (patch) | |
tree | 4e144fc58b2f96ba6dcd999a7f9a7d0115e779f7 | |
parent | ec8f3f987ec46044975557a352dd491f107ff60b (diff) | |
parent | 838e849bf785bef78fb44c50c9bc4bf86f3cb579 (diff) | |
download | org-mode-acb00702d57a6cc2f7e4bc7db2587b2d9a3ab042.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-element.el | 2 | ||||
-rw-r--r-- | testing/lisp/test-org-element.el | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index a1ca6e1..93f9d4c 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -3900,7 +3900,7 @@ element it has to parse." (cond ;; Jumping over affiliated keywords put point off-limits. ;; Parse them as regular keywords. - ((>= (point) limit) + ((and (cdr affiliated) (>= (point) limit)) (goto-char (car affiliated)) (org-element-keyword-parser limit nil)) ;; LaTeX Environment. diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index 8133c0b..31ab55f 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -2848,7 +2848,12 @@ Paragraph \\alpha." "- outer\n #+begin_center\n - inner\n #+end_center" (search-forward "inner") (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 () "Test `org-element-context' specifications." |