[PATCH v1 1/2] emacs: More flexible washed faces.

diff --git a/5d/823d380b279d039dbf10c2c4156115daee1564 b/5d/823d380b279d039dbf10c2c4156115daee1564
new file mode 100644 (file)
index 0000000..8ec2eec
--- /dev/null
+++ b/5d/823d380b279d039dbf10c2c4156115daee1564
@@ -0,0 +1,108 @@
+Return-Path: <dme@heart-of-gold.hh.sledj.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 1027D431FCB\r
+       for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 01:05:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.379\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.379 tagged_above=-999 required=5\r
+       tests=[NO_DNS_FOR_FROM=0.379] 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 lS2oFQKIqFp6 for <notmuch@notmuchmail.org>;\r
+       Fri, 31 Oct 2014 01:05:30 -0700 (PDT)\r
+Received: from heart-of-gold.hh.sledj.net (disaster-area.hh.sledj.net\r
+       [81.149.164.25])\r
+       by olra.theworths.org (Postfix) with ESMTP id E7C9C431FC2\r
+       for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 01:05:29 -0700 (PDT)\r
+Received: by heart-of-gold.hh.sledj.net (Postfix, from userid 501)\r
+       id 4FFAD1670FA4; Fri, 31 Oct 2014 08:05:21 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1 1/2] emacs: More flexible washed faces.\r
+Date: Fri, 31 Oct 2014 08:05:20 +0000\r
+Message-Id: <1414742721-22561-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.9.3 (Apple Git-50)\r
+In-Reply-To: <1414742721-22561-1-git-send-email-dme@dme.org>\r
+References: <1414742721-22561-1-git-send-email-dme@dme.org>\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: Fri, 31 Oct 2014 08:05:34 -0000\r
+\r
+The faces used when washing messages should be notmuch specific and\r
+inherit from the underlying emacs face rather than using it\r
+directly. This allows the washed face to be modified without requiring\r
+the modification of the underlying face.\r
+---\r
+ emacs/notmuch-wash.el | 21 +++++++++++++++++++--\r
+ 1 file changed, 19 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 8fe91e1..1844400 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -27,6 +27,10 @@\r
+ \r
+ ;;\r
+ \r
++(defgroup notmuch-wash nil\r
++  "Cleaning up messages for display."\r
++  :group 'notmuch)\r
++\r
+ (defvar notmuch-wash-signature-regexp\r
+   "^\\(-- ?\\|_+\\)$"\r
+   "Pattern to match a line that separates content from signature.")\r
+@@ -95,6 +99,19 @@ current window. If this is a number, lines will be wrapped after\r
+ this many characters or at the window width (whichever one is\r
+ lower).")\r
+ \r
++(defface notmuch-wash-toggle-button\r
++  '((t (:inherit font-lock-comment-face)))\r
++  "Face used for buttons toggling the visibility of washed away\r
++message parts."\r
++  :group 'notmuch-wash\r
++  :group 'notmuch-faces)\r
++\r
++(defface notmuch-wash-cited-text\r
++  '((t (:inherit message-cited-text)))\r
++  "Face used for cited text."\r
++  :group 'notmuch-wash\r
++  :group 'notmuch-faces)\r
++\r
+ (defun notmuch-wash-toggle-invisible-action (cite-button)\r
+   ;; Toggle overlay visibility\r
+   (let ((overlay (button-get cite-button 'overlay)))\r
+@@ -117,7 +134,7 @@ lower).")\r
+ (define-button-type 'notmuch-wash-button-invisibility-toggle-type\r
+   'action 'notmuch-wash-toggle-invisible-action\r
+   'follow-link t\r
+-  'face 'font-lock-comment-face\r
++  'face 'notmuch-wash-toggle-button\r
+   :supertype 'notmuch-button-type)\r
+ \r
+ (define-button-type 'notmuch-wash-button-citation-toggle-type\r
+@@ -192,7 +209,7 @@ that PREFIX should not include a newline."\r
+     (let* ((cite-start (match-beginning 0))\r
+          (cite-end (match-end 0))\r
+          (cite-lines (count-lines cite-start cite-end)))\r
+-      (overlay-put (make-overlay cite-start cite-end) 'face 'message-cited-text)\r
++      (overlay-put (make-overlay cite-start cite-end) 'face 'notmuch-wash-cited-text)\r
+       (when (> cite-lines (+ notmuch-wash-citation-lines-prefix\r
+                            notmuch-wash-citation-lines-suffix\r
+                            1))\r
+-- \r
+1.9.3 (Apple Git-50)\r
+\r