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