# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1339875219 14400
# Node ID 7dcc3e9f4ec393d5cad4272b547b1d8358a0bdbc
# Parent  2c4bac4c830b8773f2600f0d0fbf056e24bb5318# Parent  600054f4399156fcfa901dcfceacdc5a9ec9d6a1
Merge.

diff -r 2c4bac4c830b -r 7dcc3e9f4ec3 chapters/49.markdown
--- a/chapters/49.markdown	Sat Jun 16 15:33:35 2012 -0400
+++ b/chapters/49.markdown	Sat Jun 16 15:33:39 2012 -0400
@@ -78,17 +78,17 @@
 Now run the following command to view the foldlevel of line 1:
 
     :::vim
-    :echom foldmethod(1)
+    :echom foldlevel(1)
 
 Vim will display `0`.  Now let's find the foldlevel of line 2:
 
     :::vim
-    :echom foldmethod(2)
+    :echom foldlevel(2)
 
 Vim will display `1`.  Let's try line 3:
 
     :::vim
-    :echom foldmethod(3)
+    :echom foldlevel(3)
 
 Once again Vim displays `1`.  This means that lines 2 and 3 are part of a level
 1 fold.
@@ -330,7 +330,7 @@
 a given line.  Add the following function above `IndentLevel`:
 
     :::vim
-    function! s:NextNonBlankLine(lnum)
+    function! NextNonBlankLine(lnum)
         let numlines = line('$')
         let current = a:lnum + 1