bb/c5eed7f50ec20a8060ab527c79e0c05b32bcbf

   1 Return-Path: <felipe.contreras@gmail.com>\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 8C4D8431FC1\r
   6         for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:13:28 -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: -1.999\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-1.999 tagged_above=-999 required=5\r
  12         tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
  13         DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001]\r
  14         autolearn=ham\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id OnpgBDDGtwR7 for <notmuch@notmuchmail.org>;\r
  18         Sat,  5 Jun 2010 04:13:16 -0700 (PDT)\r
  19 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
  20         [209.85.214.53])\r
  21         by olra.theworths.org (Postfix) with ESMTP id 965394196F5\r
  22         for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:13:00 -0700 (PDT)\r
  23 Received: by mail-bw0-f53.google.com with SMTP id 12so686857bwz.26\r
  24         for <notmuch@notmuchmail.org>; Sat, 05 Jun 2010 04:13:00 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=domainkey-signature:received:received:from:to:cc:subject:date\r
  27         :message-id:x-mailer:in-reply-to:references;\r
  28         bh=EJ/UUPOwtXZj8rNYOzBDRlkHndycn/PqYcGd+1S0ZB8=;\r
  29         b=oMbtBl3lMVVQT0MdvkwbRwNulVQLJsb0ZiBJdUM5ko1dPHDyMhbH2tA7z7TRaLsctT\r
  30         GuhNYBby67V714hILFF5WrFjbygTD318Tgsek+XOQ3l0e+i7aRpfY5P0ZIZuaHAFuAgo\r
  31         bnm/McKc8taeMYbgVD9DkuepSZICaEwXVD5iY=\r
  32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  33         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  34         b=ibTxTa4R7roExLQiPba/nm2qI7BLCCoI0RDhAaCkZP8XvFVHDdcklpujB4mvIiFR+b\r
  35         IeH/H36wYbotapLpNbw98BVwpsItj9QLPXIr3VxUrDVgi6Fq+mZnB8Rp/fyJ3B7pvh5T\r
  36         sIilwhSQX23mB2IT3uGENTJQl1gOFb58MEcaE=\r
  37 Received: by 10.204.83.98 with SMTP id e34mr4833864bkl.99.1275736380260;\r
  38         Sat, 05 Jun 2010 04:13:00 -0700 (PDT)\r
  39 Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80])\r
  40         by mx.google.com with ESMTPS id\r
  41         v14sm9575850bkz.20.2010.06.05.04.12.59\r
  42         (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
  43         Sat, 05 Jun 2010 04:12:59 -0700 (PDT)\r
  44 From: Felipe Contreras <felipe.contreras@gmail.com>\r
  45 To: notmuch@notmuchmail.org\r
  46 Subject: [PATCH 4/9] vim: cleanup search syntax\r
  47 Date: Sat,  5 Jun 2010 14:12:37 +0300\r
  48 Message-Id: <1275736362-22771-5-git-send-email-felipe.contreras@gmail.com>\r
  49 X-Mailer: git-send-email 1.7.1\r
  50 In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
  51 References: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
  52 Cc: Bart Trojanowski <bart@jukie.net>\r
  53 X-BeenThere: notmuch@notmuchmail.org\r
  54 X-Mailman-Version: 2.1.13\r
  55 Precedence: list\r
  56 List-Id: "Use and development of the notmuch mail system."\r
  57         <notmuch.notmuchmail.org>\r
  58 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  59         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  60 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  61 List-Post: <mailto:notmuch@notmuchmail.org>\r
  62 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  63 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  65 X-List-Received-Date: Sat, 05 Jun 2010 11:13:28 -0000\r
  66 \r
  67 It was *sloooooow*.\r
  68 \r
  69 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
  70 ---\r
  71  vim/syntax/notmuch-search.vim |   36 ++++++++++++------------------------\r
  72  1 files changed, 12 insertions(+), 24 deletions(-)\r
  73 \r
  74 diff --git a/vim/syntax/notmuch-search.vim b/vim/syntax/notmuch-search.vim\r
  75 index 71839fd..f458d77 100644\r
  76 --- a/vim/syntax/notmuch-search.vim\r
  77 +++ b/vim/syntax/notmuch-search.vim\r
  78 @@ -1,24 +1,12 @@\r
  79 -" notmuch search mode syntax file\r
  80 -\r
  81 -" TODO: I cannot figure out why nmSearchTags is not matching anything :(\r
  82 -\r
  83 -syntax region nmSearchDate      start='^' end='\%13v'      oneline\r
  84 -syntax region nmSearchCountAndFrom start='\%14v\[' end='|' oneline contains=nmSearchCount,nmSearchFrom\r
  85 -syntax region nmSearchCount     start='\[' end='\]'        oneline contained contains=nmSearchCountZero,nmSearchCountSome,nmSearchCountAll\r
  86 -syntax region nmSearchFrom      start='\]\@<=' end='|'     oneline contained\r
  87 -syntax match  nmSearchCountZero '0/\(\d\+\)'               contained\r
  88 -syntax match  nmSearchCountSome '\([1-9]\d*\)/\(\d\+\)'    contained\r
  89 -syntax match  nmSearchCountAll  '\(\d\+\)/\1'              contained\r
  90 -syntax match  nmSearchSquareBracketText '\(\[\w\+\]\)'\r
  91 -syntax match  nmSearchTags      /([^)]\+)$/\r
  92 -\r
  93 -highlight link nmSearchDate      Statement\r
  94 -"highlight link nmSearchCount     Comment\r
  95 -highlight link nmSearchCountZero Function\r
  96 -highlight link nmSearchCountSome Special\r
  97 -highlight link nmSearchCountAll  Type\r
  98 -highlight link nmSearchFrom      Include\r
  99 -highlight link nmSearchSquareBracketText Special\r
 100 -highlight link nmSearchTags      String\r
 101 -\r
 102 -highlight CursorLine term=reverse cterm=reverse gui=reverse\r
 103 +syntax region nmSearch         start=/^/ end=/$/               oneline contains=nmSearchDate\r
 104 +syntax match nmSearchDate      /^.\{-13}/                      contained nextgroup=nmSearchNum\r
 105 +syntax match nmSearchNum       /.\{-4}/                        contained nextgroup=nmSearchFrom\r
 106 +syntax match nmSearchFrom      /.\{-21}/                       contained nextgroup=nmSearchSubject\r
 107 +syntax match nmSearchSubject   /.\{0,}\(([^()]\+)$\)\@=/       contained nextgroup=nmSearchTags\r
 108 +syntax match nmSearchTags      /.\+$/                          contained\r
 109 +\r
 110 +highlight link nmSearchDate    Statement\r
 111 +highlight link nmSearchNum     Type\r
 112 +highlight link nmSearchFrom    Include\r
 113 +highlight link nmSearchSubject Normal\r
 114 +highlight link nmSearchTags    String\r
 115 -- \r
 116 1.7.1\r
 117 \r