37/3fd8b7d16067fe98e136f9b795d75fc56a756e

   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 D1BDD40AB41\r
   6         for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:13:34 -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 MbXT6FmVJDze for <notmuch@notmuchmail.org>;\r
  18         Sat,  5 Jun 2010 04:13:20 -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 6D66C418C25\r
  22         for <notmuch@notmuchmail.org>; Sat,  5 Jun 2010 04:13:02 -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:02 -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=AabXUD5+EyzLxdOyc0k3F44xDRgFNvc+FTDUa9U386A=;\r
  29         b=fWPot2cKg5bGVrEZkAo9Kdj9bQrBzzFknMc8JCtmdpRbc+Q/e0UfIvhL0/PdpRxI8I\r
  30         qyXTPGiwI7jE9nhrcsZcgdm6simnk4tRJHEIH0QoBRnkVnpc2r6m1NhhRR3uM5+7Y9F/\r
  31         O2d/ZGdfLaygPlRuA4D7czQPBM3PeaOxNkmlM=\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=XEOktKRGFySb3kCW7DvlrZlEsESshGA1PROtqp5O0ZITPqCbphPRL+DNGQQktCKWRe\r
  35         7z0+cbUX3mmna2ld7QKtjw3EEJHwXk+RwzzU22pgBZFCiq5bSxRaOSZtDAnzBb3gY+Ou\r
  36         3OO9u8KZ7LcCnubowYWAONdjyJB2UC0vcOrCQ=\r
  37 Received: by 10.204.6.68 with SMTP id 4mr4820878bky.163.1275736382084;\r
  38         Sat, 05 Jun 2010 04:13:02 -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 v14sm9601771bkz.2.2010.06.05.04.13.01\r
  41         (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
  42         Sat, 05 Jun 2010 04:13:01 -0700 (PDT)\r
  43 From: Felipe Contreras <felipe.contreras@gmail.com>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH 5/9] vim: remove add_remove_tags_on_screen()\r
  46 Date: Sat,  5 Jun 2010 14:12:38 +0300\r
  47 Message-Id: <1275736362-22771-6-git-send-email-felipe.contreras@gmail.com>\r
  48 X-Mailer: git-send-email 1.7.1\r
  49 In-Reply-To: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
  50 References: <1275736362-22771-1-git-send-email-felipe.contreras@gmail.com>\r
  51 Cc: Bart Trojanowski <bart@jukie.net>\r
  52 X-BeenThere: notmuch@notmuchmail.org\r
  53 X-Mailman-Version: 2.1.13\r
  54 Precedence: list\r
  55 List-Id: "Use and development of the notmuch mail system."\r
  56         <notmuch.notmuchmail.org>\r
  57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  58         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  60 List-Post: <mailto:notmuch@notmuchmail.org>\r
  61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  64 X-List-Received-Date: Sat, 05 Jun 2010 11:13:35 -0000\r
  65 \r
  66 It's not working properly; the current message is jumping around and the\r
  67 tags not really added/removed properly.\r
  68 \r
  69 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
  70 ---\r
  71  vim/plugin/notmuch.vim |   17 -----------------\r
  72  1 files changed, 0 insertions(+), 17 deletions(-)\r
  73 \r
  74 diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
  75 index b8c9858..01ee10f 100644\r
  76 --- a/vim/plugin/notmuch.vim\r
  77 +++ b/vim/plugin/notmuch.vim\r
  78 @@ -306,7 +306,6 @@ function! s:NM_search_edit()\r
  79  endfunction\r
  80  \r
  81  function! s:NM_search_archive_thread()\r
  82 -        call <SID>NM_add_remove_tags_on_screen('', '-', ['inbox'])\r
  83          call <SID>NM_add_remove_tags([], '-', ['inbox'])\r
  84          norm j\r
  85  endfunction\r
  86 @@ -399,7 +398,6 @@ function! s:NM_search_add_remove_tags(prompt, prefix, intags)\r
  87                  let tags = a:intags\r
  88          endif\r
  89          call <SID>NM_add_remove_tags([], a:prefix, tags)\r
  90 -        call <SID>NM_add_remove_tags_on_screen('', a:prefix, tags)\r
  91  endfunction\r
  92  \r
  93  " --- implement show screen {{{1\r
  94 @@ -569,7 +567,6 @@ function! s:NM_show_advance_marking_read_and_archiving()\r
  95  \r
  96          " if entire message fits on the screen, read/archive it, move to the next one\r
  97          if msg_top['id'] != msg_bot['id'] || msg_top['end'] <= vis_bot\r
  98 -                call <SID>NM_add_remove_tags_on_screen(msg_top['start'], '-', advance_tags)\r
  99                  exec printf('norm %dG', vis_top)\r
 100                  call <SID>NM_show_next(0, 1)\r
 101                  if has_key(msg_top,'match') && msg_top['match'] != '0'\r
 102 @@ -1325,20 +1322,6 @@ function! s:NM_add_remove_tags(filter, prefix, tags)\r
 103          call <SID>NM_run(args)\r
 104  endfunction\r
 105  \r
 106 -function! s:NM_add_remove_tags_on_screen(online, prefix, tags)\r
 107 -        setlocal modifiable\r
 108 -        if a:prefix == '-'\r
 109 -                for tagname in a:tags\r
 110 -                        exec printf('silent! %ss/(\([^)]*\)\<%s\>\([^)]*\))$/(\1\2)/', string(a:online), tagname)\r
 111 -                endfor\r
 112 -        else\r
 113 -                for tagname in a:tags\r
 114 -                        exec printf('silent! %ss/(\([^)]*\))$/(\1 %s)/', string(a:online), tagname)\r
 115 -                endfor\r
 116 -        endif\r
 117 -        setlocal nomodifiable\r
 118 -endfunction\r
 119 -\r
 120  " --- process and set the defaults {{{1\r
 121  \r
 122  function! NM_set_defaults(force)\r
 123 -- \r
 124 1.7.1\r
 125 \r