alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* when forwarding, include attachments from original

Browse Source
This commit is contained in:
djcb
2012-01-14 12:55:50 +02:00
parent ff04b20712
commit 6e3e425c66
5 changed files with 112 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emacs/mu4e-proc.el
View File

@ -275,10 +275,11 @@ updated as well, with all processed sexp data removed."
(funcall mu4e-proc-remove-func (plist-get sexp :remove)))
;; start composing a new message
((plist-get sexp :compose)
((plist-get sexp :compose-type)
(funcall mu4e-proc-compose-func
(plist-get sexp :compose-type)
(plist-get sexp :compose)))
(plist-get sexp :original)
(plist-get sexp :include)))
;; get some info
((plist-get sexp :info)

27
emacs/mu4e-send.el
View File

@ -283,7 +283,7 @@ use the new docid. Returns the full path to the new message."
draft))
(defun mu4e-send-compose-handler (compose-type &optional msg)
(defun mu4e-send-compose-handler (compose-type &optional original-msg includes)
"Create a new draft message, or open an existing one.
COMPOSE-TYPE determines the kind of message to compose and is a
@ -293,6 +293,15 @@ editing existing messages.
When COMPOSE-TYPE is `reply' or `forward', MSG should be a message
plist. If COMPOSE-TYPE is `new', MSG should be nil.
Optionally (when forwarding, replying) ORIGINAL-MSG is the original
message we will forward / reply to.
Optionally (when forwarding) INCLUDES contains a list of
(:file-name <filename> :mime-type <mime-type> :disposition <disposition>)
for the attachements to include; file-name refers to
a file which our backend has conveniently saved for us (as a
tempfile).
The name of the draft folder is constructed from the concatenation
of `mu4e-maildir' and `mu4e-drafts-folder' (therefore, these must be
set).
@ -307,17 +316,25 @@ using Gnus' `message-mode'."
(unless mu4e-drafts-folder (error "mu4e-drafts-folder not set"))
(let ((draft
(if (member compose-type '(reply forward new))
(mu4e-send-open-draft compose-type msg)
(mu4e-send-open-draft compose-type original-msg)
(if (eq compose-type 'edit)
(plist-get msg :path)
(plist-get original-msg :path)
(error "unsupported compose-type %S" compose-type)))))
(unless (file-readable-p draft)
(error "Cannot read %s" path))
(error "Cannot read %s" draft))
(find-file draft)
(message-mode)
;; include files -- e.g. when forwarding a message with attachments,
;; we take those from the original.
(save-excursion
(goto-char (point-max)) ;; put attachments at the end
(dolist (att includes)
(mml-attach-file
(plist-get att :file-name) (plist-get att :mime-type))))
(make-local-variable 'write-file-functions)
;; update the db when the file is saved...]
@ -333,7 +350,7 @@ using Gnus' `message-mode'."
"^User-agent:")))
(message-hide-headers))
(if (eq compose-type 'new)
(if (member compose-type '(new forward))
(message-goto-to)
(message-goto-body))))