Merge remote-tracking branch 'vim/master'

1 files changed, 41 insertions, 0 deletions

diff --git a/.vim/doc/shortcuts.txt b/.vim/doc/shortcuts.txt
new file mode 100644
index 0000000..6b88797
--- /dev/null
+++ b/.vim/doc/shortcuts.txt
@@ -0,0 +1,41 @@
+[normal mode]
+f{char}         - move cursor to the character {char}
+
+[visual mode] - with selected lines
+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   
+
+
+[navigation]
+<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
+
+[marker]
+ma              - set marker a-z (a in this case)
+'a              - go to marker a
+
+[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