--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 1B3AD431FD0\r
+ for <notmuch@notmuchmail.org>; Fri, 31 May 2013 16:09:01 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 BuW8kvcvPZGA for <notmuch@notmuchmail.org>;\r
+ Fri, 31 May 2013 16:08:55 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 02CED431FBD\r
+ for <notmuch@notmuchmail.org>; Fri, 31 May 2013 16:08:55 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1UiYRD-00073D-O5; Sat, 01 Jun 2013 00:08:53 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1UiYRD-0002DF-EM; Sat, 01 Jun 2013 00:08:47 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <aclements@csail.mit.edu>, notmuch@notmuchmail.org,\r
+ Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+Subject: Re: [PATCH v3 3/5] emacs: show: pass button to create-overlays\r
+In-Reply-To: <874ndi3gd7.fsf@awakening.csail.mit.edu>\r
+References: <1370024806-6616-1-git-send-email-markwalters1009@gmail.com>\r
+ <1370024806-6616-4-git-send-email-markwalters1009@gmail.com>\r
+ <874ndi3gd7.fsf@awakening.csail.mit.edu>\r
+User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Sat, 01 Jun 2013 00:08:46 +0100\r
+Message-ID: <87vc5yg329.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: b6e91ab99d81b99d8f76102b1756fd01 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -0.1\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -0.1 points.\r
+ Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * -0.1 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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 23:09:01 -0000\r
+\r
+\r
+> On Fri, 31 May 2013, Mark Walters <markwalters1009@gmail.com> wrote:\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
+> I might just be mis-following the diff here, but shouldn't the above get\r
+> re-indented?\r
+\r
+I think you are right: it got a bit messed up when I tried to split up\r
+the patch. I don't think it matters much as these lines get deleted in\r
+the next patch. Incidentally is there a good git work flow for fixing up\r
+something like this where you just want to change the midpoint of a\r
+series?\r
+\r
+>\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
+> Was this swap necessary?\r
+\r
+This is needed: inserting a part header moves point and this means that\r
+point is at the start of the part content rather than the start of the\r
+part button.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+>\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
projects / notmuch-archives.git / commitdiff