From ac19d91ab89fd61e0f845fc4bb7527b16c3c8386 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Sun, 9 Dec 2012 14:05:07 +0530 Subject: [PATCH] org-e-odt.el: Use new version of org-export-get-previous/next-element --- contrib/lisp/org-e-odt.el | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index 335b55dfa..727812a6c 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -2517,15 +2517,11 @@ Return nil, otherwise." (= (incf inline-image-count) 1))) (t nil)))))))) -(defun org-e-odt-get-previous-elements (blob info) - (let ((parent (org-export-get-parent blob))) - (cdr (memq blob (reverse (org-element-contents parent)))))) - (defun org-e-odt-resolve-numbered-paragraph (element info) (when (eq (org-element-type element) 'item) (let ((el element) ordinal) (while (eq (org-element-type el) 'item) - (push (1+ (length (org-e-odt-get-previous-elements el info))) ordinal) + (push (1+ (length (org-export-get-previous-element el info t))) ordinal) (setq el (org-export-get-parent (org-export-get-parent el)))) ordinal))) @@ -3312,15 +3308,10 @@ contextual information. Use `org-e-odt--table' to typeset the table. Handle details pertaining to indentation here." - (let* ((--get-previous-elements - (function - (lambda (blob info) - (let ((parent (org-export-get-parent blob))) - (cdr (memq blob (reverse (org-element-contents parent)))))))) - (--element-preceded-by-table-p + (let* ((--element-preceded-by-table-p (function (lambda (element info) - (loop for el in (funcall --get-previous-elements element info) + (loop for el in (org-export-get-previous-element element info t) thereis (eq (org-element-type el) 'table))))) (--walk-list-genealogy-and-collect-tags (function -- 2.11.4.GIT