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 F0D826DE0F9E for ; Thu, 28 Nov 2019 08:14:27 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.329 X-Spam-Level: X-Spam-Status: No, score=-0.329 tagged_above=-999 required=5 tests=[AWL=-0.129, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1] 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 G7A50vNdE0lK for ; Thu, 28 Nov 2019 08:14:27 -0800 (PST) Received: from jb55.com (jb55.com [45.79.91.128]) by arlo.cworth.org (Postfix) with ESMTPS id 44D336DE0F6A for ; Thu, 28 Nov 2019 08:14:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d= jb55.com; h=from:to:subject:date:message-id; s=default; bh=dGPdNqucUHeWZPgWO3TtROCSeeuEpVfSRUsPNBw75FE=; b=ixxzagtI3b4UaXkT+zDD7Nt+S+i2SYTv/5KUX6qSqJISTVWbMO9/iiyB8U2Y26OCEVrGJ0avHh7eaDoz7HZ93zjhHo0vN/Lr5kYy/TJX+odYReMiYJAXiKG8vUH/JOEOmPzfi93hhDPuoywTyw7tPlBD3SMVHSkGzS0w3htOMK69eR7TrCEEDi0do/u2bfXu6DYkqb7iGDs8HlX3cidISRLa6q5W2uRoR7I16tABjSK9HDasslzUSlC2fTs1hV/kExr299Qs8vBhvrs1ANkJCMjv/e+mO9wQpGFAOddVvQkhn4kf3SpkfWcaHV5cSRo1oUY/aOUvoNrY45XLYQFmBw== Received: from jb55.com (S0106f0f249a68533.gv.shawcable.net [24.69.143.198]) by jb55.com (OpenSMTPD) with ESMTPSA id 90125809 TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Thu, 28 Nov 2019 16:14:19 +0000 (UTC) From: William Casarin To: notmuch@notmuchmail.org Subject: [PATCH v2 5/8] emacs/tree: add notmuch-tree-archive-message-than-next-or-exit Date: Thu, 28 Nov 2019 08:13:58 -0800 Message-Id: <20191128161401.28844-6-jb55@jb55.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191128161401.28844-1-jb55@jb55.com> References: <20191128161401.28844-1-jb55@jb55.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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: Thu, 28 Nov 2019 16:14:28 -0000 This is the notmuch-tree version of notmuch-show-archive-message-than-next-or-exit. Signed-off-by: William Casarin --- emacs/notmuch-tree.el | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index 367b10c4..8e596459 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -563,6 +563,15 @@ message will be \"unarchived\", i.e. the tag changes in (notmuch-tree-archive-message unarchive) (notmuch-tree-next-matching-message)) +(defun notmuch-tree-archive-message-then-next-or-exit () + "Archive current message, then show next open message in current thread. + +If at the last open message in the current thread, then exit back +to search results." + (interactive) + (notmuch-tree-archive-message) + (notmuch-tree-next-matching-message t)) + (defun notmuch-tree-next-message () "Move to next message." (interactive) @@ -588,23 +597,24 @@ nil otherwise." (forward-line (if prev -1 nil))) (not last))) -(defun notmuch-tree-matching-message (&optional prev) +(defun notmuch-tree-matching-message (&optional prev pop-at-end) "Move to the next or previous matching message" (interactive "P") (forward-line (if prev -1 nil)) - (notmuch-tree-goto-matching-message prev) - (when (window-live-p notmuch-tree-message-window) - (notmuch-tree-show-message-in))) + (if (and (not (notmuch-tree-goto-matching-message prev)) pop-at-end) + (notmuch-tree-quit pop-at-end) + (when (window-live-p notmuch-tree-message-window) + (notmuch-tree-show-message-in)))) -(defun notmuch-tree-prev-matching-message () +(defun notmuch-tree-prev-matching-message (&optional pop-at-end) "Move to previous matching message." - (interactive) - (notmuch-tree-matching-message t)) + (interactive "P") + (notmuch-tree-matching-message t pop-at-end)) -(defun notmuch-tree-next-matching-message () +(defun notmuch-tree-next-matching-message (&optional pop-at-end) "Move to next matching message." - (interactive) - (notmuch-tree-matching-message)) + (interactive "P") + (notmuch-tree-matching-message nil pop-at-end)) (defun notmuch-tree-refresh-view () "Refresh view." -- 2.23.0