X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=60801f4be7d331269a578599c00abc2c0cc5c831;hb=90a7c1af368a527700dcde9b0dcbd760afc7bd92;hp=bbf059a22cb5487f669497631363a7c924b1d3d8;hpb=9d6f4641d17a6100cb8d96bc1e09d3d4999c34f3;p=notmuch

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index bbf059a2..60801f4b 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -235,7 +235,7 @@ Typically this is added to `notmuch-mua-send-hook'."
 ;;; Mua reply
 
 (defun notmuch-mua-reply (query-string &optional sender reply-all)
-  (let ((args '("reply" "--format=sexp" "--format-version=4"))
+  (let ((args '("reply" "--format=sexp" "--format-version=5"))
 	(process-crypto notmuch-show-process-crypto)
 	reply
 	original)
@@ -316,7 +316,9 @@ Typically this is added to `notmuch-mua-send-hook'."
 		;; text.
 		(notmuch-show-process-crypto process-crypto)
 		;; Don't indent multipart sub-parts.
-		(notmuch-show-indent-multipart nil))
+		(notmuch-show-indent-multipart nil)
+		;; Stop certain mime types from being inlined
+		(mm-inline-override-types (notmuch--inline-override-types)))
 	     ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
 	     (cl-letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
 		       ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
@@ -341,8 +343,8 @@ Typically this is added to `notmuch-mua-send-hook'."
 
 (defvar notmuch-message-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-c") #'notmuch-mua-send-and-exit)
-    (define-key map (kbd "C-c C-s") #'notmuch-mua-send)
+    (define-key map [remap message-send-and-exit] #'notmuch-mua-send-and-exit)
+    (define-key map [remap message-send] #'notmuch-mua-send)
     (define-key map (kbd "C-c C-p") #'notmuch-draft-postpone)
     (define-key map (kbd "C-x C-s") #'notmuch-draft-save)
     map)
@@ -474,7 +476,7 @@ the From: address."
 		(with-current-buffer temp-buffer
 		  (erase-buffer)
 		  (let ((coding-system-for-read 'no-conversion))
-		    (call-process notmuch-command nil t nil
+		    (notmuch--call-process notmuch-command nil t nil
 				  "show" "--format=raw" id))
 		  ;; Because we process the messages in reverse order,
 		  ;; always generate a forwarded subject, then use the