X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=ad273c6e543ad72862b0c4a132fae7c84e6f2a43;hp=6a4438e68860363e99bb1af2adf41f539b6d690f;hb=aca9a1b0a3f372cc385ff2dc7c4e0c4e392e89f7;hpb=bcde0b33db971e047dcbcc241669d622b15fc5af diff --git a/.vimrc b/.vimrc old mode 100755 new mode 100644 index 6a4438e..ad273c6 --- a/.vimrc +++ b/.vimrc @@ -1,54 +1,134 @@ +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " $Id$ +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Multi-version vimrc compatible with version 4 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +" Note that "if | call Something() | endif" syntax is unsupported +" in Vim 4 so we write all our functions out the long way. It does work in +" autocommand definitions, however. + +" Vim 4 complains if version isn't set in the configuration file. +version 4.0 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options safe to use in version 4. Vim 4 parses but ignores the +" "if version" syntax used later in this file so we don't use it. No attempt +" is made to make this configuration compatible with Vim 3. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" No compatibility mode. se nocp + +" Tabstop 2. se ts=2 -se bs=2 -se sw=2 +" And use spaces not tabs. se expandtab +" And << and >> indent by 2. +se sw=2 + +" Allow backspace to delete before start of line. +se bs=2 + +" Show the ruler. se ruler +" Show partial commands in the ruler. +se showcmd +" And always show the status line. +se laststatus=2 + +" Use C indent style. se cindent se cinkeys=0{,0},0),:,!^F,o,O,e -se showcmd -se go=agilmrtT -se hlsearch +se cinoptions=b1,c2 + +" GUI options. +se go=aglmr + +" Don't be bugged by messages at the bottom of the screen. +se shm=aot + +" Find as you type. se incsearch + +" Case-insensitive search. se ignorecase +" But override by typing capitals. se smartcase -se shm=aot -se laststatus=2 -syn enable -if has("gui_running") - se guifont=Bitstream\ Vera\ Sans\ Mono\ 12 - colo darkblue -endif -highlight StatusLine guifg=white guibg=blue ctermbg=white ctermfg=blue -if has("win32") - se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI + +" Look for ctags in home directory first. +se tags=~/.tags,./tags,tags + +" Don't timeout waiting to interpet, eg, OA as an escape code. +se ttimeoutlen=100 + +" Use - and = to create underlines. +map - yyp:s/./-/g:let @/='': +map = yyp:s/./=/g:let @/='': + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 5 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "500" +version 5.0 + +" Tell Vim we use dark backgrounds in our terminals. +if ! has("gui_running") + se bg=dark endif -:autocmd! + +" Vim 5 hardcodes the size of numbers column to 8. +let numberwidth=8 + +" Save sessions in UNIX format with / as file separator. This is +" cross-platoform. +se ssop+=unix,slash + +" Nuke any pre-existing autocommands. +autocmd! + +" Save the current window width so we can restore it when we quit. +let oldcols=&columns + +" More GUI options. Add icon, tearoffs and toolbar. +se go+=itT + +" Allow dynamic window resize even if we aren't in an xterm. +se t_WS=[8;%p1%d;%p2%dt + +" Highlight search results. +se hlsearch + +" Syntax highlighting. +syn on + +" 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 +command! Wqa :wqa " Set up our variables. fun! Iain_Vars() - if ! exists("b:iainlist") | let b:iainlist = 0 | endif - if ! exists("b:iainhex") | let b:iainhex = 0 | endif -endfun - -" Change list mode. -fun! Cycle_List() - let basic='tab:\\_,trail:_,extends:<,precedes:>' - call Iain_Vars() - let b:iainlist = b:iainlist + 1 - if b:iainlist > 2 | let b:iainlist = 0 | endif - if b:iainlist == 0 - set nolist - elseif b:iainlist == 1 - exec "set lcs=" . basic - set list - else - exec "set lcs=" . basic . ",eol:$" - set list + if ! exists("b:iainlist") + let b:iainlist = 0 + endif + if ! exists("b:iainhex") + let b:iainhex = 0 + endif + if ! exists("b:iainverbose") + let b:iainverbose = 0 + endif + if ! exists("b:iainstatus") + " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old. + let b:iainstatus = "Fih" endif endfun +" Helper for status line. +" Show space, underscore or dollar sign depending on list mode. fun! Show_List() call Iain_Vars() if b:iainlist == 0 @@ -63,67 +143,76 @@ fun! Show_List() endif endfun -" Cycle between hex and decimal display of toolbar stuff. -fun! Cycle_HexStatusLine() - call Iain_Vars() - let b:iainhex = ! b:iainhex - call Show_StatusLine() +" Helper for status line. +" Show c or C to denote case-sensitivity. +fun! Show_Case() + if &ic + return "c" + else + return "C" + endif +endfun + +" Helper for status line. +" Show the size of the tabstop. +fun! Show_Tabstop() + return &ts +endfun + +" Helper for status line. +" Show p when paste mode is on. +fun! Show_Paste() + if &paste + return "p" + else + return "" + endif endfun +" Show the status line. fun! Show_StatusLine() call Iain_Vars() let sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=' - let sl2='\ \|\ P:%4.6o\ L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P' + let sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P' let hexformat='%b' if b:iainhex let hexformat='0\x%02B' endif - exec "set statusline=" . sl1 . hexformat . sl2 + if b:iainverbose + let sl2=hexformat . '\ \|\ P:%4.6o\ ' + else + let sl2='' + endif + exec "set statusline=" . sl1 . sl2 . sl3 endfun -" Save the current window width so if we change it we can restore it -" when we quit. -let andyoldcols=&columns - -" This expands the terminal to display two 80-column files side-by-side -" when vim is opened in diff mode. -if &diff | let &columns = 164 | endif - -map viwvbi"ea" -map - yyp:s/./-/g:let @/='': -map = yyp:s/./=/g:let @/='': -command! W :w -se tags=~/.tags,./tags,tags - -" Make * and # work the way you expect in visual mode. -vnoremap * y/\V=substitute(escape(@@,"/\\"),"\n","\\\\n","ge") -vnoremap # y?\V=substitute(escape(@@,"?\\"),"\n","\\\\n","ge") - +" Toggle case-sensitivity. fun! Invert_Case() let &ic = ! &ic endfun -fun! Show_Case() - if &ic | return "c" | else | return "C" | endif -endfun +" Restore window size. +au VimLeave * if exists("oldcols") | let &columns=oldcols | endif -fun! Show_Tabstop() - return &ts +" Map Makefile mode. +au BufEnter * if &ft == "make" | call MakeMode_map() | endif +au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif + +" Entering Make mode. +fun! MakeMode_map() + set list + set noexpandtab endfun -fun! Show_Paste() - if &paste | return "p" | else | return "" | endif +" Leaving Make mode. +fun! MakeMode_unmap() + set nolist + set expandtab endfun -" Clear Q as we will use it for commands. -map Q +" Show the status line for the first time. +call Show_StatusLine() -" Swap hex/decimal statusline with Qx -map Qx :call Cycle_HexStatusLine(): -" Swap case-sensitivity with Qc. -map Qc :call Invert_Case(): -" Cycle list styles with Ql. -map Ql :call Cycle_List(): " Change to ts=2 with Q2. map Q2 :se ts=2: " Change to ts=4 with Q4. @@ -134,70 +223,183 @@ map Q8 :se ts=8: map Q6 :se ts=16: " Change to ts=32 with Q3. map Q3 :se ts=32: -" Change foldmethod with Qf. -map Qf :se foldenable!: -" Change number mode with Qn. -map Qn :se number!: " Toggle paste mode with Qp. map Qp :se paste!: -" Toggle tags with Qt. -map Qt :Tlist +" Swap case-sensitivity with Qc. +map Qc :call Invert_Case(): +" Change number mode with Qn. +map Qn :se number!: +" Expand or shrink window size with Q> and Q<. For use after toggling number. +map Q> :exe 'se columns+=' . numberwidth: +map Q< :exe 'se columns-=' . numberwidth: +" Clear search pattern with Q/. +map Q/ :let @/="": -" Vim 7 has tabs. Default "next tab" mapping is gt. Add "previous tab" as gb. -map gb :tabPrev +endif -call Show_StatusLine() +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 6 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "600" +version 6.0 -au VimLeave * if exists("andyoldcols") | let &columns=andyoldcols | endif +" Remember quickfix state. +let g:quickfixing=0 -" Autocommands to setup features we only want in certain modes... +" Set indenting by filetype. +filetype indent on -" ... For C/C++ files: +" Less intrusive syntax highlighting. +syn enable -au BufEnter * if &ft == "c" || &ft == "cpp" | call CMode_map() | endif -au BufLeave * if &ft == "c" || &ft == "cpp" | call CMode_unmap() | endif +" Nice GUI colour. +if has("gui_running") + se guifont=DejaVu\ Sans\ Mono\ 10 + colo darkblue +endif +if has("win32") + se guifont=DejaVu_Sans_Mono:h10:cANSI +endif -" ... For Perl files: +" Ignore whitespace when diffing. +se diffopt=filler,iwhite -au BufEnter * if &ft == "perl" | call PerlMode_map() | endif -au BufLeave * if &ft == "perl" | call PerlMode_unmap() | endif +" Expand window when doing a vertical diff. +if &diff + let &columns = 164 +endif -" ... For makefiles: +" Status bar matches the colour. +highlight StatusLine guifg=white guibg=darkblue ctermbg=white ctermfg=darkblue -au BufEnter * if &ft == "make" | call MakeMode_map() | endif -au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif +" Numbers in blue. +highlight LineNr term=underline cterm=bold guifg=blue ctermfg=blue -" Functions to call when we enter/leave a programming language buffer... +" 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 -" ... For C-like languages: +" Make * and # work the way you expect in visual mode. +vnoremap * y/\V=substitute(escape(@@,"/\\"),"\n","\\\\n","ge") +vnoremap # y?\V=substitute(escape(@@,"?\\"),"\n","\\\\n","ge") -fun! CMode_map() - set cinkeys=0{,0},:,0#,!^F,o,O,e - set cinwords=if,else,while,do,for,switch +" Change list mode. +fun! Cycle_List() + let basic='tab:\\_,trail:_,extends:<,precedes:>' + call Iain_Vars() + let b:iainlist = b:iainlist + 1 + if b:iainlist > 2 + let b:iainlist = 0 + endif + if b:iainlist == 0 + set nolist + elseif b:iainlist == 1 + exec "set lcs=" . basic + set list + else + exec "set lcs=" . basic . ",eol:$" + set list + endif endfun -fun! CMode_unmap() +" Cycle between hex and decimal display of toolbar stuff. +fun! Cycle_HexStatusLine() + call Iain_Vars() + let b:iainhex = ! b:iainhex + call Show_StatusLine() endfun -" .. For Perl files: - -fun! PerlMode_map() - set cinkeys=0{,0},:,!^F,o,O,e - set cinwords=if,else,while,do,for,eval +" Cycle verbose display of toolbar stuff. +fun! Cycle_VerboseStatusLine() + call Iain_Vars() + let b:iainverbose = ! b:iainverbose + call Show_StatusLine() endfun -fun! PerlMode_unmap() - set foldmethod=manual +" Toggle quickfix window. +fun! Cycle_Quickfix() + if g:quickfixing == 1 + cclose + let g:quickfixing=0 + else + copen + endif endfun -" ... For makefiles: +" We use Q for various commands. Unmap it. +" Vim 5 won't let us unmap this as it treats Q as an ambiguous mapping (because +" Qx also exists. With Vim 5 you are rewarded with Ex mode if you don't type +" the Qx sequence quickly enough. Vim 6 allows us to forget the Ex mapping. +map Q -fun! MakeMode_map() - set list - set noexpandtab -endfun +" Swap hex/decimal statusline with Qx. +map Qx :call Cycle_HexStatusLine(): +" Change statusline verbosity with Qv. +map Qv :call Cycle_VerboseStatusLine(): +" Cycle list styles with Ql. +map Ql :call Cycle_List(): +" Toggle tags with Qt. +map Qt :Tlist +" Change foldmethod with Qf. +map Qf :se foldenable!: +" Toggle quickfix window with Qq. +map Qq :call Cycle_Quickfix(): +" Rerun filetype detection with Qs. The s is for syntax, as this will be +" updated as a side-effect. +map Qs :filetype detect: -fun! MakeMode_unmap() - set nolist - set expandtab +endif + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 7 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "700" +version 7.0 + +" Change status bar colour when entering insert mode. +fun! Highlight_StatusLine(flag) + " Get current status. + call Iain_Vars() + + " Change the status based on the flag. XXX: Does Vim let us to do flags? + let re = "[" . tolower(a:flag) . toupper(a:flag) . "]" + let b:iainstatus = substitute(b:iainstatus, re, a:flag, "") + + " Default colour. + let colour = "darkblue" + " 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 colour = "darkmagenta" + else + let colour = "darkred" + endif + endif + else + if b:iainstatus =~# "I" + " Regular insert mode. + let colour = "darkred" + endif + endif + + exec "highlight StatusLine guifg=white guibg=" . colour . " ctermbg=white ctermfg=" . colour endfun + +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") + +" Make diffs vertical by default. +se diffopt+=vertical + +" Set size of numbers column. +se numberwidth=5 + +" Add "previous tab" mapping as gb. +map gb :tabPrev +endif