" 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.
" 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.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
se bg=dark
endif
+" 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.
+if has("signs")
+ se updatetime=500
+endif
+
" Enable tab-completion prompting for commands.
se wildmenu
" Don't list object files when globbing files to load.
" 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!
+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.
-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 has("signs")
+ if ! exists("g:marksigns")
+ let g:marksigns = 0
+ endif
+ if ! exists("g:firstsign")
+ let g:firstsign = 100
+ endif
+ endif
endfun
" Helper for status line.
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
- return printf("%s (%s) %s", l:ts1, getcwd(), v:servername)
+ return l:ts1
endfun
" Show the status line.
endfun
" Grow or shrink the window size.
-fun! Resize_Columns(op)
- " Vim 5 hardcodes the size of numbers column to 8.
- if version >= "700"
- let l:numberwidth = &numberwidth
+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:numberwidth = 8
+ let l:columns = a:1
endif
- let l:resize = "se columns" . a:op . "=" . l:numberwidth
+ 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 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 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()
" 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 * if ! Uncluttered_Buffer() | call Number(0) | endif
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
if version >= "600"
version 6.0
+if has("win32")
+ se encoding=utf-8
+endif
+
" Remember quickfix state.
let g:quickfixing=0
" Less intrusive syntax highlighting.
syn enable
-" Nice GUI colour.
+" Set colours.
if has("gui_running")
- se guifont=DejaVu\ Sans\ Mono\ 10
- colo darkblue
- hi LineNr guibg=#303030
-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.
-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.
+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
+ 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: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: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 ! has("signs") || ! g:marksigns || Uncluttered_Buffer()
+ 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: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(resize)
+ if ! has("signs")
+ return
+ endif
+ call Iain_Vars()
+ let g:marksigns = ! g:marksigns
+
+ if g:marksigns
+ " Signs to highlight marks.
+ " Syntax won't work properly in Vim 6.
+ if <SID>Has_Unicode()
+ sign define MarkDash text=’ texthl=MarkSign
+ sign define MarkDot text=• texthl=MarkDot
+ sign define MarkQuote text=” texthl=MarkSign
+ else
+ sign define MarkDash text=' texthl=MarkSign
+ sign define MarkDot text=* texthl=MarkDot
+ sign define MarkQuote text=" texthl=MarkSign
+ endif
+ 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 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 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
+
+ if a:resize
+ call Resize_Columns("+", 2)
+ endif
+ 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)
+ 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 MarkQuote
+ sign undefine MarkCaret
+ sign undefine MarkLess
+ 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 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()
+ if a:resize
+ call Resize_Columns("-", 2)
+ endif
+ endif
+endfun
+
+fun! <SID>Has_Unicode()
+ if ! has('multi_byte')
+ return 0
+ endif
+
+ if version < "602"
+ return 0
+ endif
+
+ if &tenc =~? '^u\(tf\|cs\)'
+ return 1
+ endif
+
+ if ! strlen(&tenc) && &enc =~? '^u\(tf\|cs\)'
+ return 1
+ endif
+
+ return 0
+endfun
+
" Change list mode.
fun! Cycle_List()
- let basic='tab:\\_,trail:_,extends:<,precedes:>'
+ " Pretty UTF-8 listchars.
+ if <SID>Has_Unicode()
+ 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 Resize_Columns("-", 1)
let b:iainlist = 0
endif
if b:iainlist == 0
exec "set lcs=" . basic
set list
else
- exec "set lcs=" . basic . ",eol:$"
+ call Resize_Columns("+", 1)
+ exec "set lcs=" . basic . "," . eol
set list
endif
endfun
" 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(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
-call Highlight_StatusLine("")
+au Display VimEnter * call Highlight_StatusLine("")
+
+" Show signs by default.
+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
se tabline=%!Show_TabLine()
se guitablabel=%!Show_GUITabLine()
-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")
+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")
+
+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
git://git.iain.cx/iain / profile.git / blobdiff