" Don't timeout waiting to interpet, eg, <ESC>OA as an escape code.
se ttimeoutlen=100
+" Use ^B to search backward when completing.
+inoremap <C-b> <C-p>
+" Use ^L to show matching completions but don't select one.
+inoremap <C-l> <C-n><C-p>
+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Handle options only available in Vim 5 and above.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
se bg=dark
endif
+" Allow mouse use in a terminal.
+se mouse=nvir
+
+" Update more quickly. For use with sign highlighting as polling for
+" CursorMove makes redrawing slow.
+se updatetime=500
+
" Enable tab-completion prompting for commands.
se wildmenu
" Don't list object files when globbing files to load.
se ssop+=unix,slash
" Nuke any pre-existing autocommands.
+augroup Display
+autocmd!
+augroup Mode
autocmd!
+augroup Signs
+autocmd!
+augroup StatusLine
+autocmd!
+augroup END
" Save the current window width so we can restore it when we quit.
-let oldcols=&columns
+if ! exists("oldcols")
+ let oldcols=&columns
+endif
" More GUI options. Add icon, tearoffs and toolbar.
se go+=itT
se titlestring=%{Show_TitleString()}
" Syntax highlighting. New versions will use syn enable instead.
-if version < 600
+if version < "600"
syn on
endif
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
+ endif
endfun
" Helper for status line.
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
+fun! Resize_Columns(op, ...)
+ if a:0 == 0
+ " Vim 5 hardcodes the size of numbers column to 8.
+ if version >= "700"
+ let l:columns = &numberwidth
+ else
+ let l:columns = 8
+ endif
+ else
+ let l:columns = a:1
endif
- " Vim 5 hardcodes the size of numbers column to 8.
- if version >= 600
- let l:numberwidth = &numberwidth
- else
- let l:numberwidth = 8
+ let l:resize = "se columns" . a:op . "=" . l:columns
+
+ " 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
+ " lines and number of columns in one action. To do this it will first query
+ " the number of lines and then set <same number of lines> by <new number of
+ " columns>. Because of the extra line for the status bar this results in
+ " 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"
endif
- exec "se columns" . a:op . "=" . l:numberwidth
+ exec l:resize
endfun
" Toggle number display.
call Iain_Vars()
let &number = ! &number
- 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
+ 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
- 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
endfun
" Restore window size.
-au VimLeave * if exists("oldcols") | let &columns=oldcols | endif
+au Display VimLeave * if exists("oldcols") | let &columns=oldcols | endif
" Map Makefile mode.
-au BufEnter * if &ft == "make" | call MakeMode_map() | endif
-au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif
+au Mode BufEnter * if &ft == "make" | call MakeMode_map() | endif
+au Mode BufLeave * if &ft == "make" | call MakeMode_unmap() | endif
" Entering Make mode.
fun! MakeMode_map()
" 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>")
+" Show numbers by default.
+au Display VimEnter * call Number()
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Less intrusive syntax highlighting.
syn enable
-" Nice GUI colour.
+" Set colours.
if has("gui_running")
- se guifont=DejaVu\ Sans\ Mono\ 10
- colo darkblue
-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
" Ignore whitespace when diffing.
endif
" Remember that we are opening the quickfix window.
-au BufWinEnter quickfix let g:quickfixing=1
-au BufUnload * if &ft == "qf" | let g:quickfixing=0 | endif
+au Mode BufWinEnter quickfix let g:quickfixing=1
+au Mode BufUnload * if &ft == "qf" | let g:quickfixing=0 | endif
" Allow in-place editing of crontabs.
-au FileType crontab set backupcopy=yes
+au Mode FileType crontab set backupcopy=yes
" 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>
+" Set mark and update highlighting.
+au Signs BufEnter * call <SID>Highlight_Signs()
+au Signs CursorHold * call <SID>Highlight_Signs()
+
+fun! <SID>Prep_Signs()
+ if ! exists("b:signdot") || ! g:marksigns
+ let b:signdot=0
+ endif
+ if ! exists("b:signdash") || ! g:marksigns
+ let b:signdash=0
+ endif
+ if ! exists("b:signquote") || ! g:marksigns
+ let b:signquote=0
+ endif
+ if ! exists("b:signcaret") || ! g:marksigns
+ let b:signcaret=0
+ endif
+ if ! exists("b:signless") || ! g:marksigns
+ let b:signless=0
+ endif
+ if ! exists("b:signgreater") || ! g:marksigns
+ let b:signgreater=0
+ endif
+ if ! exists("b:signleft") || ! g:marksigns
+ let b:signleft=0
+ endif
+ if ! exists("b:signright") || ! g:marksigns
+ let b:signright=0
+ endif
+ if ! exists("b:signa") || ! g:marksigns
+ let b:signa=0
+ endif
+ if ! exists("b:signb") || ! g:marksigns
+ let b:signb=0
+ endif
+ if ! exists("b:signc") || ! g:marksigns
+ let b:signc=0
+ endif
+ if ! exists("b:signd") || ! g:marksigns
+ let b:signd=0
+ endif
+ if ! exists("b:signe") || ! g:marksigns
+ let b:signe=0
+ endif
+ if ! exists("b:signf") || ! g:marksigns
+ let b:signf=0
+ endif
+ if ! exists("b:signA") || ! g:marksigns
+ let b:signA=0
+ endif
+ if ! exists("b:signB") || ! g:marksigns
+ let b:signB=0
+ endif
+ if ! exists("b:signC") || ! g:marksigns
+ let b:signC=0
+ endif
+ if ! exists("b:signD") || ! g:marksigns
+ let b:signD=0
+ endif
+ if ! exists("b:signE") || ! g:marksigns
+ let b:signE=0
+ endif
+ if ! exists("b:signF") || ! g:marksigns
+ let b:signF=0
+ endif
+endfun!
+
+fun! <SID>Place_Sign(number, line, old, name)
+ if a:line == a:old
+ return a:old
+ endif
+
+ exe "sign unplace " . (g:firstsign + a:number) . " buffer=" . bufnr("")
+ " Don't place the sign if it would conflict with the last change sign.
+ exe "sign place " . (g:firstsign + a:number) . " line=" . a:line . " name=" . a:name . " buffer=" . bufnr("")
+ return a:line
+endfun
+
+fun! <SID>Highlight_Signs(...)
+ if ! g:marksigns
+ return
+ endif
+
+ call <SID>Prep_Signs()
+
+ let b:signdot = <SID>Place_Sign(0, line("'."), b:signdot, "MarkDot")
+ 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")
+endfun
+
+" Toggle signs.
+fun! <SID>Cycle_Signs()
+ call Iain_Vars()
+ let g:marksigns = ! g:marksigns
+
+ if g:marksigns
+ " Signs to highlight marks.
+ " Syntax won't work properly in Vim 6.
+ 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 MarkLess text=< texthl=MarkSign
+ sign define MarkGreater text=> texthl=MarkSign
+ sign define MarkLeft text=[ texthl=MarkSign
+ sign define MarkRight 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 Markd text=d texthl=MarkSign linehl=MarkLine
+ sign define Marke text=e texthl=MarkSign linehl=MarkLine
+ sign define Markf text=f 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
+ sign define MarkD text=D 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)
+ call <SID>Highlight_Signs()
+ else
+ exe "sign unplace " . (g:firstsign + 0)
+ exe "sign unplace " . (g:firstsign + 1)
+ exe "sign unplace " . (g:firstsign + 2)
+ exe "sign unplace " . (g:firstsign + 3)
+ exe "sign unplace " . (g:firstsign + 4)
+ exe "sign unplace " . (g:firstsign + 5)
+ exe "sign unplace " . (g:firstsign + 6)
+ exe "sign unplace " . (g:firstsign + 7)
+ exe "sign unplace " . (g:firstsign + 8)
+ exe "sign unplace " . (g:firstsign + 9)
+ exe "sign unplace " . (g:firstsign + 10)
+ exe "sign unplace " . (g:firstsign + 11)
+ exe "sign unplace " . (g:firstsign + 12)
+ exe "sign unplace " . (g:firstsign + 13)
+ exe "sign unplace " . (g:firstsign + 14)
+ exe "sign unplace " . (g:firstsign + 15)
+ exe "sign unplace " . (g:firstsign + 16)
+ exe "sign unplace " . (g:firstsign + 17)
+ exe "sign unplace " . (g:firstsign + 18)
+ exe "sign unplace " . (g:firstsign + 19)
+
+ sign undefine MarkDash
+ sign undefine MarkDot
+ sign undefine MarkQuote
+ sign undefine MarkCaret
+ sign undefine MarkLess
+ sign undefine MarkGreater
+ sign undefine MarkLeft
+ sign undefine MarkRight
+ sign undefine Marka
+ sign undefine Markb
+ sign undefine Markc
+ sign undefine Markd
+ sign undefine Marke
+ sign undefine Markf
+ sign undefine MarkA
+ sign undefine MarkB
+ sign undefine MarkC
+ sign undefine MarkD
+ sign undefine MarkE
+ sign undefine MarkF
+
+ call <SID>Prep_Signs()
+ call Resize_Columns("-", 2)
+ endif
+endfun
+
" Change list mode.
fun! Cycle_List()
let basic='tab:\\_,trail:_,extends:<,precedes:>'
" Rerun filetype detection with \s. The s is for syntax, as this will be
" 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>")
+
+fun! <SID>Iain_Colour(colour)
+ if &t_Co == 88
+ if a:colour == "darkblue"
+ return 17
+ elseif a:colour == "darkmagenta"
+ return 33
+ elseif a:colour == "darkred"
+ return 32
+ elseif a:colour == "red"
+ return 64
+ endif
+ elseif &t_Co == 256
+ if a:colour == "darkblue"
+ return 17
+ elseif a:colour == "darkmagenta"
+ return 90
+ elseif a:colour == "darkred"
+ return 88
+ elseif a:colour == "red"
+ return 196
+ endif
+ else
+ return a:colour
+ endif
+endfun
" Change status bar colour when various things happen.
+" Flags: H/h: Cursor held/moved.
+" F/f: Focus gained/lost.
+" I/i: Insert mode entered/left.
fun! Highlight_StatusLine(flag)
" Get current status.
call Iain_Vars()
let re = "[" . tolower(a:flag) . toupper(a:flag) . "]"
let b:iainstatus = substitute(b:iainstatus, re, a:flag, "")
+ let l:normalcolour = "darkblue"
+ let l:editingcolour = "darkmagenta"
+ let l:warningcolour = "darkred"
+ let l:readonlycolour = "red"
+
" Default colour.
- let s:colour = "darkblue"
- let s:termcolour = ""
- let s:term88colour = "17"
- let s:term256colour = "17"
+ let l:colour = l:normalcolour
" Maybe override depending on status.
if b:iainstatus =~# "H"
if b:iainstatus =~# "I"
" Held in insert mode. Add extra highlight if we don't have focus.
if b:iainstatus =~# "f"
- let s:colour = "darkred"
- let s:term88colour = "32"
- let s:term256colour = "88"
+ let l:colour = l:warningcolour
else
- let s:colour = "darkmagenta"
- let s:term88colour = "33"
- let s:term256colour = "90"
+ let l:colour = l:editingcolour
endif
endif
else
if b:iainstatus =~# "I"
" Regular insert mode.
- let s:colour = "darkmagenta"
- let s:term88colour = "33"
- let s:term256colour = "90"
+ let l:colour = l:editingcolour
endif
endif
- if &t_Co == 88
- let s:termcolour = s:term88colour
- elseif &t_Co == 256
- let s:termcolour = s:term256colour
- else
- let s:termcolour = s:colour
+ " Override again if readonly.
+ if l:colour != l:normalcolour
+ if getbufvar("", "&ro")
+ let l:colour = l:readonlycolour
+ endif
endif
- exec "highlight StatusLine guifg=white guibg=" . s:colour . " ctermbg=white ctermfg=" . s:termcolour
+ let l:termcolour = <SID>Iain_Colour(l:colour)
+
+ exec "highlight StatusLine guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour
endfun
-call Highlight_StatusLine("")
+au Display VimEnter * call Highlight_StatusLine("")
+
+" Show signs by default.
+au Display VimEnter * call <SID>Cycle_Signs()
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
if version >= "700"
version 7.0
-au CursorHoldI * call Highlight_StatusLine("H")
-au CursorMovedI * call Highlight_StatusLine("h")
-au FocusGained * call Highlight_StatusLine("F")
-au FocusLost * call Highlight_StatusLine("f")
-au InsertEnter * call Highlight_StatusLine("I")
-au InsertLeave * call Highlight_StatusLine("i")
+" Helper to show tab name.
+fun! <SID>TabName(label, gui)
+ let l:label = a:label
+ if l:label == ""
+ let l:label = "No Name"
+ if a:gui
+ let l:label = "[" . l:label . "]"
+ endif
+ else
+ let l:label = fnamemodify(l:label, ":t")
+ if strlen(l:label) >= 18
+ let l:label = l:label[0:17] . ".."
+ endif
+ endif
+ return l:label
+endfun
+
+" Find out if any buffer was modified.
+fun! <SID>TabModified(buflist)
+ let l:i = 0
+ while i < len(a:buflist)
+ if getbufvar(a:buflist[l:i], "&modified") == 1
+ return "+"
+ endif
+ let l:i = l:i + 1
+ endwhile
+ return ""
+endfun
+
+" Tab line.
+fun! Show_TabLine()
+ let l:s = "%#TabLineFill#Tabs:"
+
+ let l:i = 0
+ while l:i < tabpagenr("$")
+ let l:i = l:i + 1
+ " Get the label.
+ let l:buflist = tabpagebuflist(l:i)
+ let l:winnr = tabpagewinnr(l:i)
+ let l:n = tabpagewinnr(l:i, "$")
+ let l:label = <SID>TabName(bufname(l:buflist[l:winnr - 1]), 0)
+ let l:modified = <SID>TabModified(l:buflist)
+
+ " Choose highlighting.
+ if l:i == tabpagenr()
+ let l:s .= "%#TabLineSel#[" . l:n . l:modified . " " . l:label . "]"
+ else
+ let l:s .= "%#TabLine# " . l:n . l:modified . " " . l:label . " "
+ endif
+ endwhile
+
+ " Padding.
+ let l:s .= "%#TabLine#%T"
+ return l:s
+endfun
+
+" Per tab label for the GUI.
+fun! Show_GUITabLine()
+ let l:buflist = tabpagebuflist(v:lnum)
+ let l:winnr = tabpagewinnr(v:lnum)
+ let l:s = tabpagewinnr(v:lnum, "$")
+ let l:label = <SID>TabName(bufname(l:buflist[l:winnr - 1]), 1)
+ let l:modified = <SID>TabModified(l:buflist)
+
+ let l:s .= l:modified . " " . l:label
+ return l:s
+endfun
+
+se tabline=%!Show_TabLine()
+se guitablabel=%!Show_GUITabLine()
+
+au StatusLine CursorHoldI * call Highlight_StatusLine("H")
+au StatusLine CursorMovedI * call Highlight_StatusLine("h")
+au StatusLine FocusGained * call Highlight_StatusLine("F")
+au StatusLine FocusLost * call Highlight_StatusLine("f")
+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()
+
+" Limit the size of the popup menu when completing.
+se pumheight=20
" Make diffs vertical by default.
se diffopt+=vertical
se numberwidth=5
" Add "previous tab" mapping as gb.
-map gb :tabPrev<CR>
+map gb :tabprevious<CR>:<CR>
" Transparency.
if has("gui_macvim")
se transparency=15
endif
+" Yet more GUI options. Add tabs.
+se go+=e
+
" Perforce.
let g:p4EnableMenu=1
let g:p4Presets='P4CONFIG'
git://git.iain.cx/iain / profile.git / blobdiff