vmail 0.6.8 → 0.6.9

data/README.markdown

@@ -152,7 +152,7 @@ To mark a message spam, put the cursor on it and type `,!`. This moves the
 message to to the `spam` mailbox.
 
 You can use range selections in the message list when you star, delete, mark as
-spam, or archive. Use `<C-v>` to start marking a range of lines (the vertical
+spam, or archive. Use `v` to start marking a range of lines (the vertical
 position of the cursor doesn't matter).  Then type any of the above commands to
 perform an action on all the messages you selected.
 

data/lib/vmail.vim

@@ -67,7 +67,7 @@ function! s:create_message_window()
   close
 endfunction
 
-function! s:show_message()
+function! s:show_message(stay_in_message_list)
   let line = getline(line("."))
   if match(line, '^>  Load') != -1
     setlocal modifiable
@@ -99,9 +99,11 @@ function! s:show_message()
   " critical: don't call execute 'normal \<cr>'
   " call feedkeys("<cr>") 
   1delete
-  normal 1
-  normal jk
   setlocal nomodifiable
+  normal 1Gjk
+  if a:stay_in_message_list
+    call s:focus_list_window()
+  end
   redraw
 endfunction
 
@@ -178,6 +180,18 @@ function! s:focus_message_window()
   endif
 endfunction
 
+func! s:close_message_window()
+  if winnr('$') > 1
+    close
+  else
+    call s:focus_list_window()
+    wincmd p
+    close
+    normal z.
+  endif
+endfunc
+
+
 " gets new messages since last update
 function! s:update()
   let command = s:update_command
@@ -655,7 +669,6 @@ func! s:show_help()
   "exec "split " . helpfile
 endfunc
 
-
 " -------------------------------------------------------------------------------- 
 " MAPPINGS
 
@@ -672,7 +685,7 @@ func! s:message_window_mappings()
   nmap <silent> <buffer> <leader>k <c-k>
   noremap <silent> <buffer> <Leader>c :call <SID>compose_message()<CR>
   noremap <silent> <buffer> <Leader>h :call <SID>open_html_part()<CR><cr>
-  nnoremap <silent> <buffer> q :close<cr>
+  nnoremap <silent> <buffer> q :call <SID>close_message_window()<cr> 
 
   nnoremap <silent> <buffer> <leader>#  :close<cr>:call <SID>focus_list_window()<cr>:call <SID>delete_messages("Deleted")<cr>
   nnoremap <silent> <buffer> <leader>*  :call <SID>focus_list_window()<cr>:call <SID>toggle_star()<cr>
@@ -692,8 +705,9 @@ func! s:message_window_mappings()
 endfunc
 
 func! s:message_list_window_mappings()
-  noremap <silent> <buffer> <cr> :call <SID>show_message()<CR>
-  noremap <silent> <buffer> <LeftMouse> :call <SID>show_message()<CR>
+  noremap <silent> <buffer> <cr> :call <SID>show_message(0)<CR>
+  noremap <silent> <buffer> <LeftMouse> :call <SID>show_message(0)<CR>
+  nnoremap <silent> <buffer> l :call <SID>show_message(1)<CR>
   noremap <silent> <buffer> q :qal!<cr>
 
   noremap <silent> <buffer> <leader>* :call <SID>toggle_star()<CR>
@@ -704,7 +718,7 @@ func! s:message_list_window_mappings()
   noremap <silent> <buffer> <leader>! :call <SID>delete_messages("[Gmail]/Spam")<CR>
   noremap <silent> <buffer> <leader>e :call <SID>archive_messages()<CR>
   "open a link browser (os x)
-  "autocmd CursorMoved <buffer> call <SID>show_message()
+  "autocmd CursorMoved <buffer> call <SID>show_message(0)
   noremap <silent> <buffer> <leader>vp :call <SID>append_messages_to_file()<CR>
   noremap <silent> <buffer> u :call <SID>update()<CR>
   noremap <silent> <buffer> <Leader>s :call <SID>search_query()<CR>
@@ -712,9 +726,9 @@ func! s:message_list_window_mappings()
   noremap <silent> <buffer> <Leader>b :call <SID>move_to_mailbox(0)<CR>
   noremap <silent> <buffer> <Leader>B :call <SID>move_to_mailbox(1)<CR>
   noremap <silent> <buffer> <Leader>c :call <SID>compose_message()<CR>
-  noremap <silent> <buffer> <Leader>r :call <SID>show_message()<cr>:call <SID>compose_reply(0)<CR>
-  noremap <silent> <buffer> <Leader>a :call <SID>show_message()<cr>:call <SID>compose_reply(1)<CR>
-  noremap <silent> <buffer> <Leader>f :call <SID>show_message()<cr>:call <SID>compose_forward()<CR><cr>
+  noremap <silent> <buffer> <Leader>r :call <SID>show_message(0)<cr>:call <SID>compose_reply(0)<CR>
+  noremap <silent> <buffer> <Leader>a :call <SID>show_message(0)<cr>:call <SID>compose_reply(1)<CR>
+  noremap <silent> <buffer> <Leader>f :call <SID>show_message(0)<cr>:call <SID>compose_forward()<CR><cr>
   noremap <silent> <buffer> <c-j> :call <SID>show_next_message_in_list()<cr>
   noremap <silent> <buffer> <c-k> :call <SID>show_previous_message_in_list()<cr>
   nnoremap <silent> <buffer> <Space> :call <SID>maximize_window()<cr>

data/lib/vmail/imap_client.rb

@@ -263,7 +263,7 @@ module Vmail
       end
       log "@all_search #{@all_search}"
       @query = query
-      log "search query: #@query.inspect"
+      log "search query: #{@query.inspect}"
       @ids = reconnect_if_necessary do
         @imap.search(@query.join(' '))
       end

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Daniel Choi