X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=3f4fd1df05b2c62d08eef020213bd6eea7946c21;hp=c3eee6575792039db02dd7d7fcd11ac3662ade29;hb=24b96a93258908176503c7e6d9c4c0b912f87b2b;hpb=51df94caeca32b071b1cfbc2ce81b0988e1ffbe6

diff --git a/.vimrc b/.vimrc
index c3eee65..3f4fd1d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -75,8 +75,10 @@ if ! has("gui_running")
   se bg=dark
 endif
 
-" Allow mouse use in a terminal.
-se mouse=nvir
+" Allow mouse use in a terminal but only if it can work.
+if has("xterm_clipboard")
+  se mouse=nvir
+endif
 
 " Update more quickly.  For use with sign highlighting as polling for
 " CursorMove makes redrawing slow.
@@ -109,12 +111,13 @@ autocmd!
 augroup END
 
 " Save the current window width so we can restore it when we quit.
-if ! exists("oldcols")
-  let oldcols=&columns
+if ! exists("g:oldcols")
+  let g:oldcols=&columns
 endif
 
-" More GUI options.  Add icon, tearoffs and toolbar.
-se go+=itT
+" More GUI options.  Add icon and tearoffs.
+se go+=i
+se go+=t
 
 " Allow dynamic window resize even if we aren't in an xterm.
 se t_WS=[8;%p1%d;%p2%dt
@@ -130,10 +133,6 @@ if version < "600"
   syn on
 endif
 
-" Use a discernably different colour to highlight the cursor which shows 
-" matching brackets.  Our regular cursor is green so use blue instead of cyan.
-hi MatchParen ctermbg=blue
-
 " Catch typos.
 command! W :w
 command! Wq :wq
@@ -254,7 +253,8 @@ fun! Resize_Columns(op, ...)
     let l:columns = a:1
   endif
 
-  let l:resize = "se columns" . a:op . "=" . l:columns
+  exe "let l:resize=" . &columns . a:op . l:columns
+  let l:resize = "se columns=" . l:resize
 
   " HACK: Inside screen there is an extra line for the status bar.  Vim
   " manages the resize by sending an escape sequence to set the number of
@@ -264,10 +264,10 @@ fun! Resize_Columns(op, ...)
   " the real terminal being shrunk by a line.  We ask for the terminal to grow
   " by a line so it ends up actually being the same.
   if &term =~ '^screen'
-    let l:resize .= " lines+=1"
+    let l:resize = l:resize . " lines=" . (&lines + 1)
   endif
 
-  exec l:resize
+  exe l:resize
 endfun
 
 " Toggle number display.
@@ -300,7 +300,7 @@ fun! Number(resize)
 endfun
 
 " Restore window size.
-au Display VimLeave * if exists("oldcols") | call Resize_Columns("-", (&columns - oldcols)) | endif
+au Display VimLeave * if exists("g:oldcols") | call Resize_Columns("-", (&columns - g:oldcols)) | endif
 
 " Map Makefile mode.
 au Mode BufEnter * if &ft == "make" | call MakeMode_map() | endif
@@ -366,29 +366,62 @@ map Q <NOP>
 " Vim tip 99: What's the highlighting group under the cursor?
 call Mapping("h", ":echo \"hi<\" . synIDattr(synID(line(\".\"),col(\".\"),1),\"name\") . '> trans<' . synIDattr(synID(line(\".\"),col(\".\"),0),\"name\") . \"> lo<\" . synIDattr(synIDtrans(synID(line(\".\"),col(\".\"),1)),\"name\") . \">\"<CR>")
 
-fun! <SID>Startup_Resize()
+fun! Uncluttered_Buffer()
+  if exists("uncluttered_buffer")
+    if uncluttered_buffer == 1
+      return 1
+    endif
+  endif
+
+  if version >= "600"
+    if &buftype != ''
+      return 1
+    endif
+  endif
+
+  if &ft == 'perforce'
+    return 1
+  endif
+
+  if &ft == 'svn'
+    return 1
+  endif
+
+  if &ft == 'gitcommit'
+    return 1
+  endif
+
+  return 0
+endfun
+
+fun! Startup_Resize()
+  let l:columns = 0
+
   " Resize for numbers.
-  if version >= "700"
-    let l:columns = &numberwidth
-  else
-    let l:columns = 8
+  if &number
+    if version >= "700"
+      let l:columns = &numberwidth
+    else
+      let l:columns = 8
+    endif
   endif
 
   " Resize for signs.
   if has("signs")
-    if version >= "600"
-      let l:columns += 2
+    if g:marksigns
+      if version >= "600"
+        let l:columns = l:columns + 2
+      endif
     endif
   endif
 
-  call Resize_Columns("+", l:columns)
+  if g:oldcols < (80 + l:columns)
+    call Resize_Columns("+", l:columns)
+  endif
 endfun
 
 " Show numbers by default.
-au Display VimEnter * call Number(0)
-
-" Resize after startup.
-au Display VimEnter * call <SID>Startup_Resize()
+au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif
 endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -524,7 +557,7 @@ fun! <SID>Place_Sign(number, line, old, name)
 endfun
 
 fun! <SID>Highlight_Signs(...)
-  if ! has("signs") || ! g:marksigns
+  if ! has("signs") || ! g:marksigns || Uncluttered_Buffer()
     return
   endif
 
@@ -806,7 +839,7 @@ endfun
 " Find out if any buffer was modified.
 fun! <SID>TabModified(buflist)
   let l:i = 0
-  while i < len(a:buflist)
+  while l:i < len(a:buflist)
     if getbufvar(a:buflist[l:i], "&modified") == 1
       return "+"
     endif
@@ -893,3 +926,8 @@ se go+=e
 let g:p4EnableMenu=1
 let g:p4Presets='P4CONFIG'
 endif
+
+if version >= "500"
+" Resize after startup.
+au Display VimEnter * call Startup_Resize()
+endif