# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1350083806 14400
# Node ID 8b4e6818479532269039ca8ea444f7464e92838e
# Parent  c451e6fb149dfd95ede7ac68b500a9140c1f4784# Parent  8985aa307b9ae140d041f0834ad9e17266738f70
Merge.

diff -r c451e6fb149d -r 8b4e68184795 chapters/09.markdown
--- a/chapters/09.markdown	Fri Oct 12 19:13:41 2012 -0400
+++ b/chapters/09.markdown	Fri Oct 12 19:16:46 2012 -0400
@@ -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 `` `<`` and `` `>``
-commands for this, so read up on them with ``:help `<``.
+*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`.
diff -r c451e6fb149d -r 8b4e68184795 chapters/24.markdown
--- a/chapters/24.markdown	Fri Oct 12 19:13:41 2012 -0400
+++ b/chapters/24.markdown	Fri Oct 12 19:16:46 2012 -0400
@@ -81,7 +81,7 @@
     :  echo a:000
     :endfunction
 
-    :call Varg("a", "b", "c")
+    :call Varg2("a", "b", "c")
 
 We can see that Vim puts "a" into the named argument `a:foo`, and the rest are
 put into the list of varargs.
diff -r c451e6fb149d -r 8b4e68184795 chapters/39.markdown
--- a/chapters/39.markdown	Fri Oct 12 19:13:41 2012 -0400
+++ b/chapters/39.markdown	Fri Oct 12 19:16:46 2012 -0400
@@ -62,7 +62,7 @@
 
     function! Assoc(l, i, val)
         let new_list = deepcopy(a:l)
-        let newlist[a:i] = a:val
+        let new_list[a:i] = a:val
         return new_list
     endfunction