# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1291412220 18000
# Node ID f21a803ee3ba00efc2ad7fbae64433da3434c34f
# Parent  ddf0e2629edbf5e76bb41f4a2046a5487d8928f4
vim: kill delimitmate

diff -r ddf0e2629edb -r f21a803ee3ba .hgrc
--- a/.hgrc	Thu Dec 02 14:49:09 2010 -0500
+++ b/.hgrc	Fri Dec 03 16:37:00 2010 -0500
@@ -50,7 +50,13 @@
 opts.vd = -c 'set lines=70' -c 'set columns=240' -f '+next' '+execute "DirDiff" argv(0) argv(1)'
 cmd.kd = /usr/local/bin/ksdiff-wrapper
 opts.kd = hg
+cmd.ksdiff = /usr/local/bin/ksdiff-wrapper
+opts.ksdiff = hg
+cmd.sleep = /bin/sleep
+opts.sleep = 30 #
 
+[alias]
+kk = !/opt/local/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python /opt/local/bin/hg kd $@
 [email]
 method = smtp
 from = Steve Losh <steve@stevelosh.com>
diff -r ddf0e2629edb -r f21a803ee3ba .hgsub
--- a/.hgsub	Thu Dec 02 14:49:09 2010 -0500
+++ b/.hgsub	Fri Dec 03 16:37:00 2010 -0500
@@ -1,6 +1,5 @@
 mercurial/templates = ../mercurial-cli-templates
 vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
-vim/bundle/delimitmate = [git]git://github.com/Raimondi/delimitMate.git
 vim/bundle/gundo = [hg]http://bitbucket.org/sjl/gundo.vim/
 vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
 vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
diff -r ddf0e2629edb -r f21a803ee3ba .hgsubstate
--- a/.hgsubstate	Thu Dec 02 14:49:09 2010 -0500
+++ b/.hgsubstate	Fri Dec 03 16:37:00 2010 -0500
@@ -1,6 +1,5 @@
 0beba32679db6cf5db08ae57c5e99e411b54adc5 mercurial/templates
 b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
-f7b53f045d3bcaa7f4c0e09259e54eaf264a6abb vim/bundle/delimitmate
 206d80115d82fbb98d4c8fcb9bd4ab4c58179a9b vim/bundle/gundo
 1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
diff -r ddf0e2629edb -r f21a803ee3ba vim/.vimrc
--- a/vim/.vimrc	Thu Dec 02 14:49:09 2010 -0500
+++ b/vim/.vimrc	Fri Dec 03 16:37:00 2010 -0500
@@ -142,6 +142,8 @@
 
 au BufNewFile,BufRead *.vim set foldmethod=marker
 
+au BufNewFile,BufRead urls.py set nowrap
+
 " Sort CSS
 map <leader>S ?{<CR>jV/^\s*\}?$<CR>k:sort<CR>:noh<CR>
 
diff -r ddf0e2629edb -r f21a803ee3ba zsh/misc.zsh
--- a/zsh/misc.zsh	Thu Dec 02 14:49:09 2010 -0500
+++ b/zsh/misc.zsh	Fri Dec 03 16:37:00 2010 -0500
@@ -1,8 +1,8 @@
 alias pbc='pbcopy'
 alias pbp='pbpaste'
 
-alias M='open -a MacVim .'
-alias m='open -a MacVim'
+alias M='mvim .'
+alias m='mvim'
 
 function mdown () {
     (echo '