d6110e1c1451

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Fri, 12 Oct 2012 19:11:35 -0400
parents 8da4158741c9 (current diff) 8825c740bb7c (diff)
children c451e6fb149d
branches/tags (none)
files

Changes

--- a/chapters/17.markdown	Fri Oct 12 19:09:07 2012 -0400
+++ b/chapters/17.markdown	Fri Oct 12 19:11:35 2012 -0400
@@ -60,7 +60,7 @@
     :::vim
     :set statusline=%4l
 
-The line number in the status line will now be proceeded by enough spaces to
+The line number in the status line will now be preceded by enough spaces to
 make it at least four characters wide (for example: "  12").  This can be useful
 to prevent the text in the status line from shifting around distractingly.
 
--- a/chapters/18.markdown	Fri Oct 12 19:09:07 2012 -0400
+++ b/chapters/18.markdown	Fri Oct 12 19:11:35 2012 -0400
@@ -58,8 +58,8 @@
     :::vim
     " Vimscript file settings ---------------------- {{{
     augroup filetype_vim
-        au!
-        au FileType vim setlocal foldmethod=marker
+        autocmd!
+        autocmd FileType vim setlocal foldmethod=marker
     augroup END
     " }}}