ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-06-13 12:05:55 +02:00
parent 7eba1c2f54 3a1e6a3c3a
commit 3c5f938ae3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/lisp/org-mime.el
View File

@ -163,10 +163,13 @@ and images in a multipart/related part."
('semi (concat ('semi (concat
"--" "<<alternative>>-{\n" "--" "<<alternative>>-{\n"
"--" "[[text/plain]]\n" plain "--" "[[text/plain]]\n" plain
(when images (concat "--" "<<alternative>>-{\n")) (if (and images (> (length images) 0))
"--" "[[text/html]]\n" html (concat "--" "<<related>>-{\n"
images "--" "[[text/html]]\n" html
(when images (concat "--" "}-<<alternative>>\n")) images
"--" "}-<<related>>\n")
(concat "--" "[[text/html]]\n" html
images))
"--" "}-<<alternative>>\n")) "--" "}-<<alternative>>\n"))
('vm "?"))) ('vm "?")))