aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Walters <markwalters1009@gmail.com>2016-08-06 16:29:34 +0100
committerDavid Bremner <david@tethera.net>2016-09-12 08:06:00 -0300
commit7b7960ea228ca0449e2711377dfdebc23a791147 (patch)
treea6fa2f7cf2b127a37ec5c2b931f488de8f46b0ed
parentf94921520778ae4005500f5d1b943e2d4ddd3b2a (diff)
emacs: wash: make word-wrap bound message width
Previously if notmuch-wash-wrap-lines-length was set then all messages would be wrapped at this value (or window-width if that is smaller). This was done regardless of the message's depth in a thread -- for example, if the n.w.w.l.l is 80 and the messages depth is 20 (so indented 20 by default) the messages text only got 60 characters of space. This commit changes that so a message always gets the full n.w.w.l.l of width regardless of its indentation (unless that goes over window-width of course).
-rw-r--r--emacs/notmuch-wash.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el
index 07fc1a1f..5f8b9267 100644
--- a/emacs/notmuch-wash.el
+++ b/emacs/notmuch-wash.el
@@ -122,8 +122,8 @@ collapse the remaining lines into a button."
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 many characters (ignoring indentation due to thread depth)
+or at the window width (whichever one is lower)."
:type '(choice (const :tag "window width" nil)
(integer :tag "number of characters"))
:group 'notmuch-wash)
@@ -338,7 +338,7 @@ the wrapped text are maintained."
(let* ((coolj-wrap-follows-window-size nil)
(indent (* depth notmuch-show-indent-messages-width))
(limit (if (numberp notmuch-wash-wrap-lines-length)
- (min notmuch-wash-wrap-lines-length
+ (min (+ notmuch-wash-wrap-lines-length indent)
(window-width))
(window-width)))
(fill-column (- limit