--- /dev/null
+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 C46D0431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 21:57:33 -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 Cs9Yj+LslPO9 for <notmuch@notmuchmail.org>;\r
+ Sun, 9 Jun 2013 21:57:28 -0700 (PDT)\r
+Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com\r
+ [74.125.83.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ 9A24E431FBC for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 21:57:24 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f54.google.com with SMTP id t10so2522638eei.13\r
+ for <notmuch@notmuchmail.org>; Sun, 09 Jun 2013 21:57:23 -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:x-mailer:in-reply-to:references;\r
+ bh=yJKVdqyp6GG7n27pjQkyMlxmMiYZkNF578akPOJng9g=;\r
+ b=u/hxH4NVP/9ltRxYrilZl1YkxgWZiMqp4PuyRuVuD+C4BUmTEHULPGUOG3LUHsMwcg\r
+ fhbf6Onm+9+05Lftq9CxlU9jDOhe62Teoj+jHsvM4/xr1bmntImbOXr6jba0NaV8rwnI\r
+ HQmHCSSLhObVWcNLgtncS8hgPX/VPXe6B5e3S7aiLGDOPyQFym+LVFw6DRTYl6GLDPSq\r
+ BWtqhmAT6g9b58neUHKaPlJ+W1U684G/5DBqQNkLVlDwz3/TYwpri/fRORNvRzwqrqCK\r
+ uJX12/0ac3/fOGa5ksvNcpFaALFIOFhoDos23LPTDDC6A19EwZ+h6mN+rVr7r4VT0P/A\r
+ 4oBA==\r
+X-Received: by 10.15.82.193 with SMTP id a41mr8971282eez.39.1370840243503;\r
+ Sun, 09 Jun 2013 21:57:23 -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\r
+ n42sm20180459eeh.15.2013.06.09.21.57.22 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 09 Jun 2013 21:57:22 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+ Austin Clements <aclements@csail.mit.edu>\r
+Subject: [PATCH v5 3/6] emacs: show: pass button to create-overlays\r
+Date: Mon, 10 Jun 2013 05:57:10 +0100\r
+Message-Id: <1370840233-23258-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1370840233-23258-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1370840233-23258-1-git-send-email-markwalters1009@gmail.com>\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: Mon, 10 Jun 2013 04:57:34 -0000\r
+\r
+Now that the bodypart code has the button we can pass that to\r
+create-overlays and simplify that.\r
+---\r
+ emacs/notmuch-show.el | 31 +++++++++++++++----------------\r
+ 1 files changed, 15 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index c69456a..0a0451b 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -793,21 +793,19 @@ message at DEPTH in the current thread."\r
+ (setq handlers (cdr handlers))))\r
+ t)\r
+ \r
+-(defun notmuch-show-create-part-overlays (msg beg end hide)\r
++(defun notmuch-show-create-part-overlays (button beg end hide)\r
+ "Add an overlay to the part between BEG and END"\r
+- (let* ((button (button-at beg))\r
+- (part-beg (and button (1+ (button-end button)))))\r
+-\r
+- ;; If the part contains no text we do not make it toggleable. We\r
+- ;; also need to check that the button is a genuine part button not\r
+- ;; a notmuch-wash button.\r
+- (when (and button (/= part-beg end) (button-get button :base-label))\r
+- (button-put button 'overlay (make-overlay part-beg end))\r
+- ;; We toggle the button for hidden parts as that gets the\r
+- ;; button label right.\r
+- (save-excursion\r
+- (when hide\r
+- (notmuch-show-toggle-part-invisibility button))))))\r
++\r
++ ;; If there is no button (i.e., the part is text/plain and the first\r
++ ;; part) or if the part has no content then we don't make the part\r
++ ;; toggleable.\r
++ (when (and button (/= beg end))\r
++ (button-put button 'overlay (make-overlay beg end))\r
++ ;; We toggle the button for hidden parts as that gets the\r
++ ;; button label right.\r
++ (save-excursion\r
++ (when hide\r
++ (notmuch-show-toggle-part-invisibility button)))))\r
+ \r
+ (defun notmuch-show-insert-bodypart (msg part depth &optional hide)\r
+ "Insert the body part PART at depth DEPTH in the current thread.\r
+@@ -824,7 +822,8 @@ If HIDE is non-nil then initially hide this part."\r
+ (beg (point))\r
+ ;; We omit the part button for the first (or only) part if this is text/plain.\r
+ (button (unless (and (string= mime-type "text/plain") (<= nth 1))\r
+- (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename)))))\r
++ (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))\r
++ (content-beg (point)))\r
+ \r
+ (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button)\r
+ ;; Some of the body part handlers leave point somewhere up in the\r
+@@ -833,7 +832,7 @@ If HIDE is non-nil then initially hide this part."\r
+ ;; Ensure that the part ends with a carriage return.\r
+ (unless (bolp)\r
+ (insert "\n"))\r
+- (notmuch-show-create-part-overlays msg beg (point) hide)\r
++ (notmuch-show-create-part-overlays button content-beg (point) hide)\r
+ ;; Record part information. Since we already inserted subparts,\r
+ ;; don't override existing :notmuch-part properties.\r
+ (notmuch-map-text-property beg (point) :notmuch-part\r
+-- \r
+1.7.9.1\r
+\r
projects / notmuch-archives.git / commitdiff