# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1328025093 18000
# Node ID db4d0e62bcdb4197679fd40c2ea0a06e116fb0a1
# Parent  531bba1b3547e0f98320a41c5cf9339ae4cafd07
Moar.

diff -r 531bba1b3547 -r db4d0e62bcdb .hgsub
--- a/.hgsub	Fri Jan 27 10:29:20 2012 -0500
+++ b/.hgsub	Tue Jan 31 10:51:33 2012 -0500
@@ -5,7 +5,6 @@
 vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
 vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
 vim/bundle/vim-commentary = [git]git://github.com/tpope/vim-commentary.git
-vim/bundle/vim-speeddating = [git]git://github.com/tpope/vim-speeddating.git
 vim/bundle/nerdtree = [git]git://github.com/scrooloose/nerdtree.git
 vim/bundle/surround = [git]git://github.com/tpope/vim-surround.git
 vim/bundle/sparkup = [git]git://github.com/sjl/vim-sparkup.git
diff -r 531bba1b3547 -r db4d0e62bcdb .hgsubstate
--- a/.hgsubstate	Fri Jan 27 10:29:20 2012 -0500
+++ b/.hgsubstate	Tue Jan 31 10:51:33 2012 -0500
@@ -27,5 +27,4 @@
 6362ba99c825afc046818807267d5c1143b5c887 vim/bundle/vim-javascript
 f21fbd8759d7fa6c3cb1bbb9fe05eae90422f01a vim/bundle/vim-makegreen
 80cc08f3fb2205630a1f1cee159d8ff6052d91d0 vim/bundle/vim-orgmode
-b0ee6ec2153c5f30827d67db1668f37a975a1005 vim/bundle/vim-speeddating
 280ca1b471bd3a0d2347735e8fcbd03a53f2c6ad vim/bundle/yankring
diff -r 531bba1b3547 -r db4d0e62bcdb bin/longcat
--- a/bin/longcat	Fri Jan 27 10:29:20 2012 -0500
+++ b/bin/longcat	Tue Jan 31 10:51:33 2012 -0500
@@ -10,8 +10,8 @@
 print r'''
     /\___/\
    /       \
-  |  #    # |
-  \     @   |
+  |  o    o |
+  \     #   |
    \   _|_ /
    /       \______
   / _______ ___   \
diff -r 531bba1b3547 -r db4d0e62bcdb vim/.vimrc
--- a/vim/.vimrc	Fri Jan 27 10:29:20 2012 -0500
+++ b/vim/.vimrc	Tue Jan 31 10:51:33 2012 -0500
@@ -58,8 +58,18 @@
 au FocusLost * :wa
 
 " Resize splits when the window is resized
-au VimResized * exe "normal! \<c-w>="
+au VimResized * :wincmd =
+
+" Trailing whitespace {{{
+" Only shown when not in insert mode so I don't go insane.
 
+augroup trailing
+    au!
+    au InsertEnter * :set listchars-=trail:⌴
+    au InsertLeave * :set listchars+=trail:⌴
+augroup END
+
+" }}}
 " Wildmenu completion {{{
 
 set wildmenu
@@ -867,13 +877,6 @@
 " }}}
 
 " }}}
-" Training mappings ------------------------------------------------------- {{{
-
-" Use L, dammit.
-nnoremap Ajk <nop>
-nnoremap A<esc> <nop>
-
-" }}}
 " CTags ------------------------------------------------------------------- {{{
 
 " For some reason ctags refuses to ignore Python variables, so I'll just hack
@@ -926,7 +929,7 @@
     \ "jar|class|swp|swo|log|so|o|pyc|jpe?g|png|gif|mo|po" .
     \ ")$' | " .
     \ "egrep -v '^(\\./)?(" .
-    \ "lib/|classes/|libs/|deploy/vendor/|.git/|.hg/|.svn/|.*migrations/" . 
+    \ "deploy/|lib/|classes/|libs/|deploy/vendor/|.git/|.hg/|.svn/|.*migrations/" . 
     \ ")'"
 
 let my_ctrlp_user_command = "" . 
diff -r 531bba1b3547 -r db4d0e62bcdb vim/snippets/python.snippets
--- a/vim/snippets/python.snippets	Fri Jan 27 10:29:20 2012 -0500
+++ b/vim/snippets/python.snippets	Tue Jan 31 10:51:33 2012 -0500
@@ -8,56 +8,14 @@
 snippet for
 	for ${1:x} in ${2:xs}:
 		${3:pass}
-snippet fore
-	for ${1:n}, ${2:item} in enumerate(${3:items}):
-		${4:pass}
-snippet class
-	class ${1:ClassName}(${2:object}):
-		def __init__(self${3:, args}):
-			${4:super($1, self).__init__()}
-			${5}
 snippet def
 	def ${1:function}(${2}):
 		${3:pass}
 snippet defs
 	def ${1:method}(self${2}):
 		${3:pass}
-snippet prop
-	@property
-	def ${1:method}(self${2}):
-		${3:pass}
 snippet lam
 	lambda ${1:args}: ${2:action}
-snippet .
-	self.
-snippet try Try/Except
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-snippet try Try/Except/Else
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	else:
-		${5:pass}
-snippet try Try/Except/Finally
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	finally:
-		${5:pass}
-snippet try Try/Except/Else/Finally
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	else:
-		${5:pass}
-	finally:
-		${6:pass}
 snippet ifmain
 	if __name__ == '__main__':
 		${1:main()}
@@ -69,3 +27,5 @@
 	assert False, repr(${1})$2
 snippet pdbt
 	import pdb; pdb.set_trace()
+snippet pp
+	from pprint import pprint; pprint($1)$2