Re: [PATCH] emacs: Make the part content available to `mm-inlinable-p'.

diff --git a/04/40c27a2c7bbd8547b8bc52006dc95762e40853 b/04/40c27a2c7bbd8547b8bc52006dc95762e40853
new file mode 100644 (file)
index 0000000..96ee30d
--- /dev/null
+++ b/04/40c27a2c7bbd8547b8bc52006dc95762e40853
@@ -0,0 +1,122 @@
+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 7689F431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 19 Jan 2012 01:38:31 -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 q1jSV5CqyIVC for <notmuch@notmuchmail.org>;\r
+       Thu, 19 Jan 2012 01:38:30 -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 98A68431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 19 Jan 2012 01:38:30 -0800 (PST)\r
+Received: by bkty12 with SMTP id y12so2545422bkt.26\r
+       for <notmuch@notmuchmail.org>; Thu, 19 Jan 2012 01:38:29 -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=7eXz8qylw5tq+WSowO08Vuh9tcH8WOo9KGFyEwCqIbk=;\r
+       b=UAZuOO6o8ZmyyaWYSuIaCzjAQ4MysZhCemRcnYKGW+X73AaoHVTMeVOLm5fjRls5BX\r
+       G3tRJIfJLvFWBaIsJMdgwnmJ2XNh0mv+bJHzxChUIXB/C6sbnSR6b/jWnF9HQMhlN+lD\r
+       U+pV0qwf0X4TH3ivMWgNDFzRNj29zARh56aC0=\r
+Received: by 10.204.152.136 with SMTP id g8mr9655924bkw.127.1326965909123;\r
+       Thu, 19 Jan 2012 01:38:29 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id sp6sm37370921bkb.2.2012.01.19.01.38.28\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 19 Jan 2012 01:38:28 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: Make the part content available to\r
+       `mm-inlinable-p'.\r
+In-Reply-To: <1326965647-1222-1-git-send-email-dme@dme.org>\r
+References: <87k44o6o6e.fsf@gmail.com>\r
+       <1326965647-1222-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: Thu, 19 Jan 2012 13:37:33 +0400\r
+Message-ID: <87boq06nj6.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: Thu, 19 Jan 2012 09:38:31 -0000\r
+\r
+[and again with reply to all]\r
+\r
+On Thu, 19 Jan 2012 09:34:07 +0000, David Edmondson <dme@dme.org> wrote:\r
+> The `mm-inlinable-p' function works better if it has access to the\r
+> data of the relevant part, so load that content before calling it.\r
+> \r
+> Don't load the content for parts that the user has indicated no desire\r
+> to inline.\r
+> \r
+> This fixes the display of attached image/jpeg parts, for example.\r
+> ---\r
+> \r
+> Updated as described in id:"cunboq06szv.fsf@hotblack-desiato.hh.sledj.net".\r
+> \r
+\r
+Looks good to me.\r
+\r
+Regards,\r
+  Dmitry\r
+\r
+>  emacs/notmuch-show.el |   17 +++++++++--------\r
+>  1 files changed, 9 insertions(+), 8 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 2df8d3b..7e9c9b4 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -330,14 +330,15 @@ 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
+> +    ;; If the user wants the part inlined, insert the content and\r
+> +    ;; test whether we are able to inline it (which includes both\r
+> +    ;; capability and suitability tests).\r
+> +    (when (mm-inlined-p handle)\r
+> +      (insert (notmuch-show-get-bodypart-content msg part nth))\r
+> +      (when (mm-inlinable-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