emacs: Add a customization allowing to always prompt for the "From" address when...

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 6575af64489b9d816d2a68d7e896fc6317a2801d..61a723b761efed3052d1f4cdd07b67efd29bae49 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -149,6 +149,11 @@ name and addresses configured in the notmuch configuration file."
   :group 'notmuch
   :type '(repeat string))
 
   :group 'notmuch
   :type '(repeat string))
 

+(defcustom notmuch-always-prompt-for-sender nil
+  "Always prompt for the From: address when composing a new message."
+  :group 'notmuch
+  :type 'boolean)
+

 (defun notmuch-mua-sender-collection ()
   (if notmuch-identities
       notmuch-identities
 (defun notmuch-mua-sender-collection ()
   (if notmuch-identities
       notmuch-identities


@@ -171,7 +176,7 @@ If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
 the From: address first."
   (interactive "P")
   (let ((other-headers
 the From: address first."
   (interactive "P")
   (let ((other-headers

-        (when prompt-for-sender
+        (when (or prompt-for-sender notmuch-always-prompt-for-sender)

           (list (cons 'from (notmuch-mua-prompt-for-sender))))))
     (notmuch-mua-mail nil nil other-headers)))
 
           (list (cons 'from (notmuch-mua-prompt-for-sender))))))
     (notmuch-mua-mail nil nil other-headers)))
 


@@ -181,7 +186,7 @@ the From: address first."
 If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
 the From: address first."
   (interactive "P")
 If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
 the From: address first."
   (interactive "P")

-  (if prompt-for-sender
+  (if (or prompt-for-sender notmuch-always-prompt-for-sender)

       (let* ((sender (notmuch-mua-prompt-for-sender))
             (address-components (mail-extract-address-components sender))
             (user-full-name (car address-components))
       (let* ((sender (notmuch-mua-prompt-for-sender))
             (address-components (mail-extract-address-components sender))
             (user-full-name (car address-components))


@@ -193,7 +198,7 @@ the From: address first."
   "Invoke the notmuch reply window."
   (interactive "P")
   (let ((sender
   "Invoke the notmuch reply window."
   (interactive "P")
   (let ((sender

-        (when prompt-for-sender
+        (when (or prompt-for-sender notmuch-always-prompt-for-sender)

           (notmuch-mua-prompt-for-sender))))
     (notmuch-mua-reply query-string sender)))
 
           (notmuch-mua-prompt-for-sender))))
     (notmuch-mua-reply query-string sender)))