[PATCH v1 0/2] emacs: Improve notmuch-wash customisation.

unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed

* [PATCH v1 0/2] emacs: Improve notmuch-wash customisation.
@ 2014-10-31  8:05 David Edmondson
  2014-10-31  8:05 ` [PATCH v1 1/2] emacs: More flexible washed faces David Edmondson
  2014-10-31  8:05 ` [PATCH v1 2/2] emacs: Washing should use more `defcustom' David Edmondson
  0 siblings, 2 replies; 5+ messages in thread
From: David Edmondson @ 2014-10-31  8:05 UTC (permalink / raw)
  To: notmuch


emacs: Improve notmuch-wash customisation.

Minor updates to the customisation of notmuch-wash features.


David Edmondson (2):
  emacs: More flexible washed faces.
  emacs: Washing should use more `defcustom'.

 emacs/notmuch-wash.el | 109 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 76 insertions(+), 33 deletions(-)

-- 
1.9.3 (Apple Git-50)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v1 1/2] emacs: More flexible washed faces.
  2014-10-31  8:05 [PATCH v1 0/2] emacs: Improve notmuch-wash customisation David Edmondson
@ 2014-10-31  8:05 ` David Edmondson
  2014-10-31  8:05 ` [PATCH v1 2/2] emacs: Washing should use more `defcustom' David Edmondson
  1 sibling, 0 replies; 5+ messages in thread
From: David Edmondson @ 2014-10-31  8:05 UTC (permalink / raw)
  To: notmuch

The faces used when washing messages should be notmuch specific and
inherit from the underlying emacs face rather than using it
directly. This allows the washed face to be modified without requiring
the modification of the underlying face.
---
 emacs/notmuch-wash.el | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 8fe91e1..1844400 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -27,6 +27,10 @@
 
 ;;
 
+(defgroup notmuch-wash nil
+  "Cleaning up messages for display."
+  :group 'notmuch)
+
 (defvar notmuch-wash-signature-regexp
   "^\\(-- ?\\|_+\\)$"
   "Pattern to match a line that separates content from signature.")
@@ -95,6 +99,19 @@ current window. If this is a number, lines will be wrapped after
 this many characters or at the window width (whichever one is
 lower).")
 
+(defface notmuch-wash-toggle-button
+  '((t (:inherit font-lock-comment-face)))
+  "Face used for buttons toggling the visibility of washed away
+message parts."
+  :group 'notmuch-wash
+  :group 'notmuch-faces)
+
+(defface notmuch-wash-cited-text
+  '((t (:inherit message-cited-text)))
+  "Face used for cited text."
+  :group 'notmuch-wash
+  :group 'notmuch-faces)
+
 (defun notmuch-wash-toggle-invisible-action (cite-button)
   ;; Toggle overlay visibility
   (let ((overlay (button-get cite-button 'overlay)))
@@ -117,7 +134,7 @@ lower).")
 (define-button-type 'notmuch-wash-button-invisibility-toggle-type
   'action 'notmuch-wash-toggle-invisible-action
   'follow-link t
-  'face 'font-lock-comment-face
+  'face 'notmuch-wash-toggle-button
   :supertype 'notmuch-button-type)
 
 (define-button-type 'notmuch-wash-button-citation-toggle-type
@@ -192,7 +209,7 @@ that PREFIX should not include a newline."
     (let* ((cite-start (match-beginning 0))
 	   (cite-end (match-end 0))
 	   (cite-lines (count-lines cite-start cite-end)))
-      (overlay-put (make-overlay cite-start cite-end) 'face 'message-cited-text)
+      (overlay-put (make-overlay cite-start cite-end) 'face 'notmuch-wash-cited-text)
       (when (> cite-lines (+ notmuch-wash-citation-lines-prefix
 			     notmuch-wash-citation-lines-suffix
 			     1))
-- 
1.9.3 (Apple Git-50)

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v1 2/2] emacs: Washing should use more `defcustom'.
  2014-10-31  8:05 [PATCH v1 0/2] emacs: Improve notmuch-wash customisation David Edmondson
  2014-10-31  8:05 ` [PATCH v1 1/2] emacs: More flexible washed faces David Edmondson
@ 2014-10-31  8:05 ` David Edmondson
  2015-01-10  9:09   ` David Bremner
  1 sibling, 1 reply; 5+ messages in thread
From: David Edmondson @ 2014-10-31  8:05 UTC (permalink / raw)
  To: notmuch

More of the washing variables should be available through the standard
customisation interface.
---
 emacs/notmuch-wash.el | 88 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 31 deletions(-)

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 1844400..a76b4f5 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -31,73 +31,99 @@
   "Cleaning up messages for display."
   :group 'notmuch)
 
-(defvar notmuch-wash-signature-regexp
-  "^\\(-- ?\\|_+\\)$"
-  "Pattern to match a line that separates content from signature.")
-
-(defvar notmuch-wash-citation-regexp
-  "\\(^[[:space:]]*>.*\n\\)+"
-  "Pattern to match citation lines.")
-
-(defvar notmuch-wash-original-regexp "^\\(--+\s?[oO]riginal [mM]essage\s?--+\\)$"
-  "Pattern to match a line that separates original message from reply in top-posted message.")
-
-(defvar notmuch-wash-button-signature-hidden-format
+(defcustom notmuch-wash-signature-regexp "^\\(-- ?\\|_+\\)$"
+  "Pattern to match a line that separates content from signature."
+  :type 'regexp
+  :group 'notmuch-wash)
+
+(defcustom notmuch-wash-citation-regexp "\\(^[[:space:]]*>.*\n\\)+"
+  "Pattern to match citation lines."
+  :type 'regexp
+  :group 'notmuch-wash)
+
+(defcustom notmuch-wash-original-regexp "^\\(--+\s?[oO]riginal [mM]essage\s?--+\\)$"
+  "Pattern to match a line that separates original message from
+reply in top-posted message."
+  :type 'regexp
+  :group 'notmuch-wash)
+
+(defcustom notmuch-wash-button-signature-hidden-format
   "[ %d-line signature. Click/Enter to show. ]"
   "String used to construct button text for hidden signatures.
-Can use up to one integer format parameter, i.e. %d")
+Can use up to one integer format parameter, i.e. %d."
+  :type 'string
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-button-signature-visible-format
+(defcustom notmuch-wash-button-signature-visible-format
   "[ %d-line signature. Click/Enter to hide. ]"
   "String used to construct button text for visible signatures.
-Can use up to one integer format parameter, i.e. %d")
+Can use up to one integer format parameter, i.e. %d."
+  :type 'string
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-button-citation-hidden-format
+(defcustom notmuch-wash-button-citation-hidden-format
   "[ %d more citation lines. Click/Enter to show. ]"
   "String used to construct button text for hidden citations.
-Can use up to one integer format parameter, i.e. %d")
+Can use up to one integer format parameter, i.e. %d."
+  :type 'string
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-button-citation-visible-format
+(defcustom notmuch-wash-button-citation-visible-format
   "[ %d more citation lines. Click/Enter to hide. ]"
   "String used to construct button text for visible citations.
-Can use up to one integer format parameter, i.e. %d")
+Can use up to one integer format parameter, i.e. %d."
+  :type 'string
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-button-original-hidden-format
+(defcustom notmuch-wash-button-original-hidden-format
   "[ %d-line hidden original message. Click/Enter to show. ]"
   "String used to construct button text for hidden citations.
-Can use up to one integer format parameter, i.e. %d")
+Can use up to one integer format parameter, i.e. %d."
+  :type 'string
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-button-original-visible-format
+(defcustom notmuch-wash-button-original-visible-format
   "[ %d-line original message. Click/Enter to hide. ]"
   "String used to construct button text for visible citations.
-Can use up to one integer format parameter, i.e. %d")
+Can use up to one integer format parameter, i.e. %d."
+  :type 'string
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-signature-lines-max 12
-  "Maximum length of signature that will be hidden by default.")
+(defcustom notmuch-wash-signature-lines-max 12
+  "Maximum length of signature that will be hidden by default."
+  :type 'integer
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-citation-lines-prefix 3
+(defcustom notmuch-wash-citation-lines-prefix 3
   "Always show at least this many lines from the start of a citation.
 
 If there is one more line than the sum of
 `notmuch-wash-citation-lines-prefix' and
 `notmuch-wash-citation-lines-suffix', show that, otherwise
-collapse the remaining lines into a button.")
+collapse the remaining lines into a button."
+  :type 'integer
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-citation-lines-suffix 3
+(defcustom notmuch-wash-citation-lines-suffix 3
   "Always show at least this many lines from the end of a citation.
 
 If there is one more line than the sum of
 `notmuch-wash-citation-lines-prefix' and
 `notmuch-wash-citation-lines-suffix', show that, otherwise
-collapse the remaining lines into a button.")
+collapse the remaining lines into a button."
+  :type 'integer
+  :group 'notmuch-wash)
 
-(defvar notmuch-wash-wrap-lines-length nil
+(defcustom notmuch-wash-wrap-lines-length nil
   "Wrap line after at most this many characters.
 
 If this is nil, lines in messages will be wrapped to fit in the
 current window. If this is a number, lines will be wrapped after
 this many characters or at the window width (whichever one is
-lower).")
+lower)."
+  :type '(choice (const :tag "window width" nil)
+		 (integer :tag "number of characters"))
+  :group 'notmuch-wash)
 
 (defface notmuch-wash-toggle-button
   '((t (:inherit font-lock-comment-face)))
-- 
1.9.3 (Apple Git-50)

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 2/2] emacs: Washing should use more `defcustom'.
  2014-10-31  8:05 ` [PATCH v1 2/2] emacs: Washing should use more `defcustom' David Edmondson
@ 2015-01-10  9:09   ` David Bremner
  2015-01-11 13:39     ` David Bremner
  0 siblings, 1 reply; 5+ messages in thread
From: David Bremner @ 2015-01-10  9:09 UTC (permalink / raw)
  To: David Edmondson, notmuch

David Edmondson <dme@dme.org> writes:

> More of the washing variables should be available through the standard
> customisation interface.

series LGTM.

d

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 2/2] emacs: Washing should use more `defcustom'.
  2015-01-10  9:09   ` David Bremner
@ 2015-01-11 13:39     ` David Bremner
  0 siblings, 0 replies; 5+ messages in thread
From: David Bremner @ 2015-01-11 13:39 UTC (permalink / raw)
  To: David Edmondson, notmuch

David Bremner <david@tethera.net> writes:

> David Edmondson <dme@dme.org> writes:
>
>> More of the washing variables should be available through the standard
>> customisation interface.
>
> series LGTM.

Pushed.

d

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-01-11 13:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-31  8:05 [PATCH v1 0/2] emacs: Improve notmuch-wash customisation David Edmondson
2014-10-31  8:05 ` [PATCH v1 1/2] emacs: More flexible washed faces David Edmondson
2014-10-31  8:05 ` [PATCH v1 2/2] emacs: Washing should use more `defcustom' David Edmondson
2015-01-10  9:09   ` David Bremner
2015-01-11 13:39     ` David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).