X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=9e94ae1024a033b6a072d45cd2112d132ed67d93;hp=9ca37c6ab0dc626e14dafdb8faaab368ff1fefd0;hb=e6b7d067305c80c6177a29ce106ac847d2e641cb;hpb=8c75606a52da5a4df6018134e0806e7041ca69e1

diff --git a/.vimrc b/.vimrc
index 9ca37c6..9e94ae1 100755
--- a/.vimrc
+++ b/.vimrc
@@ -1,4 +1,5 @@
 " $Id$
+se nocp
 se ts=2
 se bs=2
 se sw=2
@@ -8,23 +9,174 @@ se cindent
 se cinkeys=0{,0},0),:,!^F,o,O,e
 se showcmd
 se go=agilmrtT
+se hlsearch
 se incsearch
 se ignorecase
 se smartcase
 se shm=aot
+se laststatus=2
 syn enable
 if has("gui_running")
   se guifont=Bitstream\ Vera\ Sans\ Mono\ 12
   colo darkblue
 endif
+highlight StatusLine guifg=white guibg=blue ctermbg=white ctermfg=blue
 if has("win32")
   se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI
 endif
+:autocmd!
+
+" Set up our variables.
+fun! Iain_Vars()
+  if ! exists("b:iainlist") | let b:iainlist = 0 | endif
+  if ! exists("b:iainhex") | let b:iainhex = 1 | endif
+endfun
+
+fun! Cycle_List()
+  call Iain_Vars()
+  let b:iainlist = b:iainlist + 1
+  if b:iainlist > 2 | let b:iainlist = 0 | endif
+  if b:iainlist == 0
+    set nolist
+  elseif b:iainlist == 1
+    set lcs=tab:\\_,trail:_,extends:<,precedes:>
+    set list
+  else
+    set lcs=tab:\\_,trail:_,extends:<,precedes:>,eol:$
+    set list
+  endif
+endfun
+
+fun! Show_List()
+  call Iain_Vars()
+  if b:iainlist == 0
+    " No list.
+    return " "
+  elseif b:iainlist == 1
+    " Just tabs.
+    return "_"
+  else
+    " Full list.
+    return "\$"
+  endif
+endfun
+
+" Cycle between hex and decimal display of toolbar stuff.
+fun! Cycle_StatusLine()
+  call Iain_Vars()
+  let b:iainhex = ! b:iainhex
+  if b:iainhex
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P
+  else
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
+  endif
+endfun
+
+" Save the current window width so if we change it we can restore it
+" when we quit.
+let andyoldcols=&columns
+
+" This expands the terminal to display two 80-column files side-by-side
+" when vim is opened in diff mode.
+if &diff | let &columns = 164 | endif
+
 map <C-"> viwvbi"<ESC>ea"<ESC>
 map - yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>
 map = yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>
-command W :w
-:autocmd!
-autocmd Syntax c se cinkeys=0{,0},0),:,0#,!^F,o,O,e
-autocmd Syntax perl se cinkeys=0{,0},0),:,!^F,o,O,e
-autocmd Syntax php se cinkeys=0{,0},0),:,!^F,o,O,e
+command! W :w
+se tags=~/.ctags
+
+" Make * and # work the way you expect in visual mode.
+vnoremap * y/\V<C-R>=substitute(escape(@@,"/\\"),"\n","\\\\n","ge")<CR><CR>
+vnoremap # y?\V<C-R>=substitute(escape(@@,"?\\"),"\n","\\\\n","ge")<CR><CR>
+
+fun! Invert_Case()
+  let &ic = ! &ic
+endfun
+
+fun! Show_Case()
+  if &ic | return "c" | else | return "C" | endif
+endfun
+
+fun! Show_Tabstop()
+  return &ts
+endfun
+
+fun! Show_Paste()
+  if &paste | return "p" | else | return "" | endif
+endfun
+
+" Clear Q as we will use it for commands.
+map Q <Nop>
+
+" Swap hex/decimal statusline with Qx
+map Qx :call Cycle_StatusLine()<CR>:<CR>
+" Swap case-sensitivity with Qc.
+map Qc :call Invert_Case()<CR>:<CR>
+" Cycle list styles with Ql.
+map Ql :call Cycle_List()<CR>:<CR>
+" Change to ts=2 with Q2.
+map Q2 :se ts=2<CR>:<CR>
+" Change to ts=4 with Q4.
+map Q4 :se ts=4<CR>:<CR>
+" Change to ts=8 with Q8.
+map Q8 :se ts=8<CR>:<CR>
+
+" Vim 7 has tabs.  Default "next tab" mapping is gt.  Add "previous tab" as gb.
+map gb :tabPrev<CR>
+
+call Cycle_StatusLine()
+
+au VimLeave * if exists("andyoldcols") | let &columns=andyoldcols | endif
+
+" Autocommands to setup features we only want in certain modes...
+
+" ... For C/C++ files:
+
+au BufEnter * if &ft == "c" || &ft == "cpp" | call CMode_map() | endif
+au BufLeave * if &ft == "c" || &ft == "cpp" | call CMode_unmap() | endif
+
+" ... For Perl files:
+
+au BufEnter * if &ft == "perl" | call PerlMode_map() | endif
+au BufLeave * if &ft == "perl" | call PerlMode_unmap() | endif
+
+" ... For makefiles:
+
+au BufEnter * if &ft == "make" | call MakeMode_map() | endif
+au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif
+
+" Functions to call when we enter/leave a programming language buffer...
+
+" ... For C-like languages:
+
+fun! CMode_map()
+  set cinkeys=0{,0},:,0#,!^F,o,O,e
+  set cinwords=if,else,while,do,for,switch
+endfun
+
+fun! CMode_unmap()
+endfun
+
+" .. For Perl files:
+
+fun! PerlMode_map()
+  set cinkeys=0{,0},:,!^F,o,O,e
+  set cinwords=if,else,while,do,for,eval
+endfun
+
+fun! PerlMode_unmap()
+  set foldmethod=manual
+endfun
+
+" ... For makefiles:
+
+fun! MakeMode_map()
+  set list
+  set noexpandtab
+endfun
+
+fun! MakeMode_unmap()
+  set nolist
+  set expandtab
+endfun