# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1321225352 18000
# Node ID 62bd929d4bb67179c1e5a8884960378230897536
# Parent  f78c198a9fd8fd921a87d4a16067c44fe32fc5d5# Parent  803c3423b387d808050224fad5adad47bb292fda
Merge.

diff -r 803c3423b387 -r 62bd929d4bb6 chapters/16.markdown
--- a/chapters/16.markdown	Wed Nov 09 11:10:53 2011 -0600
+++ b/chapters/16.markdown	Sun Nov 13 18:02:32 2011 -0500
@@ -162,7 +162,7 @@
 What's different about this mapping?  Let's look at them side by side:
 
     :onoremap ih :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rkvg_"<cr>
-    :onoremap ah :<c-u>execute "normal! ?^==\\+\r:nohlsearch\rg_vk0"<cr>
+    :onoremap ah :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rg_vk0"<cr>
 
 The only difference from the previous mapping is the very end, where we select
 the text to operate on:
diff -r 803c3423b387 -r 62bd929d4bb6 chapters/25.markdown
--- a/chapters/25.markdown	Wed Nov 09 11:10:53 2011 -0600
+++ b/chapters/25.markdown	Sun Nov 13 18:02:32 2011 -0500
@@ -74,7 +74,7 @@
 
     :echo 2 * 2.0
 
-Vim displays "2.0".
+Vim displays "4.0".
 
 Division
 --------