[PATCH 2/2] emacs: wash: make word-wrap bound message width
authorMark Walters <markwalters1009@gmail.com>
Sat, 6 Aug 2016 15:29:34 +0000 (16:29 +0100)
committerW. Trevor King <wking@tremily.us>
Sat, 20 Aug 2016 23:22:20 +0000 (16:22 -0700)
1c/218d63a9e428ae5ac89294755eb7ed6ec599a5 [new file with mode: 0644]

diff --git a/1c/218d63a9e428ae5ac89294755eb7ed6ec599a5 b/1c/218d63a9e428ae5ac89294755eb7ed6ec599a5
new file mode 100644 (file)
index 0000000..f08cd45
--- /dev/null
@@ -0,0 +1,115 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 5C52D6DE0363\r
+ for <notmuch@notmuchmail.org>; Sat,  6 Aug 2016 08:30:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.346\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.346 tagged_above=-999 required=5 tests=[AWL=0.224,\r
+  DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id xqAJczYaKjaZ for <notmuch@notmuchmail.org>;\r
+ Sat,  6 Aug 2016 08:29:52 -0700 (PDT)\r
+Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com\r
+ [74.125.82.65]) by arlo.cworth.org (Postfix) with ESMTPS id 5E0C46DE00DF for\r
+ <notmuch@notmuchmail.org>; Sat,  6 Aug 2016 08:29:52 -0700 (PDT)\r
+Received: by mail-wm0-f65.google.com with SMTP id q128so7930640wma.1\r
+ for <notmuch@notmuchmail.org>; Sat, 06 Aug 2016 08:29:52 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=60xOW2q70z5dpaW/i62Gmz2pSolW0gZxfmGT0VD//M8=;\r
+ b=jshoNYwSRZydBF/N3MaVWL1szdnoUQyH1bXNwPX/StfpOGSO9sODKtB2F/sPcKUe6f\r
+ X2xmJYcG9AYrHNk9fZvxIympB9EANJIYbZJ1ybCyZzcyy/jDhAJq2tqcIljOn/pKNadt\r
+ JlqdmI9eQuuzuyuWCgRFMVM/FiyuEYI/Kd2b8hKmQHFOHVJxOm3TQdpEq+CZP5Iro5Op\r
+ IxFGu+0Oqzg1nQGtF6W2TRNmqGMhMLahWbon9QLeruhKwzNvLnJkCdQvq3SPKvF+NZ1x\r
+ dRYeeoXIxqrjGM1WKljuPeQiB1pDesTlOBHtQiruSGf+yPE9jIU/oecZ/corXg/46CQ4\r
+ AA3Q==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=60xOW2q70z5dpaW/i62Gmz2pSolW0gZxfmGT0VD//M8=;\r
+ b=V4kOLERSt/pgExDvFsod2xO+zrvpngaKSHIuU8s4QQn7MhzQOrU3OCgHBdmyyQMSKd\r
+ pjvhOIAAmjfoh+5nGeEcuLvDTMaNkU3mPVsAR0hrSbWIsVLtlljExPwL081DX36D04oY\r
+ Qy9UYwr7kP2dH0V8P+sU1nrIGMpDI88XbggbnESOpfz42CbHRp5fWFnwi/gQinxQ9u+/\r
+ qEHeL/RFPba/dZPgEsvyhZ8hgR3Ru71cVfamJbaBm2YQe9EanwLz8E8ENKea6iHup+iO\r
+ 0BWeu67JTem33EK8g4ZFxv411WXfHUVCtk/VqfZ/VO8mJ5Of1W/pY3YXQze6NechwZpX\r
+ P6Xg==\r
+X-Gm-Message-State:\r
+ AEkoouvx+MnXhTaqLOKp4c0/sepzGbGQ29Sc+twipu7Dascse/V10ExqpplBNJpdO73u8g==\r
+X-Received: by 10.194.104.106 with SMTP id gd10mr46782901wjb.55.1470497390695;\r
+  Sat, 06 Aug 2016 08:29:50 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id k186sm14152089wmd.13.2016.08.06.08.29.47\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 06 Aug 2016 08:29:47 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] emacs: wash: make word-wrap bound message width\r
+Date: Sat,  6 Aug 2016 16:29:34 +0100\r
+Message-Id: <1470497374-17194-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1470497374-17194-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1470497374-17194-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 06 Aug 2016 15:30:00 -0000\r
+\r
+Previously if notmuch-wash-wrap-lines-length was set then all messages\r
+would be wrapped at this value (or window-width if that is\r
+smaller). This was done regardless of the message's depth in a thread --\r
+for example, if the n.w.w.l.l is 80 and the messages depth is 20\r
+(so indented 20 by default) the messages text only got 60 characters\r
+of space.\r
+\r
+This commit changes that so a message always gets the full n.w.w.l.l\r
+of width regardless of its indentation (unless that goes over\r
+window-width of course).\r
+---\r
+ emacs/notmuch-wash.el | 6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
+index 07fc1a1..5f8b926 100644\r
+--- a/emacs/notmuch-wash.el\r
++++ b/emacs/notmuch-wash.el\r
+@@ -122,8 +122,8 @@ collapse the remaining lines into a button."\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
++this many characters (ignoring indentation due to thread depth)\r
++or at the window width (whichever one is lower)."\r
+   :type '(choice (const :tag "window width" nil)\r
+                (integer :tag "number of characters"))\r
+   :group 'notmuch-wash)\r
+@@ -338,7 +338,7 @@ the wrapped text are maintained."\r
+   (let* ((coolj-wrap-follows-window-size nil)\r
+        (indent (* depth notmuch-show-indent-messages-width))\r
+        (limit (if (numberp notmuch-wash-wrap-lines-length)\r
+-                  (min notmuch-wash-wrap-lines-length\r
++                  (min (+ notmuch-wash-wrap-lines-length indent)\r
+                        (window-width))\r
+                 (window-width)))\r
+        (fill-column (- limit\r
+-- \r
+2.1.4\r
+\r