forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
aac2e8b93f
|
@ -2315,7 +2315,7 @@ This function assumes TABLE has `org' as its `:type' attribute."
|
||||||
(float-env (cond
|
(float-env (cond
|
||||||
((string= "longtable" table-env) nil)
|
((string= "longtable" table-env) nil)
|
||||||
((and attr (string-match "\\<sidewaystable\\>" attr))
|
((and attr (string-match "\\<sidewaystable\\>" attr))
|
||||||
"sidewaystables")
|
"sidewaystable")
|
||||||
((and attr
|
((and attr
|
||||||
(or (string-match (regexp-quote "table*") attr)
|
(or (string-match (regexp-quote "table*") attr)
|
||||||
(string-match "\\<multicolumn\\>" attr)))
|
(string-match "\\<multicolumn\\>" attr)))
|
||||||
|
|
|
@ -3370,6 +3370,9 @@ element it has to parse."
|
||||||
(org-element-section-parser
|
(org-element-section-parser
|
||||||
(or (save-excursion (org-with-limited-levels (outline-next-heading)))
|
(or (save-excursion (org-with-limited-levels (outline-next-heading)))
|
||||||
limit)))
|
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.
|
;; Planning and Clock.
|
||||||
((and (looking-at org-planning-or-clock-line-re))
|
((and (looking-at org-planning-or-clock-line-re))
|
||||||
(if (equal (match-string 1) org-clock-string)
|
(if (equal (match-string 1) org-clock-string)
|
||||||
|
|
|
@ -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-test-with-temp-text "[fn:1] Definition\n| a | b |"
|
||||||
(org-element-map
|
(org-element-map
|
||||||
(org-element-parse-buffer)
|
(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.
|
;;;; Footnotes Reference.
|
||||||
|
@ -917,7 +921,13 @@ DEADLINE: <2012-03-29 thu.>"
|
||||||
(should
|
(should
|
||||||
(org-element-property
|
(org-element-property
|
||||||
:hiddenp
|
: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
|
;;;; Keyword
|
||||||
|
|
Loading…
Reference in a new issue