[PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Daniel Schoepe]

This introduces a variable to control after how many characters a line
is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
window width if it is lower).
---
 emacs/notmuch-wash.el |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 56981d0..7d003a2 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -87,6 +87,14 @@ If there is one more line than the sum of
 `notmuch-wash-citation-lines-suffix', show that, otherwise
 collapse the remaining lines into a button.")
 
+(defvar 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).")
+
 (defun notmuch-wash-toggle-invisible-action (cite-button)
   (let ((invis-spec (button-get cite-button 'invisibility-spec)))
     (if (invisible-p invis-spec)
@@ -276,16 +284,24 @@ Perform several transformations on the message body:
 ;;
 
 (defun notmuch-wash-wrap-long-lines (msg depth)
-  "Wrap any long lines in the message to the width of the window.
-
-When doing so, maintaining citation leaders in the wrapped text."
-
-  (let ((coolj-wrap-follows-window-size nil)
-	(fill-column (- (window-width)
-			depth
-			;; 2 to avoid poor interaction with
-			;; `word-wrap'.
-			2)))
+  "Wrap long lines in the message.
+
+If `notmuch-wash-wrap-lines-length' is a number, this will wrap
+the message lines to the minimum of the width of the window or
+its value. Otherwise, this function will wrap long lines in the
+message at the window width. When doing so, citation leaders in
+the wrapped text are maintained."
+
+  (let* ((coolj-wrap-follows-window-size nil)
+	 (limit (if (numberp notmuch-wash-wrap-lines-length)
+		    (min notmuch-wash-wrap-lines-length
+			 (window-width))
+		  (window-width)))
+	 (fill-column (- limit
+			 depth
+			 ;; 2 to avoid poor interaction with
+			 ;; `word-wrap'.
+			 2)))
     (coolj-wrap-region (point-min) (point-max))))
 
 ;;
-- 
1.7.9

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[David Edmondson]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

* daniel@schoepe.org [2012-02-17 Fri 18:34]
> This introduces a variable to control after how many characters a line
> is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
> window width if it is lower).

What do you use this for?

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Daniel Schoepe]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

On Fri, 17 Feb 2012 18:46:21 +0000, David Edmondson <dme@dme.org> wrote:
> * daniel@schoepe.org [2012-02-17 Fri 18:34]
> > This introduces a variable to control after how many characters a line
> > is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
> > window width if it is lower).
> 
> What do you use this for?

I sometimes get mails with very long lines, but find them more readable
when they are wrapped after 80 characters (of course, this may screw up
source code listings with long lines). 

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Mark Walters]

On Fri, 17 Feb 2012, Daniel Schoepe <daniel@schoepe.org> wrote:
> This introduces a variable to control after how many characters a line
> is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
> window width if it is lower).

Hi 

This looks ok but I wonder if slightly different behaviour might be
preferable (and looks simple to implement): rather then always wrapping
at min of notmuch-wash-wrap-lines-length and window-width wrap at min of
(notmuch-wash-wrap-lines-length + depth) and window-width. Then if you
have a wide buffer you can still get 80 chars (say) of useful text even
for well nested messages whilst not having very long lines anywhere.

Best wishes

Mark

> ---
>  emacs/notmuch-wash.el |   36 ++++++++++++++++++++++++++----------
>  1 files changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
> index 56981d0..7d003a2 100644
> --- a/emacs/notmuch-wash.el
> +++ b/emacs/notmuch-wash.el
> @@ -87,6 +87,14 @@ If there is one more line than the sum of
>  `notmuch-wash-citation-lines-suffix', show that, otherwise
>  collapse the remaining lines into a button.")
>  
> +(defvar 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).")
> +
>  (defun notmuch-wash-toggle-invisible-action (cite-button)
>    (let ((invis-spec (button-get cite-button 'invisibility-spec)))
>      (if (invisible-p invis-spec)
> @@ -276,16 +284,24 @@ Perform several transformations on the message body:
>  ;;
>  
>  (defun notmuch-wash-wrap-long-lines (msg depth)
> -  "Wrap any long lines in the message to the width of the window.
> -
> -When doing so, maintaining citation leaders in the wrapped text."
> -
> -  (let ((coolj-wrap-follows-window-size nil)
> -	(fill-column (- (window-width)
> -			depth
> -			;; 2 to avoid poor interaction with
> -			;; `word-wrap'.
> -			2)))
> +  "Wrap long lines in the message.
> +
> +If `notmuch-wash-wrap-lines-length' is a number, this will wrap
> +the message lines to the minimum of the width of the window or
> +its value. Otherwise, this function will wrap long lines in the
> +message at the window width. When doing so, citation leaders in
> +the wrapped text are maintained."
> +
> +  (let* ((coolj-wrap-follows-window-size nil)
> +	 (limit (if (numberp notmuch-wash-wrap-lines-length)
> +		    (min notmuch-wash-wrap-lines-length
> +			 (window-width))
> +		  (window-width)))
> +	 (fill-column (- limit
> +			 depth
> +			 ;; 2 to avoid poor interaction with
> +			 ;; `word-wrap'.
> +			 2)))
>      (coolj-wrap-region (point-min) (point-max))))
>  
>  ;;
> -- 
> 1.7.9
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Adam Wolfe Gordon]

Hi Daniel,

On Fri, Feb 17, 2012 at 11:34, Daniel Schoepe <daniel@schoepe.org> wrote:
> This introduces a variable to control after how many characters a line
> is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
> window width if it is lower).

I really like this idea, and I'm using this patch now. I've been
missing this mechanism in notmuch.

> +(defvar 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).")

This should probably be a defcustom, in the notmuch-show section.
Otherwise, LGTM.

-- Adam

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Daniel Schoepe]

[-- Attachment #1: Type: text/plain, Size: 685 bytes --]

Hi Adam,

On Wed, 18.04.2012 17:30, Adam Wolfe Gordon wrote:
>> +(defvar 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).")
>
> This should probably be a defcustom, in the notmuch-show section.

the reason for not making this a defcustom was that all of the other
functions in notmuch-wash.el use defvar for customization too, so
perhaps they should all be defcustom'd in a separate patch?

Cheers,
Daniel

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Adam Wolfe Gordon]

On Wed, Apr 18, 2012 at 09:46, Daniel Schoepe <daniel@schoepe.org> wrote:
> the reason for not making this a defcustom was that all of the other
> functions in notmuch-wash.el use defvar for customization too, so
> perhaps they should all be defcustom'd in a separate patch?

Ah, yes, I see now. Most of those variables (the regexps and
button-formats) probably don't need to be customizable - it seems
unlikely that anyone will want to change them except for
internationalization, which should probably be done differently
anyway. I think it makes sense for the others to be customs, so doing
that in a separate patch is a good idea.

Thanks again for this patch - it makes my mail read reading much more pleasant.

-- Adam

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Albin Stjerna]

Daniel Schoepe wrote:

> This introduces a variable to control after how many characters a line
> is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
> window width if it is lower).

Hi!

Did this patch make it into mainline notmuch? Because I can't find the variable notmuch-wash-wrap-long-lines using apropos-variable.

If it didn't make it: what is now the preferred method of wrapping long lines when reading emails using notmuch/Emacs?

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[Daniel Schoepe]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

On Thu, 28.06.2012 09:41, Albin Stjerna wrote:
> If it didn't make it: what is now the preferred method of wrapping
> long lines when reading emails using notmuch/Emacs?

As far as I can tell, it didn't make it into mainline (yet?). However, it
changes a file that is rarely modified by other patches, so it should
still apply cleanly. At least it still did a few weeks ago.

Cheers,
Daniel

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] emacs: Add configurable wrapping width for notmuch-wash-wrap-long-lines

[David Bremner]

Daniel Schoepe <daniel@schoepe.org> writes:

> This introduces a variable to control after how many characters a line
> is wrapped by notmuch-wash-wrap-long-lines (still wrapping at the
> window width if it is lower).

pushed,

d