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

* fix mu4e-sent-messages-behavior for 'delete when user hasn't saved draft

Browse Source
This commit is contained in:
djcb
2012-03-30 09:15:52 +03:00
parent 5daa703678
commit 79f3289a25
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
emacs/mu4e-hdrs.el
View File

@ -139,11 +139,11 @@ the current list of headers."
(let* ((marker (gethash docid mu4e-msg-map)) (let* ((marker (gethash docid mu4e-msg-map))
(pos (and marker (marker-position marker))) (pos (and marker (marker-position marker)))
(docid-at-pos (and pos (mu4e-hdrs-get-docid pos)))) (docid-at-pos (and pos (mu4e-hdrs-get-docid pos))))
(unless marker (error "Message %d not found" docid)) (when marker
(unless (eq docid docid-at-pos) (unless (eq docid docid-at-pos)
(error "At point %d, expected docid %d, but got %S" (error "At point %d, expected docid %d, but got %S"
pos docid docid-at-pos)) pos docid docid-at-pos))
(mu4e-hdrs-remove-header docid pos))))) (mu4e-hdrs-remove-header docid pos))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -242,7 +242,7 @@ after the end of the search results."
(unless (= 0 count) (unless (= 0 count)
(message "Found %d matching message%s" (message "Found %d matching message%s"
count (if (= 1 count) "" "s")))))))) count (if (= 1 count) "" "s"))))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

24
emacs/mu4e-send.el
View File

@ -294,21 +294,22 @@ use the new docid. Returns the full path to the new message."
`("^References:" "^Face:" "^X-Face:" "^X-Draft-From:" `("^References:" "^Face:" "^X-Face:" "^X-Draft-From:"
"^User-agent:"))) "^User-agent:")))
(use-local-map mu4e-edit-mode-map) (use-local-map mu4e-edit-mode-map)
(message-hide-headers) (message-hide-headers)
(make-local-variable 'after-save-hook) (make-local-variable 'after-save-hook)
;; update the db when the file is saved...] ;; update the db when the file is saved...]
(add-hook 'after-save-hook (add-hook 'after-save-hook
(lambda() (mu4e-proc-add (buffer-file-name) mu4e-drafts-folder))) (lambda() (mu4e-proc-add (buffer-file-name) mu4e-drafts-folder)))
;; notify the backend that a message has been sent. The backend will respond ;; notify the backend that a message has been sent. The backend will respond
;; with (:sent ...) sexp, which is handled in . ;; with (:sent ...) sexp, which is handled in `mu4e-send-compose-handler'.
(add-hook 'message-sent-hook (add-hook 'message-sent-hook
(lambda () (lambda ()
(basic-save-buffer)
(mu4e-proc-sent (buffer-file-name) mu4e-drafts-folder))) (mu4e-proc-sent (buffer-file-name) mu4e-drafts-folder)))
;; register the function; this function will be called when the '(:sent...)' ;; register the function; this function will be called when the '(:sent...)'
;; message is received (see mu4e-proc.el) with parameters docid and path ;; message is received (see mu4e-proc.el) with parameters docid and path
(setq mu4e-proc-sent-func 'mu4e-sent-handler) (setq mu4e-proc-sent-func 'mu4e-sent-handler)
@ -379,9 +380,6 @@ using Gnus' `message-mode'."
"Handler function, called with DOCID and PATH for the just-sent "Handler function, called with DOCID and PATH for the just-sent
message." message."
(with-current-buffer (find-file-noselect path) (with-current-buffer (find-file-noselect path)
;; make sure this buffer is saved
(save-buffer)
(message "Mail sent")
;; for Forward ('Passed') and Replied messages, try to set the appropriate ;; for Forward ('Passed') and Replied messages, try to set the appropriate
;; flag at the message forwarded or replied-to ;; flag at the message forwarded or replied-to
(mu4e-send-set-parent-flag docid path) (mu4e-send-set-parent-flag docid path)
@ -398,7 +396,7 @@ depending on the value of `mu4e-sent-messages-behavior'.
Function assumes that it's executed in the context of the message Function assumes that it's executed in the context of the message
buffer." buffer."
;; first, what to do with the draft message in PATH? ;; first, what to do with the draft message in PATH?
(if (eq mu4e-sent-messages-behavior 'delete) (if (eq mu4e-sent-messages-behavior 'delete)
(progn (progn
(mu4e-proc-remove-msg docid)) ;; remove it (mu4e-proc-remove-msg docid)) ;; remove it
@ -410,12 +408,12 @@ buffer."
(if (search-forward-regexp (concat "^" mail-header-separator)) (if (search-forward-regexp (concat "^" mail-header-separator))
(replace-match "") (replace-match "")
(error "cannot find mail-header-separator")) (error "cannot find mail-header-separator"))
(save-buffer) (basic-save-buffer)
(message nil) (message nil)
;; ok, all seems well, well move the message to the sent-folder ;; ok, all seems well, well move the message to the sent-folder
(if (eq mu4e-sent-messages-behavior 'trash) (if (eq mu4e-sent-messages-behavior 'trash)
(mu4e-proc-move-msg docid mu4e-trash-folder "+T-D+S") (mu4e-proc-move-msg docid mu4e-trash-folder "+T-D+S")
(mu4e-proc-move-msg docid mu4e-sent-folder "-T-D+S")))))) (mu4e-proc-move-msg docid mu4e-sent-folder "-T-D+S"))))))
(defun mu4e-send-set-parent-flag (docid path) (defun mu4e-send-set-parent-flag (docid path)
@ -438,7 +436,7 @@ buffer.
" "
(let ((in-reply-to (message-fetch-field "in-reply-to")) (let ((in-reply-to (message-fetch-field "in-reply-to"))
(forwarded-from) (forwarded-from)
(references (message-fetch-field "references"))) (references (message-fetch-field "references")))
(unless in-reply-to (unless in-reply-to
(when references (when references
(with-temp-buffer ;; inspired by `message-shorten-references'. (with-temp-buffer ;; inspired by `message-shorten-references'.