mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-26 07:33:39 +00:00
Code

Merge branch 'maint' of orgmode.org:org-mode into maint

Browse Source
This commit is contained in:
Bastien Guerry 2012-09-12 15:50:01 +02:00
commit ae4950ca98
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-element.el
View File

@ -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)

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

@ -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