Merge branch 'release'

[notmuch] / command-line-arguments.h

diff --git a/command-line-arguments.h b/command-line-arguments.h
index de1734ad2fdb3f0c5444c73abc5f74b7cbd99cf2..309aaf2b37b89878ebeac38e0f67ebbfd7e4996b 100644 (file)
--- a/command-line-arguments.h
+++ b/command-line-arguments.h
@@ -5,9 +5,11 @@
 
 enum notmuch_opt_type {
     NOTMUCH_OPT_END = 0,
+    NOTMUCH_OPT_INHERIT,       /* another options table */
     NOTMUCH_OPT_BOOLEAN,       /* --verbose              */
     NOTMUCH_OPT_INT,           /* --frob=8               */
     NOTMUCH_OPT_KEYWORD,       /* --format=raw|json|text */
+    NOTMUCH_OPT_KEYWORD_FLAGS, /* the above with values OR'd together */
     NOTMUCH_OPT_STRING,                /* --file=/tmp/gnarf.txt  */
     NOTMUCH_OPT_POSITION       /* notmuch dump pos_arg   */
 };