Merge branch 'master' into testing

4 files changed, 5 insertions, 0 deletions

diff --git a/CUSTOMIZE.md b/CUSTOMIZE.md
index febcf14f..381aae6d 100644
--- a/CUSTOMIZE.md
+++ b/CUSTOMIZE.md
@@ -87,6 +87,7 @@ and in message composition. The command will be called with your prefix as only
 and its output is searched for name-email pairs. The regular expression used here
 defaults to `(?P<email>.+?@.+?)\s+(?P<name>.+)`, which makes it work nicely with `abook --mutt-query`.
 You can tune this using the `abook_regexp` option (beware Commandparsers escaping semantic!).
+Have a look at the FAQ for other examples.
 
 
 Key Bindings
diff --git a/NEWS b/NEWS
index 469dd9f3..516510e2 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@
 * errbacks and correct calling of post-hooks for deferred commands
 * add packaging info for debian
 * envelope.headers stores lists of values for each key now
+* default binding: 's' to 'toggletag unread' in search buffers
 
 0.20
 
diff --git a/README.md b/README.md
index ecc2b6bf..3085474c 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ up and customize respectively.
 Autogenerated API docs for the current release can be found [here][api].
 Their sources live in the `docs` directory.
 
+The current top-notch version for the courageous lives in branch 'testing'.
+
 Do comment on the code or file issues! I'm curious what you think of it.
 You can talk to me in #notmuch@Freenode.
 
diff --git a/alot/defaults/alot.rc b/alot/defaults/alot.rc
index f7ef98b0..30d5ed06 100644
--- a/alot/defaults/alot.rc
+++ b/alot/defaults/alot.rc
@@ -130,6 +130,7 @@ select = openfocussed
 a = toggletag inbox
 & = toggletag killed
 ! = toggletag flagged
+s = toggletag unread
 l = retagprompt
 O = refineprompt
 | = refineprompt