# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1352058640 18000
# Node ID 0adce74bc3ef189276a1145d685842a12b88c819
# Parent  f60c11e424db6ffdb5d3a70fe2551e65dbba7387# Parent  37efa216507c5b24d7386238cf83ad4dabc1eca7
Merge.

diff -r 37efa216507c -r 0adce74bc3ef .hgsubstate
--- a/.hgsubstate	Sun Nov 04 13:31:24 2012 -0500
+++ b/.hgsubstate	Sun Nov 04 14:50:40 2012 -0500
@@ -3,7 +3,7 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-89b93b086f099050eb5c5c5121cb18cc01b61f3e vim/bundle/badwolf
+9e4a52112a78ce74db15ce9af3d81dacc982a1d3 vim/bundle/badwolf
 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
 3c6182371db8e8ede3789d21b52386569eda2208 vim/bundle/ctrlp
diff -r 37efa216507c -r 0adce74bc3ef vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Sun Nov 04 13:31:24 2012 -0500
+++ b/vim/custom-dictionary.utf-8.add	Sun Nov 04 14:50:40 2012 -0500
@@ -107,3 +107,4 @@
 filetype
 filetypes
 Bitbucket
+Lua
diff -r 37efa216507c -r 0adce74bc3ef vim/vimrc
--- a/vim/vimrc	Sun Nov 04 13:31:24 2012 -0500
+++ b/vim/vimrc	Sun Nov 04 14:50:40 2012 -0500
@@ -191,6 +191,7 @@
 
 syntax on
 set background=dark
+let g:badwolf_tabline = 2
 let g:badwolf_html_link_underline = 0
 colorscheme badwolf
 
@@ -635,8 +636,9 @@
     au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> <localleader>R :emenu REPL.<Tab>
 
     " Fix the eval mappings.
-    au FileType clojure nnoremap <buffer> <localleader>ef :<c-u>call SlimvEvalExp()<cr>
-    au FileType clojure nnoremap <buffer> <localleader>ee :<c-u>call SlimvEvalDefun()<cr>
+    au FileType clojure nnoremap <buffer> <localleader>ef :call SlimvEvalExp()<cr>
+    au FileType clojure nnoremap <buffer> <localleader>ee :call SlimvEvalDefun()<cr>
+    au FileType clojure nnoremap <buffer> <localleader>en mzgg:call SlimvEvalDefun()<cr>`z
 
     " And the inspect mapping.
     au FileType clojure nmap <buffer> \i \di