Vim 5 compatibility.

[profile.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 9f8f25a..500794f 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -17,16 +17,26 @@ version 4.0
 " No compatibility mode.
 se nocp
 
 " No compatibility mode.
 se nocp
 

+" Find stuff.
+if has("win32")
+  se rtp=~/.vim,$VIMRUNTIME
+endif
+

 " Tabstop 2.
 se ts=2
 " And use spaces not tabs.
 se expandtab
 " And << and >> indent by 2.
 se sw=2
 " Tabstop 2.
 se ts=2
 " And use spaces not tabs.
 se expandtab
 " And << and >> indent by 2.
 se sw=2

+" Backspace deletes full tab width at the start of a line.
+se smarttab

 
 " Allow backspace to delete before start of line.
 se bs=2
 
 
 " Allow backspace to delete before start of line.
 se bs=2
 

+" Don't jump to the start of the line when using H, L etc.
+se nosol
+

 " Show the ruler.
 se ruler
 " Show partial commands in the ruler.
 " Show the ruler.
 se ruler
 " Show partial commands in the ruler.


@@ -64,6 +74,10 @@ inoremap <C-b> <C-p>
 " Use ^L to show matching completions but don't select one.
 inoremap <C-l> <C-n><C-p>
 
 " Use ^L to show matching completions but don't select one.
 inoremap <C-l> <C-n><C-p>
 

+" Swap jump keys.
+noremap ' `
+noremap ` '
+

 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 5 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 5 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""


@@ -75,8 +89,10 @@ if ! has("gui_running")
   se bg=dark
 endif
 
   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.
 
 " Update more quickly.  For use with sign highlighting as polling for
 " CursorMove makes redrawing slow.


@@ -95,6 +111,9 @@ se suffixes-=*.o,*.obj
 " cross-platform.
 se ssop+=unix,slash
 
 " cross-platform.
 se ssop+=unix,slash
 

+" How often do we need to use ^A/^X on octals?
+se nf=hex
+

 " Nuke any pre-existing autocommands.
 augroup Display
 autocmd!
 " Nuke any pre-existing autocommands.
 augroup Display
 autocmd!


@@ -113,8 +132,9 @@ if ! exists("g:oldcols")
   let g:oldcols=&columns
 endif
 
   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=\e[8;%p1%d;%p2%dt
 
 " Allow dynamic window resize even if we aren't in an xterm.
 se t_WS=\e[8;%p1%d;%p2%dt


@@ -130,10 +150,6 @@ if version < "600"
   syn on
 endif
 
   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
 " Catch typos.
 command! W :w
 command! Wq :wq


@@ -214,9 +230,18 @@ fun! Show_TitleString()
   if bufname("") == ""
     let l:ts1='Vim'
   else
   if bufname("") == ""
     let l:ts1='Vim'
   else

-    let l:ts1=printf("%2d: %s", bufnr(""), expand('%t'))
+    " Vim 5 doesn't have printf.
+    let l:ts1=bufnr("")
+    if l:ts1 < 10
+      let l:ts1=" " . l:ts1
+    endif
+    let l:ts1=l:ts1 . ": " . expand('%t')
+  endif
+  let l:ts1=l:ts1 . " (" .  getcwd() . ")"
+  if has("clientserver")
+    let l:ts1=l:ts1 . " " . v:servername

   endif
   endif

-  return printf("%s (%s) %s", l:ts1, getcwd(), v:servername)
+  return l:ts1

 endfun
 
 " Show the status line.
 endfun
 
 " Show the status line.


@@ -367,6 +392,34 @@ 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>")
 
 " 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! 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
 
 fun! Startup_Resize()
   let l:columns = 0
 


@@ -394,10 +447,7 @@ fun! Startup_Resize()
 endfun
 
 " Show numbers by default.
 endfun
 
 " Show numbers by default.

-au Display VimEnter * call Number(0)
-
-" Resize after startup.
-au Display VimEnter * call Startup_Resize()
+au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif

 endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""


@@ -438,7 +488,9 @@ se diffopt=filler,iwhite
 
 " Expand window when doing a vertical diff.
 if &diff
 
 " Expand window when doing a vertical diff.
 if &diff

-  let &columns = 164
+  if &columns < 161
+    let &columns = &columns * 2
+  endif

 endif
 
 " Remember that we are opening the quickfix window.
 endif
 
 " Remember that we are opening the quickfix window.


@@ -483,6 +535,18 @@ fun! <SID>Prep_Signs()
   if ! exists("b:signright") || ! g:marksigns
     let b:signright=0
   endif
   if ! exists("b:signright") || ! g:marksigns
     let b:signright=0
   endif

+  if ! exists("b:signsquareleft") || ! g:marksigns
+    let b:signsquareleft=0
+  endif
+  if ! exists("b:signsquareright") || ! g:marksigns
+    let b:signsquareright=0
+  endif
+  if ! exists("b:signbraceleft") || ! g:marksigns
+    let b:signbraceleft=0
+  endif
+  if ! exists("b:signbraceright") || ! g:marksigns
+    let b:signbraceright=0
+  endif

   if ! exists("b:signa") || ! g:marksigns
     let b:signa=0
   endif
   if ! exists("b:signa") || ! g:marksigns
     let b:signa=0
   endif


@@ -533,7 +597,7 @@ fun! <SID>Place_Sign(number, line, old, name)
 endfun
 
 fun! <SID>Highlight_Signs(...)
 endfun
 
 fun! <SID>Highlight_Signs(...)

-  if ! has("signs") || ! g:marksigns
+  if ! has("signs") || ! g:marksigns || Uncluttered_Buffer()

     return
   endif
 
     return
   endif
 


@@ -543,23 +607,27 @@ fun! <SID>Highlight_Signs(...)
   let b:signdash = <SID>Place_Sign(1, line("''"), b:signdash, "MarkDash")
   let b:signquote = <SID>Place_Sign(2, line("'\""), b:signquote, "MarkQuote")
   let b:signcaret = <SID>Place_Sign(3, line("'^"), b:signcaret, "MarkCaret")
   let b:signdash = <SID>Place_Sign(1, line("''"), b:signdash, "MarkDash")
   let b:signquote = <SID>Place_Sign(2, line("'\""), b:signquote, "MarkQuote")
   let b:signcaret = <SID>Place_Sign(3, line("'^"), b:signcaret, "MarkCaret")

-  let b:signless = <SID>Place_Sign(4, line("'<"), b:signcaret, "MarkLess")
-  let b:signgreater = <SID>Place_Sign(5, line("'>"), b:signcaret, "MarkGreater")
-  let b:signleft = <SID>Place_Sign(6, line("'["), b:signcaret, "MarkLeft")
-  let b:signright = <SID>Place_Sign(7, line("']"), b:signcaret, "MarkRight")
-
-  let b:signa = <SID>Place_Sign(8, line("'a"), b:signa, "Marka")
-  let b:signb = <SID>Place_Sign(9, line("'b"), b:signb, "Markb")
-  let b:signc = <SID>Place_Sign(10, line("'c"), b:signc, "Markc")
-  let b:signd = <SID>Place_Sign(11, line("'d"), b:signd, "Markd")
-  let b:signe = <SID>Place_Sign(12, line("'e"), b:signe, "Marke")
-  let b:signf = <SID>Place_Sign(13, line("'f"), b:signf, "Markf")
-  let b:signA = <SID>Place_Sign(14, line("'A"), b:signA, "MarkA")
-  let b:signB = <SID>Place_Sign(15, line("'B"), b:signB, "MarkB")
-  let b:signC = <SID>Place_Sign(16, line("'C"), b:signC, "MarkC")
-  let b:signD = <SID>Place_Sign(17, line("'D"), b:signD, "MarkD")
-  let b:signE = <SID>Place_Sign(18, line("'E"), b:signE, "MarkE")
-  let b:signF = <SID>Place_Sign(19, line("'F"), b:signF, "MarkF")
+  let b:signless = <SID>Place_Sign(4, line("'<"), b:signless, "MarkLess")
+  let b:signgreater = <SID>Place_Sign(5, line("'>"), b:signgreater, "MarkGreater")
+  let b:signleft = <SID>Place_Sign(6, line("'("), b:signleft, "MarkLeft")
+  let b:signright = <SID>Place_Sign(7, line("')"), b:signright, "MarkRight")
+  let b:signsquareleft = <SID>Place_Sign(8, line("'["), b:signsquareleft, "MarkSquareLeft")
+  let b:signsquareright = <SID>Place_Sign(9, line("']"), b:signsquareright, "MarkSquareRight")
+  let b:signbraceleft = <SID>Place_Sign(10, line("'{"), b:signbraceleft, "MarkBraceLeft")
+  let b:signbraceright = <SID>Place_Sign(11, line("'}"), b:signbraceright, "MarkBraceRight")
+
+  let b:signa = <SID>Place_Sign(12, line("'a"), b:signa, "Marka")
+  let b:signb = <SID>Place_Sign(13, line("'b"), b:signb, "Markb")
+  let b:signc = <SID>Place_Sign(15, line("'c"), b:signc, "Markc")
+  let b:signd = <SID>Place_Sign(16, line("'d"), b:signd, "Markd")
+  let b:signe = <SID>Place_Sign(17, line("'e"), b:signe, "Marke")
+  let b:signf = <SID>Place_Sign(18, line("'f"), b:signf, "Markf")
+  let b:signA = <SID>Place_Sign(19, line("'A"), b:signA, "MarkA")
+  let b:signB = <SID>Place_Sign(20, line("'B"), b:signB, "MarkB")
+  let b:signC = <SID>Place_Sign(21, line("'C"), b:signC, "MarkC")
+  let b:signD = <SID>Place_Sign(22, line("'D"), b:signD, "MarkD")
+  let b:signE = <SID>Place_Sign(23, line("'E"), b:signE, "MarkE")
+  let b:signF = <SID>Place_Sign(24, line("'F"), b:signF, "MarkF")

 endfun
 
 " Toggle signs.
 endfun
 
 " Toggle signs.


@@ -576,11 +644,15 @@ fun! <SID>Cycle_Signs(resize)
     sign define MarkDash text=' texthl=MarkSign
     sign define MarkDot text=* texthl=MarkDot
     sign define MarkQuote text=" texthl=MarkSign
     sign define MarkDash text=' texthl=MarkSign
     sign define MarkDot text=* texthl=MarkDot
     sign define MarkQuote text=" texthl=MarkSign

-    sign define MarkCaret text=^ texthl=MarkSign
+    sign define MarkCaret text=^ texthl=MarkDot

     sign define MarkLess text=< texthl=MarkSign
     sign define MarkGreater text=> texthl=MarkSign
     sign define MarkLess text=< texthl=MarkSign
     sign define MarkGreater text=> texthl=MarkSign

-    sign define MarkLeft text=[ texthl=MarkSign
-    sign define MarkRight text=] texthl=MarkSign
+    sign define MarkLeft text=( texthl=MarkSign
+    sign define MarkRight text=) texthl=MarkSign
+    sign define MarkSquareLeft text=[ texthl=MarkSign
+    sign define MarkSquareRight text=] texthl=MarkSign
+    sign define MarkBraceLeft text={ texthl=MarkSign
+    sign define MarkBraceRight text=} texthl=MarkSign

     sign define Marka text=a texthl=MarkSign linehl=MarkLine
     sign define Markb text=b texthl=MarkSign linehl=MarkLine
     sign define Markc text=c texthl=MarkSign linehl=MarkLine
     sign define Marka text=a texthl=MarkSign linehl=MarkLine
     sign define Markb text=b texthl=MarkSign linehl=MarkLine
     sign define Markc text=c texthl=MarkSign linehl=MarkLine


@@ -619,6 +691,11 @@ fun! <SID>Cycle_Signs(resize)
     exe "sign unplace " . (g:firstsign + 17)
     exe "sign unplace " . (g:firstsign + 18)
     exe "sign unplace " . (g:firstsign + 19)
     exe "sign unplace " . (g:firstsign + 17)
     exe "sign unplace " . (g:firstsign + 18)
     exe "sign unplace " . (g:firstsign + 19)

+    exe "sign unplace " . (g:firstsign + 20)
+    exe "sign unplace " . (g:firstsign + 21)
+    exe "sign unplace " . (g:firstsign + 22)
+    exe "sign unplace " . (g:firstsign + 23)
+    exe "sign unplace " . (g:firstsign + 24)

 
     sign undefine MarkDash
     sign undefine MarkDot
 
     sign undefine MarkDash
     sign undefine MarkDot


@@ -628,6 +705,10 @@ fun! <SID>Cycle_Signs(resize)
     sign undefine MarkGreater
     sign undefine MarkLeft
     sign undefine MarkRight
     sign undefine MarkGreater
     sign undefine MarkLeft
     sign undefine MarkRight

+    sign undefine MarkSquareLeft
+    sign undefine MarkSquareRight
+    sign undefine MarkBraceLeft
+    sign undefine MarkBraceRight

     sign undefine Marka
     sign undefine Markb
     sign undefine Markc
     sign undefine Marka
     sign undefine Markb
     sign undefine Markc


@@ -650,7 +731,20 @@ endfun
 
 " Change list mode.
 fun! Cycle_List()
 
 " Change list mode.
 fun! Cycle_List()

-  let basic='tab:\\_,trail:_,extends:<,precedes:>'
+  " Pretty UTF-8 listchars.
+  if has('multi_byte') && (&tenc =~? '^u\(tf\|cs\)' || (! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)')) && v:version >= "602"
+    let basic='tab:»·,trail:…,extends:«,precedes:»'
+    let eol='eol:¶'
+    if version >= "700"
+      let basic=basic . ',nbsp:•'
+    endif
+  else
+    let basic='tab:\\_,trail:_,extends:<,precedes:>'
+    let eol='eol:$'
+    if version >= "700"
+      let basic=basic . ',nbsp:+'
+    endif
+  endif

   call Iain_Vars()
   let b:iainlist = b:iainlist + 1
   if b:iainlist > 2
   call Iain_Vars()
   let b:iainlist = b:iainlist + 1
   if b:iainlist > 2


@@ -662,7 +756,7 @@ fun! Cycle_List()
     exec "set lcs=" . basic
     set list
   else
     exec "set lcs=" . basic
     set list
   else

-    exec "set lcs=" . basic . ",eol:$"
+    exec "set lcs=" . basic . "," . eol

     set list
   endif
 endfun
     set list
   endif
 endfun


@@ -815,7 +909,7 @@ endfun
 " Find out if any buffer was modified.
 fun! <SID>TabModified(buflist)
   let l:i = 0
 " 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
     if getbufvar(a:buflist[l:i], "&modified") == 1
       return "+"
     endif


@@ -902,3 +996,8 @@ se go+=e
 let g:p4EnableMenu=1
 let g:p4Presets='P4CONFIG'
 endif
 let g:p4EnableMenu=1
 let g:p4Presets='P4CONFIG'
 endif

+
+if version >= "500"
+" Resize after startup.
+au Display VimEnter * call Startup_Resize()
+endif