X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=vim%2FREADME;h=12ad2bb4f1bb3a1229f5537f4df867d5cdb00d56;hp=02bd3e65ac4d345d4a931c6007f4fbfef866e8f8;hb=59b251ef940609dac7e17528065a39544463e0b4;hpb=682aa2e076665db3bc344deb13033b1d480e6b6f

diff --git a/vim/README b/vim/README
index 02bd3e65..12ad2bb4 100644
--- a/vim/README
+++ b/vim/README
@@ -3,9 +3,12 @@ through vim.
 
 NOTE: this is a work in progress.  Patches welcome. <bart@jukie.net>
 
-The vim interface makes use of the git-diff.vim syntax file which is
-available from
-    http://github.com/motemen/git-vim/blob/master/syntax/git-diff.vim
+Dependencies:
+    notmuch:
+        Naturally, it expects you have notmuch installed and configured.
+
+    mailx:
+        To send mail, notmuch.vim uses the UNIX mailx command.
 
 
 To install:
@@ -17,6 +20,7 @@ To run:
 
     from vim:
         :NotMuch
+        :NotMuch new to:bart@jukie.net 'subject:this is a test'
 
 
 Buffer types:
@@ -25,6 +29,7 @@ Buffer types:
 
         Keybindings:
             <Enter> - show the selected search
+            m       - compose a new message
             s       - enter search criteria
             =       - refresh display
 
@@ -32,12 +37,15 @@ Buffer types:
         You are presented with the search results when you run :NotMuch.
 
         Keybindings:
-            <Enter> - show the selected message
+            <Space> - show the selected thread colapsing unmatched items
+            <Enter> - show the entire selected thread
             a       - archive message (remove inbox tag)
             f       - filter the current search terms
             o       - toggle search screen order
+            m       - compose a new message
+            r       - reply to thread
             s       - enter search criteria
-            es      - alter search criteria
+            ,s      - alter search criteria
             t       - filter the current search terms with tags
             q       - return to folder display, or undo filter
             +       - add tag(s) to selected message
@@ -50,13 +58,28 @@ Buffer types:
         This is the display of the message.
 
         Keybindings:
+            <Space> - mark read, archive, go to next matching message
             ^n      - next message
             ^p      - previous message
             b       - toggle folding of message bodies
             c       - toggle folding of citations
             h       - toggle folding of extra header lines
-            s       - toggle folding of signatures
+            i       - toggle folding of signatures
+            m       - compose a new message
+            r       - reply to the message
+            s       - enter search criteria
             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
+