org-mime: improve handling of cc & bcc

org-mime: improve handling of cc & bcc

[Matt Price]

[-- Attachment #1.1: Type: text/plain, Size: 235 bytes --]

I have been having some trouble with org-mime & mu4e (iv cc & bcc are
empty, then buffer creation fails), and this patch seems to have fixed it.
Not 100% sure that this is really the origin of the problem but it fixed an
issue for me.

[-- Attachment #1.2: Type: text/html, Size: 274 bytes --]

[-- Attachment #2: other-headers-1.patch --]
[-- Type: text/x-patch, Size: 928 bytes --]

diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el
index 2ced42ec8..465fb3416 100644
--- a/contrib/lisp/org-mime.el
+++ b/contrib/lisp/org-mime.el
@@ -257,6 +257,10 @@ otherwise export the entire body."
 	   (to (funcall mp "MAIL_TO"))
 	   (cc (funcall mp "MAIL_CC"))
 	   (bcc (funcall mp "MAIL_BCC"))
+	   (other-headers (cond ((and cc bcc) `((cc . ,cc) (bcc . ,bcc)))
+				(cc `((cc . ,cc)))
+				(bcc `((bcc . ,bcc)))
+				(t nil)))
 	   (body (buffer-substring
 		  (save-excursion (goto-char (point-min))
 				  (forward-line 1)
@@ -265,8 +269,7 @@ otherwise export the entire body."
 				    (forward-char))
 				  (point))
 		  (point-max))))
-      (org-mime-compose body (or fmt 'org) file to subject
-			`((cc . ,cc) (bcc . ,bcc))))))
+      (org-mime-compose body (or fmt 'org) file to subject other-headers))))
 
 (defun org-mime-send-buffer (&optional fmt)
   (run-hooks 'org-mime-send-buffer-hook)

Re: org-mime: improve handling of cc & bcc

[Nicolas Goaziou]

Hello,

Matt Price <moptop99@gmail.com> writes:

> I have been having some trouble with org-mime & mu4e (iv cc & bcc are
> empty, then buffer creation fails), and this patch seems to have fixed it.
> Not 100% sure that this is really the origin of the problem but it fixed an
> issue for me.

Thank you.

Could you send it again using git format-patch and with a proper commit
message?

Regards,

-- 
Nicolas Goaziou

Re: org-mime: improve handling of cc & bcc

[Kaushal Modi]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

I happened just recently notice that org-mime was now added to Melpa:
https://melpa.org/#/org-mime

Would it be a better option to send the patches to
https://github.com/org-mime/org-mime and remove org-mime from contrib/ as
discussed here:
https://lists.gnu.org/archive/html/emacs-orgmode/2016-09/msg00055.html
?

On Thu, Jan 12, 2017 at 3:01 PM Nicolas Goaziou <mail@nicolasgoaziou.fr>
wrote:

> Thank you.
>
> Could you send it again using git format-patch and with a proper commit
> message?
>
> Regards,
>
> --
> Nicolas Goaziou
>
> --

Kaushal Modi

[-- Attachment #2: Type: text/html, Size: 1322 bytes --]

Re: org-mime: improve handling of cc & bcc

[Matt Price]

[-- Attachment #1.1: Type: text/plain, Size: 761 bytes --]

I'm attaching the patch anyway, but of course don't mind moving the PR to
the melpa repo.

On Thu, Jan 12, 2017 at 3:07 PM, Kaushal Modi <kaushal.modi@gmail.com>
wrote:

> I happened just recently notice that org-mime was now added to Melpa:
> https://melpa.org/#/org-mime
>
> Would it be a better option to send the patches to https://github.com/org-
> mime/org-mime and remove org-mime from contrib/ as discussed here:
> https://lists.gnu.org/archive/html/emacs-orgmode/2016-09/msg00055.html
> ?
>
> On Thu, Jan 12, 2017 at 3:01 PM Nicolas Goaziou <mail@nicolasgoaziou.fr>
> wrote:
>
>> Thank you.
>>
>> Could you send it again using git format-patch and with a proper commit
>> message?
>>
>> Regards,
>>
>> --
>> Nicolas Goaziou
>>
>> --
>
> Kaushal Modi
>

[-- Attachment #1.2: Type: text/html, Size: 2188 bytes --]

[-- Attachment #2: 0004-org-mime-improve-handling-of-cc-bcc-headers.patch --]
[-- Type: text/x-patch, Size: 1252 bytes --]

From ca4dfa5e5a83fe7243affbf7e34a1435cbc5b00a Mon Sep 17 00:00:00 2001
From: Matt Price <matt.price@utoronto.ca>
Date: Thu, 12 Jan 2017 20:07:55 -0500
Subject: [PATCH 4/4] org-mime: improve handling of cc & bcc headers

---
 contrib/lisp/org-mime.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el
index 2ced42ec8..465fb3416 100644
--- a/contrib/lisp/org-mime.el
+++ b/contrib/lisp/org-mime.el
@@ -257,6 +257,10 @@ otherwise export the entire body."
 	   (to (funcall mp "MAIL_TO"))
 	   (cc (funcall mp "MAIL_CC"))
 	   (bcc (funcall mp "MAIL_BCC"))
+	   (other-headers (cond ((and cc bcc) `((cc . ,cc) (bcc . ,bcc)))
+				(cc `((cc . ,cc)))
+				(bcc `((bcc . ,bcc)))
+				(t nil)))
 	   (body (buffer-substring
 		  (save-excursion (goto-char (point-min))
 				  (forward-line 1)
@@ -265,8 +269,7 @@ otherwise export the entire body."
 				    (forward-char))
 				  (point))
 		  (point-max))))
-      (org-mime-compose body (or fmt 'org) file to subject
-			`((cc . ,cc) (bcc . ,bcc))))))
+      (org-mime-compose body (or fmt 'org) file to subject other-headers))))
 
 (defun org-mime-send-buffer (&optional fmt)
   (run-hooks 'org-mime-send-buffer-hook)
-- 
2.11.0