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
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
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
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
endfun
fun! <SID>Highlight_Signs(...)
- if ! g:marksigns
+ if ! has("signs") || ! g:marksigns || Uncluttered_Buffer()
return
endif
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 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)
sign undefine MarkF
call <SID>Prep_Signs()
- call Resize_Columns("-", 2)
+ if a:resize
+ call Resize_Columns("-", 2)
+ endif
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 . " ctermfg=white ctermbg=" . 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
git://git.iain.cx/iain / profile.git / blobdiff