From: Felipe Contreras Date: Sat, 2 Nov 2013 13:55:49 +0000 (+1800) Subject: [PATCH 16/21] vim: rename public notmuch_rb variables X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01a3c3a4ca4fa0b5601c81f24d5f982a238fc5aa;p=notmuch-archives.git [PATCH 16/21] vim: rename public notmuch_rb variables --- diff --git a/29/edf06c17ff70600f9bef862172ff36a13a21d4 b/29/edf06c17ff70600f9bef862172ff36a13a21d4 new file mode 100644 index 000000000..f5a485bbe --- /dev/null +++ b/29/edf06c17ff70600f9bef862172ff36a13a21d4 @@ -0,0 +1,162 @@ +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 0675242116C + for ; Sat, 2 Nov 2013 07:04:00 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 icJLGjIoSZWY for ; + Sat, 2 Nov 2013 07:03:54 -0700 (PDT) +Received: from mail-ob0-f177.google.com (mail-ob0-f177.google.com + [209.85.214.177]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3AA75429E4A + for ; Sat, 2 Nov 2013 07:03:17 -0700 (PDT) +Received: by mail-ob0-f177.google.com with SMTP id vb8so5505570obc.8 + for ; Sat, 02 Nov 2013 07:03:16 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=tnRkUcYFEEHWrmOW2bzBoFrC/y1kb+tYNs89erQqhNw=; + b=Pi9kezkwYqK5k69q9+FAWjKASg3druC4etqyzMuscLxomk3fVgqqxoOVwIA7/kWQem + +jX8nH82O6bXg7xpHz1eQMgszCMmoCHpz6mmPRkKuaYtQpwFw0WeGlJmh6rBqQ8LHrDD + CL4FyqECmqY0mpchfSIS7woOGOx3mZTVgloaNQInoqV3BuLn6gwtfkUVgENaHz5Zwy0K + l+6wIYPZ2p/76BYWcpE0nTxlIQSZV3XjT2i8i6USYk2F6Y29tVFKMrVwCuWJuB3zG1fk + nw7aKBZE/Qb/4y7W9uqvjSKxfqBRODL1N67Z5MU78z9RmPnvZYPcL02jvU9vZp3/lMGJ + js5w== +X-Received: by 10.60.44.239 with SMTP id h15mr6460206oem.22.1383400996735; + Sat, 02 Nov 2013 07:03:16 -0700 (PDT) +Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241]) + by mx.google.com with ESMTPSA id + dh4sm13003511obb.3.2013.11.02.07.03.15 for + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sat, 02 Nov 2013 07:03:15 -0700 (PDT) +From: Felipe Contreras +To: notmuch@notmuchmail.org +Subject: [PATCH 16/21] vim: rename public notmuch_rb variables +Date: Sat, 2 Nov 2013 07:55:49 -0600 +Message-Id: <1383400554-1832-17-git-send-email-felipe.contreras@gmail.com> +X-Mailer: git-send-email 1.8.4.2+fc1 +In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com> +References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com> +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: Sat, 02 Nov 2013 14:04:00 -0000 + +Signed-off-by: Felipe Contreras +--- + vim/notmuch.vim | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/vim/notmuch.vim b/vim/notmuch.vim +index 4e4dfb0..2fe9346 100644 +--- a/vim/notmuch.vim ++++ b/vim/notmuch.vim +@@ -60,24 +60,24 @@ let s:notmuch_reader_default = 'mutt -f %s' + let s:notmuch_sendmail_default = 'sendmail' + let s:notmuch_folders_count_threads_default = 0 + +-if !exists('g:notmuch_rb_date_format') +- let g:notmuch_rb_date_format = s:notmuch_date_format_default ++if !exists('g:notmuch_date_format') ++ let g:notmuch_date_format = s:notmuch_date_format_default + endif + +-if !exists('g:notmuch_rb_datetime_format') +- let g:notmuch_rb_datetime_format = s:notmuch_datetime_format_default ++if !exists('g:notmuch_datetime_format') ++ let g:notmuch_datetime_format = s:notmuch_datetime_format_default + endif + +-if !exists('g:notmuch_rb_reader') +- let g:notmuch_rb_reader = s:notmuch_reader_default ++if !exists('g:notmuch_reader') ++ let g:notmuch_reader = s:notmuch_reader_default + endif + +-if !exists('g:notmuch_rb_sendmail') +- let g:notmuch_rb_sendmail = s:notmuch_sendmail_default ++if !exists('g:notmuch_sendmail') ++ let g:notmuch_sendmail = s:notmuch_sendmail_default + endif + +-if !exists('g:notmuch_rb_folders_count_threads') +- let g:notmuch_rb_folders_count_threads = s:notmuch_folders_count_threads_default ++if !exists('g:notmuch_folders_count_threads') ++ let g:notmuch_folders_count_threads = s:notmuch_folders_count_threads_default + endif + + function! s:new_file_buffer(type, fname) +@@ -179,7 +179,7 @@ function! s:show_open_msg() + ruby << EOF + m = get_message + mbox = File.expand_path('~/.notmuch/vim_mbox') +- cmd = VIM::evaluate('g:notmuch_rb_reader') % mbox ++ cmd = VIM::evaluate('g:notmuch_reader') % mbox + system "notmuch show --format=mbox id:#{m.message_id} > #{mbox} && #{cmd}" + EOF + endfunction +@@ -340,7 +340,7 @@ ruby << EOF + part = m.find_first_text + nm_m = Message.new(msg, m) + $messages << nm_m +- date_fmt = VIM::evaluate('g:notmuch_rb_datetime_format') ++ date_fmt = VIM::evaluate('g:notmuch_datetime_format') + date = Time.at(msg.date).strftime(date_fmt) + nm_m.start = b.count + b << "%s %s (%s)" % [msg['from'], date, msg.tags] +@@ -410,12 +410,12 @@ endfunction + "" root + + function! s:set_defaults() +- if exists('g:notmuch_rb_custom_search_maps') +- call extend(g:notmuch_search_maps, g:notmuch_rb_custom_search_maps) ++ if exists('g:notmuch_custom_search_maps') ++ call extend(g:notmuch_search_maps, g:notmuch_custom_search_maps) + endif + +- if exists('g:notmuch_rb_custom_show_maps') +- call extend(g:notmuch_show_maps, g:notmuch_rb_custom_show_maps) ++ if exists('g:notmuch_custom_show_maps') ++ call extend(g:notmuch_show_maps, g:notmuch_custom_show_maps) + endif + + if !exists('g:notmuch_folders') +@@ -609,7 +609,7 @@ ruby << EOF + def folders_render() + $curbuf.render do |b| + folders = VIM::evaluate('g:notmuch_folders') +- count_threads = VIM::evaluate('g:notmuch_rb_folders_count_threads') ++ count_threads = VIM::evaluate('g:notmuch_folders_count_threads') + $searches.clear + folders.each do |name, search| + q = $curbuf.query(search) +@@ -621,7 +621,7 @@ ruby << EOF + end + + def search_render(search) +- date_fmt = VIM::evaluate('g:notmuch_rb_date_format') ++ date_fmt = VIM::evaluate('g:notmuch_date_format') + q = $curbuf.query(search) + q.sort = Notmuch::SORT_NEWEST_FIRST + $threads.clear +-- +1.8.4.2+fc1 +