;;
;; Authors: David Edmondson <dme@dme.org>
-(require 'cl)
(require 'message)
(require 'notmuch-lib)
notmuch-mua-user-agent-notmuch
notmuch-mua-user-agent-emacs))
+(defcustom notmuch-mua-hidden-headers '("^User-Agent:")
+ "Headers that are added to the `message-mode' hidden headers
+list."
+ :group 'notmuch
+ :type '(repeat string))
+
;;
(defun notmuch-mua-user-agent-full ()
"Generate a `User-Agent:' string suitable for notmuch."
(concat "Emacs/" emacs-version " (" system-configuration ")"))
+(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))
+ (push header message-hidden-headers)))
+ notmuch-mua-hidden-headers))
+
(defun notmuch-mua-reply (query-string)
(let (headers body)
;; This make assumptions about the output of `notmuch reply', but
((same-window-regexps '("\\*mail .*")))
(notmuch-mua-mail (mail-header 'to headers)
(mail-header 'subject headers)
- (loop for header in headers
- if (not (or (eq 'to (car header))
- (eq 'subject (car header))))
- collect header)))
- (message-sort-headers)
- (message-hide-headers)
- (save-excursion
- (goto-char (point-max))
- (insert body))
- (set-buffer-modified-p nil)))
+ (message-headers-to-generate headers t '(to subject))))
+ ;; insert the message body - but put it in front of the signature
+ ;; if one is present
+ (goto-char (point-max))
+ (if (re-search-backward message-signature-separator nil t)
+ (forward-line -1)
+ (goto-char (point-max)))
+ (insert body))
+ (set-buffer-modified-p nil)
+
+ (message-goto-body))
(defun notmuch-mua-forward-message ()
(message-forward)
- (save-excursion
- (when notmuch-mua-user-agent-function
- (let ((user-agent (funcall notmuch-mua-user-agent-function)))
- (when (not (string= "" user-agent))
- (message-add-header (format "User-Agent: %s" user-agent)))))
- (message-sort-headers)
- (message-hide-headers))
- (set-buffer-modified-p nil))
+
+ (when notmuch-mua-user-agent-function
+ (let ((user-agent (funcall notmuch-mua-user-agent-function)))
+ (when (not (string= "" user-agent))
+ (message-add-header (format "User-Agent: %s" user-agent)))))
+ (message-sort-headers)
+ (message-hide-headers)
+ (set-buffer-modified-p nil)
+
+ (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."
(interactive)
(when notmuch-mua-user-agent-function
(message-mail to subject other-headers continue
switch-function yank-action send-actions)
(message-sort-headers)
- (message-hide-headers))
+ (message-hide-headers)
+ (set-buffer-modified-p nil)
+
+ (message-goto-to))
(defun notmuch-mua-send-and-exit (&optional arg)
(interactive "P")
'notmuch-mua-mail 'notmuch-mua-send-and-exit
'notmuch-mua-kill-buffer 'notmuch-mua-send-hook)
+;; Add some more headers to the list that `message-mode' hides when
+;; composing a message.
+(notmuch-mua-add-more-hidden-headers)
+
;;
(provide 'notmuch-mua)