Mark Walters <markwalters1009@gmail.com> writes: > The previous version of this series is at > id:1479036106-32453-1-git-send-email-markwalters1009@gmail.com > > The only change is for the error handling for resume. In show mode is > is actually simpler than before -- notmuch-show-get-message-id will > always return an id, so we don't need to check for non-nil > there. Indeed, if this were not the case then the tag commands would > all need to check too. > > However, in tree-mode the corresponding command can fail if point is > after the end of the last message. Thus there we do check for non-nil > (as do the tagging commands). Pushed to master with the following edits: diff --git a/emacs/notmuch-draft.el b/emacs/notmuch-draft.el index 496e11f..fb7f4f5 100644 --- a/emacs/notmuch-draft.el +++ b/emacs/notmuch-draft.el @@ -25,9 +25,9 @@ (require 'notmuch-maildir-fcc) (require 'notmuch-tag) -(require 'notmuch-mua) (declare-function notmuch-show-get-message-id "notmuch-show" (&optional bare)) +(declare-function notmuch-message-mode "notmuch-mua") switch require to declare function to avoid circular require (defgroup notmuch-draft nil "Saving and editing drafts in Notmuch." @@ -152,7 +152,6 @@ Used when a new version is saved, or the message is sent." `notmuch-draft-save-plaintext' controls the behaviour." (case notmuch-draft-save-plaintext ((ask) - (notmuch-draft--query-encryption) (unless (yes-or-no-p "(Customize `notmuch-draft-save-plaintext' to avoid this warning) This message contains mml tags that suggest it is intended to be encrypted. Really save and index an unencrypted copy? ") remove recursive call. diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index b68cdf2..93747b1 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -27,6 +27,7 @@ (require 'notmuch-lib) (require 'notmuch-address) +(require 'notmuch-draft) (eval-when-compile (require 'cl)) Added a require so that saving worked after applying 3 of 4 patches