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