From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id DA7476DE012F for ; Sun, 13 Nov 2016 09:35:42 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.006 X-Spam-Level: X-Spam-Status: No, score=-0.006 tagged_above=-999 required=5 tests=[AWL=0.005, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A3u3z03kJ94B for ; Sun, 13 Nov 2016 09:35:41 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 8DF346DE00D3 for ; Sun, 13 Nov 2016 09:35:41 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1c5yga-0001BF-MR; Sun, 13 Nov 2016 12:35:20 -0500 Received: (nullmailer pid 1628 invoked by uid 1000); Sun, 13 Nov 2016 17:35:38 -0000 From: David Bremner To: Mark Walters , notmuch@notmuchmail.org Subject: Re: [PATCH v7 0/4] emacs postpone/resume patches In-Reply-To: <1479046130-2716-1-git-send-email-markwalters1009@gmail.com> References: <1479046130-2716-1-git-send-email-markwalters1009@gmail.com> Date: Sun, 13 Nov 2016 13:35:30 -0400 Message-ID: <87y40nxoyl.fsf@tethera.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2016 17:35:42 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Mark Walters 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 =2D-- a/emacs/notmuch-draft.el +++ b/emacs/notmuch-draft.el @@ -25,9 +25,9 @@ =20 (require 'notmuch-maildir-fcc) (require 'notmuch-tag) =2D(require 'notmuch-mua) =20 (declare-function notmuch-show-get-message-id "notmuch-show" (&optional ba= re)) +(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 sen= t." `notmuch-draft-save-plaintext' controls the behaviour." (case notmuch-draft-save-plaintext ((ask) =2D (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 =2D-- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -27,6 +27,7 @@ =20 (require 'notmuch-lib) (require 'notmuch-address) +(require 'notmuch-draft) =20 (eval-when-compile (require 'cl)) =20 Added a require so that saving worked after applying 3 of 4 patches --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGcBAEBCAAGBQJYKKRiAAoJEPIClx2kp54srhIL/RGH3A9pODpwPd7pYzlFRsgG u9er1c6xRmJizPgW/nfqSzb3KD6I5ibzogv9IJ9zxgJxnnc1mi+OGPO3Q0xGMo31 uV3C6Me8gdY+tAiLA4ABVYxOAqr/XvdKF+eFEPT0poMkQMgbtr9kXEzs5SI+jC5z DqQaZSAeFBqWviKeh2Wxg8KLox4fkeWzCbd30wGwG53U3citfWMOmNuvFigkzXGQ Op3LGa6+pqntnArQ8T3sxY4AZb7kVgQx2O3a7qMdRWrdNvku8VY8ixCHWoauHzmY L6nMv1FCE55j1tyN8awpc/LiOyNeBl6OOm+xsjX+88PNQG4/IgjPTTLUjTy17bHD JAQdkxhXua7eK3Envn9f10l/fvaQVg/vXHn9XWGBlzGdqbKCBoyplhjv11fXgwlT 83a8W682r2V4PWtF5+OLimQu3RFUeDaG9E5J7bTalYsNkiy6UME9gx4jXBqX7wK/ U/HkwKstovhOjAfnp0vGN3w6oyNztEo2TngegJI8Dg== =EdzU -----END PGP SIGNATURE----- --=-=-=--