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 4E77C6DE0203 for ; Sat, 28 Dec 2019 07:01:38 -0800 (PST) Authentication-Results: arlo.cworth.org; dkim=pass (2048-bit key; secure) header.d=jb55.com header.i=@jb55.com header.b="YQWc2tll"; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.2 X-Spam-Level: X-Spam-Status: No, score=-0.2 tagged_above=-999 required=5 tests=[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 b5NazM4GqBH9 for ; Sat, 28 Dec 2019 07:01:37 -0800 (PST) Received: from jb55.com (jb55.com [45.79.91.128]) by arlo.cworth.org (Postfix) with ESMTPS id AD2AE6DE01E0 for ; Sat, 28 Dec 2019 07:01:37 -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=J97QtKl4jKKzfe1ZFJq1SUM6qT+eXfHsiuOKUGGXKZs=; b=YQWc2tllKtT/QKU5CYn9iEmMtmohZuL5w74wJY0TMKXBW9yD+VtUb2rem6Ef9dL6ggIoGMKsOH5mBnfXaVRXeeHaZ29IgkCHT7UkJV070SaHlVv2xplKBskMfR6mDmwyD+Dr4Y+micFxofzCb4It3/p5a3M1ud4ZfCYax68IoXQXB0b9gnLOFhKoTwH97Tb7txIT9mMT5xxcJnPTmrPz0EdxjTuGIVWmWrSmKlKkstv37BFUNWJgIktveiGkSbazZVjUkXAPOeArV/z/d7lRdMzhkA/7aZFkme9OxJWGRBXIPwqXEwGDUd9ljKGB2JSNs4tjjnrOxlQMLq3k9ws45A== 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 aa89993f TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 28 Dec 2019 15:01:36 +0000 (UTC) From: William Casarin To: notmuch@notmuchmail.org Subject: [PATCH v3 2/7] emacs/tree: add notmuch-tree-goto-matching-message Date: Sat, 28 Dec 2019 10:01:19 -0500 Message-Id: <20191228150124.20630-3-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:38 -0000 This function captures some common logic when jumping to matching messages in notmuch-tree mode. We also add a new return value (t or nil), that indicates if there was a next matching message in the thread to show. Signed-off-by: William Casarin --- emacs/notmuch-tree.el | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index d262ba26..18fdb1c0 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -577,12 +577,23 @@ message will be \"unarchived\", i.e. the tag changes in (when (window-live-p notmuch-tree-message-window) (notmuch-tree-show-message-in))) +(defun notmuch-tree-goto-matching-message (&optional prev) + "Move to the next or previous matching message. + +Returns t if there was a next matching message in the thread to show, +nil otherwise." + (let ((dir (if prev -1 nil)) + (eobfn (if prev #'bobp #'eobp))) + (while (and (not (funcall eobfn)) + (not (notmuch-tree-get-match))) + (forward-line dir)) + (not (funcall eobfn)))) + (defun notmuch-tree-prev-matching-message () "Move to previous matching message." (interactive) (forward-line -1) - (while (and (not (bobp)) (not (notmuch-tree-get-match))) - (forward-line -1)) + (notmuch-tree-goto-matching-message t) (when (window-live-p notmuch-tree-message-window) (notmuch-tree-show-message-in))) @@ -590,8 +601,7 @@ message will be \"unarchived\", i.e. the tag changes in "Move to next matching message." (interactive) (forward-line) - (while (and (not (eobp)) (not (notmuch-tree-get-match))) - (forward-line)) + (notmuch-tree-goto-matching-message) (when (window-live-p notmuch-tree-message-window) (notmuch-tree-show-message-in))) -- 2.24.0