emacs: make editing a message as new include FCC

This changes the meaning of `e` for non-drafts to make it behave
similarly to new messages, which here means add the `FCC` header.
This commit is contained in:
Léo Gaspard 2018-10-22 23:44:54 +09:00 committed by David Bremner
parent 0ae8cab4d3
commit 8e584392dc

View file

@ -2,6 +2,7 @@
;; ;;
;; Copyright © Mark Walters ;; Copyright © Mark Walters
;; Copyright © David Bremner ;; Copyright © David Bremner
;; Copyright © Leo Gaspard
;; ;;
;; This file is part of Notmuch. ;; This file is part of Notmuch.
;; ;;
@ -20,6 +21,7 @@
;; ;;
;; Authors: Mark Walters <markwalters1009@gmail.com> ;; Authors: Mark Walters <markwalters1009@gmail.com>
;; David Bremner <david@tethera.net> ;; David Bremner <david@tethera.net>
;; Leo Gaspard <leo@gaspard.io>
;;; Code: ;;; Code:
@ -225,7 +227,7 @@ applied to newly inserted messages)."
"--exclude=false" id)) "--exclude=false" id))
(draft (equal tags (notmuch-update-tags tags notmuch-draft-tags)))) (draft (equal tags (notmuch-update-tags tags notmuch-draft-tags))))
(when (or draft (when (or draft
(yes-or-no-p "Message does not appear to be a draft: really resume? ")) (yes-or-no-p "Message does not appear to be a draft: edit as new? "))
(switch-to-buffer (get-buffer-create (concat "*notmuch-draft-" id "*"))) (switch-to-buffer (get-buffer-create (concat "*notmuch-draft-" id "*")))
(setq buffer-read-only nil) (setq buffer-read-only nil)
(erase-buffer) (erase-buffer)
@ -244,6 +246,7 @@ applied to newly inserted messages)."
(message-remove-header "Message-ID")) (message-remove-header "Message-ID"))
(when (member 'Date message-deletable-headers) (when (member 'Date message-deletable-headers)
(message-remove-header "Date")) (message-remove-header "Date"))
(unless draft (notmuch-fcc-header-setup))
;; The X-Notmuch-Emacs-Draft header is a more reliable ;; The X-Notmuch-Emacs-Draft header is a more reliable
;; indication of whether the message really is a draft. ;; indication of whether the message really is a draft.
(setq draft (> (message-remove-header "X-Notmuch-Emacs-Draft") 0))) (setq draft (> (message-remove-header "X-Notmuch-Emacs-Draft") 0)))