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

diff -r 30546599658c -r c900d30856a9 chapters/02.markdown
--- a/chapters/02.markdown	Sun Jan 08 21:26:45 2012 +0200
+++ b/chapters/02.markdown	Wed Apr 04 13:48:45 2012 -0400
@@ -71,7 +71,8 @@
 
     :::vim
     :set wrap?
-    :set numberwidth?
+    :set shiftround?
+    :set matchtime?
 
 Setting Multiple Options at Once
 --------------------------------
@@ -93,4 +94,8 @@
 
 Read `:help wrap`.
 
-Add a few lines to your vimrc file to set these four options however you like.
+Read `:help shiftround`.
+
+Read `:help matchtime`.
+
+Add a few lines to your vimrc file to set these options however you like.
diff -r 30546599658c -r c900d30856a9 outline.org
--- a/outline.org	Sun Jan 08 21:26:45 2012 +0200
+++ b/outline.org	Wed Apr 04 13:48:45 2012 -0400
@@ -1,61 +1,51 @@
-* part 1 - basic .vimrc stuff
-** DONE echoing
-** DONE setting options
-** DONE basic mapping
-** DONE modal mapping
-** DONE strict mapping
-** DONE leaders
-** DONE editing .vimrc faster
-** DONE abbreviations
-** DONE more about mappings
-** DONE training with <nop>
-** DONE buffer-local mappings and options
-** DONE autocommands
-** DONE buffer-local abbreviations
-** DONE augroups
-** DONE operator-pending maps
-** DONE more operator-pending maps
-** DONE basic status lines
-** DONE a word on shortened command names
-* part 2 - programming in vimscript
-** DONE variables
-** DONE variable scopes
-** DONE conditionals
-** DONE comparisons
-** DONE functions
-** DONE function arguments
-** DONE numbers
-** DONE strings
-** DONE string functions
-** DONE normal!
-** DONE execute
-** DONE execute normal!
-** DONE basic regexes
-** DONE Case Study: GrepMotion
-** DONE lists
-** DONE looping
-** DONE dictionaries
-** DONE toggling
-** DONE functional programming
-** DONE paths
-** TODO advanced regexes
-** TODO exceptions
-** TODO functions again
-** TODO command!
 * part 3 - creating a full plugin
-** DONE intro
-** DONE plugin layout
-** DONE pathogen
-** DONE ftdetect
-** DONE syntax
-** DONE folding
-** TODO compilers
-*** makeprg
-*** errorformat
+** ... stuff that's done ...
+** TODO mapping
+*** run and view output
+*** run and view bytecode + output
+*** :nnoremap <buffer> ]] /\v^\S<cr>:noh<cr>
+*** :nnoremap <buffer> [[ ?\v^\S<cr>:noh<cr>
+** TODO indent files
+** TODO customization
+*** mappings
+**** custom leader
+**** disable entirely
+**** autoinsert period
+*** behaviour
+**** vertical/horizontal preview splits
+**** split sizes
+** TODO dynamic status lines
 ** TODO autoload
-** TODO customization
-** TODO dynamic status lines
-** TODO mapping
-** TODO customizing maps
 ** TODO documentation
+*** TOC
+*** Mappings
+*** Configuration
+*** Bugs
+*** License
 ** TODO distributing
+*** GitHub
+*** Vim.org
+*** a Web page
+* TODO Where to go from here
+** Omnicomplete
+** makeprg, errorfmt
+** Read the fucking documentation
+** Read the source of some popular plugins
+*** Powerline for a mindfuck
+*** Fugitive
+* Ideas
+** MOAR SYNTAX
+** MOAR MAPPING
+*** <expr>
+*** <c-e>
+** String Escaping
+** Character theory
+   i.e. <c-v>n vs n
+** <M-Trap>
+** <C-Trap>
+** !
+** GUI-Specific stuff
+** Color schemes
+** command!
+** Case Studies
+*** Visual mode * from Scrooloose