From 26e9c78a2aa07fa3df1a257f6f0fe8bef7c209a3 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 1 Jun 2013 09:15:45 +0100 Subject: [PATCH] [PATCH v4 3/5] emacs: show: pass button to create-overlays --- b7/6b52df449e8eec17f778822112a859333646f0 | 130 ++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 b7/6b52df449e8eec17f778822112a859333646f0 diff --git a/b7/6b52df449e8eec17f778822112a859333646f0 b/b7/6b52df449e8eec17f778822112a859333646f0 new file mode 100644 index 000000000..777c3f327 --- /dev/null +++ b/b7/6b52df449e8eec17f778822112a859333646f0 @@ -0,0 +1,130 @@ +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 A0E66429E4F + for ; Sat, 1 Jun 2013 01:16:31 -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 5SI+w+cxvs5q for ; + Sat, 1 Jun 2013 01:16:27 -0700 (PDT) +Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com + [209.85.212.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2CE2A429E44 + for ; Sat, 1 Jun 2013 01:16:24 -0700 (PDT) +Received: by mail-wi0-f178.google.com with SMTP id hj6so1312770wib.5 + for ; Sat, 01 Jun 2013 01:16:23 -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:x-mailer:in-reply-to:references; + bh=gsmea6u0kF/sVUJeDYXtG+76vfG0wv+59X6iK7hJTw8=; + b=jcBcp0N3dPDWiSyQrjZ6pfm0A7VD0mFqY67j+nlGjSsA1eyZy3o0BXGrQP8G6uawK2 + RnaEAD5wWV6LROfR3QVURpe/kgkxQcEkuD2NwW15WY8kDncEgEJGBP2h29tWpknjWdfZ + xEqjYXX8AEM4oFvXa2LHu4yLxYLs8gAdeUx5BB3gx0VlMDOFCbikfHpUJstsWG/aRLuP + qnTQfP0OlCPpb6bVi6L076A6gVfuV51DsVoKXG5Bq2OjXNwSQ8T3XPjxoNPJyKtfLHNp + 0sYxi8Mxt22MIROwfjCvsiW2ah+DX6T1iKPqBcz4kSniak6ucDJdXjEakqZLikDu5WrU + O8Hw== +X-Received: by 10.194.104.105 with SMTP id gd9mr12431695wjb.1.1370074583085; + Sat, 01 Jun 2013 01:16:23 -0700 (PDT) +Received: from localhost (94.197.247.227.threembb.co.uk. [94.197.247.227]) + by mx.google.com with ESMTPSA id d5sm8657105wic.1.2013.06.01.01.16.20 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 01 Jun 2013 01:16:22 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, Austin Clements , + Adam Wolfe Gordon +Subject: [PATCH v4 3/5] emacs: show: pass button to create-overlays +Date: Sat, 1 Jun 2013 09:15:45 +0100 +Message-Id: <1370074547-24677-4-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1370074547-24677-1-git-send-email-markwalters1009@gmail.com> +References: <1370074547-24677-1-git-send-email-markwalters1009@gmail.com> +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: Sat, 01 Jun 2013 08:16:31 -0000 + +Now that the bodypart code has the button we can pass that to +create-overlays and simplify that. +--- + emacs/notmuch-show.el | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 9e119e8..cdea271 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -793,21 +793,19 @@ message at DEPTH in the current thread." + (setq handlers (cdr handlers)))) + t) + +-(defun notmuch-show-create-part-overlays (msg beg end hide) ++(defun notmuch-show-create-part-overlays (button beg end hide) + "Add an overlay to the part between BEG and END" +- (let* ((button (button-at beg)) +- (part-beg (and button (1+ (button-end button))))) +- +- ;; If the part contains no text we do not make it toggleable. We +- ;; also need to check that the button is a genuine part button not +- ;; a notmuch-wash button. +- (when (and button (/= part-beg end) (button-get button :base-label)) +- (button-put button 'overlay (make-overlay part-beg end)) +- ;; We toggle the button for hidden parts as that gets the +- ;; button label right. +- (save-excursion +- (when hide +- (notmuch-show-toggle-part-invisibility button)))))) ++ ++ ;; If there is no button (i.e., the part is text/plain and the first ++ ;; part) or if the part has no content then we don't make the part ++ ;; toggleable. ++ (when (and button (/= beg end)) ++ (button-put button 'overlay (make-overlay beg end)) ++ ;; We toggle the button for hidden parts as that gets the ++ ;; button label right. ++ (save-excursion ++ (when hide ++ (notmuch-show-toggle-part-invisibility button))))) + + (defun notmuch-show-insert-bodypart (msg part depth &optional hide) + "Insert the body part PART at depth DEPTH in the current thread. +@@ -824,7 +822,8 @@ If HIDE is non-nil then initially hide this part." + (beg (point)) + ;; We omit the part button for the first (or only) part if this is text/plain. + (button (unless (and (string= mime-type "text/plain") (<= nth 1)) +- (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))) ++ (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename)))) ++ (content-beg (point))) + + (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) + ;; Some of the body part handlers leave point somewhere up in the +@@ -833,7 +832,7 @@ If HIDE is non-nil then initially hide this part." + ;; Ensure that the part ends with a carriage return. + (unless (bolp) + (insert "\n")) +- (notmuch-show-create-part-overlays msg beg (point) hide) ++ (notmuch-show-create-part-overlays button content-beg (point) hide) + ;; Record part information. Since we already inserted subparts, + ;; don't override existing :notmuch-part properties. + (notmuch-map-text-property beg (point) :notmuch-part +-- +1.7.10.4 + -- 2.26.2