1 Return-Path: <jasonwoof@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 D0ED7431FD0
\r
6 for <notmuch@notmuchmail.org>; Sun, 10 Jul 2011 22:40:42 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,
\r
13 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 09Cns2JoiLww for <notmuch@notmuchmail.org>;
\r
17 Sun, 10 Jul 2011 22:40:42 -0700 (PDT)
\r
18 Received: from mail-vw0-f53.google.com (mail-vw0-f53.google.com
\r
19 [209.85.212.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 86F65429E28
\r
22 for <notmuch@notmuchmail.org>; Sun, 10 Jul 2011 22:40:38 -0700 (PDT)
\r
23 Received: by mail-vw0-f53.google.com with SMTP id 13so2781810vws.26
\r
24 for <notmuch@notmuchmail.org>; Sun, 10 Jul 2011 22:40:38 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to
\r
27 :references; bh=2/TmYZBCXLh9E2JL1NmT2ReNy4ZTiBXUIOY8kq6PU4s=;
\r
28 b=KcYPhuZW3FXoZBeqF5xTNoxtZeuHf6HQXo6xZhDhdIoobHadonS7RP8ZKQYyLwTOcD
\r
29 ODLc8EjOSO5Ya7ONwQZHUlInvRB36YuVSzOS/ZiFaVZUMvojidLn1liBeqEs/w3R4SN9
\r
30 Rp5Jtwaa5S8SrpQdDwWIZcAWpomVp6+LkYP3o=
\r
31 Received: by 10.52.24.43 with SMTP id r11mr1892675vdf.529.1310362838298;
\r
32 Sun, 10 Jul 2011 22:40:38 -0700 (PDT)
\r
33 Received: from localhost.localdomain (c-98-216-100-90.hsd1.ma.comcast.net
\r
35 by mx.google.com with ESMTPS id bl2sm5324172vbb.9.2011.07.10.22.40.37
\r
36 (version=SSLv3 cipher=OTHER); Sun, 10 Jul 2011 22:40:38 -0700 (PDT)
\r
37 Sender: Jason Woofenden <jasonwoof@gmail.com>
\r
38 From: Jason Woofenden <jason@jasonwoof.com>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH 4/5] vim: fix (hack) cig/cit parsing within multipart/*
\r
41 Date: Mon, 11 Jul 2011 01:40:09 -0400
\r
42 Message-Id: <1310362810-10926-5-git-send-email-jason@jasonwoof.com>
\r
43 X-Mailer: git-send-email 1.7.5.4
\r
44 In-Reply-To: <1310362810-10926-1-git-send-email-jason@jasonwoof.com>
\r
45 References: <1310362810-10926-1-git-send-email-jason@jasonwoof.com>
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Mon, 11 Jul 2011 05:40:43 -0000
\r
60 The vim front-end isn't written to handle nested parts.
\r
62 This patch doesn't change that, it just changes the code to pretend that
\r
63 multipart/* sections end immediately. This makes the parsing code think that
\r
64 all sections are top-level, and are thus parsed well enough.
\r
66 The lovely result of this is that citation folds and signature folds now work
\r
67 in text/plain parts that are within multipart/* sections. Also, all mime
\r
68 section starts are now shown correctly (before some were not parsed and showed
\r
69 the ugly ^L and an ID and so on from notmuch.)
\r
71 vim/plugin/notmuch.vim | 9 ++++++++-
\r
72 1 files changed, 8 insertions(+), 1 deletions(-)
\r
74 diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
\r
75 index 3982008..2095547 100644
\r
76 --- a/vim/plugin/notmuch.vim
\r
77 +++ b/vim/plugin/notmuch.vim
\r
78 @@ -796,7 +796,14 @@ function! s:NM_cmd_show_parse(inlines)
\r
80 call add(info['disp'],
\r
81 \ printf('--- %s ---', in_part))
\r
82 - let part_start = len(info['disp']) + 1
\r
83 + " We don't yet handle nested parts, so pop
\r
84 + " multipart/* immediately so text/plain
\r
85 + " sub-parts are parsed properly
\r
86 + if match(in_part, '^multipart/') != -1
\r
89 + let part_start = len(info['disp']) + 1
\r