[PATCH] emacs: Correct the documentation for `notmuch-search-line-faces'.

diff --git a/0a/2347c6ccd14440bcc7a4fba4d19bc633165f8a b/0a/2347c6ccd14440bcc7a4fba4d19bc633165f8a
new file mode 100644 (file)
index 0000000..166abc1
--- /dev/null
+++ b/0a/2347c6ccd14440bcc7a4fba4d19bc633165f8a
@@ -0,0 +1,101 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AE155431FDA\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 03:03:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=unavailable\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id LyVcYRgPqM3z for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 03:03:34 -0700 (PDT)\r
+Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com\r
+ [74.125.82.51])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 57E4F431FD6   for <notmuch@notmuchmail.org>; Tue,  6 May 2014 03:03:34 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f51.google.com with SMTP id x13so2624657wgg.22\r
+       for <notmuch@notmuchmail.org>; Tue, 06 May 2014 03:03:33 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+       :references;\r
+       bh=FqG8x3nHIyaMdg+lpzf5wRSNCbbGGigGGA1WkF6bBLY=;\r
+       b=O0sVca54cg7Ybt8fsV0SyMI6dkyZ7yclj2F3j0g6gAFYbYnNPSj/Uch1MVWmMer3Bs\r
+       va0q9g55PXlagLhO/EuqBgtDKiA8bM6qovthdZGvRxUSlVlmMyok79qf848heM5x4BwC\r
+       g6SWarmP+CkJsLs3u6ZsOm49zNPByIn+RIhJtp8DseaPWAuT7D6uMtf0nXodLqO4gVvP\r
+       zar0MldRKOhrJe1v0x7WaAF0RT/1nEMLWNSjmAzGX7AeGO82wFX32k6e3G3xi8wysIUV\r
+       GJPA5ZWmQka5FPjDymtf2weZ8QWiJ+uPDuVYoazi2wIb8prlrIvdcOg3soGJ/3orf27N\r
+       D6hw==\r
+X-Gm-Message-State:\r
+ ALoCoQnIflkQEc2qeCpTXlTsUCcTk8Gv+U/FN0rm8BSniDyqZoDPaSexd45ZH2qtc/3V41ELNAf6\r
+X-Received: by 10.180.14.199 with SMTP id r7mr20292195wic.0.1399370613151;\r
+       Tue, 06 May 2014 03:03:33 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net (disaster-area.hh.sledj.net.\r
+       [81.149.164.25]) by mx.google.com with ESMTPSA id\r
+       g13sm21285961wjn.15.2014.05.06.03.03.31 for <notmuch@notmuchmail.org>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Tue, 06 May 2014 03:03:32 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 9D6D61036D6; Tue,  6 May 2014 11:03:30 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Correct the documentation for\r
+       `notmuch-search-line-faces'.\r
+Date: Tue,  6 May 2014 11:03:30 +0100\r
+Message-Id: <1399370610-7146-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <cun8uqffdo1.fsf@hotblack-desiato.hh.sledj.net>\r
+References: <cun8uqffdo1.fsf@hotblack-desiato.hh.sledj.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 06 May 2014 10:03:34 -0000\r
+\r
+The implementation and documentation for `notmuch-search-line-faces'\r
+disagreed in how elements in the list were merged. Correct the\r
+documentation to match the implementation (that is, the earlier\r
+elements in the list have precedence over later elements).\r
+---\r
+ emacs/notmuch.el | 10 +++++-----\r
+ 1 file changed, 5 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 6c0bc1b..8aa0104 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -647,12 +647,12 @@ of the result."\r
+ Here is an example of how to color search results based on tags.\r
+  (the following text would be placed in your ~/.emacs file):\r
+ \r
+- (setq notmuch-search-line-faces '((\"deleted\" . (:foreground \"red\"\r
+-                                                :background \"blue\"))\r
+-                                   (\"unread\" . (:foreground \"green\"))))\r
++ (setq notmuch-search-line-faces '((\"unread\" . (:foreground \"green\"))\r
++                                   (\"deleted\" . (:foreground \"red\"\r
++                                                :background \"blue\"))))\r
+ \r
+-The attributes defined for matching tags are merged, with later\r
+-attributes overriding earlier. A message having both \"deleted\"\r
++The attributes defined for matching tags are merged, with earlier\r
++attributes overriding later. A message having both \"deleted\"\r
+ and \"unread\" tags with the above settings would have a green\r
+ foreground and blue background."\r
+   :type '(alist :key-type (string) :value-type (custom-face-edit))\r
+-- \r
+2.0.0.rc0\r
+\r