doc: include notmuch-emacs-mua in documentation ToC

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 3e5f88725d0b290f1347003c6082dab9099a88be..399e1380df02a8ac2d0caae38179ad675135866f 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -250,7 +250,9 @@ mutiple parts get a header."
                       ;; Don't omit long parts.
                       (notmuch-show-max-text-part-size 0)
                       ;; Insert headers for parts as appropriate for replying.
-                      (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function))
+                      (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
+                      ;; Don't indent multipart sub-parts.
+                      (notmuch-show-indent-multipart nil))
                    (notmuch-show-insert-body original (plist-get original :body) 0)
                    (buffer-substring-no-properties (point-min) (point-max)))))
 
@@ -336,7 +338,10 @@ modified. This function is notmuch addaptation of
          ;; We need to convert any string input, eg from rmail-start-mail.
          (dolist (h other-headers other-headers)
            (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))
-       (args (list yank-action send-actions)))
+       (args (list yank-action send-actions))
+       ;; Cause `message-setup-1' to do things relevant for mail,
+       ;; such as observe `message-default-mail-headers'.
+       (message-this-is-mail t))
     ;; message-setup-1 in Emacs 23 does not accept return-action
     ;; argument. Pass it only if it is supplied by the caller. This
     ;; will never be the case when we're called by `compose-mail' in