89/dacc53a275d1009290fc27d21acfc511a32735

   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 74622431FAE\r
   6         for <notmuch@notmuchmail.org>; Wed, 21 Mar 2012 21:32:57 -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 lxYuR8QRLZWn for <notmuch@notmuchmail.org>;\r
  16         Wed, 21 Mar 2012 21:32:55 -0700 (PDT)\r
  17 Received: from qmta08.westchester.pa.mail.comcast.net\r
  18         (qmta08.westchester.pa.mail.comcast.net [76.96.62.80])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 4922D431FAF\r
  20         for <notmuch@notmuchmail.org>; Wed, 21 Mar 2012 21:32:55 -0700 (PDT)\r
  21 Received: from omta16.westchester.pa.mail.comcast.net ([76.96.62.88])\r
  22         by qmta08.westchester.pa.mail.comcast.net with comcast\r
  23         id oUVQ1i0071uE5Es58UYu3S; Thu, 22 Mar 2012 04:32:54 +0000\r
  24 Received: from dalek.condo.net ([67.170.34.167])\r
  25         by omta16.westchester.pa.mail.comcast.net with comcast\r
  26         id oUYt1i00G3cMnU33cUYtB6; Thu, 22 Mar 2012 04:32:54 +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 1SAZh1-00089S-EB; Wed, 21 Mar 2012 21:32:07 -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: Wed, 21 Mar 2012 21:31:15 -0700\r
  34 Message-Id: <1332390675-31273-1-git-send-email-jakob@pipefour.org>\r
  35 X-Mailer: git-send-email 1.7.9.1\r
  36 X-BeenThere: notmuch@notmuchmail.org\r
  37 X-Mailman-Version: 2.1.13\r
  38 Precedence: list\r
  39 List-Id: "Use and development of the notmuch mail system."\r
  40         <notmuch.notmuchmail.org>\r
  41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  42         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  44 List-Post: <mailto:notmuch@notmuchmail.org>\r
  45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  47         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  48 X-List-Received-Date: Thu, 22 Mar 2012 04:32:57 -0000\r
  49 \r
  50 The new field "excluded" was added to the output and made this regex fail.\r
  51 ---\r
  52  vim/plugin/notmuch.vim |    5 +++--\r
  53  1 files changed, 3 insertions(+), 2 deletions(-)\r
  54 \r
  55 diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
  56 index 21985c7..92e1b50 100644\r
  57 --- a/vim/plugin/notmuch.vim\r
  58 +++ b/vim/plugin/notmuch.vim\r
  59 @@ -48,7 +48,7 @@ let s:notmuch_defaults = {\r
  60          \ 'g:notmuch_show_part_end_regexp':          '\f\r
  61 part}'                   ,\r
  62          \ 'g:notmuch_show_marker_regexp':            '\f\r
  63 \\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',\r
  64          \\r
  65 -        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) filename:\(.*\)$',\r
  66 +        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) excluded:\([[0-9]*\) filename:\(.*\)$',\r
  67          \ 'g:notmuch_show_tags_regexp':              '(\([^)]*\))$'               ,\r
  68          \\r
  69          \ 'g:notmuch_show_signature_regexp':         '^\(-- \?\|_\+\)$'           ,\r
  70 @@ -870,7 +870,8 @@ function! s:NM_cmd_show_parse(inlines)\r
  71                                          let msg['id'] = m[1]\r
  72                                          let msg['depth'] = m[2]\r
  73                                          let msg['match'] = m[3]\r
  74 -                                        let msg['filename'] = m[4]\r
  75 +                                        let msg['excluded'] = m[4]\r
  76 +                                        let msg['filename'] = m[5]\r
  77                                  endif\r
  78  \r
  79                                  let in_message = 1\r
  80 -- \r
  81 1.7.9.1\r
  82 \r