X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=ecc5bece86e3454d92a14b01327a7444ef265a14;hb=e103f0a971b87c1e4bc3677eef40481f9143d466;hp=a66a30668ed03889612e27bb5aca540c58a21bfc;hpb=570c0aeb40bd0c3af8174624a55e968f62c44f09;p=notmuch diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index a66a3066..ecc5bece 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -28,7 +28,9 @@ (eval-when-compile (require 'cl)) -(declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide)) +(declare-function notmuch-show-insert-body "notmuch-show" (msg body depth)) +(declare-function notmuch-fcc-header-setup "notmuch-maildir-fcc" ()) +(declare-function notmuch-fcc-handler "notmuch-maildir-fcc" (destdir)) ;; @@ -142,31 +144,6 @@ Note that these functions use `mail-citation-hook' if that is non-nil." else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*") do (notmuch-mua-reply-crypto (plist-get part :content)))) -(defun notmuch-mua-get-quotable-parts (parts) - (loop for part in parts - if (notmuch-match-content-type (plist-get part :content-type) "multipart/alternative") - collect (let* ((subparts (plist-get part :content)) - (types (mapcar (lambda (part) (plist-get part :content-type)) subparts)) - (chosen-type (car (notmuch-multipart/alternative-choose types)))) - (loop for part in (reverse subparts) - if (notmuch-match-content-type (plist-get part :content-type) chosen-type) - return part)) - else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*") - append (notmuch-mua-get-quotable-parts (plist-get part :content)) - else if (notmuch-match-content-type (plist-get part :content-type) "text/*") - collect part)) - -(defun notmuch-mua-insert-quotable-part (message part) - ;; We don't want text properties leaking from the show renderer into - ;; the reply so we use a temp buffer. Also we don't want hooks, such - ;; as notmuch-wash-*, to be run on the quotable part so we set - ;; notmuch-show-insert-text/plain-hook to nil. - (insert (with-temp-buffer - (let ((notmuch-show-insert-text/plain-hook nil)) - ;; Show the part but do not add buttons. - (notmuch-show-insert-bodypart message part 0 'no-buttons)) - (buffer-substring-no-properties (point-min) (point-max))))) - ;; There is a bug in emacs 23's message.el that results in a newline ;; not being inserted after the References header, so the next header ;; is concatenated to the end of it. This function fixes the problem, @@ -245,10 +222,18 @@ Note that these functions use `mail-citation-hook' if that is non-nil." (insert "From: " from "\n") (insert "Date: " date "\n\n") - ;; Get the parts of the original message that should be quoted; this includes - ;; all the text parts, except the non-preferred ones in a multipart/alternative. - (let ((quotable-parts (notmuch-mua-get-quotable-parts (plist-get original :body)))) - (mapc (apply-partially 'notmuch-mua-insert-quotable-part original) quotable-parts)) + (insert (with-temp-buffer + (let + ;; Don't attempt to clean up messages, excerpt + ;; citations, etc. in the original message before + ;; quoting. + ((notmuch-show-insert-text/plain-hook nil) + ;; 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-show-reply-insert-header-p-never)) + (notmuch-show-insert-body original (plist-get original :body) 0) + (buffer-substring-no-properties (point-min) (point-max))))) (set-mark (point)) (goto-char start) @@ -278,7 +263,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil." (define-key notmuch-message-mode-map (kbd "C-c C-c") #'notmuch-mua-send-and-exit) (define-key notmuch-message-mode-map (kbd "C-c C-s") #'notmuch-mua-send) -(defun notmuch-mua-pop-to-buffer (name) +(defun notmuch-mua-pop-to-buffer (name switch-function) "Pop to buffer NAME, and warn if it already exists and is modified. This function is notmuch addaptation of `message-pop-to-buffer'." @@ -291,7 +276,7 @@ modified. This function is notmuch addaptation of (progn (gnus-select-frame-set-input-focus (window-frame window)) (select-window window)) - (funcall (notmuch-mua-get-switch-function) buffer) + (funcall switch-function buffer) (set-buffer buffer)) (when (and (buffer-modified-p) (not (prog1 @@ -299,7 +284,7 @@ modified. This function is notmuch addaptation of "Message already being composed; erase? ") (message nil)))) (error "Message being composed"))) - (funcall (notmuch-mua-get-switch-function) name) + (funcall switch-function name) (set-buffer name)) (erase-buffer) (notmuch-message-mode))) @@ -319,19 +304,26 @@ modified. This function is notmuch addaptation of (push (cons 'From (concat (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers)) - (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)) - (message-setup-1 - ;; The following sexp is copied from `message-mail' - (nconc - `((To . ,(or to "")) (Subject . ,(or subject ""))) - ;; C-h f compose-mail says that headers should be specified as - ;; (string . value); however all the rest of message expects - ;; headers to be symbols, not strings (eg message-header-format-alist). - ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html - ;; 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))))))) - yank-action send-actions return-action) + (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to) + (or switch-function (notmuch-mua-get-switch-function))) + (let ((headers + (append + ;; The following is copied from `message-mail' + `((To . ,(or to "")) (Subject . ,(or subject ""))) + ;; C-h f compose-mail says that headers should be specified as + ;; (string . value); however all the rest of message expects + ;; headers to be symbols, not strings (eg message-header-format-alist). + ;; http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html + ;; 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))) + ;; 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 + ;; Emacs 23. + (when return-action (nconc args '(return-action))) + (apply 'message-setup-1 headers args)) (notmuch-fcc-header-setup) (message-sort-headers) (message-hide-headers)