# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334066020 14400
# Node ID 5ec39f00d24d19f1d0903317145eb68a481d9bf7
# Parent  36ec7052b16be00a26f85fc17e3fd9066adc6ec6
Moar.

diff -r 36ec7052b16b -r 5ec39f00d24d .hgsubstate
--- a/.hgsubstate	Tue Apr 10 09:40:33 2012 -0400
+++ b/.hgsubstate	Tue Apr 10 09:53:40 2012 -0400
@@ -2,7 +2,7 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-513f0b205c699ffda0a45ed316c140298855d9bd vim/bundle/badwolf
+b85d43f6560154269b965e5d9ad9e4a787ca410f vim/bundle/badwolf
 2b5144befdbb88a4606c62f891741d21656232b5 vim/bundle/clam
 c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
@@ -16,7 +16,7 @@
 b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
 99277d9eed97a59cacc1db8c1dece2bcfd96d877 vim/bundle/powerline
 1d60548ce9543c462a1fc36830c5e7ec33a57b78 vim/bundle/python-mode
-86228e5aaf622c6386ab4e98c3bca144ca333ba1 vim/bundle/slimv
+17bd7f6cefeec93af6c852b3c146c8e75805cc4b vim/bundle/slimv
 c01d81a697de5e28452f32762a9c8fbe3eac0496 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
diff -r 36ec7052b16b -r 5ec39f00d24d vim/.vimrc
--- a/vim/.vimrc	Tue Apr 10 09:40:33 2012 -0400
+++ b/vim/.vimrc	Tue Apr 10 09:53:40 2012 -0400
@@ -235,8 +235,8 @@
 " Kill window
 nnoremap K :q<cr>
 
-" The "unfuck my screen" mapping.
-nnoremap <leader>U :syntax sync fromstart<cr>:redraw!<cr>
+" Unfuck my screen
+nnoremap U :syntax sync fromstart<cr>:redraw!<cr>
 
 " System clipboard interaction
 " From https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim
@@ -269,7 +269,7 @@
 " vnoremap <leader>UG :w !gist -p \| pbcopy<cr>
 
 " Send visual selection to paste.stevelosh.com
-vnoremap <c-p> :w !curl -sF 'sprunge=<-' 'http://paste.stevelosh.com' \| tr -d '\n ' \| pbcopy<cr>
+vnoremap <c-p> :w !curl -sF 'sprunge=<-' 'http://paste.stevelosh.com' \| tr -d '\n ' \| pbcopy && open `pbpaste`<cr>
 
 " Change case
 inoremap <C-u> <esc>gUiwea
@@ -340,7 +340,7 @@
 set pastetoggle=<F6>
 
 " Toggle [i]nvisible characters
-  nnoremap <leader>i :set list!<cr>
+nnoremap <leader>i :set list!<cr>
 
 " Drag Lines {{{
 
@@ -447,15 +447,15 @@
 
 " Directional Keys {{{
 
-" It's 2011.
+" It's 2012.
 noremap j gj
 noremap k gk
 
 " Easy buffer navigation
-noremap <C-h>  <C-w>h
-noremap <C-j>  <C-w>j
-noremap <C-k>  <C-w>k
-noremap <C-l>  <C-w>l
+noremap <C-h> <C-w>h
+noremap <C-j> <C-w>j
+noremap <C-k> <C-w>k
+noremap <C-l> <C-w>l
 
 noremap <leader>v <C-w>v
 
@@ -543,7 +543,7 @@
     au FileType clojure compiler clojure
     au FileType clojure setlocal report=100000
 
-    au BufWinEnter            SLIMV.REPL setlocal winfixwidth nolist
+    au BufWinEnter            SLIMV.REPL setlocal nolist
     au BufNewFile,BufReadPost SLIMV.REPL setlocal nowrap foldlevel=99
     au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> A GA
     au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> <localleader>R :emenu REPL.<Tab>
@@ -1137,7 +1137,7 @@
 
 let g:slimv_repl_name = 'SLIMV.REPL'
 let g:slimv_repl_split = 4
-let g:slimv_repl_syntax = 1
+let g:slimv_repl_syntax = 0
 let g:slimv_repl_wrap = 0
 
 " Use a swank command that works, and doesn't require new app windows.
@@ -1667,6 +1667,7 @@
     endif
 
     " Save on losing focus.
+    " TODO: Make this work...
     if exists('$TMUX')
         " let &t_ti = "\<Esc>Ptmux;\<Esc>" . &t_ti . "\e[?1004h" . "\<Esc>\\"
         " let &t_te = "\<Esc>Ptmux;\<Esc>" . "\e[?1004l" . &t_te . "\<Esc>\\"
@@ -1682,3 +1683,4 @@
 endif
 
 " }}}
+
diff -r 36ec7052b16b -r 5ec39f00d24d vim/custom-dictionary.utf-8.add
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/custom-dictionary.utf-8.add	Tue Apr 10 09:53:40 2012 -0400
@@ -0,0 +1,5 @@
+workflows
+Losh
+backend
+workflow
+admins
diff -r 36ec7052b16b -r 5ec39f00d24d vim/ftplugin/clojure/clojurefolding.vim
--- a/vim/ftplugin/clojure/clojurefolding.vim	Tue Apr 10 09:40:33 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-if exists('loaded_clojurefolding') || &cp
-    finish
-endif
-let loaded_clojurefolding=1
-
-let folded_forms = [
-            \ 'def',
-            \ 'defn',
-            \ 'defn-',
-            \ 'defform',
-            \ 'defform-',
-            \ 'defrule',
-            \ 'defprotocol',
-            \ 'defparser',
-            \ 'defmacro',
-            \ 'defmethod',
-            \ 'defmulti',
-            \ 'defonce',
-            \ 'defpage',
-            \ 'defmigration',
-            \ 'defremote',
-            \ 'defpartial',
-            \ 'extend-type',
-            \ 'extend-protocol',
-            \ 'defgauge',
-            \ 'defmeter',
-            \ 'defhistogram',
-            \ 'defcounter',
-            \ 'deftimer',
-            \ 'deftest',
-            \ 'defroutes',
-            \ 'defentity',
-            \ 'defdb',
-            \ 'defproject',
-            \ 'defsynth',
-            \ 'definst',
-            \ 'ns'
-            \ ]
-let s:form_re      = '\v^\((' . join(folded_forms, '|') . ')\s'
-let s:form_re_bare = '\v^\((' . join(folded_forms, '|') . ')$'
-
-function! s:NextNonBlankLineContents(start)
-    let lnum = a:start
-    let max = line("$")
-
-    while 1
-        let lnum += 1
-
-        " If we've run off the end of the file, return a blank string as
-        " a sentinel.
-        if lnum > max
-            return ""
-        endif
-
-        " Otherwise, get the contents.
-        let contents = getline(lnum)
-
-        " If they're non-blank, return it.  Otherwise we'll loop to the next
-        " line.
-        if contents =~ '\v\S'
-            return contents
-        endif
-    endwhile
-endfunction
-
-function! GetClojureFold()
-    let line = getline(v:lnum)
-
-    if line =~ s:form_re || line =~ s:form_re_bare
-        " We're on one of the forms we want to fold.
-
-        let nextline = s:NextNonBlankLineContents(v:lnum)
-
-        " If we've run off the end of the file, this means we're on a top-level
-        " form with no later nonblank lines in the file.  This has to be a one
-        " liner, because there's no content left that could be closing parens!
-        if nextline == ""
-            return 0
-        elseif nextline =~ '\v^\s+'
-            " If it's indented, this almost certainly isn't a one-liner.  Fold
-            " away!
-            return ">1"
-        else
-            " Otherwise, the next non-blank line after this one is not
-            " indented.  This means we're on a one-liner, so we don't want to
-            " fold.
-            return 0
-        endif
-    elseif line =~ '^\s*$'
-        " We need to look at the next non-blank line to determine how to fold
-        " blank lines.
-        let nextline = s:NextNonBlankLineContents(v:lnum)
-
-        " If we've run off the end of the file, this means we're on one of
-        " a series of blank lines ending the file.  They shouldn't be folded
-        " with anything.
-        if nextline == ""
-            return 0
-        elseif nextline =~ '\v^\s+'
-            " If it's indented, we're in the middle of an existing form.
-            " Just fold with that.
-            return "="
-        else
-            " Otherwise, the next non-blank line after this one is not
-            " indented.  That means we need to close any existing folds
-            " here.
-            return "<1"
-        endif
-    elseif line =~ '\v^\s+\S'
-        " Indented content, fold it into any existing folds.
-        return "="
-    else
-        " We are sitting on a non-blank, non-indented line, but it's not one of
-        " our special top-level forms, so we'll just leave it alone.
-        return 0
-    endif
-endfunction
-
-function! TurnOnClojureFolding()
-    setlocal foldexpr=GetClojureFold()
-    setlocal foldmethod=expr
-endfunction
diff -r 36ec7052b16b -r 5ec39f00d24d vim/ftplugin/clojurescript/clojurefolding.vim
--- a/vim/ftplugin/clojurescript/clojurefolding.vim	Tue Apr 10 09:40:33 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../clojure/clojurefolding.vim
\ No newline at end of file