Re: [PATCH v2] emacs: Make the part content available to the mm-inline* checks.

diff --git a/0b/b110bdc46bf27af09f89e9611281a85cb791e8 b/0b/b110bdc46bf27af09f89e9611281a85cb791e8
new file mode 100644 (file)
index 0000000..3efe8ce
--- /dev/null
+++ b/0b/b110bdc46bf27af09f89e9611281a85cb791e8
@@ -0,0 +1,119 @@
+Return-Path: <dmitry.kurochkin@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 5DCF4431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 10:05:34 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 3koHk-SdmOaD for <notmuch@notmuchmail.org>;\r
+       Wed, 18 Jan 2012 10:05:33 -0800 (PST)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8D631431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 10:05:33 -0800 (PST)\r
+Received: by bkty12 with SMTP id y12so1955787bkt.26\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 10:05:32 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=rC/UT0pcKTL8TLKoeIcXoNZMcFepxGVaTvyI3F3sNug=;\r
+       b=LUNIwJ2lwjX3wwHneon0RTutks4niIVHDLJ0eX9A495EeHP09bezoCAmZkaB8m45LI\r
+       W9f7YOVeU38i12P/WQc75pBIOGG8evBR9lBOL47DshMn7Bc8AS/RF/xX+p0kxCbGea8R\r
+       2avRMYS3yzjr0vGcOEisDv4aRkVvVFd1BgCM0=\r
+Received: by 10.204.152.206 with SMTP id h14mr2790006bkw.62.1326909932197;\r
+       Wed, 18 Jan 2012 10:05:32 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id y22sm56483202bkf.4.2012.01.18.10.05.31\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 18 Jan 2012 10:05:31 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: Make the part content available to the\r
+       mm-inline* checks.\r
+In-Reply-To: <1326908371-11949-1-git-send-email-dme@dme.org>\r
+References: <1326907993-11054-1-git-send-email-dme@dme.org>\r
+       <1326908371-11949-1-git-send-email-dme@dme.org>\r
+User-Agent: Notmuch/0.11+73~g8a5402e (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 18 Jan 2012 22:04:36 +0400\r
+Message-ID: <877h0o99aj.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Wed, 18 Jan 2012 18:05:34 -0000\r
+\r
+Hi David.\r
+\r
+On Wed, 18 Jan 2012 17:39:31 +0000, David Edmondson <dme@dme.org> wrote:\r
+> The `mm-inlinable-p' and `mm-inlined-p' functions work better if they\r
+> have access to the data of the relevant part, so load that content\r
+> before calling either function.\r
+> \r
+> This fixes the display of attached image/jpeg parts, for example.\r
+\r
+Not so long ago I made an opposite change to avoid fetching useless\r
+parts (e.g. audio files).  Looks like we need a better check here.  Can\r
+we know from Content-Type if fetching a part body would be useful?\r
+\r
+Regards,\r
+  Dmitry\r
+\r
+> ---\r
+> \r
+> Removed the cruft that crept into the previous patch.\r
+> \r
+>  emacs/notmuch-show.el |   14 ++++++--------\r
+>  1 files changed, 6 insertions(+), 8 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 2df8d3b..f280df2 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -330,14 +330,12 @@ current buffer, if possible."\r
+>      (with-temp-buffer\r
+>        (let* ((charset (plist-get part :content-charset))\r
+>           (handle (mm-make-handle (current-buffer) `(,content-type (charset . ,charset)))))\r
+> -    (if (and (mm-inlinable-p handle)\r
+> -             (mm-inlined-p handle))\r
+> -        (let ((content (notmuch-show-get-bodypart-content msg part nth)))\r
+> -          (insert content)\r
+> -          (set-buffer display-buffer)\r
+> -          (mm-display-part handle)\r
+> -          t)\r
+> -      nil)))))\r
+> +    (insert (notmuch-show-get-bodypart-content msg part nth))\r
+> +    (when (and (mm-inlinable-p handle)\r
+> +               (mm-inlined-p handle))\r
+> +      (set-buffer display-buffer)\r
+> +      (mm-display-part handle)\r
+> +      t)))))\r
+>  \r
+>  (defvar notmuch-show-multipart/alternative-discouraged\r
+>    '(\r
+> -- \r
+> 1.7.8.3\r
+> \r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r