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 33C016DE0E8B for ; Sat, 28 Dec 2019 07:01:58 -0800 (PST) Authentication-Results: arlo.cworth.org; dkim=pass (2048-bit key; secure) header.d=jb55.com header.i=@jb55.com header.b="WY8Agrdv"; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.391 X-Spam-Level: X-Spam-Status: No, score=-0.391 tagged_above=-999 required=5 tests=[AWL=-0.191, 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 plMj8hnz1cma for ; Sat, 28 Dec 2019 07:01:57 -0800 (PST) Received: from jb55.com (jb55.com [45.79.91.128]) by arlo.cworth.org (Postfix) with ESMTPS id EC4AC6DE0BEB for ; Sat, 28 Dec 2019 07:01:42 -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=RuofAUzZ5kRy3x6wMPUU8LvbaoucIBx5/qcK90JW6rA=; b=WY8AgrdvvifdnVvShP7zTgWwuN7BL8gFmTJ3p5aOZJ4LvqDEv/ExLeQu/4SLina+iTo6mhM6udxdVQEFpLWphXLQGQdTzfkJWk5Ov2fajJYnqAIqFZUzaddmt2Hw5wD8dInC4sBBeQ+wb3qxHHYHq7qjXTL+JSECcX2WleY61BZMdup++RgZ3nLfNJ3xXl89Qdamua6zzzqUnWgnVzM8x/+jkLd6ghzOA3a4QoA6GSvpo1M37m7wNuVfYJtzCDJtbVUQp0B3bK0Qxq9rlRPmZv3Laq2NOsnrx1LJFFBBZjV0aY+ammyMSnmaR+3gh1rhR+Kup1zIxFj3mCsaKmtD1A== Received: from jb55.com (barion1850w-lp130-03-70-49-37-238.dsl.bell.ca [70.49.37.238]) by jb55.com (OpenSMTPD) with ESMTPSA id 5aa4c95a TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 28 Dec 2019 15:01:40 +0000 (UTC) From: William Casarin To: notmuch@notmuchmail.org Subject: [PATCH v3 5/7] emacs/tree: add notmuch-tree-archive-message-than-next-or-exit Date: Sat, 28 Dec 2019 10:01:22 -0500 Message-Id: <20191228150124.20630-6-jb55@jb55.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191228150124.20630-1-jb55@jb55.com> References: <20191228150124.20630-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: Sat, 28 Dec 2019 15:01:58 -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 f66219c5..cdf68ed4 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) @@ -589,23 +598,24 @@ nil otherwise." (forward-line dir)) (not (funcall eobfn)))) -(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.24.0