summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-09-12 15:50:25 +0200
committerBastien Guerry <bzg@altern.org>2012-09-12 15:50:25 +0200
commitaac2e8b93fcf19213a67f6c13f6c0cf01b64b930 (patch)
tree8b4cfab4a3678ed533d4d4a8351333927c1a16ab
parent59d0f3052289c84784f778f1a1eb66f9584ac50c (diff)
parentae4950ca98073ffa225907df13bd786786930e76 (diff)
downloadorg-mode-aac2e8b93fcf19213a67f6c13f6c0cf01b64b930.tar.gz
Merge branch 'maint'
-rw-r--r--contrib/lisp/org-e-latex.el2
-rw-r--r--lisp/org-element.el3
-rw-r--r--testing/lisp/test-org-element.el14
3 files changed, 16 insertions, 3 deletions
diff --git a/contrib/lisp/org-e-latex.el b/contrib/lisp/org-e-latex.el
index a0ca7dc..6c666e8 100644
--- a/contrib/lisp/org-e-latex.el
+++ b/contrib/lisp/org-e-latex.el
@@ -2315,7 +2315,7 @@ This function assumes TABLE has `org' as its `:type' attribute."
(float-env (cond
((string= "longtable" table-env) nil)
((and attr (string-match "\\<sidewaystable\\>" attr))
- "sidewaystables")
+ "sidewaystable")
((and attr
(or (string-match (regexp-quote "table*") attr)
(string-match "\\<multicolumn\\>" attr)))
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 6488a99..2fef7b6 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3370,6 +3370,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 f308144..e3cc7f6 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