mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 21:37:50 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2017-12-16 13:45:43 +01:00
parent 1992394148 84cb63a44a
commit 6ffcdcbf02
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ox.el
View file

@ -3681,7 +3681,9 @@ the communication channel used for export, as a plist."
:translate-alist all-transcoders :translate-alist all-transcoders
:exported-data (make-hash-table :test #'eq :size 401))))) :exported-data (make-hash-table :test #'eq :size 401)))))
;; `:internal-references' are shared across back-ends. ;; `: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-put info :internal-references
(plist-get new-info :internal-references))))))) (plist-get new-info :internal-references)))))))

15
testing/lisp/test-ox.el
View file

@ -1779,12 +1779,19 @@ Footnotes[fn:2], foot[fn:test] and [fn:inline:inline footnote]
(equal "Success" (equal "Success"
(let (org-export-registered-backends) (let (org-export-registered-backends)
(org-export-define-backend 'test (org-export-define-backend 'test
'((plain-text . (lambda (text contents info) "Failure")))) '((verbatim . (lambda (text contents info) "Failure"))))
(org-export-define-backend 'test2 (org-export-define-backend 'test2
'((plain-text . (lambda (text contents info) "Success")))) '((verbatim . (lambda (text contents info) "Success"))))
(org-export-with-backend 'test2 "Test")))) (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 ;; Provide correct back-end if transcoder needs to use recursive
;; calls anyway. ;; calls.
(should (should
(equal "Success\n" (equal "Success\n"
(let ((test-back-end (let ((test-back-end