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

diff --git a/ad/364fa69c40a116ef5eecc4b6149069806916d6 b/ad/364fa69c40a116ef5eecc4b6149069806916d6
new file mode 100644 (file)
index 0000000..b710d00
--- /dev/null
+++ b/ad/364fa69c40a116ef5eecc4b6149069806916d6
@@ -0,0 +1,95 @@
+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 2DC09431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 09:39:37 -0800 (PST)\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 gN8swHa3KYBt for <notmuch@notmuchmail.org>;\r
+       Wed, 18 Jan 2012 09:39:36 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ A276B431FAE   for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 09:39:36 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so66508wgb.2\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 09:39:35 -0800 (PST)\r
+Received: by 10.180.19.6 with SMTP id a6mr38488746wie.14.1326908375483;\r
+       Wed, 18 Jan 2012 09:39:35 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id di5sm57336768wib.3.2012.01.18.09.39.33\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 18 Jan 2012 09:39:34 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 98CF29FD95; Wed, 18 Jan 2012 17:39:32 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: Make the part content available to the mm-inline*\r
+       checks.\r
+Date: Wed, 18 Jan 2012 17:39:31 +0000\r
+Message-Id: <1326908371-11949-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1326907993-11054-1-git-send-email-dme@dme.org>\r
+References: <1326907993-11054-1-git-send-email-dme@dme.org>\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 17:39:37 -0000\r
+\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
+\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