Hello I think notmuch-pick is now ready for mainline: it's not perfect but there are no longer any significant problems in the code (ie nothing that makes me go yuck!). This series just moves pick and the associated tests into mainline. There are some changes that should follow: for example moving the key-bindings that pick inserts into other keymaps into the correct files but I will do this in later series. I have also left the remnants in the directory contrib/notmuch/pick to be removed in a later cleanup and a NEWS item will need to be added. Pick has been in contrib for almost exactly one year and has seen a reasonable amount of use (I think) during this time. One thing to think about: do we want to keep the name "pick"? If not then now is the last sensible time to change it. I don't have any better suggestion however. Finally, it would be nice to have id:1381498794-17000-1-git-send-email-markwalters1009@gmail.com as well: without the key bindings that pick overrides show up twice in help. Best wishes Mark Mark Walters (5): emacs: move pick from contrib into mainline emacs: add pick to the Makefile test: move the pick tests to the main test directory test: add the emacs-pick test to the list of tests emacs: pick: remove initialisation message contrib/notmuch-pick/notmuch-pick.el | 946 -------------------- contrib/notmuch-pick/test/emacs-pick | 210 ----- .../pick.expected-output/notmuch-pick-show-window | 40 - .../notmuch-pick-single-thread | 6 - .../pick.expected-output/notmuch-pick-tag-inbox | 53 -- .../notmuch-pick-tag-inbox-tagged | 53 -- .../notmuch-pick-tag-inbox-thread-tagged | 53 -- emacs/Makefile.local | 1 + emacs/notmuch-pick.el | 945 +++++++++++++++++++ test/emacs-pick | 210 +++++ test/notmuch-test | 1 + test/pick.expected-output/notmuch-pick-show-window | 40 + .../notmuch-pick-single-thread | 6 + test/pick.expected-output/notmuch-pick-tag-inbox | 53 ++ .../notmuch-pick-tag-inbox-tagged | 53 ++ .../notmuch-pick-tag-inbox-thread-tagged | 53 ++ 16 files changed, 1362 insertions(+), 1361 deletions(-) delete mode 100644 contrib/notmuch-pick/notmuch-pick.el delete mode 100755 contrib/notmuch-pick/test/emacs-pick delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-show-window delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged create mode 100644 emacs/notmuch-pick.el create mode 100755 test/emacs-pick create mode 100644 test/pick.expected-output/notmuch-pick-show-window create mode 100644 test/pick.expected-output/notmuch-pick-single-thread create mode 100644 test/pick.expected-output/notmuch-pick-tag-inbox create mode 100644 test/pick.expected-output/notmuch-pick-tag-inbox-tagged create mode 100644 test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged -- 1.7.9.1