Here is a split up version of the patches with (I hope) reasonable 
commit messages. (Magit is amazing.)                                                                          

I have not split up the new notmuch-pick file but the cli and other
emacs bits should be managable. (Note intermediate emacs points may
not compile as they add references to notmuch-pick in the existing
code.)                                                                                                        

I have included another bugfix from Daniel (entire-thread was used 
uninitialised in notmuch-show.c)                                                                              

The only functional change is to add Daniel's notmuch-search-pick-thread
function to notmuch.el (bound to M-RET) which views the currently 
selected thread in notmuch-pick.                                                                              

I also found one stale change which I removed.   

Best wishes

Mark


Mark Walters (11):
  cli: add --headers_only option to notmuch-show.c
  cli: add sort options to notmuch-show.c
  cli: add --thread= option to notmuch-show
  emacs: add entry to notmuch-pick from notmuch-hello.el
  emacs: add defcustom group for notmuch-pick
  emacs: add extra parameters option to notmuch-query-get-threads
  emacs: add entry to notmuch-pick from notmuch.el
  emacs: add the entry to notmuch-pick to notmuch-show.el
  emacs: make notmuch-show return its buffer
  emacs: notmuch-show.el just show the actual matching messages
  emacs: add notmuch-pick itself

 emacs/Makefile.local   |    3 +-
 emacs/notmuch-hello.el |   10 +
 emacs/notmuch-lib.el   |    4 +
 emacs/notmuch-pick.el  |  585 ++++++++++++++++++++++++++++++++++++++++++++++++
 emacs/notmuch-query.el |    4 +-
 emacs/notmuch-show.el  |   25 ++-
 emacs/notmuch.el       |   20 ++
 notmuch-client.h       |    9 +-
 notmuch-show.c         |   73 ++++++-
 9 files changed, 723 insertions(+), 10 deletions(-)
 create mode 100644 emacs/notmuch-pick.el

-- 
1.7.2.3