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