From daf8cf030c21260b2615c303653913cdf2907e00 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Fri, 5 Oct 2012 14:24:45 +0200
Subject: [PATCH] org-element: Fix `org-element-context' when in recursive
 objects

* lisp/org-element.el (org-element-context,
  org-element--get-next-object-candidates): Fix `org-element-context'.
  In particular, the restrictions for an object may be different from
  those of its container (i.e. table rows and table cells).
* testing/lisp/test-org-element.el: Add tests.
---
 lisp/org-element.el              | 11 ++++++++---
 testing/lisp/test-org-element.el | 11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 3a593d6b5..fe4a18405 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3857,6 +3857,9 @@ Return value is an alist whose CAR is position and CDR the object
 type, as a symbol.
 
 OBJECTS is the previous candidates alist."
+  ;; Filter out any object found but not belonging to RESTRICTION.
+  (setq objects (org-remove-if-not (lambda (obj) (memq (car obj) restriction))
+				   objects))
   (let (next-candidates types-to-search)
     ;; If no previous result, search every object type in RESTRICTION.
     ;; Otherwise, keep potential candidates (old objects located after
@@ -4254,7 +4257,7 @@ and :post-blank properties."
 		       (progn (beginning-of-line)
 			      (skip-chars-forward "* ")
 			      (setq end (point-at-eol))))
-		  (and (memq type '(paragraph table-cell verse-block))
+		  (and (memq type '(paragraph table-row verse-block))
 		       (let ((cbeg (org-element-property
 				    :contents-begin element))
 			     (cend (org-element-property
@@ -4273,7 +4276,7 @@ and :post-blank properties."
 					candidates)))
 	       ;; If ORIGIN is before next object in element, there's
 	       ;; no point in looking further.
-	       (if (> (cdr closest-cand) origin) (throw 'exit element)
+	       (if (> (cdr closest-cand) origin) (throw 'exit parent)
 		 (let* ((object
 			 (progn (goto-char (cdr closest-cand))
 				(funcall (intern (format "org-element-%s-parser"
@@ -4293,7 +4296,9 @@ and :post-blank properties."
 		    ;; search to the end of its contents.
 		    (t (goto-char cbeg)
 		       (org-element-put-property object :parent parent)
-		       (setq parent object end cend)))))))
+		       (setq parent object
+			     restriction (org-element-restriction object)
+			     end cend)))))))
 	   parent))))))
 
 (defsubst org-element-nested-p (elem-A elem-B)
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 0b636731a..3467eabfb 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -2440,6 +2440,17 @@ Paragraph \\alpha."
        (org-test-with-temp-text "* Headline _with_ underlining"
 	 (progn (search-forward "w")
 		(org-element-type (org-element-context))))))
+  ;; Find objects in objects.
+  (should
+   (eq 'macro
+       (org-test-with-temp-text "| a | {{{macro}}} |"
+	 (progn (search-forward "{")
+		(org-element-type (org-element-context))))))
+  (should
+   (eq 'table-cell
+       (org-test-with-temp-text "| a | b {{{macro}}} |"
+	 (progn (search-forward "b")
+		(org-element-type (org-element-context))))))
   ;; Correctly set `:parent' property.
   (should
    (eq 'paragraph