1 Return-Path: <dmitry.kurochkin@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id BDBE7429E25
\r
6 for <notmuch@notmuchmail.org>; Fri, 18 Nov 2011 10:13:57 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id CLetshj0aQnJ for <notmuch@notmuchmail.org>;
\r
17 Fri, 18 Nov 2011 10:13:57 -0800 (PST)
\r
18 Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com
\r
19 [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 2E799431FD0
\r
22 for <notmuch@notmuchmail.org>; Fri, 18 Nov 2011 10:13:56 -0800 (PST)
\r
23 Received: by faan15 with SMTP id n15so5339987faa.26
\r
24 for <notmuch@notmuchmail.org>; Fri, 18 Nov 2011 10:13:54 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer;
\r
27 bh=4V5vS3gxPmCgRe6WMyjxM0COE1GjOs/rp4lwHM1MHI0=;
\r
28 b=X/gaZGa636H8JdJeyEzL7/v+/gAMKTsp6BQ4fuc3qlD3tpl3huXXWjMy0FV8WxlwBu
\r
29 a3ADvBk6XG6c9KexYGFxWFPg2lZj5Vr5i1/dFXP1dusTsQRp1PhM2HfkbLXUowxQgyqk
\r
30 Mbh1xMWvwYcJToUyk98+xWqV8zSbwPeDJIH1I=
\r
31 Received: by 10.204.130.140 with SMTP id t12mr4434244bks.136.1321640034275;
\r
32 Fri, 18 Nov 2011 10:13:54 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id e18sm1355452bkr.15.2011.11.18.10.13.53
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Fri, 18 Nov 2011 10:13:53 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH] emacs: fix `mm-make-handle' content-type parameter
\r
40 Date: Fri, 18 Nov 2011 22:13:37 +0400
\r
41 Message-Id: <1321640017-25414-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
42 X-Mailer: git-send-email 1.7.7.3
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Fri, 18 Nov 2011 18:13:57 -0000
\r
57 `notmuch-show-mm-display-part-inline' uses undocumented
\r
58 `mm-make-handle' function. One of the parameters for `mm-make-handle'
\r
59 is charset. Before the change, an unparsed content-type was given to
\r
60 `mm-make-handle' (this was probably copied from Gnus source which uses
\r
61 simple hard-coded values in a similar manner). But in fact,
\r
62 `mm-make-handle' expects a content-type value parsed by
\r
63 `mail-header-parse-content-type'. In particular, this is needed for
\r
64 MIME display functions to correctly determine charset.
\r
66 emacs/notmuch-show.el | 3 ++-
\r
67 1 files changed, 2 insertions(+), 1 deletions(-)
\r
69 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
70 index d5c95d8..9fafafa 100644
\r
71 --- a/emacs/notmuch-show.el
\r
72 +++ b/emacs/notmuch-show.el
\r
73 @@ -316,7 +316,8 @@ current buffer, if possible."
\r
74 (let ((display-buffer (current-buffer)))
\r
77 - (let ((handle (mm-make-handle (current-buffer) (list content-type))))
\r
78 + (let ((handle (mm-make-handle (current-buffer)
\r
79 + (mail-header-parse-content-type content-type))))
\r
80 (set-buffer display-buffer)
\r
81 (if (and (mm-inlinable-p handle)
\r
82 (mm-inlined-p handle))
\r