[PATCH] emacs: show: lazy part bugfix

diff --git a/5a/fc50425095eab0b8bd545fa8b8322d0fe9181f b/5a/fc50425095eab0b8bd545fa8b8322d0fe9181f
new file mode 100644 (file)
index 0000000..d17c936
--- /dev/null
+++ b/5a/fc50425095eab0b8bd545fa8b8322d0fe9181f
@@ -0,0 +1,112 @@
+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 5F7E9431FD5\r
+       for <notmuch@notmuchmail.org>; Fri, 23 Aug 2013 01:34:47 -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 c+8zUFvkLPKQ for <notmuch@notmuchmail.org>;\r
+       Fri, 23 Aug 2013 01:34:43 -0700 (PDT)\r
+Received: from mail-we0-f180.google.com (mail-we0-f180.google.com\r
+       [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D26D6431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 23 Aug 2013 01:34:42 -0700 (PDT)\r
+Received: by mail-we0-f180.google.com with SMTP id q58so258512wes.25\r
+       for <notmuch@notmuchmail.org>; Fri, 23 Aug 2013 01:34:40 -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=JKJgzo4Y18lFRdP5oIUpYWjBXd/CKkcPmKWGmURZ3tw=;\r
+       b=mRtU0J0KwZX2b26XsBWUrx/Z7aucOu4EL/ddjrda7Xfr8bQP+WsyhKWhzD/HbtzMjk\r
+       Nb2tiv6mwrlKnWvGRifJgl3PE9A0m+1k9957qZ627b2zq+yDISfMPwf9+bg7+ah8/esR\r
+       /GylGwI8LUv3wBHJ3hjxRTkI5I9kwqybMxIf3doQZaBY1xnGdSbODzQ0dSaxT1/Jcr/k\r
+       hd5eC+CprucLiruVXzu1KxiOUGzKJ6FOa+4vApEhUfZsIZsKBcu+3V2JjFvIKDBX6nIN\r
+       8wjePBTdJ3RJWEO/FPUFGYdcMPEKTWk1eS+QqPr9WdfUDTsR9D/bAgDW1A4KXYT4MTtM\r
+       NdxQ==\r
+X-Received: by 10.180.184.84 with SMTP id es20mr1266534wic.37.1377246879165;\r
+       Fri, 23 Aug 2013 01:34:39 -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 ei6sm2045104wid.11.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 23 Aug 2013 01:34:38 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       amdragon@MIT.EDU\r
+Subject: [PATCH] emacs: show: lazy part bugfix\r
+Date: Fri, 23 Aug 2013 09:34:35 +0100\r
+Message-Id: <1377246875-7784-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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, 23 Aug 2013 08:34:47 -0000\r
+\r
+The lazy part handling had a subtle bug. Notmuch stores the part\r
+information as a text property with the displayed part so attachment\r
+handling (saving viewing etc work).\r
+\r
+Now, some mime parts have subparts and to avoid overwriting the\r
+sub-part data notmuch checks and if part data is already recorded it\r
+does not overwrite it.\r
+\r
+Now with lazy part handling this could fail: there is already part\r
+data stored. In the common case it works as the part type information\r
+was stored when the lazy-part button was inserted. However, this fails\r
+if the lazy part has sub-parts: notmuch had no idea these existed\r
+until the lazy part insertion.\r
+\r
+We fix this by removing any existing part-information from the\r
+relevant region before doing the lazy insertion.\r
+---\r
+This was shown up by Istvan's patch in id:m3r4dtgz9k.fsf@zsu.kismala.com and \r
+the bug found by Jamie in id:87fvu4fl25.fsf@servo.finestructure.net\r
+\r
+I think this is essentially the right patch: I am not certain about\r
+the +1 in the removing the property. It seems to be needed but maybe\r
+something with front/back sticky would be better.\r
+\r
+Also this definitely needs more testing before going into master: this\r
+code is definitely fragile.\r
+\r
+Best wishes \r
+\r
+Mark\r
+\r
+ emacs/notmuch-show.el |    3 +++\r
+ 1 files changed, 3 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 20844f0..a31b6dc 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -853,6 +853,9 @@ message at DEPTH in the current thread."\r
+   ;; character of the button by adding a newline and finish by\r
+   ;; removing the extra newline from the end of the part.\r
+   (save-excursion\r
++    ;; Remove part-information from lazy part-region\r
++    (put-text-property (button-start button) (1+ (button-end button)) :notmuch-part nil)\r
++\r
+     (goto-char (button-end button))\r
+     (insert "\n")\r
+     (let* ((inhibit-read-only t)\r
+-- \r
+1.7.9.1\r
+\r