diff --git a/contrib/lisp/org-e-ascii.el b/contrib/lisp/org-e-ascii.el index 11ce9ee0d..357da9dae 100644 --- a/contrib/lisp/org-e-ascii.el +++ b/contrib/lisp/org-e-ascii.el @@ -1068,7 +1068,7 @@ holding contextual information." (defun org-e-ascii-dynamic-block (dynamic-block contents info) "Transcode a DYNAMIC-BLOCK element from Org to ASCII. CONTENTS holds the contents of the block. INFO is a plist -holding contextual information. See `org-export-data'." +holding contextual information." contents) @@ -1661,13 +1661,12 @@ are ignored. " (lambda (row) (setq max-width (max (length - (mapconcat - (lambda (obj) (org-export-data obj info)) + (org-export-data (org-element-contents (elt (if specialp (car (org-element-contents row)) (org-element-contents row)) col)) - "")) + info)) max-width)))) max-width))) diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index c2ef8b8ac..627c55ca1 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -1578,10 +1578,9 @@ Return transcoded string." ((not (org-export-interpret-p data info)) (org-export-expand data - (org-element-normalize-string - (mapconcat (lambda (blob) (org-export-data blob info)) - (org-element-contents data) - "")))) + (mapconcat (lambda (blob) (org-export-data blob info)) + (org-element-contents data) + ""))) ;; Secondary string. ((not type) (mapconcat (lambda (obj) (org-export-data obj info)) data ""))