# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1312814038 14400
# Node ID f1af6fcabf698eb3874888538fb7f1cca7ffd5ad
# Parent  da50e176229c47deab2fac1b8bb4f3567c16d332
...

diff -r da50e176229c -r f1af6fcabf69 .hgrc
--- a/.hgrc	Wed Aug 03 17:20:40 2011 -0400
+++ b/.hgrc	Mon Aug 08 10:33:58 2011 -0400
@@ -127,6 +127,8 @@
 takeother = !"$HG" revert --rev 'p2()' $@ && "$HG" resolve -m $@
 
 
+diffl = !"$HG" diff --color=always | less -R
+
 fdiff = diff -U 10000000000000
 qfdiff = qdiff -U 10000000000000
 
diff -r da50e176229c -r f1af6fcabf69 keymando/keymandorc.rb
--- a/keymando/keymandorc.rb	Wed Aug 03 17:20:40 2011 -0400
+++ b/keymando/keymandorc.rb	Mon Aug 08 10:33:58 2011 -0400
@@ -73,7 +73,7 @@
   end
 
   def after
-      except /iTerm/, /MacVim/, /Firefox/, /PeepOpen/, /Quicksilver/ do
+      except /iTerm/, /MacVim/, /Firefox/, /PeepOpen/, /Quicksilver/, /1Password/ do
           Vim.maps['disabled'] = {}
           Vim.maps['n'] = {
               'h' => lambda { send("<Left>") },
diff -r da50e176229c -r f1af6fcabf69 vim/after/indent/html.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/after/indent/html.vim	Mon Aug 08 10:33:58 2011 -0400
@@ -0,0 +1,3 @@
+let g:html_indent_tags .= '\|p'
+let g:html_indent_tags .= '\|li'
+