X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=4c10a31f681ded33d5f3c7d1ff9f23201b7ad651;hp=d4376a0665f5abe31140e285ef5f10dd7e918a65;hb=f47e88a5316392ef25aff9420f1c73c85f5e91fa;hpb=6c82a1ef785f1d3ad8b31f20eb33d11ecccf4e8e

diff --git a/.vimrc b/.vimrc
index d4376a0..4c10a31 100755
--- a/.vimrc
+++ b/.vimrc
@@ -9,6 +9,7 @@ se cindent
 se cinkeys=0{,0},0),:,!^F,o,O,e
 se showcmd
 se go=agilmrtT
+se hlsearch
 se incsearch
 se ignorecase
 se smartcase
@@ -26,14 +27,14 @@ endif
 :autocmd!
 
 " Set up our variables.
-fun Iain_Vars()
+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()
+fun! Cycle_List()
   call Iain_Vars()
-  let b:iainlist += 1
+  let b:iainlist = b:iainlist + 1
   if b:iainlist > 2 | let b:iainlist = 0 | endif
   if b:iainlist == 0
     set nolist
@@ -46,28 +47,28 @@ fun Cycle_List()
   endif
 endfun
 
-fun Show_List()
+fun! Show_List()
   call Iain_Vars()
   if b:iainlist == 0
     " No list.
-    return "  "
+    return " "
   elseif b:iainlist == 1
     " Just tabs.
-    return "\\_"
+    return "_"
   else
     " Full list.
-    return "\.\$"
+    return "\$"
   endif
 endfun
 
-" Cycle between hex and decimal display of toolbar stuff
-fun Cycle_StatusLine()
+" 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()}]%y%m%r%\ =0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%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()}]%y%m%r%\ =%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
+    set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%Y%M%R]\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P
   endif
 endfun
 
@@ -82,23 +83,39 @@ 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
+command! W :w
 se tags=~/.ctags
 
-fun Invert_Case()
+fun! Invert_Case()
   let &ic = ! &ic
 endfun
 
-fun Show_Case()
-  if &ic | return "ca" | else | return "Ca" | endif
+fun! Show_Case()
+  if &ic | return "c" | else | return "C" | endif
 endfun
 
-" Swap hex/decimal statusline with ,x
-map ,x :call Cycle_StatusLine()<CR>:<CR>
-" Swap case-sensitivity with ,c.
-map ,c :call Invert_Case()<CR>:<CR>
-" Cycle list styles with ,l.
-map ,l :call Cycle_List()<CR>:<CR>
+fun! Show_Tabstop()
+  return &ts
+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()
 
@@ -116,11 +133,6 @@ au BufLeave * if &ft == "c" || &ft == "cpp" | call CMode_unmap() | endif
 au BufEnter * if &ft == "perl" | call PerlMode_map() | endif
 au BufLeave * if &ft == "perl" | call PerlMode_unmap() | endif
 
-" ... For PHP files:
-
-au BufEnter * if &ft == "php" | call PHPMode_map() | endif
-au BufLeave * if &ft == "php" | call PHPMode_unmap() | endif
-
 " ... For makefiles:
 
 au BufEnter * if &ft == "make" | call MakeMode_map() | endif
@@ -130,43 +142,33 @@ au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif
 
 " ... For C-like languages:
 
-fun CMode_map()
+fun! CMode_map()
   set cinkeys=0{,0},:,0#,!^F,o,O,e
   set cinwords=if,else,while,do,for,switch
 endfun
 
-fun CMode_unmap()
+fun! CMode_unmap()
 endfun
 
 " .. For Perl files:
 
-fun PerlMode_map()
+fun! PerlMode_map()
   set cinkeys=0{,0},:,!^F,o,O,e
   set cinwords=if,else,while,do,for,eval
 endfun
 
-fun PerlMode_unmap()
+fun! PerlMode_unmap()
   set foldmethod=manual
 endfun
 
-fun PHPMode_map()
-  set nocindent
-  set autoindent
-endfun
-
-fun PHPMode_unmap()
-  set noautoindent
-  set cindent
-endfun
-
 " ... For makefiles:
 
-fun MakeMode_map()
+fun! MakeMode_map()
   set list
   set noexpandtab
 endfun
 
-fun MakeMode_unmap()
+fun! MakeMode_unmap()
   set nolist
   set expandtab
 endfun