--- /dev/null
+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 D2C33431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 2 Nov 2013 07:03:56 -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 IfoR+sY+fyjn for <notmuch@notmuchmail.org>;\r
+ Sat, 2 Nov 2013 07:03:52 -0700 (PDT)\r
+Received: from mail-ob0-f170.google.com (mail-ob0-f170.google.com\r
+ [209.85.214.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id B03E2429E26\r
+ for <notmuch@notmuchmail.org>; Sat, 2 Nov 2013 07:03:14 -0700 (PDT)\r
+Received: by mail-ob0-f170.google.com with SMTP id wp18so5656740obc.15\r
+ for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:14 -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=zIf4aHXvGo9zM/qheYYu4qkdphw2uu6/k6cAGfuavcA=;\r
+ b=kAwbiJpDlSlhwJoQkPHJbf5jpbNZZAlTPbP5lWlr8Z51itXnlGUarXMlS4Ozm8fMuR\r
+ mjoVcOMxxKooFHSOhAwVMHfRr0nvFUanvSpQMjhPYAjhVqOH5kbL00apRr/cczgO6EGH\r
+ VkeHRPf846JdEt/efFLYwrqkbLtgDQs+C2mY2PE7lEwfePnQRNWrQKUYITBf3r804jb3\r
+ C8bcU+jgrqqCUF60LS2bWcRqQsFTJbs/jPUYogqbG79378XCLm4+UdcfvPyDGi5NFJhT\r
+ bg48IkZF9lBvlQ/3p2u8mizAoKlM961cXdY5yDMP3dBaceqvG6GQkutT2kdvvAd5zhuV\r
+ /p8w==\r
+X-Received: by 10.60.60.105 with SMTP id g9mr6463795oer.8.1383400994234;\r
+ Sat, 02 Nov 2013 07:03:14 -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
+ jz7sm24741703oeb.4.2013.11.02.07.03.12 for <multiple recipients>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 02 Nov 2013 07:03:13 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 15/21] vim: rename internal notmuch_rb variables\r
+Date: Sat, 2 Nov 2013 07:55:48 -0600\r
+Message-Id: <1383400554-1832-16-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:03:57 -0000\r
+\r
+Now we are the official one.\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ vim/notmuch.vim | 59 ++++++++++++++++++++++++++-------------------------------\r
+ 1 file changed, 27 insertions(+), 32 deletions(-)\r
+\r
+diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
+index 42c5f18..4e4dfb0 100644\r
+--- a/vim/notmuch.vim\r
++++ b/vim/notmuch.vim\r
+@@ -1,4 +1,4 @@\r
+-if exists("g:loaded_notmuch_rb")\r
++if exists("g:loaded_notmuch")\r
+ finish\r
+ endif\r
+ \r
+@@ -6,16 +6,16 @@ if !has("ruby") || version < 700\r
+ finish\r
+ endif\r
+ \r
+-let g:loaded_notmuch_rb = "yep"\r
++let g:loaded_notmuch = "yep"\r
+ \r
+-let g:notmuch_rb_folders_maps = {\r
++let g:notmuch_folders_maps = {\r
+ \ '<Enter>': 'folders_show_search()',\r
+ \ 's': 'folders_search_prompt()',\r
+ \ '=': 'folders_refresh()',\r
+ \ 'c': 'compose()',\r
+ \ }\r
+ \r
+-let g:notmuch_rb_search_maps = {\r
++let g:notmuch_search_maps = {\r
+ \ 'q': 'kill_this_buffer()',\r
+ \ '<Enter>': 'search_show_thread(1)',\r
+ \ '<Space>': 'search_show_thread(2)',\r
+@@ -28,7 +28,7 @@ let g:notmuch_rb_search_maps = {\r
+ \ 'c': 'compose()',\r
+ \ }\r
+ \r
+-let g:notmuch_rb_show_maps = {\r
++let g:notmuch_show_maps = {\r
+ \ 'q': 'kill_this_buffer()',\r
+ \ 'A': 'show_tag("-inbox -unread")',\r
+ \ 'I': 'show_tag("-unread")',\r
+@@ -43,41 +43,41 @@ let g:notmuch_rb_show_maps = {\r
+ \ 'c': 'compose()',\r
+ \ }\r
+ \r
+-let g:notmuch_rb_compose_maps = {\r
++let g:notmuch_compose_maps = {\r
+ \ ',s': 'compose_send()',\r
+ \ ',q': 'compose_quit()',\r
+ \ }\r
+ \r
+-let s:notmuch_rb_folders_default = [\r
++let s:notmuch_folders_default = [\r
+ \ [ 'new', 'tag:inbox and tag:unread' ],\r
+ \ [ 'inbox', 'tag:inbox' ],\r
+ \ [ 'unread', 'tag:unread' ],\r
+ \ ]\r
+ \r
+-let s:notmuch_rb_date_format_default = '%d.%m.%y'\r
+-let s:notmuch_rb_datetime_format_default = '%d.%m.%y %H:%M:%S'\r
+-let s:notmuch_rb_reader_default = 'mutt -f %s'\r
+-let s:notmuch_rb_sendmail_default = 'sendmail'\r
+-let s:notmuch_rb_folders_count_threads_default = 0\r
++let s:notmuch_date_format_default = '%d.%m.%y'\r
++let s:notmuch_datetime_format_default = '%d.%m.%y %H:%M:%S'\r
++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_rb_date_format_default\r
++ let g:notmuch_rb_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_rb_datetime_format_default\r
++ let g:notmuch_rb_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_rb_reader_default\r
++ let g:notmuch_rb_reader = s:notmuch_reader_default\r
+ endif\r
+ \r
+ if !exists('g:notmuch_rb_sendmail')\r
+- let g:notmuch_rb_sendmail = s:notmuch_rb_sendmail_default\r
++ let g:notmuch_rb_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_rb_folders_count_threads_default\r
++ let g:notmuch_rb_folders_count_threads = s:notmuch_folders_count_threads_default\r
+ endif\r
+ \r
+ function! s:new_file_buffer(type, fname)\r
+@@ -146,7 +146,7 @@ endfunction\r
+ function! s:show_reply()\r
+ ruby open_reply get_message.mail\r
+ let b:compose_done = 0\r
+- call s:set_map(g:notmuch_rb_compose_maps)\r
++ call s:set_map(g:notmuch_compose_maps)\r
+ autocmd BufUnload <buffer> call s:compose_unload()\r
+ startinsert!\r
+ endfunction\r
+@@ -154,7 +154,7 @@ endfunction\r
+ function! s:compose()\r
+ ruby open_compose\r
+ let b:compose_done = 0\r
+- call s:set_map(g:notmuch_rb_compose_maps)\r
++ call s:set_map(g:notmuch_compose_maps)\r
+ autocmd BufUnload <buffer> call s:compose_unload()\r
+ startinsert!\r
+ endfunction\r
+@@ -365,7 +365,7 @@ ruby << EOF\r
+ end\r
+ EOF\r
+ setlocal nomodifiable\r
+- call s:set_map(g:notmuch_rb_show_maps)\r
++ call s:set_map(g:notmuch_show_maps)\r
+ endfunction\r
+ \r
+ function! s:search_show_thread(mode)\r
+@@ -388,7 +388,7 @@ ruby << EOF\r
+ search_render($cur_search)\r
+ EOF\r
+ call s:set_menu_buffer()\r
+- call s:set_map(g:notmuch_rb_search_maps)\r
++ call s:set_map(g:notmuch_search_maps)\r
+ autocmd CursorMoved <buffer> call s:show_cursor_moved()\r
+ endfunction\r
+ \r
+@@ -404,27 +404,22 @@ function! s:folders()\r
+ call s:new_buffer('folders')\r
+ ruby folders_render()\r
+ call s:set_menu_buffer()\r
+- call s:set_map(g:notmuch_rb_folders_maps)\r
++ call s:set_map(g:notmuch_folders_maps)\r
+ endfunction\r
+ \r
+ "" root\r
+ \r
+ function! s:set_defaults()\r
+ if exists('g:notmuch_rb_custom_search_maps')\r
+- call extend(g:notmuch_rb_search_maps, g:notmuch_rb_custom_search_maps)\r
++ call extend(g:notmuch_search_maps, g:notmuch_rb_custom_search_maps)\r
+ endif\r
+ \r
+ if exists('g:notmuch_rb_custom_show_maps')\r
+- call extend(g:notmuch_rb_show_maps, g:notmuch_rb_custom_show_maps)\r
++ call extend(g:notmuch_show_maps, g:notmuch_rb_custom_show_maps)\r
+ endif\r
+ \r
+- " TODO for now lets check the old folders too\r
+- if !exists('g:notmuch_rb_folders')\r
+- if exists('g:notmuch_folders')\r
+- let g:notmuch_rb_folders = g:notmuch_folders\r
+- else\r
+- let g:notmuch_rb_folders = s:notmuch_rb_folders_default\r
+- endif\r
++ if !exists('g:notmuch_folders')\r
++ let g:notmuch_folders = s:notmuch_folders_default\r
+ endif\r
+ endfunction\r
+ \r
+@@ -613,7 +608,7 @@ ruby << EOF\r
+ \r
+ def folders_render()\r
+ $curbuf.render do |b|\r
+- folders = VIM::evaluate('g:notmuch_rb_folders')\r
++ folders = VIM::evaluate('g:notmuch_folders')\r
+ count_threads = VIM::evaluate('g:notmuch_rb_folders_count_threads')\r
+ $searches.clear\r
+ folders.each do |name, search|\r
+-- \r
+1.8.4.2+fc1\r
+\r
projects / notmuch-archives.git / commitdiff