diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-09-12 15:50:01 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-09-12 15:50:01 +0200 |
| commit | ae4950ca98073ffa225907df13bd786786930e76 (patch) | |
| tree | 1898944616169c46476d4ee18c5b6fe05480a30f | |
| parent | 14296c0599d91dc306f7bc589ecc745d9fb936e4 (diff) | |
| parent | f969e24a4317eac2f3a7c14c565ae260f2877e3a (diff) | |
| download | org-mode-ae4950ca98073ffa225907df13bd786786930e76.tar.gz | |
Merge branch 'maint' of orgmode.org:org-mode into maint
| -rw-r--r-- | lisp/org-element.el | 3 | ||||
| -rw-r--r-- | testing/lisp/test-org-element.el | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index 456ed15..3c6bbe5 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -3348,6 +3348,9 @@ element it has to parse." (org-element-section-parser (or (save-excursion (org-with-limited-levels (outline-next-heading))) limit))) + ;; When not at bol, point is at the beginning of an item or + ;; a footnote definition: next item is always a paragraph. + ((not (bolp)) (org-element-paragraph-parser limit)) ;; Planning and Clock. ((and (looking-at org-planning-or-clock-line-re)) (if (equal (match-string 1) org-clock-string) diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index eb0578d..8aa24b2 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -631,7 +631,11 @@ CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] => 0:01" (org-test-with-temp-text "[fn:1] Definition\n| a | b |" (org-element-map (org-element-parse-buffer) - 'footnote-definition 'identity nil t)))))) + 'footnote-definition 'identity nil t))))) + ;; Footnote starting with special syntax. + (should-not + (org-test-with-temp-text "[fn:1] - no item" + (org-element-map (org-element-parse-buffer) 'item 'identity)))) ;;;; Footnotes Reference. @@ -917,7 +921,13 @@ DEADLINE: <2012-03-29 thu.>" (should (org-element-property :hiddenp - (org-element-map (org-element-parse-buffer) 'item 'identity nil t))))) + (org-element-map (org-element-parse-buffer) 'item 'identity nil t)))) + ;; Item starting with special syntax. + (should + (equal '(("- item")) + (org-test-with-temp-text "- - item" + (org-element-map + (org-element-parse-buffer) 'paragraph 'org-element-contents))))) ;;;; Keyword |