Merge remote-tracking branch 'upstream/master'
author |
Richard Cheng <rcheng@neuratron.com> |
date |
Thu, 05 Apr 2012 13:19:51 +0100 |
parents |
70fa74df63c3
(diff)
33e01424adaa
(current diff)
|
children |
f52bd8e7e36d
|
branches/tags |
(none) |
files |
|
Changes
--- a/chapters/05.markdown Wed Apr 04 13:50:41 2012 -0400
+++ b/chapters/05.markdown Thu Apr 05 13:19:51 2012 +0100
@@ -90,7 +90,7 @@
character.
Each of the `*map` commands has a `*noremap` counterpart that ignores other
-mappings: `nnoremap`, `vnoremap`, and `inoremap`.
+mappings: `noremap`, `nnoremap`, `vnoremap`, and `inoremap`.
When to Use
-----------
@@ -102,7 +102,7 @@
**No, seriously, ALWAYS.**
-Using a bare `nmap` is just *asking* for pain down the road when you install
+Using a bare `*map` is just *asking* for pain down the road when you install
a plugin or add a new custom mapping. Save yourself the trouble and type the
extra characters to make sure it never happens.
--- a/chapters/08.markdown Wed Apr 04 13:50:41 2012 -0400
+++ b/chapters/08.markdown Thu Apr 05 13:19:51 2012 +0100
@@ -89,7 +89,7 @@
Run this command:
:::vim
- :inoremap ssig --<cr>Steve Losh<cr>steve@stevelosh.com
+ :inoremap ssig -- <cr>Steve Losh<cr>steve@stevelosh.com
This is a *mapping* intended to let you insert your signature quickly. Try it
out by entering insert mode and typing `ssig`.
@@ -109,7 +109,7 @@
:::vim
:iunmap ssig
- :iabbrev ssig --<cr>Steve Losh<cr>steve@stevelosh.com
+ :iabbrev ssig -- <cr>Steve Losh<cr>steve@stevelosh.com
Now try out the abbreviation again.
--- a/chapters/09.markdown Wed Apr 04 13:50:41 2012 -0400
+++ b/chapters/09.markdown Thu Apr 05 13:19:51 2012 +0100
@@ -76,8 +76,8 @@
instead of double quotes.
Try using `vnoremap` to add a mapping that will wrap whatever text you have
-*visually selected* in quotes. You'll probably need the `gv` command for this,
-so read up on it with `:help gv`.
+*visually selected* in quotes. You'll probably need the ```<`` and ```>``
+commands for this, so read up on them with ``:help `<``.
Map `H` in normal mode to go to the beginning of the current line. Since `h`
moves left you can think of `H` as a "stronger" `h`.