From b137cdb296d8074aaae95fac1a9a31e0f9ef2716 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Sat, 5 May 2012 01:38:11 +0200
Subject: [PATCH] org-element: Fix to footnote-definition parsing

* contrib/lisp/org-element.el (org-element-footnote-definition-parser):
Fix bug when parsing a footnote definition at end of buffer.
* testing/lisp/test-org-element.el: Add test.
---
 contrib/lisp/org-element.el      |  4 ++--
 testing/lisp/test-org-element.el | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/contrib/lisp/org-element.el b/contrib/lisp/org-element.el
index 90637c887..b03738ed7 100644
--- a/contrib/lisp/org-element.el
+++ b/contrib/lisp/org-element.el
@@ -294,9 +294,9 @@ Assume point is at the beginning of the footnote definition."
 			       (re-search-forward
 				(concat org-outline-regexp-bol "\\|"
 					org-footnote-definition-re "\\|"
-					"^[ \t]*$") nil t))
+					"^[ \t]*$") nil 'move))
 			     (match-beginning 0)
-			   (point-max)))
+			   (point)))
 	   (end (progn (org-skip-whitespace)
 		       (if (eobp) (point) (point-at-bol)))))
       `(footnote-definition
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index ab2b446f0..1977c3790 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -519,7 +519,16 @@ CLOCK: [2012-01-01 sun. 00:01]--[2012-01-01 sun. 00:02] =>  0:01"
 	      :post-blank 0)
       (paragraph
        (:begin 8 :end 18 :contents-begin 8 :contents-end 18 :post-blank 0)
-       "Definition")))))
+       "Definition"))))
+  ;; Footnote with more contents
+  (should
+   (= 28
+      (org-element-property
+       :end
+       (org-test-with-temp-text "[fn:1] Definition\n| a | b |"
+	 (org-element-map
+	  (org-element-parse-buffer)
+	  'footnote-definition 'identity nil t))))))
 
 
 ;;;; Footnotes Reference