From cd608e324a82e61d07644618e72561e601c8d33a Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 20 Oct 2014 22:05:32 +0300 Subject: [PATCH] Re: [PATCH] VIM: Add URI handling --- 2c/04baa1819c21316ebe69fa2fe4360be2397fef | 174 ++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 2c/04baa1819c21316ebe69fa2fe4360be2397fef diff --git a/2c/04baa1819c21316ebe69fa2fe4360be2397fef b/2c/04baa1819c21316ebe69fa2fe4360be2397fef new file mode 100644 index 000000000..c9b5d2273 --- /dev/null +++ b/2c/04baa1819c21316ebe69fa2fe4360be2397fef @@ -0,0 +1,174 @@ +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 0C550431FAF + for ; Mon, 20 Oct 2014 12:05:56 -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=[none] + 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 Ex0-5RiIuOVR for ; + Mon, 20 Oct 2014 12:05:52 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 1F60C431FAE + for ; Mon, 20 Oct 2014 12:05:52 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id ADE0B10008C; + Mon, 20 Oct 2014 22:05:32 +0300 (EEST) +From: Tomi Ollila +To: Franz Fellner +Subject: Re: [PATCH] VIM: Add URI handling +In-Reply-To: <20141017181422.GG20696@TP_L520.localdomain> +References: <1412281423-22441-1-git-send-email-imain@stemwinder.org> + <20141010114457.GG28601@TP_L520.localdomain> + <543822f73d3fd_46ad163fe88cd@ovo.mains.priv.notmuch> + <20141011142943.GD23373@TP_L520.localdomain> + <543ecc23bb98_2c291569e8c17@ovo.mains.priv.notmuch> + <20141017181422.GG20696@TP_L520.localdomain> +User-Agent: Notmuch/0.18.1+130~ga61922f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +Cc: notmuch@notmuchmail.org +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: Mon, 20 Oct 2014 19:05:56 -0000 + +On Fri, Oct 17 2014, Franz Fellner wrote: + +> On Wed, 15 Oct 2014 12:33:55 -0700, Ian Main wrote: +>> Franz Fellner wrote: +>> > Here is a working implementation. +>> > Please review carefully as I only can simulate ruby and vimscript +>> > knowledge from what I see in notmuch.vim sourcefile and quick +>> > googling. +>> +>> Yes, this works nicely. Thanks! +>> +>> I do notice however that this is against the github plugin repo (I think)? +> Yes, that's right. +> I forked the notmuch repo on github and incorporated your patches. +> Already made a mistake while applying one of your patches... +> https://github.com/ff2000/notmuch +> (Hope everythin is fine now) +> +> commit cb757e9e438341a7bc6d2cfec4de7bdcc85946ea +> Author: Franz Fellner +> Date: Fri Oct 17 11:19:41 2014 +0200 +> +> VIM: Add MsgID to supported URIs + +Code-wise this patch looks good -- although I am not entirely sure what id +does -- I expect it to handle id:... links... + +This email applies with git am (on top of Ian's) but the commit message has +quite a few lines of cruft -- I'd like to see a commit message what +explains what this change do ( the term 'MsgID' seems to be some vim client +internal (subclass in URI class ?) which IMO should be better commented in +this commit message. + + +Tomi + +> +> diff --git a/vim/notmuch.vim b/vim/notmuch.vim +> index 6287cf6..30e1876 100644 +> --- a/vim/notmuch.vim +> +++ b/vim/notmuch.vim +> @@ -268,6 +268,14 @@ ruby << EOF +> if uri.class == URI::MailTo +> vim_puts("Composing new email to #{uri.to}.") +> VIM::command("call s:compose('#{uri.to}')") +> + elsif uri.class == URI::MsgID +> + msg = $curbuf.message(uri.opaque) +> + if !msg +> + vim_puts("Message not found in NotMuch database: #{uri.to_s}") +> + else +> + vim_puts("Opening message #{msg.message_id} in thread #{msg.thread_id}.") +> + VIM::command("call s:show('thread:#{msg.thread_id}', '#{msg.message_id}')") +> + end +> else +> vim_puts("Opening #{uri.to_s}.") +> cmd = VIM::evaluate('g:notmuch_open_uri') +> @@ -428,11 +436,12 @@ endfunction +> +> "" main +> +> -function! s:show(thread_id) +> +function! s:show(thread_id, msg_id) +> call s:new_buffer('show') +> setlocal modifiable +> ruby << EOF +> thread_id = VIM::evaluate('a:thread_id') +> + msg_id = VIM::evaluate('a:msg_id') +> $cur_thread = thread_id +> $messages.clear +> $curbuf.render do |b| +> @@ -464,6 +473,9 @@ ruby << EOF +> end +> b << "" +> nm_m.end = b.count +> + if !msg_id.empty? and nm_m.message_id == msg_id +> + VIM::command("normal #{nm_m.start}zt") +> + end +> end +> b.delete(b.count) +> end +> @@ -486,7 +498,7 @@ ruby << EOF +> when 1; $cur_filter = nil +> when 2; $cur_filter = $cur_search +> end +> - VIM::command("call s:show('#{id}')") +> + VIM::command("call s:show('#{id}', '')") +> EOF +> endfunction +> +> @@ -910,6 +922,10 @@ ruby << EOF +> q +> end +> +> + def message(id) +> + @db.find_message(id) +> + end +> + +> def close +> @queries.delete_if { |q| ! q.destroy! } +> @db.close +> @@ -930,6 +946,13 @@ ruby << EOF +> end +> end +> +> + module URI +> + class MsgID < Generic +> + end +> + +> + @@schemes['ID'] = MsgID +> + end +> + +> class Message +> attr_accessor :start, :body_start, :end +> attr_reader :message_id, :filename, :mail +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2