--- /dev/null
+Return-Path: <dme@dme.org>\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 148C6431FC2\r
+ for <notmuch@notmuchmail.org>; Tue, 13 May 2014 02:47:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[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 6XUKKKV6R7SJ for <notmuch@notmuchmail.org>;\r
+ Tue, 13 May 2014 02:47:31 -0700 (PDT)\r
+Received: from mail-we0-f182.google.com (mail-we0-f182.google.com\r
+ [74.125.82.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 04DE0431FAF\r
+ for <notmuch@notmuchmail.org>; Tue, 13 May 2014 02:47:30 -0700 (PDT)\r
+Received: by mail-we0-f182.google.com with SMTP id t60so101544wes.13\r
+ for <notmuch@notmuchmail.org>; Tue, 13 May 2014 02:47:29 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:to:subject:in-reply-to:references:user-agent\r
+ :from:date:message-id:mime-version:content-type;\r
+ bh=jyF/oyfkO3Mt9YqRzy/YRokhBC640rN/sFam1lOU0Lk=;\r
+ b=EOvlTNb3rAyHE3oJTPh499njLAxRIfIkQEPKIIly5dT+j1fVLt3hiaj9oKTBlXFosS\r
+ tapmJENGrU4tmO5HfU/rOljl6V952rHINNVjoROFNDXkOTP4Hs1Jnn+HuyZB48Gr1qmU\r
+ bzAmOslQCueW4KjlZzwkacXnCNlpwdPC5j1Fs0qhws3hW9ETMy9q28iSM5kYzbjiHbRF\r
+ vlsOhb7QwxDmG3WkgEl5BOpf41mbpH2Lcx19yFslmD85CfamZ65drSB8/m6d9Byg+bWO\r
+ 8vkGK/poQ2By9YYa1fM3u1NeyCIuSOATDvprdCEXDtPlSp8lb6bxCx3DKGKzTe0Ga6B3\r
+ Shkw==\r
+X-Gm-Message-State:\r
+ ALoCoQmZRNXPlNq/Jua4Cd3MCtrVVbqU0058oVRruW14T6MWvoN4UWFP3ZdpO+jRwImmS7I9gYAz\r
+X-Received: by 10.195.13.76 with SMTP id ew12mr702135wjd.80.1399974449609;\r
+ Tue, 13 May 2014 02:47:29 -0700 (PDT)\r
+Received: from localhost ([2a01:348:1a2:1:a288:b4ff:fe8a:77d8])\r
+ by mx.google.com with ESMTPSA id 12sm21512017wju.48.2014.05.13.02.47.27\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 13 May 2014 02:47:28 -0700 (PDT)\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 1/9] emacs/show: Re-arrange determination if a part\r
+ header is necessary\r
+In-Reply-To: <87sioek5sz.fsf@qmul.ac.uk>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+ <1399897769-26809-1-git-send-email-dme@dme.org>\r
+ <1399897769-26809-2-git-send-email-dme@dme.org>\r
+ <87sioek5sz.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.18 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+From: David Edmondson <dme@dme.org>\r
+Date: Tue, 13 May 2014 10:47:22 +0100\r
+Message-ID: <cun1tvy6mdx.fsf@hotblack-desiato.hh.sledj.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+ micalg=pgp-sha1; protocol="application/pgp-signature"\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: Tue, 13 May 2014 09:47:39 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Mon, May 12 2014, Mark Walters wrote:\r
+> On Mon, 12 May 2014, David Edmondson <dme@dme.org> wrote:\r
+>> Move the determination of whether a part header is required to a\r
+>> distinct function.\r
+>> ---\r
+>> emacs/notmuch-show.el | 25 ++++++++++++++++++-------\r
+>> 1 file changed, 18 insertions(+), 7 deletions(-)\r
+>>\r
+>> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+>> index 10fc872..ec99141 100644\r
+>> --- a/emacs/notmuch-show.el\r
+>> +++ b/emacs/notmuch-show.el\r
+>> @@ -871,6 +871,21 @@ message at DEPTH in the current thread."\r
+>> ;; showable this returns nil.\r
+>> (notmuch-show-create-part-overlays button part-beg part-end))))\r
+>>=20=20\r
+>> +(defun notmuch-show-mime-type (part)\r
+>> + "Return the correct mime-type to use for PART."\r
+>> + (let ((content-type (downcase (plist-get part :content-type))))\r
+>> + (or (and (string=3D content-type "application/octet-stream")\r
+>> + (notmuch-show-get-mime-type-of-application/octet-stream part))\r
+>> + (and (string=3D content-type "inline patch")\r
+>> + "text/x-diff")\r
+>> + content-type)))\r
+>> +\r
+>> +(defun notmuch-show-insert-header-p (part)\r
+>> + "Return non-NIL if a header button should be inserted for this part."\r
+>> + (let ((mime-type (notmuch-show-mime-type part)))\r
+>> + (not (and (string=3D mime-type "text/plain")\r
+>> + (<=3D (plist-get part :id) 1)))))\r
+>\r
+> My only query here is whether a notmuch-show-hide-header-p (part) might\r
+> make some of the logic clearer?\r
+\r
+You're suggesting to simply invert the sense of the function?\r
+>\r
+> MW\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
+>>=20=20\r
+>> @@ -881,19 +896,15 @@ is t, hide the part initially and show the button.=\r
+ If HIDE is\r
+>> useful for quoting in replies)."\r
+>>=20=20\r
+>> (let* ((content-type (downcase (plist-get part :content-type)))\r
+>> - (mime-type (or (and (string=3D content-type "application/octet-stream=\r
+")\r
+>> - (notmuch-show-get-mime-type-of-application/octet-stream part))\r
+>> - (and (string=3D content-type "inline patch")\r
+>> - "text/x-diff")\r
+>> - content-type))\r
+>> + (mime-type (notmuch-show-mime-type part))\r
+>> (nth (plist-get part :id))\r
+>> (beg (point))\r
+>> ;; Hide the part initially if HIDE is t.\r
+>> (show-part (not (equal hide t)))\r
+>> ;; We omit the part button for the first (or only) part if\r
+>> ;; this is text/plain, or HIDE is 'no-buttons.\r
+>> - (button (unless (or (equal hide 'no-buttons)\r
+>> - (and (string=3D mime-type "text/plain") (<=3D nth 1)))\r
+>> + (button (when (and (not (equal hide 'no-buttons))\r
+>> + (notmuch-show-insert-header-p part))\r
+>> (notmuch-show-insert-part-header nth mime-type content-type (plist=\r
+-get part :filename))))\r
+>> (content-beg (point)))\r
+>>=20=20\r
+>> --=20\r
+>> 2.0.0.rc0\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1\r
+\r
+iKYEARECAGYFAlNx6ipfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl\r
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDc1M0Y5NDJDMEExNjc3MDE4OURGMUYyMDY5\r
+RUNEMEFCRjA0OTY1MTYACgkQaezQq/BJZRbHVQCffqqBuh+DKGalBH+hmacDsjjj\r
+UGYAoIwEjXh00e/UYzPKaasGd8A+NDWg\r
+=rrCA\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r
projects / notmuch-archives.git / commitdiff