# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1333561725 14400
# Node ID c900d30856a933015d4b762ffb6da4ce97399bdb
# Parent  e668fd6598477f293202ca4bbb016becbfd94b1c# Parent  30546599658c413a11fca7ace87fd51ab6b5cd6a
Merge.

diff -r e668fd659847 -r c900d30856a9 chapters/15.markdown
--- a/chapters/15.markdown	Wed Apr 04 13:45:32 2012 -0400
+++ b/chapters/15.markdown	Wed Apr 04 13:48:45 2012 -0400
@@ -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 e668fd659847 -r c900d30856a9 chapters/20.markdown
--- a/chapters/20.markdown	Wed Apr 04 13:45:32 2012 -0400
+++ b/chapters/20.markdown	Wed Apr 04 13:48:45 2012 -0400
@@ -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 e668fd659847 -r c900d30856a9 chapters/23.markdown
--- a/chapters/23.markdown	Wed Apr 04 13:45:32 2012 -0400
+++ b/chapters/23.markdown	Wed Apr 04 13:48:45 2012 -0400
@@ -88,7 +88,7 @@
 
     :::vim
     :function TextwidthIsTooWide()
-    :  if &l:numberwidth ># 80
+    :  if &l:textwidth ># 80
     :    return 1
     :  endif
     :endfunction
diff -r e668fd659847 -r c900d30856a9 chapters/24.markdown
--- a/chapters/24.markdown	Wed Apr 04 13:45:32 2012 -0400
+++ b/chapters/24.markdown	Wed Apr 04 13:48:45 2012 -0400
@@ -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
 ---------