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 5B4D16DE1378 for ; Sat, 4 Apr 2020 13:41:47 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.267 X-Spam-Level: X-Spam-Status: No, score=-0.267 tagged_above=-999 required=5 tests=[AWL=-0.267] 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 GnOkxazqnjgm for ; Sat, 4 Apr 2020 13:41:46 -0700 (PDT) Received: from cfg.domain (jb55.com [45.79.91.128]) by arlo.cworth.org (Postfix) with ESMTPS id A045C6DE1029 for ; Sat, 4 Apr 2020 13:41:45 -0700 (PDT) Received: from jb55.com (S010660e327dca171.vc.shawcable.net [24.84.152.187]) by jb55.com (OpenSMTPD) with ESMTPSA id f459dab1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sat, 4 Apr 2020 20:41:51 +0000 (UTC) From: William Casarin To: notmuch@notmuchmail.org Subject: [PATCH 3/7] emacs/tree: add notmuch-tree-matching-message Date: Sat, 4 Apr 2020 13:41:33 -0700 Message-Id: <20200404204142.2526-3-jb55@jb55.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200404204142.2526-1-jb55@jb55.com> References: <20200404204142.2526-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, 04 Apr 2020 20:41:47 -0000 This functions removes some duplicate logic between notmuch-tree-{next,prev}-matching-message We do this because we will be adding some additional logic similar to the notmuch-show-next-open-message function, and it will help if this logic is all in one place. Signed-off-by: William Casarin --- emacs/notmuch-tree.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index 7f68efba..e6a6e67f 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -643,21 +643,23 @@ nil otherwise." (forward-line dir)) (not (funcall eobfn)))) +(defun notmuch-tree-matching-message (&optional prev) + "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))) + (defun notmuch-tree-prev-matching-message () "Move to previous matching message." (interactive) - (forward-line -1) - (notmuch-tree-goto-matching-message t) - (when (window-live-p notmuch-tree-message-window) - (notmuch-tree-show-message-in))) + (notmuch-tree-matching-message t)) (defun notmuch-tree-next-matching-message () "Move to next matching message." (interactive) - (forward-line) - (notmuch-tree-goto-matching-message) - (when (window-live-p notmuch-tree-message-window) - (notmuch-tree-show-message-in))) + (notmuch-tree-matching-message)) (defun notmuch-tree-refresh-view (&optional view) "Refresh view." -- 2.25.1