[PATCH] emacs: show: lazy part handling bugfix

diff --git a/a3/205d29a62513416c44e3a1857af36b9d8ba893 b/a3/205d29a62513416c44e3a1857af36b9d8ba893
new file mode 100644 (file)
index 0000000..28115e2
--- /dev/null
+++ b/a3/205d29a62513416c44e3a1857af36b9d8ba893
@@ -0,0 +1,98 @@
+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 olra.theworths.org (Postfix) with ESMTP id 9E400431FB6\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 16:28:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id ww6Sp4URIbH2 for <notmuch@notmuchmail.org>;\r
+       Fri,  6 Sep 2013 16:28:54 -0700 (PDT)\r
+Received: from mail-we0-f176.google.com (mail-we0-f176.google.com\r
+       [74.125.82.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CED0D431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 16:28:53 -0700 (PDT)\r
+Received: by mail-we0-f176.google.com with SMTP id u56so3480235wes.7\r
+       for <notmuch@notmuchmail.org>; Fri, 06 Sep 2013 16:28:51 -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=nZT1RptGARqF3uju0ullcm5CCZIulrmpGhlHfKhTAfM=;\r
+       b=jYe3a5q5yIKaMO/X2dKtPwYABHeNar6YOqIANBx75rytKjD4ZGY9vKBMzWWM/VMWVk\r
+       F5dc3oN5iCRKpvxd4wojMhk40KNOw5TfMT4PaVi/paQJ/QQWmgG8iflDW7yXMqnrFdrR\r
+       +mV304Tio3yfXnMwI4YD695ojbN+zZQBM3Ot/R54pdERSAZlwSFrYL8S0cacQK9BgVei\r
+       Y1szXRYhqPD9zecghIIt31rF2B/50+s82R435+ABBXiGhVL+mcs68zvsaT6PRA9scDh/\r
+       uH+5D3iESg6tsDUd8Y4fNo7jd7qPvNmg+yZSWMZsXoX9UHft87ASJ6iq2yIlUYj7lK62\r
+       MT+w==\r
+X-Received: by 10.180.39.134 with SMTP id p6mr223716wik.9.1378510131359;\r
+       Fri, 06 Sep 2013 16:28:51 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id p8sm64211wij.8.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 06 Sep 2013 16:28:50 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: show: lazy part handling bugfix\r
+Date: Sat,  7 Sep 2013 00:28:45 +0100\r
+Message-Id: <1378510125-10245-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <87txhz14z6.fsf@qmul.ac.uk>\r
+References: <87txhz14z6.fsf@qmul.ac.uk>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 06 Sep 2013 23:28:58 -0000\r
+\r
+The lazy part handler had a bug that it allowed the button to be\r
+toggled to be specified. During toggling it needs to save and restore\r
+the text-properties for the button but it actually saved the text\r
+properties at point rather than from the button.\r
+\r
+In almost all cases this didn't matter as as point had the same text\r
+properties as the button. However, it is a bug and did cause incorrect\r
+behaviour in some cases: see id:87txhz14z6.fsf@qmul.ac.uk for details.\r
+---\r
+This is exactly the same as the patch in the parent except it has a\r
+commit message.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+ emacs/notmuch-show.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 20844f0..0267574 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -503,7 +503,7 @@ message at DEPTH in the current thread."\r
+            (new-start (button-start button))\r
+            (button-label (button-get button :base-label))\r
+            (old-point (point))\r
+-           (properties (text-properties-at (point)))\r
++           (properties (text-properties-at (button-start button)))\r
+            (inhibit-read-only t))\r
+       ;; Toggle the button itself.\r
+       (button-put button :notmuch-part-hidden (not show))\r
+-- \r
+1.7.9.1\r
+\r