f2/7db604ecaac449cfef415b6d6d62cdcdaf979e

   1 Return-Path: <markwalters1009@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5  by arlo.cworth.org (Postfix) with ESMTP id 4B54E6DE035C\r
   6  for <notmuch@notmuchmail.org>; Sat,  6 Aug 2016 08:29:56 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at cworth.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.346\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.346 tagged_above=-999 required=5 tests=[AWL=0.224,\r
  12   DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13  FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,\r
  14  RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]\r
  15  autolearn=disabled\r
  16 Received: from arlo.cworth.org ([127.0.0.1])\r
  17  by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
  18  with ESMTP id LSVBhr4vywh2 for <notmuch@notmuchmail.org>;\r
  19  Sat,  6 Aug 2016 08:29:47 -0700 (PDT)\r
  20 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com\r
  21  [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 06E776DE012F for\r
  22  <notmuch@notmuchmail.org>; Sat,  6 Aug 2016 08:29:47 -0700 (PDT)\r
  23 Received: by mail-wm0-f67.google.com with SMTP id i5so7922038wmg.2\r
  24  for <notmuch@notmuchmail.org>; Sat, 06 Aug 2016 08:29:46 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  26  h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  27  bh=01S0TYGOFVIUelc+M8VFeb1DAi434dHdz24wa7Cmxz4=;\r
  28  b=PxfccBwXTJmzc3WVZkIcad+7nKmyDCkWSpWGkysCLpXFGnQQA1CcCiSX7lZtWygQV6\r
  29  hBHpUvY0lj+zazYO6+esX2kEOBFma6hZo7Qvh5W8xBMB7xLrHFlCW+8Xv47zh0Li57fy\r
  30  i1mcMM+P2EZ52DtBuTXydaROxRgQPTG9M8V8MVV6mHzARj979oZ0VcQrpPU2ZSXilhJI\r
  31  ym5U+AuJ1QUhjPjLe/efQmsGEsvt/ssPSgXkQQWcND6KRMgNAWrJOsfbA1DVHkJaJVz3\r
  32  UIxOegMnFNq9+xdhTXa2LO2PeNmN5J1GwfhWoxVgH6jMrB6r/Xx7hU8ZbeBy9OFCBQ1S\r
  33  Kx0w==\r
  34 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  35  d=1e100.net; s=20130820;\r
  36  h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  37  :references;\r
  38  bh=01S0TYGOFVIUelc+M8VFeb1DAi434dHdz24wa7Cmxz4=;\r
  39  b=lOeH+nWM5/s03pFTD4IS2xnmhbDJI4hLYp7eKWKLIqqzPqpaqX4FimKjR1HfJ/d+/q\r
  40  X8oXmWUli/6nL6ThQ95OWtuOReEnmyFDNTmkRNB/VM+xoaUiFqwhEnypX14xlcWFmwEa\r
  41  3HxTm4YsaJvbFlx1SIvNDtVX1dQHDnYqCJ3aT7D/FE9G8JmI9PPAsJ5B1KoFtoDiUj4Y\r
  42  DgiPCFWMRGtEuJxolbLvjSQglb6gqTt2OFmBxocevTl9j536KkKt/YJ/LIo0b4wDUPT0\r
  43  Zsmi+OikjDL6kJk0xmzOx5luHTnkTjtFUUZokpHtR9iTnRpthQhTdZR8Lz5qxELC7QEI\r
  44  shVQ==\r
  45 X-Gm-Message-State:\r
  46  AEkoouvlAupZSUwyRCt8xYCkMbzFaHm4KwM+s+/88FWO281XEtr5FTlHm6I18bm3mYwZgA==\r
  47 X-Received: by 10.28.165.3 with SMTP id o3mr8697741wme.3.1470497385578;\r
  48  Sat, 06 Aug 2016 08:29:45 -0700 (PDT)\r
  49 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
  50  by smtp.gmail.com with ESMTPSA id i66sm14201637wmg.9.2016.08.06.08.29.44\r
  51  (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  52  Sat, 06 Aug 2016 08:29:44 -0700 (PDT)\r
  53 From: Mark Walters <markwalters1009@gmail.com>\r
  54 To: notmuch@notmuchmail.org\r
  55 Subject: [PATCH 1/2] emacs: wash: word-wrap bugfix\r
  56 Date: Sat,  6 Aug 2016 16:29:33 +0100\r
  57 Message-Id: <1470497374-17194-2-git-send-email-markwalters1009@gmail.com>\r
  58 X-Mailer: git-send-email 2.1.4\r
  59 In-Reply-To: <1470497374-17194-1-git-send-email-markwalters1009@gmail.com>\r
  60 References: <1470497374-17194-1-git-send-email-markwalters1009@gmail.com>\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.20\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65  <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
  67  <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72  <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Sat, 06 Aug 2016 15:29:56 -0000\r
  74 \r
  75 Previously notmuch-wash made the width of the text (approximately) the\r
  76 window-width minus the depth in thread. This is correct for the\r
  77 default indentation of 1 per message depth, but is incorrect for any\r
  78 other setting of notmuch-show-indent-messages-width.\r
  79 \r
  80 As notmuch-show-indent-messages-width is customisable, and notmuch-tree\r
  81 sets it to zero to avoid indenting messages in the message pane, this\r
  82 bug can show up in real use.\r
  83 \r
  84 Two of the tests had to be updated: when\r
  85 notmuch-show-indent-messages-width is 0, then the new (correct) word\r
  86 wrapping happens later, when notmuch-show-indent-messages-width is 4,\r
  87 then the new word wrapping happens sooner.\r
  88 ---\r
  89  emacs/notmuch-wash.el                                 |  4 +++-\r
  90  ...w-thread-maildir-storage-with-fourfold-indentation | 19 ++++++++++++-------\r
  91  ...ch-show-thread-maildir-storage-without-indentation |  8 ++++----\r
  92  3 files changed, 19 insertions(+), 12 deletions(-)\r
  93 \r
  94 diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el\r
  95 index 57e6dfa..07fc1a1 100644\r
  96 --- a/emacs/notmuch-wash.el\r
  97 +++ b/emacs/notmuch-wash.el\r
  98 @@ -26,6 +26,7 @@\r
  99  (require 'coolj)\r
 100  \r
 101  (declare-function notmuch-show-insert-bodypart "notmuch-show" (msg part depth &optional hide))\r
 102 +(defvar notmuch-show-indent-messages-width)\r
 103  \r
 104  ;;\r
 105  \r
 106 @@ -335,12 +336,13 @@ message at the window width. When doing so, citation leaders in\r
 107  the wrapped text are maintained."\r
 108  \r
 109    (let* ((coolj-wrap-follows-window-size nil)\r
 110 +        (indent (* depth notmuch-show-indent-messages-width))\r
 111          (limit (if (numberp notmuch-wash-wrap-lines-length)\r
 112                     (min notmuch-wash-wrap-lines-length\r
 113                          (window-width))\r
 114                   (window-width)))\r
 115          (fill-column (- limit\r
 116 -                        depth\r
 117 +                        indent\r
 118                          ;; 2 to avoid poor interaction with\r
 119                          ;; `word-wrap'.\r
 120                          2)))\r
 121 diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation\r
 122 index 4721b8b..3bbb114 100644\r
 123 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation\r
 124 +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation\r
 125 @@ -109,12 +109,14 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
 126             To: notmuch@notmuchmail.org\r
 127             Date: Wed, 18 Nov 2009 02:50:48 +0600\r
 128  \r
 129 -           Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu\r
 130 -           did gyre and gimble:\r
 131 +           Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at\r
 132 +           seas.harvard.edu did gyre and gimble:\r
 133  \r
 134              LK> Is the list archived anywhere?  The obvious archives\r
 135 -            LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I\r
 136 -            LK> think I subscribed too late to get the patch (I only just saw the\r
 137 +            LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available,\r
 138 +           and I\r
 139 +            LK> think I subscribed too late to get the patch (I only just saw\r
 140 +           the\r
 141              LK> discussion about it).\r
 142  \r
 143              LK> It doesn't look like the patch is in git yet.\r
 144 @@ -141,7 +143,8 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
 145             seas.harvard.edu> wrote:\r
 146             > > See the patch just posted here.\r
 147  \r
 148 -           I've also pushed a slightly more complicated (and complete) fix to my\r
 149 +           I've also pushed a slightly more complicated (and complete) fix to\r
 150 +           my\r
 151             private notmuch repository\r
 152  \r
 153             git://keithp.com/git/notmuch\r
 154 @@ -164,10 +167,12 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
 155                 [ multipart/signed ]\r
 156                 [ Unknown signature status ]\r
 157                 [ text/plain ]\r
 158 -               > I've also pushed a slightly more complicated (and complete) fix to my\r
 159 +               > I've also pushed a slightly more complicated (and complete)\r
 160 +               > fix to my\r
 161                 > private notmuch repository\r
 162  \r
 163 -               The version of lib/messages.cc in your repo doesn't build because it's\r
 164 +               The version of lib/messages.cc in your repo doesn't build\r
 165 +               because it's\r
 166                 missing "#include <stdint.h>" (for the uint32_t on line 466).\r
 167  \r
 168                 [ 4-line signature. Click/Enter to show. ]\r
 169 diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation\r
 170 index 62a4635..620caa0 100644\r
 171 --- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation\r
 172 +++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation\r
 173 @@ -49,8 +49,8 @@ Date: Wed, 18 Nov 2009 01:02:38 +0600\r
 174  [ Unknown signature status ]\r
 175  [ text/plain ]\r
 176  \r
 177 -Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did\r
 178 -gyre and gimble:\r
 179 +Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did gyre\r
 180 +and gimble:\r
 181  \r
 182   LK> Resulted in 4604 lines of errors along the lines of:\r
 183  \r
 184 @@ -109,8 +109,8 @@ Subject: [notmuch] Working with Maildir storage?\r
 185  To: notmuch@notmuchmail.org\r
 186  Date: Wed, 18 Nov 2009 02:50:48 +0600\r
 187  \r
 188 -Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu\r
 189 -did gyre and gimble:\r
 190 +Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu did\r
 191 +gyre and gimble:\r
 192  \r
 193   LK> Is the list archived anywhere?  The obvious archives\r
 194   LK> (http://notmuchmail.org/pipermail/notmuch/) aren't available, and I\r
 195 -- \r
 196 2.1.4\r
 197 \r