--- /dev/null
+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 0DF30431E62\r
+ for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 01:05:49 -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 lxDYI1E6tLWe for <notmuch@notmuchmail.org>;\r
+ Fri, 31 Oct 2014 01:05:44 -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 CFBEA431FD4\r
+ for <notmuch@notmuchmail.org>; Fri, 31 Oct 2014 01:05:37 -0700 (PDT)\r
+Received: by heart-of-gold.hh.sledj.net (Postfix, from userid 501)\r
+ id 505661670FA5; 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 2/2] emacs: Washing should use more `defcustom'.\r
+Date: Fri, 31 Oct 2014 08:05:21 +0000\r
+Message-Id: <1414742721-22561-3-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:49 -0000\r
+\r
+More of the washing variables should be available through the standard\r
+customisation interface.\r
+---\r
+ emacs/notmuch-wash.el | 88 +++++++++++++++++++++++++++++++++------------------\r
+ 1 file changed, 57 insertions(+), 31 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 1844400..a76b4f5 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -31,73 +31,99 @@\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
+-\r
+-(defvar notmuch-wash-citation-regexp\r
+- "\\(^[[:space:]]*>.*\n\\)+"\r
+- "Pattern to match citation lines.")\r
+-\r
+-(defvar notmuch-wash-original-regexp "^\\(--+\s?[oO]riginal [mM]essage\s?--+\\)$"\r
+- "Pattern to match a line that separates original message from reply in top-posted message.")\r
+-\r
+-(defvar notmuch-wash-button-signature-hidden-format\r
++(defcustom notmuch-wash-signature-regexp "^\\(-- ?\\|_+\\)$"\r
++ "Pattern to match a line that separates content from signature."\r
++ :type 'regexp\r
++ :group 'notmuch-wash)\r
++\r
++(defcustom notmuch-wash-citation-regexp "\\(^[[:space:]]*>.*\n\\)+"\r
++ "Pattern to match citation lines."\r
++ :type 'regexp\r
++ :group 'notmuch-wash)\r
++\r
++(defcustom notmuch-wash-original-regexp "^\\(--+\s?[oO]riginal [mM]essage\s?--+\\)$"\r
++ "Pattern to match a line that separates original message from\r
++reply in top-posted message."\r
++ :type 'regexp\r
++ :group 'notmuch-wash)\r
++\r
++(defcustom notmuch-wash-button-signature-hidden-format\r
+ "[ %d-line signature. Click/Enter to show. ]"\r
+ "String used to construct button text for hidden signatures.\r
+-Can use up to one integer format parameter, i.e. %d")\r
++Can use up to one integer format parameter, i.e. %d."\r
++ :type 'string\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-button-signature-visible-format\r
++(defcustom notmuch-wash-button-signature-visible-format\r
+ "[ %d-line signature. Click/Enter to hide. ]"\r
+ "String used to construct button text for visible signatures.\r
+-Can use up to one integer format parameter, i.e. %d")\r
++Can use up to one integer format parameter, i.e. %d."\r
++ :type 'string\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-button-citation-hidden-format\r
++(defcustom notmuch-wash-button-citation-hidden-format\r
+ "[ %d more citation lines. Click/Enter to show. ]"\r
+ "String used to construct button text for hidden citations.\r
+-Can use up to one integer format parameter, i.e. %d")\r
++Can use up to one integer format parameter, i.e. %d."\r
++ :type 'string\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-button-citation-visible-format\r
++(defcustom notmuch-wash-button-citation-visible-format\r
+ "[ %d more citation lines. Click/Enter to hide. ]"\r
+ "String used to construct button text for visible citations.\r
+-Can use up to one integer format parameter, i.e. %d")\r
++Can use up to one integer format parameter, i.e. %d."\r
++ :type 'string\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-button-original-hidden-format\r
++(defcustom notmuch-wash-button-original-hidden-format\r
+ "[ %d-line hidden original message. Click/Enter to show. ]"\r
+ "String used to construct button text for hidden citations.\r
+-Can use up to one integer format parameter, i.e. %d")\r
++Can use up to one integer format parameter, i.e. %d."\r
++ :type 'string\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-button-original-visible-format\r
++(defcustom notmuch-wash-button-original-visible-format\r
+ "[ %d-line original message. Click/Enter to hide. ]"\r
+ "String used to construct button text for visible citations.\r
+-Can use up to one integer format parameter, i.e. %d")\r
++Can use up to one integer format parameter, i.e. %d."\r
++ :type 'string\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-signature-lines-max 12\r
+- "Maximum length of signature that will be hidden by default.")\r
++(defcustom notmuch-wash-signature-lines-max 12\r
++ "Maximum length of signature that will be hidden by default."\r
++ :type 'integer\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-citation-lines-prefix 3\r
++(defcustom notmuch-wash-citation-lines-prefix 3\r
+ "Always show at least this many lines from the start of a citation.\r
+ \r
+ If there is one more line than the sum of\r
+ `notmuch-wash-citation-lines-prefix' and\r
+ `notmuch-wash-citation-lines-suffix', show that, otherwise\r
+-collapse the remaining lines into a button.")\r
++collapse the remaining lines into a button."\r
++ :type 'integer\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-citation-lines-suffix 3\r
++(defcustom notmuch-wash-citation-lines-suffix 3\r
+ "Always show at least this many lines from the end of a citation.\r
+ \r
+ If there is one more line than the sum of\r
+ `notmuch-wash-citation-lines-prefix' and\r
+ `notmuch-wash-citation-lines-suffix', show that, otherwise\r
+-collapse the remaining lines into a button.")\r
++collapse the remaining lines into a button."\r
++ :type 'integer\r
++ :group 'notmuch-wash)\r
+ \r
+-(defvar notmuch-wash-wrap-lines-length nil\r
++(defcustom notmuch-wash-wrap-lines-length nil\r
+ "Wrap line after at most this many characters.\r
+ \r
+ If this is nil, lines in messages will be wrapped to fit in the\r
+ 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
++lower)."\r
++ :type '(choice (const :tag "window width" nil)\r
++ (integer :tag "number of characters"))\r
++ :group 'notmuch-wash)\r
+ \r
+ (defface notmuch-wash-toggle-button\r
+ '((t (:inherit font-lock-comment-face)))\r
+-- \r
+1.9.3 (Apple Git-50)\r
+\r
projects / notmuch-archives.git / commitdiff