merge: notmuch

 * enabling notmuch enables sidebar
 * conditional include if <sys/syscall.h>
 * minor style changes to match sidebar
 * fix typo
 * change sidebar-toggle function to match sidebar
 * change wiki references to website

diff --cc hdrline.c
index de0f693a2469ad442ddb9fe27ad2eb93a7cfa6c6,534baa6272b01c753dde76dbd2454e4d4681b288..6f069457389ad9d3b678010df3cdb6002192c080
--- 1/hdrline.c
--- 2/hdrline.c
+++ b/hdrline.c
@@@ -247,9 -247,8 +247,9 @@@ int mutt_user_is_recipient (HEADER *h
   * %E = number of messages in current thread
   * %f = entire from line
   * %F = like %n, unless from self
-  * %g = message labes (e.g. notmuch tags)
+  * %g = message labels (e.g. notmuch tags)
   * %i = message-id
 + * %I = initials of author
   * %l = number of lines in the message
   * %L = like %F, except `lists' are displayed first
   * %m = number of messages in the mailbox

diff --cc sidebar.c
Simple merge

diff --cc sidebar.h
Simple merge