Merge branch 'maint'

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

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)

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