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

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