X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=0ae331271dbfbc508d8b1f8be2841bb528d0f352;hp=60801f4be7d331269a578599c00abc2c0cc5c831;hb=3a6b479a7360fbdbc1c6def4c1e1581bfd63e8a2;hpb=66369ddf1cd1d7f84a048095ee5dcf5cb07e110c

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 60801f4b..0ae33127 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -385,7 +385,13 @@ instead of `message-mode' and SWITCH-FUNCTION is mandatory."
 (defun notmuch-mua-mail (&optional to subject other-headers _continue
 				   switch-function yank-action send-actions
 				   return-action &rest ignored)
-  "Invoke the notmuch mail composition window."
+  "Invoke the notmuch mail composition window.
+
+The position of point when the function returns differs depending
+on the values of TO and SUBJECT.  If both are non-nil, point is
+moved to the message's body.  If SUBJECT is nil but TO isn't,
+point is moved to the \"Subject:\" header.  Otherwise, point is
+moved to the \"To:\" header."
   (interactive)
   (when notmuch-mua-user-agent-function
     (let ((user-agent (funcall notmuch-mua-user-agent-function)))
@@ -420,7 +426,10 @@ instead of `message-mode' and SWITCH-FUNCTION is mandatory."
   (message-hide-headers)
   (set-buffer-modified-p nil)
   (notmuch-mua-maybe-set-window-dedicated)
-  (message-goto-to))
+  (cond
+   ((and to subject) (message-goto-body))
+   (to (message-goto-subject))
+   (t (message-goto-to))))
 
 (defvar notmuch-mua-sender-history nil)