Merge pull request #480 from jonEbird/master

mu4e: updated html export to org v8 standards
This commit is contained in:
Dirk-Jan C. Binnema 2014-10-11 16:10:40 +03:00
commit bd334a5d02
1 changed files with 4 additions and 6 deletions

View File

@ -156,8 +156,8 @@ and images in a multipart/related part."
(defun org~mu4e-mime-convert-to-html ()
"Convert the current body to html."
(unless (fboundp 'org-export-string)
(mu4e-error "require function 'org-export-string not found."))
(unless (fboundp 'org-export-string-as)
(mu4e-error "require function 'org-export-string-as not found."))
(unless (executable-find "dvipng")
(mu4e-error "Required program dvipng not found"))
(let* ((begin
@ -168,8 +168,7 @@ and images in a multipart/related part."
(raw-body (buffer-substring begin end))
(tmp-file (make-temp-name (expand-file-name "mail"
temporary-file-directory)))
(body (org-export-string raw-body 'org
(file-name-directory tmp-file)))
(body (org-export-string-as raw-body 'html t))
;; because we probably don't want to skip part of our mail
(org-export-skip-text-before-1st-heading nil)
;; because we probably don't want to export a huge style file
@ -181,8 +180,7 @@ and images in a multipart/related part."
;; to hold attachments for inline html images
(html-and-images
(org~mu4e-mime-replace-images
(org-export-string raw-body 'html
(file-name-directory tmp-file))
(org-export-string-as raw-body 'html t)
tmp-file))
(html-images (cdr html-and-images))
(html (car html-and-images)))