Re: [PATCH] VIM: Add URI handling
authorFranz Fellner <alpine.art.de@gmail.com>
Fri, 17 Oct 2014 16:14:22 +0000 (18:14 +0200)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:05:19 +0000 (10:05 -0800)
b3/c15f9a917a906ec7a193d55feb5b09877f75d8 [new file with mode: 0644]

diff --git a/b3/c15f9a917a906ec7a193d55feb5b09877f75d8 b/b3/c15f9a917a906ec7a193d55feb5b09877f75d8
new file mode 100644 (file)
index 0000000..24594a3
--- /dev/null
@@ -0,0 +1,171 @@
+Return-Path: <alpine.art.de@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 19DCD431FAF\r
+       for <notmuch@notmuchmail.org>; Fri, 17 Oct 2014 09:14:21 -0700 (PDT)\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 GAbmhgcAx-Qy for <notmuch@notmuchmail.org>;\r
+       Fri, 17 Oct 2014 09:14:13 -0700 (PDT)\r
+Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com\r
+ [74.125.82.41])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ CF62E431FB6   for <notmuch@notmuchmail.org>; Fri, 17 Oct 2014 09:14:12 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f41.google.com with SMTP id b13so1263713wgh.12\r
+       for <notmuch@notmuchmail.org>; Fri, 17 Oct 2014 09:14:11 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=date:message-id:from:to:cc:subject:in-reply-to:references\r
+       :mime-version:content-type:content-disposition\r
+       :content-transfer-encoding;\r
+       bh=erEWxFjw9iu1QcMHVxnSKtQAIZvTaJkx77deUjeygOs=;\r
+       b=T4W/80BJxAzMqJCaCXyKKzJMrzmM9FObAzFrGgTq6auggRfVoq7Ys3FhDDOHyRyBW8\r
+       ZDB2ZruySthKTswmVt4t+l2jp0qPcYGb0BLgDO6vx1B48HFCAlgkxTz4Wf+vaqi6awiV\r
+       k7ImI8ZgaBW2d/txfe2XjgrbvHNYJWWpKBxxqnBmxYKVBweUdY8DlvLcU35lZMgCJekk\r
+       YYQ4CJMGgMBTgVNMl/baerZLitz5XSbuzVPyLveL6qLXD0pHZS5eY5jr9x2TrPKr6u85\r
+       Jqafa4LBE+P6DzQOWzd7pSh3wxREUO+R3lVwRWZGhS/cUKDSbIjzrq4vtrc3+F0kziPh\r
+       WGjw==\r
+X-Received: by 10.194.60.230 with SMTP id k6mr4277986wjr.135.1413562451607;\r
+       Fri, 17 Oct 2014 09:14:11 -0700 (PDT)\r
+Received: from localhost (p5B00C8AC.dip0.t-ipconnect.de. [91.0.200.172])\r
+       by mx.google.com with ESMTPSA id ei1sm2567181wib.20.2014.10.17.09.14.10\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 17 Oct 2014 09:14:10 -0700 (PDT)\r
+Date: Fri, 17 Oct 2014 18:14:22 +0200\r
+Message-ID: <20141017181422.GG20696@TP_L520.localdomain>\r
+From: Franz Fellner <alpine.art.de@gmail.com>\r
+To: Ian Main <imain@stemwinder.org>\r
+Subject: Re: [PATCH] VIM: Add URI handling\r
+In-Reply-To: <543ecc23bb98_2c291569e8c17@ovo.mains.priv.notmuch>\r
+References: <1412281423-22441-1-git-send-email-imain@stemwinder.org>\r
+       <20141010114457.GG28601@TP_L520.localdomain>\r
+       <543822f73d3fd_46ad163fe88cd@ovo.mains.priv.notmuch>\r
+       <20141011142943.GD23373@TP_L520.localdomain>\r
+       <543ecc23bb98_2c291569e8c17@ovo.mains.priv.notmuch>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: 8bit\r
+Cc: notmuch@notmuchmail.org\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: Fri, 17 Oct 2014 16:14:21 -0000\r
+\r
+On Wed, 15 Oct 2014 12:33:55 -0700, Ian Main <imain@stemwinder.org> wrote:\r
+> Franz Fellner wrote:\r
+> > Here is a working implementation.\r
+> > Please review carefully as I only can simulate ruby and vimscript\r
+> > knowledge from what I see in notmuch.vim sourcefile and quick\r
+> > googling.\r
+> \r
+> Yes, this works nicely.  Thanks!\r
+> \r
+> I do notice however that this is against the github plugin repo (I think)?\r
+Yes, that's right.\r
+I forked the notmuch repo on github and incorporated your patches.\r
+Already made a mistake while applying one of your patches...\r
+https://github.com/ff2000/notmuch\r
+(Hope everythin is fine now)\r
\r
+commit cb757e9e438341a7bc6d2cfec4de7bdcc85946ea\r
+Author: Franz Fellner <alpine.art.de@gmail.com>\r
+Date:   Fri Oct 17 11:19:41 2014 +0200\r
+\r
+    VIM: Add MsgID to supported URIs\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 6287cf6..30e1876 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -268,6 +268,14 @@ ruby << EOF\r
+               if uri.class == URI::MailTo\r
+                       vim_puts("Composing new email to #{uri.to}.")\r
+                       VIM::command("call s:compose('#{uri.to}')")\r
++              elsif uri.class == URI::MsgID\r
++                      msg = $curbuf.message(uri.opaque)\r
++                      if !msg\r
++                              vim_puts("Message not found in NotMuch database: #{uri.to_s}")\r
++                      else\r
++                              vim_puts("Opening message #{msg.message_id} in thread #{msg.thread_id}.")\r
++                              VIM::command("call s:show('thread:#{msg.thread_id}', '#{msg.message_id}')")\r
++                      end\r
+               else\r
+                       vim_puts("Opening #{uri.to_s}.")\r
+                       cmd = VIM::evaluate('g:notmuch_open_uri')\r
+@@ -428,11 +436,12 @@ endfunction\r
\r
+ "" main\r
\r
+-function! s:show(thread_id)\r
++function! s:show(thread_id, msg_id)\r
+       call s:new_buffer('show')\r
+       setlocal modifiable\r
+ ruby << EOF\r
+       thread_id = VIM::evaluate('a:thread_id')\r
++      msg_id = VIM::evaluate('a:msg_id')\r
+       $cur_thread = thread_id\r
+       $messages.clear\r
+       $curbuf.render do |b|\r
+@@ -464,6 +473,9 @@ ruby << EOF\r
+                       end\r
+                       b << ""\r
+                       nm_m.end = b.count\r
++                      if !msg_id.empty? and nm_m.message_id == msg_id\r
++                              VIM::command("normal #{nm_m.start}zt")\r
++                      end\r
+               end\r
+               b.delete(b.count)\r
+       end\r
+@@ -486,7 +498,7 @@ ruby << EOF\r
+       when 1; $cur_filter = nil\r
+       when 2; $cur_filter = $cur_search\r
+       end\r
+-      VIM::command("call s:show('#{id}')")\r
++      VIM::command("call s:show('#{id}', '')")\r
+ EOF\r
+ endfunction\r
\r
+@@ -910,6 +922,10 @@ ruby << EOF\r
+                       q\r
+               end\r
\r
++              def message(id)\r
++                      @db.find_message(id)\r
++              end\r
++\r
+               def close\r
+                       @queries.delete_if { |q| ! q.destroy! }\r
+                       @db.close\r
+@@ -930,6 +946,13 @@ ruby << EOF\r
+               end\r
+       end\r
\r
++      module URI\r
++              class MsgID < Generic\r
++              end\r
++\r
++              @@schemes['ID'] = MsgID\r
++      end\r
++\r
+       class Message\r
+               attr_accessor :start, :body_start, :end\r
+               attr_reader :message_id, :filename, :mail\r