vim: few compose mode updates, including README

2 files changed, 18 insertions, 2 deletions

diff --git a/vim/README b/vim/README
index d8bea97f..b2328814 100644
--- a/vim/README
+++ b/vim/README
@@ -25,6 +25,7 @@ To run:
 
     from vim:
         :NotMuch
+        :NotMuch new to:bart@jukie.net 'subject:this is a test'
 
 
 Buffer types:
@@ -33,6 +34,7 @@ Buffer types:
 
         Keybindings:
             <Enter> - show the selected search
+            m       - compose a new message
             s       - enter search criteria
             =       - refresh display
 
@@ -44,6 +46,7 @@ Buffer types:
             a       - archive message (remove inbox tag)
             f       - filter the current search terms
             o       - toggle search screen order
+            m       - compose a new message
             s       - enter search criteria
             ,s      - alter search criteria
             t       - filter the current search terms with tags
@@ -64,8 +67,20 @@ Buffer types:
             b       - toggle folding of message bodies
             c       - toggle folding of citations
             h       - toggle folding of extra header lines
+            m       - compose a new message
             s       - toggle folding of signatures
             q       - return to search display
             ?       - reveal the message and thread IDs of what's under cursor
             ^]      - search using word under cursor
 
+    [notmuch-compose]
+        When you're writing an email, you're in this mode.
+
+        Insert-mode keybindings:
+            <Tab>   - go to the next header line
+
+        Normal-mode keybindings:
+            <Tab>   - go to the next header line
+            ,s      - send this message
+            ,q      - abort this message
+
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index f32a134f..37781c0c 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -105,6 +105,7 @@ let s:notmuch_compose_headers_defaults = [
 " --- --- bindings for folders mode {{{2
 
 let g:notmuch_folders_maps = {
+        \ 'm':          ':call <SID>NM_new_mail()<CR>',
         \ 's':          ':call <SID>NM_search_prompt()<CR>',
         \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
         \ '=':          ':call <SID>NM_folders_refresh_view()<CR>',
@@ -1134,7 +1135,7 @@ function! s:NM_newComposeBuffer(lines, start_on_line)
         if start_on_line > 0 && start_on_line <= len(lines)
                 call cursor(start_on_line, strlen(getline(start_on_line)) + 1)
         else
-                call cursor(real_hdr_start, strlen(getline(real_hdr_start) + 1)
+                call cursor(real_hdr_start, strlen(getline(real_hdr_start)) + 1)
                 call <SID>NM_compose_next_entry_area()
         endif
 
@@ -1231,7 +1232,7 @@ endfunction
 " --- external mail handling helpers {{{1
 
 function! s:NM_new_mail()
-        echo 'not implemented'
+        call <SID>NM_cmd_compose([], [])
 endfunction
 
 " --- tag manipulation helpers {{{1