26/f1102cc802693b572c57264117ebd98b93b7c5

   1 Return-Path: <jakob@pipefour.org>\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 736FD431FAF\r
   6         for <notmuch@notmuchmail.org>; Thu, 29 Mar 2012 15:03:38 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id buUFFEtApKXd for <notmuch@notmuchmail.org>;\r
  16         Thu, 29 Mar 2012 15:03:38 -0700 (PDT)\r
  17 Received: from qmta12.westchester.pa.mail.comcast.net\r
  18         (qmta12.westchester.pa.mail.comcast.net [76.96.59.227])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 15FDE431FAE\r
  20         for <notmuch@notmuchmail.org>; Thu, 29 Mar 2012 15:03:38 -0700 (PDT)\r
  21 Received: from omta10.westchester.pa.mail.comcast.net ([76.96.62.28])\r
  22         by qmta12.westchester.pa.mail.comcast.net with comcast\r
  23         id rZsY1i0030cZkys5Ca3eLP; Thu, 29 Mar 2012 22:03:38 +0000\r
  24 Received: from dalek.condo.net ([67.170.34.167])\r
  25         by omta10.westchester.pa.mail.comcast.net with comcast\r
  26         id ra3a1i00P3cMnU33Wa3ca3; Thu, 29 Mar 2012 22:03:37 +0000\r
  27 Received: from jakob by dalek.condo.net with local (Exim 4.77)\r
  28         (envelope-from <jakob@dalek.hsd1.wa.comcast.net.>)\r
  29         id 1SDNR6-0002eJ-Do; Thu, 29 Mar 2012 15:03:16 -0700\r
  30 From: Jakob <jakob@pipefour.org>\r
  31 To: notmuch@notmuchmail.org\r
  32 Subject: [PATCH] vim: fix regex after "notmuch show" output change\r
  33 Date: Thu, 29 Mar 2012 15:02:53 -0700\r
  34 Message-Id: <1333058573-10120-1-git-send-email-jakob@pipefour.org>\r
  35 X-Mailer: git-send-email 1.7.9.1\r
  36 In-Reply-To: <20120329214953.GA8548@dalek.hsd1.wa.comcast.net>\r
  37 References: <20120329214953.GA8548@dalek.hsd1.wa.comcast.net>\r
  38 X-BeenThere: notmuch@notmuchmail.org\r
  39 X-Mailman-Version: 2.1.13\r
  40 Precedence: list\r
  41 List-Id: "Use and development of the notmuch mail system."\r
  42         <notmuch.notmuchmail.org>\r
  43 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  44         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  45 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  46 List-Post: <mailto:notmuch@notmuchmail.org>\r
  47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  48 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  49         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  50 X-List-Received-Date: Thu, 29 Mar 2012 22:03:38 -0000\r
  51 \r
  52 The new field "excluded" was added to the output and made this regex fail.\r
  53 ---\r
  54  vim/plugin/notmuch.vim |    5 +++--\r
  55  1 files changed, 3 insertions(+), 2 deletions(-)\r
  56 \r
  57 diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
  58 index 21985c7..8f27fb9 100644\r
  59 --- a/vim/plugin/notmuch.vim\r
  60 +++ b/vim/plugin/notmuch.vim\r
  61 @@ -48,7 +48,7 @@ let s:notmuch_defaults = {\r
  62          \ 'g:notmuch_show_part_end_regexp':          '\f\r
  63 part}'                   ,\r
  64          \ 'g:notmuch_show_marker_regexp':            '\f\r
  65 \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',\r
  66          \\r
  67 -        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) filename:\(.*\)$',\r
  68 +        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) excluded:\([0-9]*\) filename:\(.*\)$',\r
  69          \ 'g:notmuch_show_tags_regexp':              '(\([^)]*\))$'               ,\r
  70          \\r
  71          \ 'g:notmuch_show_signature_regexp':         '^\(-- \?\|_\+\)$'           ,\r
  72 @@ -870,7 +870,8 @@ function! s:NM_cmd_show_parse(inlines)\r
  73                                          let msg['id'] = m[1]\r
  74                                          let msg['depth'] = m[2]\r
  75                                          let msg['match'] = m[3]\r
  76 -                                        let msg['filename'] = m[4]\r
  77 +                                        let msg['excluded'] = m[4]\r
  78 +                                        let msg['filename'] = m[5]\r
  79                                  endif\r
  80  \r
  81                                  let in_message = 1\r
  82 -- \r
  83 1.7.9.1\r
  84 \r