This is version 6 of this patch series: version 5 is at id:"1338047694-32548-1-git-send-email-markwalters1009@gmail.com". The changes for this version: As suggest by Peter in id:"20120527123253.GA3049@hili.localdomain" the command line handling for keywords is changed so that if the option is specified as --option (i.e., not --option=<something>) then an empty string is passed to the parser. Thus the caller can deal with this case rather than it being an automatic error. This makes it easier to add options to an existing boolean option without breaking the syntax. Patch 3/6 has a one line change in response to the above change. The previous version also had some whitespace errors that have been fixed. Patch 6/6 is a trivial whitespace fix. It is right next to the main changes so may be worth taking (since any patches touching this code will need to be fixed up anyway) but is obviously independent of the series. Best wishes Mark Mark Walters (6): cli: command line parsing: allow default for keyword options cli: Let json output "null" messages for non --entire-thread cli: make --entire-thread=false work for format=json. Update devel/schemata for --entire-thread=false emacs: make elide messages use notmuch-show for omitting messages. cli: notmuch-show.c fix whitespace error command-line-arguments.c | 17 +++++++++++--- devel/TODO | 2 - devel/schemata | 2 +- emacs/notmuch-show.el | 18 ++++++++------ notmuch-client.h | 1 + notmuch-show.c | 54 +++++++++++++++++++++++++++++++++++++-------- 6 files changed, 69 insertions(+), 25 deletions(-) -- 1.7.9.1