" 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
+" Backspace deletes full tab width at the start of a line.
+se smarttab
" 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.
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.
-se updatetime=500
+if has("signs")
+ se updatetime=500
+endif
" Enable tab-completion prompting for commands.
se wildmenu
" 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!
augroup Mode
autocmd!
-augroup Signs
-autocmd!
+if has("signs")
+ augroup Signs
+ autocmd!
+endif
augroup StatusLine
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=\e[8;%p1%d;%p2%dt
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
if ! exists("g:iainextracolumns")
let g:iainextracolumns = 0
endif
- if ! exists("g:marksigns")
- let g:marksigns = 0
- endif
- if ! exists("g:firstsign")
- let g:firstsign = 100
+ if has("signs")
+ if ! exists("g:marksigns")
+ let g:marksigns = 0
+ endif
+ if ! exists("g:firstsign")
+ let g:firstsign = 100
+ endif
endif
endfun
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
" 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.
-fun! Number()
+fun! Number(resize)
call Iain_Vars()
let &number = ! &number
if l:num_numbers == 0
let g:iainextracolumns = 0
- call Resize_Columns("-")
+ if a:resize
+ call Resize_Columns("-")
+ endif
elseif g:iainextracolumns == 0
let g:iainextracolumns = 1
- call Resize_Columns("+")
+ if a:resize
+ call Resize_Columns("+")
+ endif
endif
endif
endfun
" Restore window size.
-au Display VimLeave * if exists("oldcols") | let &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
" Swap case-sensitivity with \c.
call Mapping("c", ":call Invert_Case()<CR>:<CR>")
" Change number mode with \n.
-call Mapping("n", ":call Number()<CR>:<CR>")
+call Mapping("n", ":call Number(1)<CR>:<CR>")
" Expand or shrink window size with \> and \<.
call Mapping(">", ":call Resize_Columns('+')<CR>:<CR>")
call Mapping("<", ":call Resize_Columns('-')<CR>:<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
+
+ " Resize for numbers.
+ if &number
+ if version >= "700"
+ let l:columns = &numberwidth
+ else
+ let l:columns = 8
+ endif
+ endif
+
+ " Resize for signs.
+ if has("signs")
+ if g:marksigns
+ if version >= "600"
+ let l:columns = l:columns + 2
+ endif
+ endif
+ endif
+
+ if g:oldcols < (80 + l:columns)
+ call Resize_Columns("+", l:columns)
+ endif
+endfun
+
" Show numbers by default.
-au Display VimEnter * call Number()
+au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Less intrusive syntax highlighting.
syn enable
-" Nice GUI colour.
+" Set colours.
if has("gui_running")
- se guifont=DejaVu\ Sans\ Mono\ 10
- " XXX: Sort this out.
- colo darkblue
- hi Cursor guibg=green
- hi LineNr guibg=#303030
- hi MarkLine guibg=#2e2e2e
- hi MarkDot guifg=red guibg=#2e2e2e
- hi MarkSign guifg=lightblue guibg=#2e2e2e
- hi! link SignColumn LineNr
-elseif &t_Co > 16
try
- colo iain
+ if has("win32")
+ se guifont=DejaVu_Sans_Mono:h10:cANSI
+ else
+ se guifont=DejaVu\ Sans\ Mono\ 10
+ endif
catch
endtry
endif
-if has("win32")
- se guifont=DejaVu_Sans_Mono:h10:cANSI
+if has("gui_running") || &t_Co > 16
+ try
+ colo iain
+ catch
+ endtry
endif
-hi! link TabLineSel StatusLine
-hi! link TabLine StatusLineNC
" Ignore whitespace when diffing.
se diffopt=filler,iwhite
" 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.
vnoremap # y?\V<C-R>=substitute(escape(@@,"?\\"),"\n","\\\\n","ge")<CR><CR>
" Set mark and update highlighting.
-au Signs BufEnter * call <SID>Highlight_Signs()
-au Signs CursorHold * call <SID>Highlight_Signs()
+if has("signs")
+ au Signs BufEnter * call <SID>Highlight_Signs()
+ au Signs CursorHold * call <SID>Highlight_Signs()
+endif
fun! <SID>Prep_Signs()
if ! exists("b:signdot") || ! g:marksigns
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
endfun
fun! <SID>Highlight_Signs(...)
- if ! g:marksigns
+ if ! has("signs") || ! g:marksigns || Uncluttered_Buffer()
return
endif
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.
-fun! <SID>Cycle_Signs()
+fun! <SID>Cycle_Signs(resize)
+ if ! has("signs")
+ return
+ endif
call Iain_Vars()
let g:marksigns = ! g:marksigns
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 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 MarkE text=E texthl=MarkSign linehl=MarkLine
sign define MarkF text=F texthl=MarkSign linehl=MarkLine
- call Resize_Columns("+", 2)
+ if a:resize
+ call Resize_Columns("+", 2)
+ endif
call <SID>Highlight_Signs()
else
exe "sign unplace " . (g:firstsign + 0)
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 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 MarkF
call <SID>Prep_Signs()
- call Resize_Columns("-", 2)
+ if a:resize
+ call Resize_Columns("-", 2)
+ endif
endif
endfun
" 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
exec "set lcs=" . basic
set list
else
- exec "set lcs=" . basic . ",eol:$"
+ exec "set lcs=" . basic . "," . eol
set list
endif
endfun
" updated as a side-effect.
call Mapping("s", ":filetype detect<CR>:<CR>")
" Toggle marks with \m.
-call Mapping("m", ":call <SID>Cycle_Signs()<CR>:<CR>")
+call Mapping("m", ":call <SID>Cycle_Signs(1)<CR>:<CR>")
fun! <SID>Iain_Colour(colour)
if &t_Co == 88
let l:termcolour = <SID>Iain_Colour(l:colour)
- exec "highlight StatusLine guifg=white guibg=" . l:colour . " ctermbg=white ctermfg=" . l:termcolour
+ exec "highlight StatusLine gui=bold term=bold cterm=bold guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour
endfun
au Display VimEnter * call Highlight_StatusLine("")
" Show signs by default.
-au Display VimEnter * call <SID>Cycle_Signs()
+au Display VimEnter * call <SID>Cycle_Signs(0)
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" 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
au StatusLine InsertEnter * call Highlight_StatusLine("I")
au StatusLine InsertLeave * call Highlight_StatusLine("i")
-au Signs InsertEnter * call <SID>Highlight_Signs()
-au Signs InsertLeave * call <SID>Highlight_Signs()
+if has("signs")
+ au Signs InsertEnter * call <SID>Highlight_Signs()
+ au Signs InsertLeave * call <SID>Highlight_Signs()
+endif
" Limit the size of the popup menu when completing.
se pumheight=20
let g:p4EnableMenu=1
let g:p4Presets='P4CONFIG'
endif
+
+if version >= "500"
+" Resize after startup.
+au Display VimEnter * call Startup_Resize()
+endif