Update devel/schemata for --entire-thread=false

Also remove the Json --entire-thread item from devel/TODO.

diff --git a/devel/TODO b/devel/TODO
index 7b750afa5cbde78b868f6ec111630aca8ac8da29..eb757af5da2ab3c75099189dfc6c0de020f107bb 100644 (file)
--- a/devel/TODO
+++ b/devel/TODO
@@ -92,8 +92,6 @@ and email address in the From: line. We could also then easily support
 "notmuch compose --from <something>" to support getting at alternate
 email addresses.
 
-Fix the --format=json option to not imply --entire-thread.
-
 Implement "notmuch search --exclude-threads=<search-terms>" to allow
 for excluding muted threads, (and any other negative, thread-based
 filtering that the user wants to do).

diff --git a/devel/schemata b/devel/schemata
index 977cea75396e540a0bc64afd099fddd6ed8ba410..8fcab8e5f8ed2eaf806a5f611960e55b06a56e67 100644 (file)
--- a/devel/schemata
+++ b/devel/schemata
@@ -32,7 +32,7 @@ thread = [thread_node*]
 
 # A message and its replies (show_messages)
 thread_node = [
-    message?,                 # present if --entire-thread or matched
+    message?,                 # null if not matched and not --entire-thread
     [thread_node*]            # children of message
 ]