--- a/.hgsubstate Mon Apr 23 14:49:47 2012 +0100
+++ b/.hgsubstate Wed Apr 25 15:58:08 2012 +0000
@@ -3,7 +3,7 @@
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-fe251fc8ef2919fc1daf52dd733851630498adc1 vim/bundle/badwolf
+17443dcd6ceed84184d4e92dccc5d8f1f29e67b6 vim/bundle/badwolf
b528cf3de72884dd6cf5fdbeda375d7437ea811f vim/bundle/clam
c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
--- a/mutt/mailcap Mon Apr 23 14:49:47 2012 +0100
+++ b/mutt/mailcap Wed Apr 25 15:58:08 2012 +0000
@@ -24,11 +24,10 @@
image/gif; ~/.mutt/view_attachment.sh %s gif
# PDF
-application/pdf; ~/.mutt/view_attachment.sh %s pdf
+# application/pdf; ~/.mutt/view_attachment.sh %s pdf
# HTML
text/html; ~/.mutt/view_attachment.sh %s html
-ext/html; ~/.mutt/view_attachment.sh %s html
# Unidentified.
application/octet-stream; ~/.mutt/view_attachment.sh %s "-"
--- a/mutt/muttrc Mon Apr 23 14:49:47 2012 +0100
+++ b/mutt/muttrc Wed Apr 25 15:58:08 2012 +0000
@@ -116,6 +116,7 @@
bind index <space> collapse-thread
# macros
+macro index \Co "!offlineimap -q<enter>" "run offlineimap to sync mail"
macro index \Cr "<tag-prefix><clear-flag>N" "mark tagged messages as read"
macro index \CR "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
macro index B "<limit>~b " "search message bodies"
--- a/vim/custom-dictionary.utf-8.add Mon Apr 23 14:49:47 2012 +0100
+++ b/vim/custom-dictionary.utf-8.add Wed Apr 25 15:58:08 2012 +0000
@@ -20,3 +20,10 @@
changelog
tradeoff
checkbox
+PAETEC
+Windstream
+GitHub
+changeset
+IRC
+diffs
+codebase
--- a/vim/vimrc Mon Apr 23 14:49:47 2012 +0100
+++ b/vim/vimrc Wed Apr 25 15:58:08 2012 +0000
@@ -171,6 +171,12 @@
let g:badwolf_html_link_underline = 0
colorscheme badwolf
+" Reload the colorscheme whenever we write the file.
+augroup color_badwolf_dev
+ au!
+ au BufWritePost badwolf.vim color badwolf
+augroup END
+
" Highlight VCS conflict markers
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -295,7 +301,7 @@
" Split line (sister to [J]oin lines)
" The normal use of S is covered by cc, so don't worry about shadowing it.
-nnoremap S i<cr><esc><right>mwgk:silent! s/\v +$//<cr>:noh<cr>`w
+nnoremap S i<cr><esc>^mwgk:silent! s/\v +$//<cr>:noh<cr>`w
" HTML tag closing
inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
--- a/zshrc Mon Apr 23 14:49:47 2012 +0100
+++ b/zshrc Wed Apr 25 15:58:08 2012 +0000
@@ -52,6 +52,7 @@
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
export VEW_PATH="$HOME/lib/python/virtualenvwrapper/virtualenvwrapper.sh"
+export VEW_PATH="/usr/local/share/python/virtualenvwrapper.sh"
export PYTHONPATH="$HOME/lib/python/see:$PYTHONPATH"
export NODE_PATH="$NODE_PATH:/usr/local/lib/node:/usr/local/lib/node_modules"