[PATCH 4/4] emacs: modify help message for notmuch-search-line-faces to reflect prefe...

diff --git a/5f/44caf9ceea630c606e54a33e2b3e475fabb847 b/5f/44caf9ceea630c606e54a33e2b3e475fabb847
new file mode 100644 (file)
index 0000000..ce615a1
--- /dev/null
+++ b/5f/44caf9ceea630c606e54a33e2b3e475fabb847
@@ -0,0 +1,85 @@
+Return-Path: <jrollins@finestructure.net>\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 046EA40F1CC\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 14:28:26 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\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 hBiCAJIBQvGl for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Jan 2012 14:28:23 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id B795E40F21E\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 14:28:23 -0800 (PST)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 61A1F32802E\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 14:28:23 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-174-137-84.socal.res.rr.com\r
+       [76.174.137.84]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id 97AE62E50DEA\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jan 2012 14:28:21 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id D936B120F; Sat,  7 Jan 2012 14:28:20 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 4/4] emacs: modify help message for notmuch-search-line-faces\r
+       to reflect preferred "deleted" tag name.\r
+Date: Sat,  7 Jan 2012 14:28:14 -0800\r
+Message-Id: <1325975294-646-5-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1325975294-646-4-git-send-email-jrollins@finestructure.net>\r
+References: <1325975294-646-1-git-send-email-jrollins@finestructure.net>\r
+       <1325975294-646-2-git-send-email-jrollins@finestructure.net>\r
+       <1325975294-646-3-git-send-email-jrollins@finestructure.net>\r
+       <1325975294-646-4-git-send-email-jrollins@finestructure.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: Sat, 07 Jan 2012 22:28:26 -0000\r
+\r
+No functional change here.  The help message previously referred to\r
+the "delete" tag, but "deleted" is now preferred, so hopefully this\r
+will reduce any potential confusion.\r
+---\r
+ emacs/notmuch.el |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 2b860f4..ebdc7d1 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -658,12 +658,12 @@ will be excluded from searches."\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 '((\"delete\" . (:foreground \"red\"\r
++ (setq notmuch-search-line-faces '((\"deleted\" . (:foreground \"red\"\r
+                                                 :background \"blue\"))\r
+                                    (\"unread\" . (:foreground \"green\"))))\r
+ \r
+ The attributes defined for matching tags are merged, with later\r
+-attributes overriding earlier. A message having both \"delete\"\r
++attributes overriding earlier. 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
+1.7.7.3\r
+\r