diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-14 14:25:02 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-14 14:25:02 +0200 |
| commit | 0cf76b7a3fae6ccc14ef7921bac173511202bbe2 (patch) | |
| tree | fcab3609d65304849aed5aae8d7ccef1298a019f | |
| parent | 60c11dcb0c8725eaf8213162029e83c578d24a29 (diff) | |
| parent | 504ffefcd5815d5ac770bb8da62c764bab37811a (diff) | |
| download | org-mode-0cf76b7a3fae6ccc14ef7921bac173511202bbe2.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/lisp/org-mime.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el index 682f635..42fee3c 100644 --- a/contrib/lisp/org-mime.el +++ b/contrib/lisp/org-mime.el @@ -173,7 +173,7 @@ and images in a multipart/related part." "--" "}-<<alternative>>\n")) ('vm "?"))) -(defun org-mime-replace-images (str current-file) +(defun org-mime-replace-images (str) "Replace images in html files with cid links." (let (html-images) (cons @@ -185,7 +185,7 @@ and images in a multipart/related part." (let* ((url (and (string-match "src=\"\\([^\"]+\\)\"" text) (match-string 1 text))) (path (expand-file-name - url (file-name-directory current-file))) + url temporary-file-directory)) (ext (file-name-extension path)) (id (replace-regexp-in-string "[\/\\\\]" "_" path))) (add-to-list 'html-images @@ -212,8 +212,6 @@ otherwise export the entire body." (point-max))) (raw-body (concat org-mime-default-header (buffer-substring html-start html-end))) - (tmp-file (make-temp-name (expand-file-name - "mail" temporary-file-directory))) (body (org-export-string-as raw-body 'org t)) ;; because we probably don't want to export a huge style file (org-export-htmlize-output-type 'inline-css) @@ -224,7 +222,7 @@ otherwise export the entire body." ;; to hold attachments for inline html images (html-and-images (org-mime-replace-images - (org-export-string-as raw-body 'html t) tmp-file)) + (org-export-string-as raw-body 'html t))) (html-images (unless arg (cdr html-and-images))) (html (org-mime-apply-html-hook (if arg @@ -317,7 +315,7 @@ otherwise export the entire body." (org-export-htmlize-output-type 'inline-css) (html-and-images (org-mime-replace-images - (org-export-string-as (funcall bhook body 'html) 'html t) file)) + (org-export-string-as (funcall bhook body 'html) 'html t))) (images (cdr html-and-images)) (html (org-mime-apply-html-hook (car html-and-images)))) (insert (org-mime-multipart |