X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=3396ecd828f2d827c98a72032dbfd321d9e7ea88;hb=6f97e97f869574f0d03232f51c08faee52c269db;hp=7b535bb90f551ba19baa1fab7a268890f5b0117c;hpb=104b025d33b8cf5f9d42bda3ac3d158eb7a07701;p=profile.git

diff --git a/.vimrc b/.vimrc
old mode 100755
new mode 100644
index 7b535bb..3396ecd
--- a/.vimrc
+++ b/.vimrc
@@ -1,44 +1,272 @@
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " $Id$
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Multi-version vimrc compatible with version 4 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" Note that "if <condition> | call Something() | endif" syntax is unsupported 
+" in Vim 4 so we write all our functions out the long way.  It does work in 
+" autocommand definitions, however.
+
+" Vim 4 complains if version isn't set in the configuration file.
+version 4.0
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options safe to use in version 4.  Vim 4 parses but ignores the 
+" "if version" syntax used later in this file so we don't use it.  No attempt 
+" is made to make this configuration compatible with Vim 3.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" No compatibility mode.
 se nocp
+
+" Tabstop 2.
 se ts=2
-se bs=2
-se sw=2
+" And use spaces not tabs.
 se expandtab
+" And << and >> indent by 2.
+se sw=2
+
+" Allow backspace to delete before start of line.
+se bs=2
+
+" Show the ruler.
 se ruler
+" Show partial commands in the ruler.
+se showcmd
+" And always show the status line.
+se laststatus=2
+
+" Use C indent style.
 se cindent
 se cinkeys=0{,0},0),:,!^F,o,O,e
-se showcmd
-se go=agilmrtT
-se hlsearch
+se cinoptions=b1,c2
+
+" GUI options.
+se go=aglmr
+
+" Don't be bugged by messages at the bottom of the screen.
+se shm=aot
+
+" Find as you type.
 se incsearch
+
+" Case-insensitive search.
 se ignorecase
+" But override by typing capitals.
 se smartcase
-se shm=aot
-se laststatus=2
+
+" Look for ctags in home directory first.
+se tags=~/.tags,./tags,tags
+
+" Use - and = to create underlines.
+map - yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>
+map = yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options only available in Vim 5 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "500"
+version 5.0
+
+" Nuke any pre-existing autocommands.
+autocmd!
+
+" Save the current window width so we can restore it when we quit.
+let oldcols=&columns
+
+" More GUI options.  Add icon, tearoffs and toolbar.
+se go=agilmrtT
+
+" Allow dynamic window resize even if we aren't in an xterm.
 se t_WS=[8;%p1%d;%p2%dt
+
+" Highlight search results.
+se hlsearch
+
+" Syntax highlighting.
+syn on
+
+" Catch typos.
+command! W :w
+command! Wq :wq
+command! Wqa :wqa
+
+" Set up our variables.
+fun! Iain_Vars()
+  if ! exists("b:iainlist")
+    let b:iainlist = 0
+  endif
+  if ! exists("b:iainhex")
+    let b:iainhex = 0
+  endif
+  if ! exists("b:iainverbose")
+    let b:iainverbose = 0
+  endif
+endfun
+
+" Helper for status line.
+" Show space, underscore or dollar sign depending on list mode.
+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
+
+" Helper for status line.
+" Show c or C to denote case-sensitivity.
+fun! Show_Case()
+  if &ic
+    return "c"
+  else
+    return "C"
+  endif
+endfun
+
+" Helper for status line.
+" Show the size of the tabstop.
+fun! Show_Tabstop()
+  return &ts
+endfun
+
+" Helper for status line.
+" Show p when paste mode is on.
+fun! Show_Paste()
+  if &paste
+    return "p"
+  else
+    return ""
+  endif
+endfun
+
+" Show the status line.
+fun! Show_StatusLine()
+  call Iain_Vars()
+  let sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %='
+  let sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P'
+  let hexformat='%b'
+  if b:iainhex
+    let hexformat='0\x%02B'
+  endif
+  if b:iainverbose
+    let sl2=hexformat . '\ \|\ P:%4.6o\ '
+  else
+    let sl2=''
+  endif
+  exec "set statusline=" . sl1 . sl2 . sl3
+endfun
+
+" Restore window size.
+au VimLeave * if exists("oldcols") | let &columns=oldcols | endif
+
+" Map C mode.
+au BufEnter * if &ft == "c" || &ft == "cpp" | call CMode_map() | endif
+au BufLeave * if &ft == "c" || &ft == "cpp" | call CMode_unmap() | endif
+
+" Map Perl mode.
+au BufEnter * if &ft == "perl" | call PerlMode_map() | endif
+au BufLeave * if &ft == "perl" | call PerlMode_unmap() | endif
+
+" Map Makefile mode.
+au BufEnter * if &ft == "make" | call MakeMode_map() | endif
+au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif
+
+" Entering C mode.
+fun! CMode_map()
+  let oldcinkeys=&cinkeys
+  let oldcinwords=&cinwords
+  set cinkeys=0{,0},:,0#,!^F,o,O,e
+  set cinwords=if,else,while,do,for,switch
+endfun
+
+" Leaving C mode.
+fun! CMode_unmap()
+  set cinkeys=oldcinkeys
+  set cinwords=oldcinwords
+endfun
+
+" Entering Perl mode.
+fun! PerlMode_map()
+  let oldcinkeys=&cinkeys
+  let oldcinwords=&cinwords
+  set cinkeys=0{,0},:,!^F,o,O,e
+  set cinwords=if,else,while,do,for,eval
+endfun
+
+" Leaving Perl mode.
+fun! PerlMode_unmap()
+  set cinkeys=oldcinkeys
+  set cinwords=oldcinwords
+endfun
+
+" Entering Make mode.
+fun! MakeMode_map()
+  set list
+  set noexpandtab
+endfun
+
+" Leaving Make mode.
+fun! MakeMode_unmap()
+  set nolist
+  set expandtab
+endfun
+
+" Show the status line for the first time.
+call Show_StatusLine()
+endif
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options only available in Vim 6 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "600"
+version 6.0
+
+" Track changing number mode.
+let g:numbercols=&columns
+let g:numberchanges=0
+
+" Less intrusive syntax highlighting.
 syn enable
+
+" Nice GUI colour.
 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 = 0 | endif
-endfun
+" Expand window when doing a vertical diff.
+if &diff
+  let &columns = 164
+endif
+
+" Status bar matches the colour.
+highlight StatusLine guifg=white guibg=blue ctermbg=white ctermfg=blue
+
+" Numbers in blue.
+highlight LineNr term=underline cterm=bold guifg=blue ctermfg=blue
+
+" 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>
 
 " Change list mode.
 fun! Cycle_List()
   let basic='tab:\\_,trail:_,extends:<,precedes:>'
   call Iain_Vars()
   let b:iainlist = b:iainlist + 1
-  if b:iainlist > 2 | let b:iainlist = 0 | endif
+  if b:iainlist > 2
+    let b:iainlist = 0
+  endif
   if b:iainlist == 0
     set nolist
   elseif b:iainlist == 1
@@ -50,20 +278,6 @@ fun! Cycle_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_HexStatusLine()
   call Iain_Vars()
@@ -71,79 +285,63 @@ fun! Cycle_HexStatusLine()
   call Show_StatusLine()
 endfun
 
-fun! Show_StatusLine()
+" Cycle verbose display of toolbar stuff.
+fun! Cycle_VerboseStatusLine()
   call Iain_Vars()
-  let sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %='
-  let sl2='\ \|\ P:%4.6o\ L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P'
-  let hexformat='%b'
-  if b:iainhex
-    let hexformat='0\x%02B'
-  endif
-  exec "set statusline=" . sl1 . hexformat . sl2
+  let b:iainverbose = ! b:iainverbose
+  call Show_StatusLine()
 endfun
 
+" Cycle between number mode.
+" FIXME: Toggling in a split window doesn't work properly.  We need to track 
+" the number of windows and number modes.  Something for later...
+" Perhaps have a redraw callback that checks width and original column number.
 fun! Cycle_Number()
   if &number
     " Restore width.
     if &t_WS =~ '^.'
-      let &columns=g:numbercols
+      " Track changes.
+      let g:numberchanges=g:numberchanges-1
+      if g:numberchanges<0
+        g:numberchanges=0
+      endif
+
+      " Change size back if this was the last window.
+      if g:numberchanges == 0
+        let &columns=g:numbercols
+      endif
     endif
     set nonumber
   else
     " Save width between number toggling.
     if &t_WS =~ '^'
-      let g:numbercols=&columns
-      let &columns=&columns+5
+      " Expand if this was the first change.
+      if g:numberchanges == 0
+        let g:numbercols=&columns
+        if version >= 700
+          " Expand column by our preferred width.
+          let &columns=&columns+&numberwidth
+        else
+          " Vim 6 hardcodes width to 8.
+          let &columns=&columns+8
+        endif
+      endif
+
+      " Track changes.
+      let g:numberchanges=g:numberchanges+1
     endif
     set number
   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
-se tags=~/.tags,./tags,tags
-
-" 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>
-
+" Toggle case-sensitivity.
 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.
+" We'll use Q for various commands.  Unmap it.
 map Q <Nop>
 
-" Swap hex/decimal statusline with Qx
-map Qx :call Cycle_HexStatusLine()<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 number mode with Qn.
-map Qn :call Cycle_Number()<CR>:<CR>
 " Change to ts=2 with Q2.
 map Q2 :se ts=2<CR>:<CR>
 " Change to ts=4 with Q4.
@@ -158,64 +356,38 @@ map Q3 :se ts=32<CR>:<CR>
 map Qf :se foldenable!<CR>:<CR>
 " Toggle paste mode with Qp.
 map Qp :se paste!<CR>:<CR>
+" Swap hex/decimal statusline with Qx
+map Qx :call Cycle_HexStatusLine()<CR>:<CR>
+" Change statusline verbosity with Qv
+map Qv :call Cycle_VerboseStatusLine()<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 number mode with Qn.
+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>
 
-" Vim 7 has tabs.  Default "next tab" mapping is gt.  Add "previous tab" as gb.
-map gb :tabPrev<CR>
-
-call Show_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
-
+" Leaving Perl mode.
 fun! PerlMode_unmap()
+  set cinkeys=oldcinkeys
+  set cinwords=oldcinwords
   set foldmethod=manual
 endfun
+endif
 
-" ... For makefiles:
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options only available in Vim 7 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "700"
+version 7.0
 
-fun! MakeMode_map()
-  set list
-  set noexpandtab
-endfun
+" Set size of numbers column.
+se numberwidth=5
 
-fun! MakeMode_unmap()
-  set nolist
-  set expandtab
-endfun
+" Add "previous tab" mapping as gb.
+map gb :tabPrev<CR>
+endif