--- a/.hgrc Thu Aug 25 16:08:59 2011 -0400
+++ b/.hgrc Fri Aug 26 13:29:34 2011 -0400
@@ -141,8 +141,11 @@
takelocal = !"$HG" revert --rev 'p1()' $@ && "$HG" resolve -m $@
takeother = !"$HG" revert --rev 'p2()' $@ && "$HG" resolve -m $@
+# Diff.
+d = diff -p --color=auto
+
# Run a colored diff and pipe it to less.
-diffl = !"$HG" diff --color=always | less -R
+dl = !"$HG" diff -p --color=always | less -R
# Kaleidoscope
# Mnemonics: "kaleidoscope diff" and "kaleidoscope show"
--- a/.hgsubstate Thu Aug 25 16:08:59 2011 -0400
+++ b/.hgsubstate Fri Aug 26 13:29:34 2011 -0400
@@ -9,7 +9,7 @@
b28e7be63235982501ab7dd30c03ea7feef7b095 vim/bundle/nerdcommenter
2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
a0831b09f2026c3a3d52e253ffd139fe20a9360a vim/bundle/pydoc
-3d6bc1798d025ff31701fd7813a31992e36dd9cb vim/bundle/slimv
+e824de36da30baee5adc7be980b907e50099545c vim/bundle/slimv
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
d9e6bfdd902fc661c8fd58ede248ccfc3b3039d7 vim/bundle/surround
--- a/vim/.vimrc Thu Aug 25 16:08:59 2011 -0400
+++ b/vim/.vimrc Fri Aug 26 13:29:34 2011 -0400
@@ -14,10 +14,8 @@
" }}}
" Basic options --------------------------------------------------------------- {{{
-
set encoding=utf-8
set modelines=0
-set scrolloff=3
set autoindent
set showmode
set showcmd
@@ -142,7 +140,8 @@
nnoremap D d$
-" Make horizontal scrolling less horrible.
+" Scrolling
+set scrolloff=3
set sidescroll=1
set sidescrolloff=10