From: Leo Okawa Ericson <git@relevant-information.com>
To: notmuch@notmuchmail.org
Cc: Leo Okawa Ericson <git@relevant-information.com>
Subject: [PATCH v4] emacs: Make notmuch-show-next-thread return nil on failure
Date: Thu, 9 Jun 2022 17:18:22 +0200 [thread overview]
Message-ID: <20220609151822.31271-1-git@relevant-information.com> (raw)
Having notmuch-show-next-thread return non-nil on success and nil on
failure makes it easier for users to interact with notmuch via elisp.
This commit changes notmuch-search-show-thread too since the return
value of notmuch-show-next-thread depends on notmuch-search-show-thread.
---
Whitespace issues should have been fixed.
I think I was generally confused over how tests work. It was probably
that I was missing a call to (notmuch-test-wait). These revised tests
hopefully makes more sense now.
Previous patch: id:8baa58c3-7ab9-ec03-1bbd-28aa5be838f2@kleine-koenig.org
emacs/notmuch-show.el | 4 +++-
emacs/notmuch.el | 7 +++++--
test/T450-emacs-show.sh | 11 +++++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 203ca7f0..aded1ee7 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -2227,7 +2227,9 @@ (defun notmuch-show-next-thread (&optional show previous)
If SHOW is non-nil, open the next item in a show
buffer. Otherwise just highlight the next item in the search
buffer. If PREVIOUS is non-nil, move to the previous item in the
-search results instead."
+search results instead.
+
+Return non-nil on success."
(interactive "P")
(let ((parent-buffer notmuch-show-parent-buffer))
(notmuch-bury-or-kill-this-buffer)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index c9cf80dc..01a92997 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -520,7 +520,9 @@ (defun notmuch-search-show-thread (&optional elide-toggle)
With a prefix argument, invert the default value of
`notmuch-show-only-matching-messages' when displaying the
-thread."
+thread.
+
+Return non-nil on success."
(interactive "P")
(let ((thread-id (notmuch-search-find-thread-id)))
(if thread-id
@@ -532,7 +534,8 @@ (defun notmuch-search-show-thread (&optional elide-toggle)
(format "*%s*" (truncate-string-to-width
(notmuch-search-find-subject)
30 nil nil t)))
- (message "End of search results."))))
+ (message "End of search results.")
+ nil)))
(defun notmuch-tree-from-search-current-query ()
"Tree view of current query."
diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index 678efd8b..9e92cb98 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -62,6 +62,17 @@ test_emacs '(let ((notmuch-crypto-process-mime nil))
(test-visible-output))'
test_expect_equal_file $EXPECTED/notmuch-show-process-crypto-mime-parts-on OUTPUT
+test_begin_subtest "notmuch-search-show-thread returns non-nil on success"
+test_emacs_expect_t '(notmuch-search "id:20091117203301.GV3165@dottiness.seas.harvard.edu")
+ (notmuch-test-wait)
+ (and (notmuch-search-show-thread)
+ (not (notmuch-show-next-thread)))'
+
+test_begin_subtest "notmuch-search-show-thread returns nil when there are no messages"
+test_emacs_expect_t '(notmuch-search "id:non-existing-id")
+ (notmuch-test-wait)
+ (not (notmuch-search-show-thread))'
+
test_begin_subtest "notmuch-show: don't elide non-matching messages"
test_emacs '(let ((notmuch-show-only-matching-messages nil))
(notmuch-search "from:lars@seas.harvard.edu and subject:\"Maildir storage\"")
base-commit: 3a6b479a7360fbdbc1c6def4c1e1581bfd63e8a2
--
2.36.1
next reply other threads:[~2022-06-09 15:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-09 15:18 Leo Okawa Ericson [this message]
2022-06-13 11:13 ` [PATCH v4] emacs: Make notmuch-show-next-thread return nil on failure David Bremner
2022-06-13 18:54 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220609151822.31271-1-git@relevant-information.com \
--to=git@relevant-information.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).