--- /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 95B03429E43\r
+ for <notmuch@notmuchmail.org>; Fri, 31 May 2013 11:27:41 -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 j4eOyHN4WAki for <notmuch@notmuchmail.org>;\r
+ Fri, 31 May 2013 11:27:36 -0700 (PDT)\r
+Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com\r
+ [209.85.212.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id DAABD431FDA\r
+ for <notmuch@notmuchmail.org>; Fri, 31 May 2013 11:27:22 -0700 (PDT)\r
+Received: by mail-wi0-f172.google.com with SMTP id m6so967961wiv.17\r
+ for <notmuch@notmuchmail.org>; Fri, 31 May 2013 11:27:21 -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=xfabkqI6AhNDuC/K5386ZB4UBfvf6zv7lLeNwLl3QHQ=;\r
+ b=Wr0pdzEOgntsjd37OFK678v0jINZHfT9oCSTdJb+fThNqBHFDhinyzsW9MWU8Kd7Rw\r
+ D/wnLSd2k3QltXOV0OO6YmJPbJc3b+RWmG+r8wVVFkDVijrw5YiPMP3tLlSvVH/Qoo/G\r
+ 9DpnAOQPEbcsE5MNedup9+mIX5R53uaosaIhyb71sq9nKQy2WK2/mSt/MXmQ5xJ5k9ZT\r
+ ItF0K++E5KN9R8q7OKq1wa8NnyN3+qJx4Y+VVAW64lwFwOWkq84FuFXSGzC+YdI0XKBd\r
+ RKUpswEU545FR5jHU/Oylt9iUO0531xETbiHxor4wt5om9HQmh7Hu9mPX4+fB4T+6g0L\r
+ 6WvA==\r
+X-Received: by 10.180.36.147 with SMTP id q19mr4501563wij.26.1370024841834;\r
+ Fri, 31 May 2013 11:27:21 -0700 (PDT)\r
+Received: from localhost (92.40.240.237.threembb.co.uk. [92.40.240.237])\r
+ by mx.google.com with ESMTPSA id fz8sm5734304wib.2.2013.05.31.11.27.20\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Fri, 31 May 2013 11:27:21 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org, Austin Clements <aclements@csail.mit.edu>,\r
+ Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+Subject: [PATCH v3 3/5] emacs: show: pass button to create-overlays\r
+Date: Fri, 31 May 2013 19:26:44 +0100\r
+Message-Id: <1370024806-6616-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1370024806-6616-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1370024806-6616-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: Fri, 31 May 2013 18:27:42 -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 | 26 ++++++++++++--------------\r
+ 1 file changed, 12 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index be3aeac..66cc3a5 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -851,21 +851,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
++\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
++ (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
+@@ -879,10 +877,10 @@ If HIDE is non-nil then initially hide this part."\r
+ "text/x-diff")\r
+ content-type))\r
+ (nth (plist-get part :id))\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
++ (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
+@@ -891,7 +889,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 beg (point) hide)))\r
+ \r
+ (defun notmuch-show-insert-body (msg body depth)\r
+ "Insert the body BODY at depth DEPTH in the current thread."\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff