Hi, this set switches to getopt_long for parsing command line options where applicable, and hopefully makes David happy. ;) This is on top of id:"cover.1321217854.git.jani@nikula.org". This was a fairly quick exercise, so watch out for bugs. getopt_long does have subtle differences from the original. All the tests pass after patch 6/6. BR, Jani. Jani Nikula (6): cli: notmuch new: use getopt_long for parsing command line options cli: notmuch search: use getopt_long for parsing command line options cli: notmuch show: use getopt_long for parsing command line options cli: notmuch count: use getopt_long for parsing command line options cli: notmuch reply: use getopt_long for parsing command line options test: emacs-large-search-buffer: expected results according to getopt_long notmuch-client.h | 1 + notmuch-count.c | 33 ++++++++------- notmuch-new.c | 20 +++++++-- notmuch-reply.c | 40 ++++++++++-------- notmuch-search.c | 90 +++++++++++++++++++++------------------ notmuch-show.c | 61 +++++++++++++++----------- test/emacs-large-search-buffer | 2 +- 7 files changed, 141 insertions(+), 106 deletions(-) -- 1.7.5.4