From cf3c52d5884a974af449d5c1eb5c6af6ee071de6 Mon Sep 17 00:00:00 2001 From: "Foivos S. Zakkak" Date: Wed, 16 Dec 2015 16:51:15 +0200 Subject: [PATCH 1/2] Fix mu4e-context-determine to match documentation --- mu4e/mu4e-context.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el index 11014fe1..624e3473 100644 --- a/mu4e/mu4e-context.el +++ b/mu4e/mu4e-context.el @@ -107,7 +107,7 @@ If there are contexts but none match, return nil, unless (or (find-if (lambda (context) (and (mu4e-context-match-func context) (funcall (mu4e-context-match-func context) msg))) mu4e-contexts) - (car mu4e-contexts)))) + (when pick-first (car mu4e-contexts))))) (provide 'mu4e-context) From 0032ccf73c96d0f0edd4ed3e933f3dec221ad7c5 Mon Sep 17 00:00:00 2001 From: "Foivos S. Zakkak" Date: Wed, 16 Dec 2015 16:32:29 +0200 Subject: [PATCH 2/2] When mu4e-context-determine fails, prompt user --- mu4e/mu4e-compose.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el index 64652502..dd0c6e12 100644 --- a/mu4e/mu4e-compose.el +++ b/mu4e/mu4e-compose.el @@ -368,8 +368,9 @@ tempfile)." (set (make-local-variable 'mu4e-compose-parent-message) original-msg) (put 'mu4e-compose-parent-message 'permanent-local t) (let ((context (mu4e-context-determine mu4e-compose-parent-message))) - (when context - (mu4e-context-switch (mu4e-context-name context)))) + (if context + (mu4e-context-switch (mu4e-context-name context)) + (when mu4e-contexts (mu4e-context-switch)))) (run-hooks 'mu4e-compose-pre-hook) ;; this opens (or re-opens) a messages with all the basic headers set.