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 85CA46DE1065 for ; Sun, 17 Nov 2019 14:29:50 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.347 X-Spam-Level: X-Spam-Status: No, score=-0.347 tagged_above=-999 required=5 tests=[AWL=-0.147, 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 5V5WsVcqdeer for ; Sun, 17 Nov 2019 14:29:49 -0800 (PST) Received: from jb55.com (jb55.com [45.79.91.128]) by arlo.cworth.org (Postfix) with ESMTPS id CCF9A6DE0F27 for ; Sun, 17 Nov 2019 14:29:48 -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=4ZuEBLM2KRgOx8lrMhaZINIYNJegmKqikSSKszkLSJM=; b=WSl6Qr+Fi8yWH3lzp5GW2maKAMg2EzNV5YQ4obdW2osR2YgoDtBcH32DB3MAPo+1CnZ9UkfzhAIhwYU3trKfCJuoWo0mmN5Jmr/eVZ3UeOw/auLCcKeBj0db3oM0u1MGUyFXfXQsZz46Vswa7iXmP/Oli8cTGhSNUasm/3wW89hS4pE1nzjnvL6zM28tIiECIm7SC6RL1nJegQoJQrKm9MkD5AII33Rtw8ShakXV/9bYM5Zw0MjOpQvKuZvSi2LPrRu/ZkUe8mAod9LPfx5EveY0vd2MkrOYlCTrhninQXuGCVP3YCTN4II351NuqkPw1CeCHSP7eOiIrR3QC7IwYg== Received: from jb55.com (S010660e327dca171.vc.shawcable.net [24.84.152.187]) by jb55.com (OpenSMTPD) with ESMTPSA id 99d20ccf TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sun, 17 Nov 2019 22:29:45 +0000 (UTC) From: William Casarin To: notmuch@notmuchmail.org Subject: [PATCH 2/7] emacs/tree: add notmuch-tree-goto-matching-message Date: Sun, 17 Nov 2019 14:29:24 -0800 Message-Id: <20191117222929.1064-3-jb55@jb55.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191117222929.1064-1-jb55@jb55.com> References: <20191117222929.1064-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: Sun, 17 Nov 2019 22:29:50 -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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index 4bc05160..9f2d87b5 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -577,12 +577,22 @@ 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 (last) + (while (and (not (setq last (if prev (bobp) (eobp)))) + (not (notmuch-tree-get-match))) + (forward-line (if prev -1 nil))) + (not last))) + (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 +600,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.23.0