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

diff --git a/26/f1102cc802693b572c57264117ebd98b93b7c5 b/26/f1102cc802693b572c57264117ebd98b93b7c5
new file mode 100644 (file)
index 0000000..ac3ef25
--- /dev/null
+++ b/26/f1102cc802693b572c57264117ebd98b93b7c5
@@ -0,0 +1,84 @@
+Return-Path: <jakob@pipefour.org>\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 736FD431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 29 Mar 2012 15:03:38 -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\r
+       tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 buUFFEtApKXd for <notmuch@notmuchmail.org>;\r
+       Thu, 29 Mar 2012 15:03:38 -0700 (PDT)\r
+Received: from qmta12.westchester.pa.mail.comcast.net\r
+       (qmta12.westchester.pa.mail.comcast.net [76.96.59.227])\r
+       by olra.theworths.org (Postfix) with ESMTP id 15FDE431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 29 Mar 2012 15:03:38 -0700 (PDT)\r
+Received: from omta10.westchester.pa.mail.comcast.net ([76.96.62.28])\r
+       by qmta12.westchester.pa.mail.comcast.net with comcast\r
+       id rZsY1i0030cZkys5Ca3eLP; Thu, 29 Mar 2012 22:03:38 +0000\r
+Received: from dalek.condo.net ([67.170.34.167])\r
+       by omta10.westchester.pa.mail.comcast.net with comcast\r
+       id ra3a1i00P3cMnU33Wa3ca3; Thu, 29 Mar 2012 22:03:37 +0000\r
+Received: from jakob by dalek.condo.net with local (Exim 4.77)\r
+       (envelope-from <jakob@dalek.hsd1.wa.comcast.net.>)\r
+       id 1SDNR6-0002eJ-Do; Thu, 29 Mar 2012 15:03:16 -0700\r
+From: Jakob <jakob@pipefour.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] vim: fix regex after "notmuch show" output change\r
+Date: Thu, 29 Mar 2012 15:02:53 -0700\r
+Message-Id: <1333058573-10120-1-git-send-email-jakob@pipefour.org>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <20120329214953.GA8548@dalek.hsd1.wa.comcast.net>\r
+References: <20120329214953.GA8548@dalek.hsd1.wa.comcast.net>\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: Thu, 29 Mar 2012 22:03:38 -0000\r
+\r
+The new field "excluded" was added to the output and made this regex fail.\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..8f27fb9 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