summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-16 13:45:43 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-16 13:45:43 +0100
commit6ffcdcbf021a29eca2ac6268c8cca0050cff96f6 (patch)
tree4a80bb31e2cff5ba1a5fde56f2ba5fbec5046a4b
parent1992394148c41acee905e3191e3c32ee40333096 (diff)
parent84cb63a44aaee9b97884903f4576b761a837724f (diff)
downloadorg-mode-6ffcdcbf021a29eca2ac6268c8cca0050cff96f6.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox.el4
-rw-r--r--testing/lisp/test-ox.el15
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index 744e941..11ab4c1 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -3681,7 +3681,9 @@ the communication channel used for export, as a plist."
:translate-alist all-transcoders
:exported-data (make-hash-table :test #'eq :size 401)))))
;; `:internal-references' are shared across back-ends.
- (prog1 (funcall transcoder data contents new-info)
+ (prog1 (if (eq type 'plain-text)
+ (funcall transcoder data new-info)
+ (funcall transcoder data contents new-info))
(plist-put info :internal-references
(plist-get new-info :internal-references)))))))
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index d9b9692..1db52c4 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -1779,12 +1779,19 @@ Footnotes[fn:2], foot[fn:test] and [fn:inline:inline footnote]
(equal "Success"
(let (org-export-registered-backends)
(org-export-define-backend 'test
- '((plain-text . (lambda (text contents info) "Failure"))))
+ '((verbatim . (lambda (text contents info) "Failure"))))
(org-export-define-backend 'test2
- '((plain-text . (lambda (text contents info) "Success"))))
- (org-export-with-backend 'test2 "Test"))))
+ '((verbatim . (lambda (text contents info) "Success"))))
+ (org-export-with-backend 'test2 '(verbatim (:value "=Test="))))))
+ ;; Corner case: plain-text transcoders have a different arity.
+ (should
+ (equal "Success"
+ (org-export-with-backend
+ (org-export-create-backend
+ :transcoders '((plain-text . (lambda (text info) "Success"))))
+ "Test")))
;; Provide correct back-end if transcoder needs to use recursive
- ;; calls anyway.
+ ;; calls.
(should
(equal "Success\n"
(let ((test-back-end