# HG changeset patch
# User Richard Cheng <rcheng@neuratron.com>
# Date 1333628391 -3600
# Node ID 5f0854fc2f0ca9222875db1cf70164124c08975b
# Parent  70fa74df63c33a1b3fc341d5408a2bb52ff3f90d# Parent  33e01424adaa5c3f433d1a48a3032d6675f8a86f
Merge remote-tracking branch 'upstream/master'

diff -r 70fa74df63c3 -r 5f0854fc2f0c chapters/02.markdown
--- a/chapters/02.markdown	Tue Apr 03 17:30:39 2012 +0100
+++ b/chapters/02.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -71,7 +71,8 @@
 
     :::vim
     :set wrap?
-    :set numberwidth?
+    :set shiftround?
+    :set matchtime?
 
 Setting Multiple Options at Once
 --------------------------------
@@ -85,7 +86,7 @@
 Exercises
 ---------
 
-Read `:help number`.
+Read `:help 'number'` (note the quotes).
 
 Read `:help relativenumber`.
 
@@ -93,4 +94,8 @@
 
 Read `:help wrap`.
 
-Add a few lines to your vimrc file to set these four options however you like.
+Read `:help shiftround`.
+
+Read `:help matchtime`.
+
+Add a few lines to your vimrc file to set these options however you like.
diff -r 70fa74df63c3 -r 5f0854fc2f0c chapters/15.markdown
--- a/chapters/15.markdown	Tue Apr 03 17:30:39 2012 +0100
+++ b/chapters/15.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -147,7 +147,7 @@
 
 * If your operator-pending mapping ends with some text visually selected, Vim
   will operate on that text.
-* Otherwise, Vim will operator on the text between the original cursor position
+* Otherwise, Vim will operate on the text between the original cursor position
   and the new position.
 
 Exercises
diff -r 70fa74df63c3 -r 5f0854fc2f0c chapters/20.markdown
--- a/chapters/20.markdown	Tue Apr 03 17:30:39 2012 +0100
+++ b/chapters/20.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -10,13 +10,13 @@
 
     :::vim
     :let b:hello = "world"
-    :echo hello
+    :echo b:hello
 
 As expected, Vim displays "world".  Now switch to the other buffer and run the
 echo command again:
 
     :::vim
-    :echo hello
+    :echo b:hello
 
 This time Vim throws an error, saying it can't find the variable.
 
diff -r 70fa74df63c3 -r 5f0854fc2f0c chapters/23.markdown
--- a/chapters/23.markdown	Tue Apr 03 17:30:39 2012 +0100
+++ b/chapters/23.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -88,7 +88,7 @@
 
     :::vim
     :function TextwidthIsTooWide()
-    :  if &l:numberwidth ># 80
+    :  if &l:textwidth ># 80
     :    return 1
     :  endif
     :endfunction
diff -r 70fa74df63c3 -r 5f0854fc2f0c chapters/24.markdown
--- a/chapters/24.markdown	Tue Apr 03 17:30:39 2012 +0100
+++ b/chapters/24.markdown	Thu Apr 05 13:19:51 2012 +0100
@@ -111,7 +111,7 @@
 
     :call AssignGood("test")
 
-This time the function works, and Vim displays "Yes".
+This time the function works, and Vim displays "Yep".
 
 Exercises
 ---------
diff -r 70fa74df63c3 -r 5f0854fc2f0c outline.org
--- a/outline.org	Tue Apr 03 17:30:39 2012 +0100
+++ b/outline.org	Thu Apr 05 13:19:51 2012 +0100
@@ -5,7 +5,7 @@
 *** run and view bytecode + output
 *** :nnoremap <buffer> ]] /\v^\S<cr>:noh<cr>
 *** :nnoremap <buffer> [[ ?\v^\S<cr>:noh<cr>
-*** :inoremap :<cr> :<cr><tab>.<left>
+** TODO indent files
 ** TODO customization
 *** mappings
 **** custom leader
@@ -29,3 +29,23 @@
 * TODO Where to go from here
 ** Omnicomplete
 ** makeprg, errorfmt
+** Read the fucking documentation
+** Read the source of some popular plugins
+*** Powerline for a mindfuck
+*** Fugitive
+* Ideas
+** MOAR SYNTAX
+** MOAR MAPPING
+*** <expr>
+*** <c-e>
+** String Escaping
+** Character theory
+   i.e. <c-v>n vs n
+** <M-Trap>
+** <C-Trap>
+** !
+** GUI-Specific stuff
+** Color schemes
+** command!
+** Case Studies
+*** Visual mode * from Scrooloose