From: Richard Russon <rich@flatcap.org>
Date: Fri, 15 Apr 2016 22:15:26 +0000 (+0100)
Subject: merge: notmuch
X-Git-Tag: neomutt-20160416~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa72ef9ed3a8bc78e8a5852ebdf1394083695f25;p=neomutt

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
---

aa72ef9ed3a8bc78e8a5852ebdf1394083695f25
diff --cc hdrline.c
index de0f693a2,534baa627..6f0694573
--- a/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