vimdiff shortcuts added and support for CTRL+Shift+LeftArrow...

1 files changed, 30 insertions, 8 deletions

diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt
index 9f4325f..3b714bc 100644
--- a/doc/shortcuts.txt
+++ b/doc/shortcuts.txt
@@ -1,13 +1,35 @@
-
 [visual mode] - with selected lines
-gq             - format text so that it fits in whatever :set textwidth was set
+gq              - formats text so that it fits in whatever :set textwidth was set
+
 
 [commands]
-:spell [word]  - adds a word to the current dictionary (no mistake any more)
-:set list      - display non printable characters
-:retab         - replaces tabs with spaces
-:set expandtab - in insert mode: replace tab with spaces   
+:spell [word]   - adds a word to the current dictionary (no mistake any more)
+:set list       - display non printable characters
+:retab          - replaces tabs with spaces
+:set expandtab  - in insert mode: replace tab with spaces   
+
 
 [navigation]
-<CTRL-]>       - go to tag under the cursor (help links as well)
-<CTRL-T>       - return back from tag under the cursor
+<CTRL-]>        - look up the tag under the cursor (help links as well)
+<CTRL-T>        - return back from tag under the cursor
+
+
+[macros] - record and play back a series of vim commands
+qa              - start (q) macro recording in register a (can be anything)
+q               - stop macro recording
+@a              - replay macro a
+:'<,'>normal @a - apply a to every line in the current selection
+
+
+[windows]
+<C-W>v          - splits buffer vertically (screen uses |)
+<C-W>s          - splits buffer horizontally (same as screen)
+<C-W>w          - moves the cursor to the next window and back
+<C-W>[dir]      - moves the cursor in that direction (use hjkl or arrow keys)
+
+
+[vimdiff]
+do              - get changes from other window into the current
+dp              - put changes from current window into the other
+]c              - jump to the next change
+[c              - jump to the prevous change