[PATCH 1/3] vim: refactor tagging stuff

diff --git a/4c/b08909dca1d43e2daa4140bf5c1f45b61555e9 b/4c/b08909dca1d43e2daa4140bf5c1f45b61555e9
new file mode 100644 (file)
index 0000000..dcd997b
--- /dev/null
+++ b/4c/b08909dca1d43e2daa4140bf5c1f45b61555e9
@@ -0,0 +1,147 @@
+Return-Path: <felipe.contreras@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8FD7341A54B\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Dec 2010 14:16:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id idpraOJvejjk for <notmuch@notmuchmail.org>;\r
+       Thu,  9 Dec 2010 14:16:50 -0800 (PST)\r
+Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com\r
+       [209.85.214.52])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8A0C441A552\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Dec 2010 14:16:50 -0800 (PST)\r
+Received: by mail-bw0-f52.google.com with SMTP id 4so3687965bwz.39\r
+       for <notmuch@notmuchmail.org>; Thu, 09 Dec 2010 14:16:50 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=domainkey-signature:received:received:from:to:cc:subject:date\r
+       :message-id:x-mailer:in-reply-to:references;\r
+       bh=9Ce2yFZ5vaC7kEhK0VKeJqMDJt1k//ZrTSydnApkXIw=;\r
+       b=sv5fxxbw2HkIZsds+MAORbIdy7qleOoxvAszsuwSrKDz2oYQV2TThUGppPfTN1wyN1\r
+       NaL8Tk2/3qi1NPDd+8F+6YppJ9qxJ+npEDIYRhezs0rj1pRzqAfdcVGfZsYQ2q4sUHhb\r
+       Prdkr772ZoP5GHqzAzitl51HYcoaXC3Nz8Cyk=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       b=pBgv8CthZg7HOo24/0CIEgrvNY2+cH4iNbicgUQLklbALGyiyGZhGFOdnR3p9NaXam\r
+       cnaPsHkWuBdkkW0Xbydj/Ux/IsTTCQf11OiY6xqOnZjcMyAX9zilnv7eOveod1GBtnT1\r
+       gGTZmZ/L5Zi1UUG6VWHKuEJuVD6070//lGwv0=\r
+Received: by 10.204.115.73 with SMTP id h9mr1801bkq.22.1291933010214;\r
+       Thu, 09 Dec 2010 14:16:50 -0800 (PST)\r
+Received: from localhost (a91-153-253-80.elisa-laajakaista.fi [91.153.253.80])\r
+       by mx.google.com with ESMTPS id\r
+       d11sm1213721bkd.22.2010.12.09.14.16.49\r
+       (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
+       Thu, 09 Dec 2010 14:16:49 -0800 (PST)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] vim: refactor tagging stuff\r
+Date: Fri, 10 Dec 2010 00:16:23 +0200\r
+Message-Id: <1291932985-5220-2-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.7.3.2\r
+In-Reply-To: <1291932985-5220-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1291932985-5220-1-git-send-email-felipe.contreras@gmail.com>\r
+Cc: Felipe Contreras <felipe.contreras@ngmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 09 Dec 2010 22:16:53 -0000\r
+\r
+From: Felipe Contreras <felipe.contreras@ngmail.com>\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@ngmail.com>\r
+---\r
+ vim/plugin/notmuch.vim |   18 ++++++++++--------\r
+ 1 files changed, 10 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
+index 8d5d1c3..6898d56 100644\r
+--- a/vim/plugin/notmuch.vim\r
++++ b/vim/plugin/notmuch.vim\r
+@@ -307,12 +307,12 @@ function! s:NM_search_edit()\r
+ endfunction\r
+ \r
+ function! s:NM_search_archive_thread()\r
+-        call <SID>NM_add_remove_tags([], '-', ['inbox'])\r
++        call <SID>NM_tag([], ['-inbox'])\r
+         norm j\r
+ endfunction\r
+ \r
+ function! s:NM_search_mark_read_then_archive_thread()\r
+-        call <SID>NM_add_remove_tags([], '-', ['unread', 'inbox'])\r
++        call <SID>NM_tag([], ['-unread', '-inbox'])\r
+         norm j\r
+ endfunction\r
+ \r
+@@ -403,7 +403,8 @@ function! s:NM_search_add_remove_tags(prompt, prefix, intags)\r
+         else\r
+                 let tags = a:intags\r
+         endif\r
+-        call <SID>NM_add_remove_tags([], a:prefix, tags)\r
++        call map(tags, 'a:prefix . v:val')\r
++        call <SID>NM_tag([], tags)\r
+ endfunction\r
+ \r
+ " --- implement show screen {{{1\r
+@@ -497,7 +498,7 @@ function! s:NM_show_archive_thread()\r
+ endfunction\r
+ \r
+ function! s:NM_show_mark_read_then_archive_thread()\r
+-        call <SID>NM_add_remove_tags(b:nm_search_words, '-', ['unread', 'inbox'])\r
++        call <SID>NM_tag(b:nm_search_words, ['-unread', '-inbox'])\r
+         call <SID>NM_show_next_thread()\r
+ endfunction\r
+ \r
+@@ -561,7 +562,8 @@ function! s:NM_show_advance_marking_read_and_archiving()\r
+                 let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')\r
+                          \ + ['AND']\r
+                          \ + <SID>NM_combine_tags('', ids, 'OR', '()')\r
+-                call <SID>NM_add_remove_tags(filter, '-', advance_tags)\r
++                call map(advance_tags, '"+" . v:val')\r
++                call <SID>NM_tag(filter, advance_tags)\r
+                 call <SID>NM_show_next(1, 1)\r
+                 return\r
+         endif\r
+@@ -580,7 +582,8 @@ function! s:NM_show_advance_marking_read_and_archiving()\r
+                         " do this last to hide the latency\r
+                         let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')\r
+                                  \ + ['AND', msg_top['id']]\r
+-                        call <SID>NM_add_remove_tags(filter, '-', advance_tags)\r
++                        call map(advance_tags, '"-" . v:val')\r
++                        call <SID>NM_tag(filter, advance_tags)\r
+                 endif\r
+                 return\r
+         endif\r
+@@ -1266,12 +1269,11 @@ function! s:NM_search_expand(arg)\r
+         let b:nm_prev_bufnr = prev_bufnr\r
+ endfunction\r
+ \r
+-function! s:NM_add_remove_tags(filter, prefix, tags)\r
++function! s:NM_tag(filter, tags)\r
+         let filter = len(a:filter) ? a:filter : [<SID>NM_search_thread_id()]\r
+         if !len(filter)\r
+                 throw 'Eeek! I couldn''t find the thead id!'\r
+         endif\r
+-        call map(a:tags, 'a:prefix . v:val')\r
+         let args = ['tag']\r
+         call extend(args, a:tags)\r
+         call add(args, '--')\r
+-- \r
+1.7.3.2\r
+\r