Revert "emacs: use --exclude=false when checking for empty searches"

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.

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 9ac52c11bcc5ac716e7fab6feb67517c152f5eb8..71e91093ab5969461af9bde1e096738ae50fb440 100644 (file)
--- 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 842781a48c3512c82c259688947f8b87b1f53167..dc80cc75880d59845a02e7c5b29c7b4965d7c0ce 100755 (executable)
--- 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 2802a7080122d76f031013142795ac840ea4ad5c..65e479faed6b6785671738367a532e4ee02927b9 100644 (file)
--- 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]