From: Mark Walters <markwalters1009@gmail.com>
Date: Sat, 16 Jun 2012 10:21:45 +0000 (+0100)
Subject: Update devel/schemata for --entire-thread=false
X-Git-Tag: 0.14~80
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=fdce20d365d58491bd82a5944915843972fc0f00

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 7b750afa..eb757af5 100644
--- 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 977cea75..8fcab8e5 100644
--- 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
 ]