X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=3a2f7542b490f9c3fe7ac10925712b5d56d1720f;hb=99881ad89700e483371cc2794d63afab85469498;hp=6bb850dc9672eacfef73f16deff1b03e0dffef75;hpb=06fddc543253f8144360348b13ee49a8a3564082;p=profile.git

diff --git a/.vimrc b/.vimrc
old mode 100755
new mode 100644
index 6bb850d..3a2f754
--- a/.vimrc
+++ b/.vimrc
@@ -39,6 +39,7 @@ se laststatus=2
 " Use C indent style.
 se cindent
 se cinkeys=0{,0},0),:,!^F,o,O,e
+se cinoptions=b1,c2
 
 " GUI options.
 se go=aglmr
@@ -67,6 +68,10 @@ map = yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>
 if version >= "500"
 version 5.0
 
+" Save sessions in UNIX format with / as file separator.  This is
+" cross-platoform.
+se ssop+=unix,slash
+
 " Nuke any pre-existing autocommands.
 autocmd!
 
@@ -236,13 +241,16 @@ syn enable
 
 " Nice GUI colour.
 if has("gui_running")
-  se guifont=Bitstream\ Vera\ Sans\ Mono\ 12
+  se guifont=Bitstream\ Vera\ Sans\ Mono\ 10
   colo darkblue
 endif
 if has("win32")
   se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI
 endif
 
+" Ignore whitespace when diffing.
+se diffopt=filler,iwhite
+
 " Expand window when doing a vertical diff.
 if &diff
   let &columns = 164
@@ -367,6 +375,8 @@ map Ql :call Cycle_List()<CR>:<CR>
 map Qn :call Cycle_Number()<CR>:<CR>
 " Toggle tags with Qt.
 map Qt :Tlist<CR>
+" Clear search pattern with Q/.
+map Q/ :let @/=""<CR>:<CR>
 
 " Leaving Perl mode.
 fun! PerlMode_unmap()
@@ -382,6 +392,9 @@ endif
 if version >= "700"
 version 7.0
 
+" Make diffs vertical by default.
+se diffopt+=vertical
+
 " Set size of numbers column.
 se numberwidth=5