X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=b6ba9a8dcef02553c03d18148d13437cde7f9f2c;hp=9fba99c4a6959b843d166be0cf61271ad6b96745;hb=832105f1cffb94d0193777f6c1d3ddc98be1e24d;hpb=518d9698777610c32b50ac83d8a9463be91f0563

diff --git a/.vimrc b/.vimrc
index 9fba99c..b6ba9a8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,4 @@
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" $Id$
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Multi-version vimrc compatible with version 4 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
@@ -79,9 +77,6 @@ se wildignore+=*.o,*.obj
 " So there's no need to assign them low priority.
 se suffixes-=*.o,*.obj
 
-" Vim 5 hardcodes the size of numbers column to 8.
-let numberwidth=8
-
 " Save sessions in UNIX format with / as file separator.  This is
 " cross-platform.
 se ssop+=unix,slash
@@ -105,7 +100,7 @@ se hlsearch
 se titlestring=%{Show_TitleString()}
 
 " Syntax highlighting.  New versions will use syn enable instead.
-if version < 600
+if version < "600"
   syn on
 endif
 
@@ -133,6 +128,9 @@ fun! Iain_Vars()
     " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old.
     let b:iainstatus = "Fih"
   endif
+  if ! exists("g:iainextracolumns")
+    let g:iainextracolumns = 0
+  endif
 endfun
 
 " Helper for status line.
@@ -180,28 +178,28 @@ endfun
 " Show the window title.
 fun! Show_TitleString()
   if bufname("") == ""
-    let ts1='Vim'
+    let l:ts1='Vim'
   else
-    let ts1=printf("%2d: %s", bufnr(""), expand('%t'))
+    let l:ts1=printf("%2d: %s", bufnr(""), expand('%t'))
   endif
-  return printf("%s (%s) %s", ts1, getcwd(), v:servername)
+  return printf("%s (%s) %s", l:ts1, getcwd(), v:servername)
 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'
+  let l:sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %='
+  let l:sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P'
+  let l:hexformat='%b'
   if b:iainhex
-    let hexformat='0\x%02B'
+    let l:hexformat='0\x%02B'
   endif
   if b:iainverbose
-    let sl2=hexformat . '\ \|\ P:%4.6o\ '
+    let l:sl2=l:hexformat . '\ \|\ P:%4.6o\ '
   else
-    let sl2=''
+    let l:sl2=''
   endif
-  exec "set statusline=" . sl1 . sl2 . sl3
+  exec "set statusline=" . l:sl1 . l:sl2 . l:sl3
 endfun
 
 " Toggle case-sensitivity.
@@ -209,6 +207,49 @@ fun! Invert_Case()
   let &ic = ! &ic
 endfun
 
+" Grow or shrink the window size.
+fun! Resize_Columns(op)
+  " XXX: This won't work inside screen.
+  " We should really detect whether it would work rather than assume it won't.
+  if &term =~ '^screen'
+    return
+  endif
+
+  " Vim 5 hardcodes the size of numbers column to 8.
+  if version >= "700"
+    let l:numberwidth = &numberwidth
+  else
+    let l:numberwidth = 8
+  endif
+
+  exec "se columns" . a:op . "=" . l:numberwidth
+endfun
+
+" Toggle number display.
+fun! Number()
+  call Iain_Vars()
+  let &number = ! &number
+
+  if version >= "700"
+    let l:i = 0
+    let l:num_numbers = 0
+    while l:i <= winnr("$")
+      if getwinvar(l:i, "&number") == 1
+        let l:num_numbers = l:num_numbers + 1
+      endif
+      let l:i = l:i + 1
+    endwhile
+
+    if l:num_numbers == 0
+      let g:iainextracolumns = 0
+      call Resize_Columns("-")
+    elseif g:iainextracolumns == 0
+      let g:iainextracolumns = 1
+      call Resize_Columns("+")
+    endif
+  endif
+endfun
+
 " Restore window size.
 au VimLeave * if exists("oldcols") | let &columns=oldcols | endif
 
@@ -263,10 +304,10 @@ call Mapping("p", ":se paste!<CR>:<CR>")
 " Swap case-sensitivity with \c.
 call Mapping("c", ":call Invert_Case()<CR>:<CR>")
 " Change number mode with \n.
-call Mapping("n", ":se number!<CR>:<CR>")
-" Expand or shrink window size with \> and \<.  For use after toggling number.
-call Mapping(">", ":exe 'se columns+=' . numberwidth<CR>:<CR>")
-call Mapping("<", ":exe 'se columns-=' . numberwidth<CR>:<CR>")
+call Mapping("n", ":call Number()<CR>:<CR>")
+" Expand or shrink window size with \> and \<.
+call Mapping(">", ":call Resize_Columns('+')<CR>:<CR>")
+call Mapping("<", ":call Resize_Columns('-')<CR>:<CR>")
 " Clear search pattern with \/.
 call Mapping("/", ":let @/=\"\"<CR>:<CR>")
 
@@ -297,6 +338,7 @@ syn enable
 if has("gui_running")
   se guifont=DejaVu\ Sans\ Mono\ 10
   colo darkblue
+  hi LineNr guibg=#303030
 elseif &t_Co > 16
   try
     colo iain