From: Jakob Date: Thu, 22 Mar 2012 04:31:15 +0000 (+1700) Subject: [PATCH] vim: fix regex after "notmuch show" output change X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1102473f59a23feebb9bb917bab0600832893bb7;p=notmuch-archives.git [PATCH] vim: fix regex after "notmuch show" output change --- diff --git a/89/dacc53a275d1009290fc27d21acfc511a32735 b/89/dacc53a275d1009290fc27d21acfc511a32735 new file mode 100644 index 000000000..e0bab0d03 --- /dev/null +++ b/89/dacc53a275d1009290fc27d21acfc511a32735 @@ -0,0 +1,82 @@ +Return-Path: +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 74622431FAE + for ; Wed, 21 Mar 2012 21:32:57 -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=[RCVD_IN_DNSWL_NONE=-0.0001] 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 lxYuR8QRLZWn for ; + Wed, 21 Mar 2012 21:32:55 -0700 (PDT) +Received: from qmta08.westchester.pa.mail.comcast.net + (qmta08.westchester.pa.mail.comcast.net [76.96.62.80]) + by olra.theworths.org (Postfix) with ESMTP id 4922D431FAF + for ; Wed, 21 Mar 2012 21:32:55 -0700 (PDT) +Received: from omta16.westchester.pa.mail.comcast.net ([76.96.62.88]) + by qmta08.westchester.pa.mail.comcast.net with comcast + id oUVQ1i0071uE5Es58UYu3S; Thu, 22 Mar 2012 04:32:54 +0000 +Received: from dalek.condo.net ([67.170.34.167]) + by omta16.westchester.pa.mail.comcast.net with comcast + id oUYt1i00G3cMnU33cUYtB6; Thu, 22 Mar 2012 04:32:54 +0000 +Received: from jakob by dalek.condo.net with local (Exim 4.77) + (envelope-from ) + id 1SAZh1-00089S-EB; Wed, 21 Mar 2012 21:32:07 -0700 +From: Jakob +To: notmuch@notmuchmail.org +Subject: [PATCH] vim: fix regex after "notmuch show" output change +Date: Wed, 21 Mar 2012 21:31:15 -0700 +Message-Id: <1332390675-31273-1-git-send-email-jakob@pipefour.org> +X-Mailer: git-send-email 1.7.9.1 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 22 Mar 2012 04:32:57 -0000 + +The new field "excluded" was added to the output and made this regex fail. +--- + 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 +