# HG changeset patch # User Steve Losh # Date 1279657782 14400 # Node ID 60a5c951165ae4a6b90343f64952baf11b6037b8 # Parent 22a55caedce5b98b98999c4ef6b746a1281cf51b guts: lots diff -r 22a55caedce5 -r 60a5c951165a .hgrc --- a/.hgrc Mon Jul 12 16:34:29 2010 -0400 +++ b/.hgrc Tue Jul 20 16:29:42 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 @@ -121,3 +122,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 22a55caedce5 -r 60a5c951165a vim/.vimrc --- a/vim/.vimrc Mon Jul 12 16:34:29 2010 -0400 +++ b/vim/.vimrc Tue Jul 20 16:29:42 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 22a55caedce5 -r 60a5c951165a vim/bundle/sparkup/ftplugin/html/sparkup.vim --- a/vim/bundle/sparkup/ftplugin/html/sparkup.vim Mon Jul 12 16:34:29 2010 -0400 +++ b/vim/bundle/sparkup/ftplugin/html/sparkup.vim Tue Jul 20 16:29:42 2010 -0400 @@ -26,10 +26,10 @@ let g:sparkupNextMapping = '' endif -exec 'nmap ' . g:sparkupExecuteMapping . ' :call Sparkup()' -exec 'imap ' . g:sparkupExecuteMapping . ' u:call Sparkup()' -exec 'nmap ' . g:sparkupNextMapping . ' :call SparkupNext()' -exec 'imap ' . g:sparkupNextMapping . ' u:call SparkupNext()' +exec 'nnoremap ' . g:sparkupExecuteMapping . ' :call Sparkup()' +exec 'inoremap ' . g:sparkupExecuteMapping . ' u:call Sparkup()' +exec 'nnoremap ' . g:sparkupNextMapping . ' :call SparkupNext()' +exec 'inoremap ' . g:sparkupNextMapping . ' u:call SparkupNext()' if exists('*s:Sparkup') finish diff -r 22a55caedce5 -r 60a5c951165a zsh/misc.zsh --- a/zsh/misc.zsh Mon Jul 12 16:34:29 2010 -0400 +++ b/zsh/misc.zsh Tue Jul 20 16:29:42 2010 -0400 @@ -1,2 +1,29 @@ alias pbc='pbcopy' alias pbp='pbpaste' + +function mdown () { + (echo ' + + + + '; markdown $@) | bcat +}