From 367e6805826d11cd728a14cf4e96cb3ccf381c79 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 Feb 2013 23:16:14 +0100 Subject: [PATCH] ox: Change order of retured elements in `org-export-get-previous-element' * lisp/ox.el (org-export-get-previous-element): Change order of retured elements in `org-export-get-previous-element'. * testing/lisp/test-ox.el: Update test. --- lisp/ox.el | 8 ++++---- testing/lisp/test-ox.el | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/ox.el b/lisp/ox.el index aa8bfa891..f50dbbd77 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -4800,8 +4800,8 @@ a communication channel. Return previous exportable element or object, a string, or nil. When optional argument N is a positive integer, return a list -containing up to N siblings before BLOB, from closest to -farthest. With any other non-nil value, return a list containing +containing up to N siblings before BLOB, from farthest to +closest. With any other non-nil value, return a list containing all of them." (let ((siblings ;; An object can belong to the contents of its parent or @@ -4823,10 +4823,10 @@ all of them." (cond ((memq obj (plist-get info :ignore-list))) ((null n) (throw 'exit obj)) ((not (wholenump n)) (push obj prev)) - ((zerop n) (throw 'exit (nreverse prev))) + ((zerop n) (throw 'exit prev)) (t (decf n) (push obj prev)))) (cdr (memq blob (reverse siblings)))) - (nreverse prev)))) + prev))) (defun org-export-get-next-element (blob info &optional n) "Return next element or object. diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el index 876829ff1..ffd61618c 100644 --- a/testing/lisp/test-ox.el +++ b/testing/lisp/test-ox.el @@ -2340,7 +2340,7 @@ Another text. (ref:text) (org-element-type (org-export-get-previous-element (org-element-map - (plist-get info :title) 'plain-text 'identity info t) info))))) + (plist-get info :title) 'plain-text 'identity info t) info))))) ;; Find previous element in parsed affiliated keywords. (should (eq 'verbatim @@ -2351,7 +2351,7 @@ Another text. (ref:text) ;; With optional argument N, return a list containing up to ;; N previous elements. (should - (equal '(bold italic underline) + (equal '(underline italic bold) (org-test-with-parsed-data "_a_ /b/ *c* ~d~" (mapcar 'car (org-export-get-previous-element @@ -2359,7 +2359,7 @@ Another text. (ref:text) ;; When N is a positive integer, return a list containing up to ;; N previous elements. (should - (equal '(bold italic) + (equal '(italic bold) (org-test-with-parsed-data "_a_ /b/ *c* ~d~" (mapcar 'car (org-export-get-previous-element -- 2.11.4.GIT