"Function used to generate a `User-Agent:' string. If this is
`nil' then no `User-Agent:' will be generated."
:group 'notmuch
- :type 'function
- :options '(notmuch-mua-user-agent-full
- notmuch-mua-user-agent-notmuch
- notmuch-mua-user-agent-emacs))
+ :type '(choice (const :tag "No user agent string" nil)
+ (const :tag "Full" notmuch-mua-user-agent-full)
+ (const :tag "Notmuch" notmuch-mua-user-agent-notmuch)
+ (const :tag "Emacs" notmuch-mua-user-agent-emacs)
+ (function :tag "Custom user agent function"
+ :value notmuch-mua-user-agent-full)))
(defcustom notmuch-mua-hidden-headers '("^User-Agent:")
"Headers that are added to the `message-mode' hidden headers
(defun notmuch-mua-add-more-hidden-headers ()
"Add some headers to the list that are hidden by default."
(mapc (lambda (header)
- (when (not (member header 'message-hidden-headers))
+ (when (not (member header message-hidden-headers))
(push header message-hidden-headers)))
notmuch-mua-hidden-headers))
(message-goto-to))
-(defun notmuch-mua-mail (&optional to subject other-headers continue
- switch-function yank-action send-actions)
- "Invoke the notmuch mail composition window."
+(defun notmuch-mua-mail (&optional to subject other-headers &rest other-args)
+ "Invoke the notmuch mail composition window.
+
+OTHER-ARGS are passed through to `message-mail'."
(interactive)
(when notmuch-mua-user-agent-function
(push (cons "From" (concat
(notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))
- (message-mail to subject other-headers continue
- switch-function yank-action send-actions)
+ (apply #'message-mail to subject other-headers other-args)
(message-sort-headers)
(message-hide-headers)
(set-buffer-modified-p nil)
:group 'notmuch
:type 'boolean)
-(defun notmuch-mua-sender-collection ()
- (if notmuch-identities
- notmuch-identities
- (mapcar (lambda (address)
- (concat (notmuch-user-name) " <" address ">"))
- (cons (notmuch-user-primary-email) (notmuch-user-other-email)))))
-
(defvar notmuch-mua-sender-history nil)
(defun notmuch-mua-prompt-for-sender ()
(interactive)
- (let ((collection (notmuch-mua-sender-collection)))
- (ido-completing-read "Send mail From: " collection
- nil 'confirm nil 'notmuch-mua-sender-history (car collection))))
+ (let (name addresses one-name-only)
+ ;; If notmuch-identities is non-nil, check if there is a fixed user name.
+ (if notmuch-identities
+ (let ((components (mapcar 'mail-extract-address-components notmuch-identities)))
+ (setq name (caar components)
+ addresses (mapcar 'cadr components)
+ one-name-only (eval
+ (cons 'and
+ (mapcar (lambda (identity)
+ (string-equal name (car identity)))
+ components)))))
+ ;; If notmuch-identities is nil, use values from the notmuch configuration file.
+ (setq name (notmuch-user-name)
+ addresses (cons (notmuch-user-primary-email) (notmuch-user-other-email))
+ one-name-only t))
+ ;; Now prompt the user, either for an email address only or for a full identity.
+ (if one-name-only
+ (let ((address
+ (ido-completing-read (concat "Sender address for " name ": ") addresses
+ nil nil nil 'notmuch-mua-sender-history (car addresses))))
+ (concat name " <" address ">"))
+ (ido-completing-read "Send mail From: " notmuch-identities
+ nil nil nil 'notmuch-mua-sender-history (car notmuch-identities)))))
(defun notmuch-mua-new-mail (&optional prompt-for-sender)
"Invoke the notmuch mail composition window.