[PATCH 1/2] Revert "emacs: use --exclude=false when checking for empty searches"

Subject:[PATCH 1/2] Revert "emacs: use --exclude=false when checking for empty searches"

Date:Sat, 22 Jan 2022 13:44:39 -0400

To:David Bremner ,Gregor Zattler ,notmuch@notmuchmail.org

Cc:

From:David Bremner


Revert commit 8370e3cfe2dd8a79323613c2bbf2f11db6134dac, and remark the
corresponding test as broken. Also update the expected output of the
broken test to show excludes active in the user defined saved searches.
---
 emacs/notmuch-hello.el                            | 2 +-
 test/T440-emacs-hello.sh                          | 1 +
 test/emacs.expected-output/notmuch-hello-all-tags | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 9ac52c11..71e91093 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -570,7 +570,7 @@ options will be handled as specified for
 					    (plist-get options :filter))))
 	 "\n")))
     (unless (= (notmuch--call-process-region (point-min) (point-max) notmuch-command
-					     t t nil "count" "--exclude=false" "--batch") 0)
+				    t t nil "count" "--batch") 0)
       (notmuch-logged-error
        "notmuch count --batch failed"
        "Please check that the notmuch CLI is new enough to support `count
diff --git a/test/T440-emacs-hello.sh b/test/T440-emacs-hello.sh
index 842781a4..dc80cc75 100755
--- a/test/T440-emacs-hello.sh
+++ b/test/T440-emacs-hello.sh
@@ -69,6 +69,7 @@ notmuch tag -$tag '*'
 test_expect_equal_file $EXPECTED/notmuch-hello-long-names OUTPUT
 
 test_begin_subtest "All tags show up"
+test_subtest_known_broken
 tag=exclude_me
 notmuch tag +$tag '*'
 notmuch config set search.exclude_tags $tag
diff --git a/test/emacs.expected-output/notmuch-hello-all-tags b/test/emacs.expected-output/notmuch-hello-all-tags
index 2802a708..65e479fa 100644
--- a/test/emacs.expected-output/notmuch-hello-all-tags
+++ b/test/emacs.expected-output/notmuch-hello-all-tags
@@ -1,9 +1,5 @@
    Welcome to notmuch. You have 52 messages.
 
-Saved searches: [edit]
-
-	  52 inbox           52 unread          52 all mail
-
 Search:                                                                     .
 
 All tags: [hide]
-- 
2.34.1

_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: