[PATCH 0/2] emacs: wash: word-wrap bugfix and tweak

diff --git a/d1/1d43db58f264f318eb552c95c215c8f5d6cef8 b/d1/1d43db58f264f318eb552c95c215c8f5d6cef8
new file mode 100644 (file)
index 0000000..43a4a45
--- /dev/null
+++ b/d1/1d43db58f264f318eb552c95c215c8f5d6cef8
@@ -0,0 +1,113 @@
+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 340856DE02AF\r
+ for <notmuch@notmuchmail.org>; Sat,  6 Aug 2016 08:29:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.154\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.154 tagged_above=-999 required=5 tests=[AWL=-0.276,\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, FREEMAIL_REPLY=1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\r
+ SPF_PASS=-0.001] 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 q-1iqVHK93u8 for <notmuch@notmuchmail.org>;\r
+ Sat,  6 Aug 2016 08:29:44 -0700 (PDT)\r
+Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
+ [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 8CBD16DE00DF for\r
+ <notmuch@notmuchmail.org>; Sat,  6 Aug 2016 08:29:43 -0700 (PDT)\r
+Received: by mail-wm0-f67.google.com with SMTP id q128so7930203wma.1\r
+ for <notmuch@notmuchmail.org>; Sat, 06 Aug 2016 08:29:43 -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;\r
+ bh=eUQ6MfwCWRwAIopqR8iIk9sZT2meEWJvcoRMsaZ7XtQ=;\r
+ b=FI7nH/U3hVR//4RI+x/m5NgcMa3jID6QXQkdndxvy/qygHzRvlNEIq7dWzdMJryM6g\r
+ d+BkXs5L+V6QhhbjBx54/L/7gGGp2x//ZNz6+wJo53Ck9AZyhUxsGrGbe/Qg7EUrkq0Z\r
+ ZbocEIzPaftPYLSOMCkvf/c/krhEYcbh8dz2uNAWSDTDHz6AFPTuW1279EFqlSXa6+lg\r
+ 4c9GmpyHAuRtPF0w82f50IHMTZAjZyr4yQ4r3hOQ9dip3PRvFS0EJBWN0Uw7SqCJGLY/\r
+ n0oGA/kwNPw/irkJfKyRmLYe/0/Cr4iPAkhJng/r5vHrwYxE+AqlGDcMhMXBzsQ4qHXo\r
+ a10g==\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;\r
+ bh=eUQ6MfwCWRwAIopqR8iIk9sZT2meEWJvcoRMsaZ7XtQ=;\r
+ b=donbDkZ4bFqH9s6389HVW8FBBFtxRuoB1k0ae+9yAefzIrs3Yn600EdB30bo7CTFpH\r
+ TrRXeAFh01SY83wf4oDa0EOhBdcNmXH+sqDKUTugiap3rkOBWU39XFraT9hQdGmlXhIU\r
+ fU1yRi0JhSFUpBdFNTtJnYcQG0HX78kGtxRNrjN1iIqB/b+7px8Pqb7igsXei3vyC5RM\r
+ q9uk4spQ33wzlJlMX4OawdwjFYWm/8nb/Sg+TVRAR4J0qUw6210Jw83IK+hKkU2rMxPG\r
+ rKukqaJsgLR15PzyEVTC3mnvOI2autDkn9x/Q5zcGJUPa2jto+H43vTBm7mPP+c3KmI+\r
+ GG3g==\r
+X-Gm-Message-State:\r
+ AEkoouv21ocoYH00siO4xa4UaGjkTrzIxhVjByRuvPYxUSeukxWdKK5MmMOHJ8926o51FA==\r
+X-Received: by 10.194.148.202 with SMTP id tu10mr76766285wjb.56.1470497381390;\r
+  Sat, 06 Aug 2016 08:29:41 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by smtp.gmail.com with ESMTPSA id k3sm23386923wjf.7.2016.08.06.08.29.38\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 06 Aug 2016 08:29:39 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/2] emacs: wash: word-wrap bugfix and tweak\r
+Date: Sat,  6 Aug 2016 16:29:32 +0100\r
+Message-Id: <1470497374-17194-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\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:29:52 -0000\r
+\r
+Jani pointed out on irc that there was a bug in notmuch-tree that when\r
+a message very deep in a thread is viewed in the message pane it is\r
+wordwrapped too soon.\r
+\r
+This is actually a bug in notmuch-wash: it assumes that\r
+notmuch-show-indent-messages-width is 1, so that the indentation of\r
+the message is equal to its depth in the thread.\r
+\r
+The first patch fixes the bug, and uses the correct indentation.\r
+\r
+The second patch is a version of\r
+id:1467791251-6823-1-git-send-email-markwalters1009@gmail.com on\r
+on top of the first patch above.\r
+\r
+The first patch is a clear bugfix and can be applied on its own.\r
+\r
+The second is a change; I think the new version is the natural\r
+interpretation of notmuch-word-wrap-lines-length so have removed the\r
+old behaviour. See the message\r
+id:1467791251-6823-1-git-send-email-markwalters1009@gmail.com for more\r
+details of the change.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+\r
+\r
+Mark Walters (2):\r
+  emacs: wash: word-wrap bugfix\r
+  emacs: wash: make word-wrap bound message width\r
+\r
+ emacs/notmuch-wash.el                                 | 10 ++++++----\r
+ ...w-thread-maildir-storage-with-fourfold-indentation | 19 ++++++++++++-------\r
+ ...ch-show-thread-maildir-storage-without-indentation |  8 ++++----\r
+ 3 files changed, 22 insertions(+), 15 deletions(-)\r
+\r
+-- \r
+2.1.4\r
+\r