[PATCH v1 2/2] emacs: Washing should use more `defcustom'.
David Bremner writes: > David Edmondson writes: > >> More of the washing variables should be available through the standard >> customisation interface. > > series LGTM. Pushed. d
Re: [PATCH v1 2/2] emacs: Washing should use more `defcustom'.
David Bremner da...@tethera.net writes: David Edmondson d...@dme.org writes: More of the washing variables should be available through the standard customisation interface. series LGTM. Pushed. d ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v1 2/2] emacs: Washing should use more `defcustom'.
David Edmondson writes: > More of the washing variables should be available through the standard > customisation interface. series LGTM. d
Re: [PATCH v1 2/2] emacs: Washing should use more `defcustom'.
David Edmondson d...@dme.org writes: More of the washing variables should be available through the standard customisation interface. series LGTM. d ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v1 2/2] emacs: Washing should use more `defcustom'.
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
[PATCH v1 2/2] emacs: Washing should use more `defcustom'.
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
