[nongnu] elpa/org-mime fb265448df 038/118: Merge pull request #14 from unhammer/issue13-OPTIONS-noise

[ELPA Syncer]

branch: elpa/org-mime
commit fb265448df658062bc99a8734a386183b7e59e0a
Merge: ad30f199cb 5f253f541c
Author: Chen Bin <chenbin.sh@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #14 from unhammer/issue13-OPTIONS-noise
    
    only use export header when creating html, keep out of email
---
 org-mime.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/org-mime.el b/org-mime.el
index c6047e0507..d86b9aee7c 100644
--- a/org-mime.el
+++ b/org-mime.el
@@ -367,8 +367,8 @@ If ARG is not nil, use `org-mime-fixedwith-wrap' to wrap 
the exported text."
          (html-end (or (and region-p (region-end))
                        ;; TODO: should catch signature...
                        (point-max)))
-         (body (concat org-mime-default-header
-                       (buffer-substring html-start html-end)))
+         (body (buffer-substring html-start html-end))
+         (header-body (concat org-mime-default-header body))
          (tmp-file (make-temp-name (expand-file-name
                                     "mail" temporary-file-directory)))
          ;; because we probably don't want to export a huge style file
@@ -380,7 +380,7 @@ If ARG is not nil, use `org-mime-fixedwith-wrap' to wrap 
the exported text."
          ;; to hold attachments for inline html images
          (html-and-images
           (org-mime-replace-images
-           (org-mime--export-string body
+           (org-mime--export-string header-body
                                     'html
                                     (if (fboundp 
'org-export--get-inbuffer-options)
                                         (org-export--get-inbuffer-options)))
@@ -388,7 +388,7 @@ If ARG is not nil, use `org-mime-fixedwith-wrap' to wrap 
the exported text."
          (html-images (unless arg (cdr html-and-images)))
          (html (org-mime-apply-html-hook
                 (if arg
-                    (format org-mime-fixedwith-wrap body)
+                    (format org-mime-fixedwith-wrap header-body)
                   (car html-and-images)))))
     (delete-region html-start html-end)
     (save-excursion