04/48025dbfa96ddc0b92371570ce358d9c1981e6

   1 Return-Path: <felipe.contreras@gmail.com>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id D2C33431FAF\r
   6         for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:56 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id IfoR+sY+fyjn for <notmuch@notmuchmail.org>;\r
  17         Sat,  2 Nov 2013 07:03:52 -0700 (PDT)\r
  18 Received: from mail-ob0-f170.google.com (mail-ob0-f170.google.com\r
  19         [209.85.214.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id B03E2429E26\r
  22         for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 07:03:14 -0700 (PDT)\r
  23 Received: by mail-ob0-f170.google.com with SMTP id wp18so5656740obc.15\r
  24         for <notmuch@notmuchmail.org>; Sat, 02 Nov 2013 07:03:14 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  26         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  27         bh=zIf4aHXvGo9zM/qheYYu4qkdphw2uu6/k6cAGfuavcA=;\r
  28         b=kAwbiJpDlSlhwJoQkPHJbf5jpbNZZAlTPbP5lWlr8Z51itXnlGUarXMlS4Ozm8fMuR\r
  29         mjoVcOMxxKooFHSOhAwVMHfRr0nvFUanvSpQMjhPYAjhVqOH5kbL00apRr/cczgO6EGH\r
  30         VkeHRPf846JdEt/efFLYwrqkbLtgDQs+C2mY2PE7lEwfePnQRNWrQKUYITBf3r804jb3\r
  31         C8bcU+jgrqqCUF60LS2bWcRqQsFTJbs/jPUYogqbG79378XCLm4+UdcfvPyDGi5NFJhT\r
  32         bg48IkZF9lBvlQ/3p2u8mizAoKlM961cXdY5yDMP3dBaceqvG6GQkutT2kdvvAd5zhuV\r
  33         /p8w==\r
  34 X-Received: by 10.60.60.105 with SMTP id g9mr6463795oer.8.1383400994234;\r
  35         Sat, 02 Nov 2013 07:03:14 -0700 (PDT)\r
  36 Received: from localhost (187-162-140-241.static.axtel.net. [187.162.140.241])\r
  37         by mx.google.com with ESMTPSA id\r
  38         jz7sm24741703oeb.4.2013.11.02.07.03.12 for <multiple recipients>\r
  39         (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
  40         Sat, 02 Nov 2013 07:03:13 -0700 (PDT)\r
  41 From: Felipe Contreras <felipe.contreras@gmail.com>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH 15/21] vim: rename internal notmuch_rb variables\r
  44 Date: Sat,  2 Nov 2013 07:55:48 -0600\r
  45 Message-Id: <1383400554-1832-16-git-send-email-felipe.contreras@gmail.com>\r
  46 X-Mailer: git-send-email 1.8.4.2+fc1\r
  47 In-Reply-To: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
  48 References: <1383400554-1832-1-git-send-email-felipe.contreras@gmail.com>\r
  49 X-BeenThere: notmuch@notmuchmail.org\r
  50 X-Mailman-Version: 2.1.13\r
  51 Precedence: list\r
  52 List-Id: "Use and development of the notmuch mail system."\r
  53         <notmuch.notmuchmail.org>\r
  54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  55         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  57 List-Post: <mailto:notmuch@notmuchmail.org>\r
  58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  61 X-List-Received-Date: Sat, 02 Nov 2013 14:03:57 -0000\r
  62 \r
  63 Now we are the official one.\r
  64 \r
  65 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
  66 ---\r
  67  vim/notmuch.vim | 59 ++++++++++++++++++++++++++-------------------------------\r
  68  1 file changed, 27 insertions(+), 32 deletions(-)\r
  69 \r
  70 diff --git a/vim/notmuch.vim b/vim/notmuch.vim\r
  71 index 42c5f18..4e4dfb0 100644\r
  72 --- a/vim/notmuch.vim\r
  73 +++ b/vim/notmuch.vim\r
  74 @@ -1,4 +1,4 @@\r
  75 -if exists("g:loaded_notmuch_rb")\r
  76 +if exists("g:loaded_notmuch")\r
  77         finish\r
  78  endif\r
  79  \r
  80 @@ -6,16 +6,16 @@ if !has("ruby") || version < 700\r
  81         finish\r
  82  endif\r
  83  \r
  84 -let g:loaded_notmuch_rb = "yep"\r
  85 +let g:loaded_notmuch = "yep"\r
  86  \r
  87 -let g:notmuch_rb_folders_maps = {\r
  88 +let g:notmuch_folders_maps = {\r
  89         \ '<Enter>':    'folders_show_search()',\r
  90         \ 's':          'folders_search_prompt()',\r
  91         \ '=':          'folders_refresh()',\r
  92         \ 'c':          'compose()',\r
  93         \ }\r
  94  \r
  95 -let g:notmuch_rb_search_maps = {\r
  96 +let g:notmuch_search_maps = {\r
  97         \ 'q':          'kill_this_buffer()',\r
  98         \ '<Enter>':    'search_show_thread(1)',\r
  99         \ '<Space>':    'search_show_thread(2)',\r
 100 @@ -28,7 +28,7 @@ let g:notmuch_rb_search_maps = {\r
 101         \ 'c':          'compose()',\r
 102         \ }\r
 103  \r
 104 -let g:notmuch_rb_show_maps = {\r
 105 +let g:notmuch_show_maps = {\r
 106         \ 'q':          'kill_this_buffer()',\r
 107         \ 'A':          'show_tag("-inbox -unread")',\r
 108         \ 'I':          'show_tag("-unread")',\r
 109 @@ -43,41 +43,41 @@ let g:notmuch_rb_show_maps = {\r
 110         \ 'c':          'compose()',\r
 111         \ }\r
 112  \r
 113 -let g:notmuch_rb_compose_maps = {\r
 114 +let g:notmuch_compose_maps = {\r
 115         \ ',s':         'compose_send()',\r
 116         \ ',q':         'compose_quit()',\r
 117         \ }\r
 118  \r
 119 -let s:notmuch_rb_folders_default = [\r
 120 +let s:notmuch_folders_default = [\r
 121         \ [ 'new', 'tag:inbox and tag:unread' ],\r
 122         \ [ 'inbox', 'tag:inbox' ],\r
 123         \ [ 'unread', 'tag:unread' ],\r
 124         \ ]\r
 125  \r
 126 -let s:notmuch_rb_date_format_default = '%d.%m.%y'\r
 127 -let s:notmuch_rb_datetime_format_default = '%d.%m.%y %H:%M:%S'\r
 128 -let s:notmuch_rb_reader_default = 'mutt -f %s'\r
 129 -let s:notmuch_rb_sendmail_default = 'sendmail'\r
 130 -let s:notmuch_rb_folders_count_threads_default = 0\r
 131 +let s:notmuch_date_format_default = '%d.%m.%y'\r
 132 +let s:notmuch_datetime_format_default = '%d.%m.%y %H:%M:%S'\r
 133 +let s:notmuch_reader_default = 'mutt -f %s'\r
 134 +let s:notmuch_sendmail_default = 'sendmail'\r
 135 +let s:notmuch_folders_count_threads_default = 0\r
 136  \r
 137  if !exists('g:notmuch_rb_date_format')\r
 138 -       let g:notmuch_rb_date_format = s:notmuch_rb_date_format_default\r
 139 +       let g:notmuch_rb_date_format = s:notmuch_date_format_default\r
 140  endif\r
 141  \r
 142  if !exists('g:notmuch_rb_datetime_format')\r
 143 -       let g:notmuch_rb_datetime_format = s:notmuch_rb_datetime_format_default\r
 144 +       let g:notmuch_rb_datetime_format = s:notmuch_datetime_format_default\r
 145  endif\r
 146  \r
 147  if !exists('g:notmuch_rb_reader')\r
 148 -       let g:notmuch_rb_reader = s:notmuch_rb_reader_default\r
 149 +       let g:notmuch_rb_reader = s:notmuch_reader_default\r
 150  endif\r
 151  \r
 152  if !exists('g:notmuch_rb_sendmail')\r
 153 -       let g:notmuch_rb_sendmail = s:notmuch_rb_sendmail_default\r
 154 +       let g:notmuch_rb_sendmail = s:notmuch_sendmail_default\r
 155  endif\r
 156  \r
 157  if !exists('g:notmuch_rb_folders_count_threads')\r
 158 -       let g:notmuch_rb_folders_count_threads = s:notmuch_rb_folders_count_threads_default\r
 159 +       let g:notmuch_rb_folders_count_threads = s:notmuch_folders_count_threads_default\r
 160  endif\r
 161  \r
 162  function! s:new_file_buffer(type, fname)\r
 163 @@ -146,7 +146,7 @@ endfunction\r
 164  function! s:show_reply()\r
 165         ruby open_reply get_message.mail\r
 166         let b:compose_done = 0\r
 167 -       call s:set_map(g:notmuch_rb_compose_maps)\r
 168 +       call s:set_map(g:notmuch_compose_maps)\r
 169         autocmd BufUnload <buffer> call s:compose_unload()\r
 170         startinsert!\r
 171  endfunction\r
 172 @@ -154,7 +154,7 @@ endfunction\r
 173  function! s:compose()\r
 174         ruby open_compose\r
 175         let b:compose_done = 0\r
 176 -       call s:set_map(g:notmuch_rb_compose_maps)\r
 177 +       call s:set_map(g:notmuch_compose_maps)\r
 178         autocmd BufUnload <buffer> call s:compose_unload()\r
 179         startinsert!\r
 180  endfunction\r
 181 @@ -365,7 +365,7 @@ ruby << EOF\r
 182         end\r
 183  EOF\r
 184         setlocal nomodifiable\r
 185 -       call s:set_map(g:notmuch_rb_show_maps)\r
 186 +       call s:set_map(g:notmuch_show_maps)\r
 187  endfunction\r
 188  \r
 189  function! s:search_show_thread(mode)\r
 190 @@ -388,7 +388,7 @@ ruby << EOF\r
 191         search_render($cur_search)\r
 192  EOF\r
 193         call s:set_menu_buffer()\r
 194 -       call s:set_map(g:notmuch_rb_search_maps)\r
 195 +       call s:set_map(g:notmuch_search_maps)\r
 196         autocmd CursorMoved <buffer> call s:show_cursor_moved()\r
 197  endfunction\r
 198  \r
 199 @@ -404,27 +404,22 @@ function! s:folders()\r
 200         call s:new_buffer('folders')\r
 201         ruby folders_render()\r
 202         call s:set_menu_buffer()\r
 203 -       call s:set_map(g:notmuch_rb_folders_maps)\r
 204 +       call s:set_map(g:notmuch_folders_maps)\r
 205  endfunction\r
 206  \r
 207  "" root\r
 208  \r
 209  function! s:set_defaults()\r
 210         if exists('g:notmuch_rb_custom_search_maps')\r
 211 -               call extend(g:notmuch_rb_search_maps, g:notmuch_rb_custom_search_maps)\r
 212 +               call extend(g:notmuch_search_maps, g:notmuch_rb_custom_search_maps)\r
 213         endif\r
 214  \r
 215         if exists('g:notmuch_rb_custom_show_maps')\r
 216 -               call extend(g:notmuch_rb_show_maps, g:notmuch_rb_custom_show_maps)\r
 217 +               call extend(g:notmuch_show_maps, g:notmuch_rb_custom_show_maps)\r
 218         endif\r
 219  \r
 220 -       " TODO for now lets check the old folders too\r
 221 -       if !exists('g:notmuch_rb_folders')\r
 222 -               if exists('g:notmuch_folders')\r
 223 -                       let g:notmuch_rb_folders = g:notmuch_folders\r
 224 -               else\r
 225 -                       let g:notmuch_rb_folders = s:notmuch_rb_folders_default\r
 226 -               endif\r
 227 +       if !exists('g:notmuch_folders')\r
 228 +               let g:notmuch_folders = s:notmuch_folders_default\r
 229         endif\r
 230  endfunction\r
 231  \r
 232 @@ -613,7 +608,7 @@ ruby << EOF\r
 233  \r
 234         def folders_render()\r
 235                 $curbuf.render do |b|\r
 236 -                       folders = VIM::evaluate('g:notmuch_rb_folders')\r
 237 +                       folders = VIM::evaluate('g:notmuch_folders')\r
 238                         count_threads = VIM::evaluate('g:notmuch_rb_folders_count_threads')\r
 239                         $searches.clear\r
 240                         folders.each do |name, search|\r
 241 -- \r
 242 1.8.4.2+fc1\r
 243 \r