From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sat, 24 Mar 2012 08:58:59 +0000 (+0200)
Subject: Re: [PATCH] vim: fix regex after "notmuch show" output change
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=90aedded9aec0be21b9bb3bc0e8825d58dc10d4d;p=notmuch-archives.git

Re: [PATCH] vim: fix regex after "notmuch show" output change
---

diff --git a/a4/d2258c14738183314299e7e5d071cd4ccfcde1 b/a4/d2258c14738183314299e7e5d071cd4ccfcde1
new file mode 100644
index 000000000..3392ecad1
--- /dev/null
+++ b/a4/d2258c14738183314299e7e5d071cd4ccfcde1
@@ -0,0 +1,99 @@
+Return-Path: <tomi.ollila@iki.fi>
+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 9ECE0431FAF
+	for <notmuch@notmuchmail.org>; Sat, 24 Mar 2012 01:59:07 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	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 W-4reMGY6afx for <notmuch@notmuchmail.org>;
+	Sat, 24 Mar 2012 01:59:03 -0700 (PDT)
+Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
+	by olra.theworths.org (Postfix) with ESMTP id 9ED6E431FAE
+	for <notmuch@notmuchmail.org>; Sat, 24 Mar 2012 01:59:03 -0700 (PDT)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id DB56768055; Sat, 24 Mar 2012 10:58:59 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jakob <jakob@pipefour.org>, notmuch@notmuchmail.org
+Subject: Re: [PATCH] vim: fix regex after "notmuch show" output change
+In-Reply-To: <1332390675-31273-1-git-send-email-jakob@pipefour.org>
+References: <1332390675-31273-1-git-send-email-jakob@pipefour.org>User-Agent:
+ Notmuch/0.12+70~g598bf0a	(http://notmuchmail.org) Emacs/23.3.1
+ (x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Sat, 24 Mar 2012 10:58:59 +0200
+Message-ID: <m2mx76idd8.fsf@guru.guru-group.fi>
+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."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sat, 24 Mar 2012 08:59:07 -0000
+
+Jakob <jakob@pipefour.org> writes:
+
+> The new field "excluded" was added to the output and made this regex fail.
+> ---
+
+Is this regexp part below good ?
+
+> +        ... match:\([0-9]*\) excluded:\([[0-9]*\) filename:\(.*\)$', ...
+
+( --> excluded:\([[0-9]*\) <-- )
+
+Otherwise lookg good (I think).
+
+Tomi
+
+>  vim/plugin/notmuch.vim |    5 +++--
+>  1 files changed, 3 insertions(+), 2 deletions(-)
+>
+> diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
+> index 21985c7..92e1b50 100644
+> --- a/vim/plugin/notmuch.vim
+> +++ b/vim/plugin/notmuch.vim
+> @@ -48,7 +48,7 @@ let s:notmuch_defaults = {
+>          \ 'g:notmuch_show_part_end_regexp':          '
+part}'                   ,
+>          \ 'g:notmuch_show_marker_regexp':            '
+\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',
+>          \
+> -        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) filename:\(.*\)$',
+> +        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) excluded:\([[0-9]*\) filename:\(.*\)$',
+>          \ 'g:notmuch_show_tags_regexp':              '(\([^)]*\))$'               ,
+>          \
+>          \ 'g:notmuch_show_signature_regexp':         '^\(-- \?\|_\+\)$'           ,
+> @@ -870,7 +870,8 @@ function! s:NM_cmd_show_parse(inlines)
+>                                          let msg['id'] = m[1]
+>                                          let msg['depth'] = m[2]
+>                                          let msg['match'] = m[3]
+> -                                        let msg['filename'] = m[4]
+> +                                        let msg['excluded'] = m[4]
+> +                                        let msg['filename'] = m[5]
+>                                  endif
+>  
+>                                  let in_message = 1
+> -- 
+> 1.7.9.1
+>
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch