# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1398205113 14400
# Node ID dea5f01cd866ac2a3a618eb5ae3f6c19a6a68c86
# Parent  f89668b148ecc459ebaabc9fdf4d639cdf1a43db
shit

diff -r f89668b148ec -r dea5f01cd866 .hgsubstate
--- a/.hgsubstate	Wed Apr 02 13:37:40 2014 -0400
+++ b/.hgsubstate	Tue Apr 22 18:18:33 2014 -0400
@@ -39,7 +39,7 @@
 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
 14cb306414dda411b1809a088e18eb2796030095 vim/bundle/syntastic
-e5433ec4644f266df27202f1e0d6b4ca45bff392 vim/bundle/timl
+c4dda1da8d6b290c9d01f5568cfb6f0effeeb3de vim/bundle/timl
 bf4a599901e0a9c85238158c661351dfaa1c91c2 vim/bundle/tslime2
 84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
diff -r f89668b148ec -r dea5f01cd866 fish/config.fish
--- a/fish/config.fish	Wed Apr 02 13:37:40 2014 -0400
+++ b/fish/config.fish	Tue Apr 22 18:18:33 2014 -0400
@@ -69,7 +69,6 @@
 # prepend_to_path "/usr/local/share/python"
 prepend_to_path "/usr/local/sbin"
 prepend_to_path "/usr/local/share/npm/bin"
-prepend_to_path "$HOME/bin"
 prepend_to_path "$HOME/lib/dotfiles/bin"
 prepend_to_path "/opt/local/bin"
 prepend_to_path "/opt/subversion/bin"
@@ -78,7 +77,7 @@
 prepend_to_path "/usr/local/Cellar/ruby/1.9.3-p194/bin"
 prepend_to_path "/Applications/Postgres.app/Contents/MacOS/bin"
 prepend_to_path "$HOME/.rbenv/shims"
-prepend_to_path "$NIX_LINK/bin"
+prepend_to_path "$HOME/bin"
 
 set BROWSER open
 
diff -r f89668b148ec -r dea5f01cd866 vim/vimrc
--- a/vim/vimrc	Wed Apr 02 13:37:40 2014 -0400
+++ b/vim/vimrc	Tue Apr 22 18:18:33 2014 -0400
@@ -293,6 +293,9 @@
 nnoremap <leader>( :tabprev<cr>
 nnoremap <leader>) :tabnext<cr>
 
+" Wrap
+nnoremap <leader>W :set wrap!<cr>
+
 " Copying text to the system clipboard.
 "
 " For some reason Vim no longer wants to talk to the OS X pasteboard through "*.
@@ -793,9 +796,9 @@
 " }}}
 " Common Lisp {{{
 
-function! SendToTmuxStripped(text)
-    call SendToTmux(substitute(a:text, '\v\n*$', '', ''))
-endfunction
+" function! SendToTmuxStripped(text)
+"     call SendToTmux(substitute(a:text, '\v\n*$', '', ''))
+" endfunction
 function! SetLispWords()
     if exists("g:did_set_lisp_words")
         return
@@ -1937,7 +1940,8 @@
     diffupdate
 endfunc
 
-nnoremap <leader>W :call ToggleDiffWhitespace()<CR>
+" TODO: Figure out the diffexpr shit necessary to make this buffer-local.
+" nnoremap <leader>W :call ToggleDiffWhitespace()<CR>
 
 " }}}
 " Error Toggles {{{
diff -r f89668b148ec -r dea5f01cd866 weechat/alias.conf
--- a/weechat/alias.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/alias.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.4.2
+# alias.conf -- weechat v0.4.3
 #
 
 [cmd]
diff -r f89668b148ec -r dea5f01cd866 weechat/aspell.conf
--- a/weechat/aspell.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/aspell.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.4.2
+# aspell.conf -- weechat v0.4.3
 #
 
 [color]
diff -r f89668b148ec -r dea5f01cd866 weechat/buffers.conf
--- a/weechat/buffers.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/buffers.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.4.2
+# buffers.conf -- weechat v0.4.3
 #
 
 [color]
diff -r f89668b148ec -r dea5f01cd866 weechat/charset.conf
--- a/weechat/charset.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/charset.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v0.4.2
+# charset.conf -- weechat v0.4.3
 #
 
 [default]
diff -r f89668b148ec -r dea5f01cd866 weechat/logger.conf
--- a/weechat/logger.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/logger.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.4.2
+# logger.conf -- weechat v0.4.3
 #
 
 [look]
diff -r f89668b148ec -r dea5f01cd866 weechat/plugins.conf
--- a/weechat/plugins.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/plugins.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.4.2
+# plugins.conf -- weechat v0.4.3
 #
 
 [var]
diff -r f89668b148ec -r dea5f01cd866 weechat/relay.conf
--- a/weechat/relay.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/relay.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.4.2
+# relay.conf -- weechat v0.4.3
 #
 
 [look]
diff -r f89668b148ec -r dea5f01cd866 weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/rmodifier.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- weechat v0.4.2
+# rmodifier.conf -- weechat v0.4.3
 #
 
 [look]
diff -r f89668b148ec -r dea5f01cd866 weechat/script.conf
--- a/weechat/script.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/script.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v0.4.2
+# script.conf -- weechat v0.4.3
 #
 
 [look]
diff -r f89668b148ec -r dea5f01cd866 weechat/sec.conf
--- a/weechat/sec.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/sec.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# sec.conf -- weechat v0.4.2
+# sec.conf -- weechat v0.4.3
 #
 
 [crypt]
diff -r f89668b148ec -r dea5f01cd866 weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/urlgrab.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.4.2
+# urlgrab.conf -- weechat v0.4.3
 #
 
 [color]
diff -r f89668b148ec -r dea5f01cd866 weechat/weechat.conf
--- a/weechat/weechat.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/weechat.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -349,6 +349,8 @@
 meta2-19~ = "/window +1"
 meta2-1;3A = "/buffer -1"
 meta2-1;3B = "/buffer +1"
+meta2-1;9A = "/buffer move -1"
+meta2-1;9B = "/buffer move +1"
 meta2-1;3C = "/buffer +1"
 meta2-1;3D = "/buffer -1"
 meta2-1;5A = "/input history_global_previous"
diff -r f89668b148ec -r dea5f01cd866 weechat/xfer.conf
--- a/weechat/xfer.conf	Wed Apr 02 13:37:40 2014 -0400
+++ b/weechat/xfer.conf	Tue Apr 22 18:18:33 2014 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.4.2
+# xfer.conf -- weechat v0.4.3
 #
 
 [look]
@@ -30,6 +30,7 @@
 auto_accept_chats = off
 auto_accept_files = off
 auto_accept_nicks = ""
+auto_check_crc32 = off
 auto_rename = on
 auto_resume = on
 convert_spaces = on