[PATCH 16/21] vim: rename public notmuch_rb variables

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