# HG changeset patch # User Steve Losh # Date 1279657803 14400 # Node ID c18c81c8b2626ac5da83d64ea6c15871cbf6a1d9 # Parent 60a5c951165ae4a6b90343f64952baf11b6037b8# Parent 2f93a524001b9570b4bf23d2c318310ff6acd485 Merge. diff -r 2f93a524001b -r c18c81c8b262 .hgrc --- a/.hgrc Mon Jul 19 22:00:25 2010 -0400 +++ b/.hgrc Tue Jul 20 16:30:03 2010 -0400 @@ -16,6 +16,7 @@ parentrevspec = schemes = progress = +fetch = attic = ~/lib/hg/hgattic/attic.py paste = ~/lib/hg/hg-paste/paste.py prompt = ~/lib/hg/hg-prompt/prompt.py @@ -122,3 +123,5 @@ nlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.nlog n = nlog -vr show = nlog --color=always -vpr + +fet = fetch --message 'Automated merge.' diff -r 2f93a524001b -r c18c81c8b262 vim/.vimrc --- a/vim/.vimrc Mon Jul 19 22:00:25 2010 -0400 +++ b/vim/.vimrc Tue Jul 20 16:30:03 2010 -0400 @@ -82,6 +82,10 @@ map map +" And make them fucking work, too. +nnoremap j gj +nnoremap k gk + " Easy buffer navigation map

h map

j @@ -119,7 +123,10 @@ " Various syntax stuff au BufNewFile,BufRead *.less set filetype=less -au BufNewFile,BufRead *.markdown set filetype=markdown + +au BufNewFile,BufRead *.m*down set filetype=markdown +au BufNewFile,BufRead *.m*down map h1 yypVr= +au BufNewFile,BufRead *.m*down map h2 yypVr- " Sort CSS map S ?{jV/^\s*\}\=$k:sort:let @/='' @@ -174,13 +181,12 @@ au BufNewFile,BufRead *.less set foldmethod=marker au BufNewFile,BufRead *.less set foldmarker={,} au BufNewFile,BufRead *.less set nocursorline -au BufNewFile,BufRead *.less map p opV`]> " Easier linewise reselection map v V`] " HTML tag closing -imap :call InsertCloseTag()a +inoremap :call InsertCloseTag()a " Arpeggio call arpeggio#load() @@ -188,4 +194,5 @@ Arpeggio inoremap fh Arpeggio inoremap hj Arpeggio inoremap fj +Arpeggio inoremap asdf inoremap diff -r 2f93a524001b -r c18c81c8b262 zsh/misc.zsh --- a/zsh/misc.zsh Mon Jul 19 22:00:25 2010 -0400 +++ b/zsh/misc.zsh Tue Jul 20 16:30:03 2010 -0400 @@ -1,2 +1,29 @@ alias pbc='pbcopy' alias pbp='pbpaste' + +function mdown () { + (echo ' + + + + '; markdown $@) | bcat +}