X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=2b6167a348d64ff8ce1b8b29212600422b3e4c34;hp=e803032a88088013c895248d4758bf3077bb7a30;hb=42b87d14b952594606783e373badd8aca1b1eb8f;hpb=6a5d3d5b7070c7026e498deb92c814377cc37256 diff --git a/.vimrc b/.vimrc old mode 100755 new mode 100644 index e803032..2b6167a --- a/.vimrc +++ b/.vimrc @@ -1,6 +1,8 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " $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 @@ -37,6 +39,7 @@ se laststatus=2 " Use C indent style. se cindent se cinkeys=0{,0},0),:,!^F,o,O,e +se cinoptions=b1,c2 " GUI options. se go=aglmr @@ -55,9 +58,8 @@ se smartcase " Look for ctags in home directory first. se tags=~/.tags,./tags,tags -" Use - and = to create underlines. -map - yyp:s/./-/g:let @/='': -map = yyp:s/./=/g:let @/='': +" Don't timeout waiting to interpet, eg, OA as an escape code. +se ttimeoutlen=100 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 5 and above. @@ -65,6 +67,25 @@ map = yyp:s/./=/g:let @/='': if version >= "500" version 5.0 +" Tell Vim we use dark backgrounds in our terminals. +if ! has("gui_running") + se bg=dark +endif + +" Enable tab-completion prompting for commands. +se wildmenu +" Don't list object files when globbing files to load. +se wildignore+=*.o,*.obj +" So there's no need to assign them low priority. +se suffixes-=*.o,*.obj + +" 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-platform. +se ssop+=unix,slash + " Nuke any pre-existing autocommands. autocmd! @@ -72,7 +93,7 @@ autocmd! let oldcols=&columns " More GUI options. Add icon, tearoffs and toolbar. -se go=agilmrtT +se go+=itT " Allow dynamic window resize even if we aren't in an xterm. se t_WS=[8;%p1%d;%p2%dt @@ -80,8 +101,14 @@ se t_WS=[8;%p1%d;%p2%dt " Highlight search results. se hlsearch -" Syntax highlighting. -syn on +" Syntax highlighting. New versions will use syn enable instead. +if version < 600 + 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 @@ -96,6 +123,13 @@ fun! Iain_Vars() 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. @@ -144,57 +178,31 @@ endfun 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 + +" Toggle case-sensitivity. +fun! Invert_Case() + let &ic = ! &ic endfun " Restore window size. au VimLeave * if exists("oldcols") | let &columns=oldcols | endif -" Map C mode. -au BufEnter * if &ft == "c" || &ft == "cpp" | call CMode_map() | endif -au BufLeave * if &ft == "c" || &ft == "cpp" | call CMode_unmap() | endif - -" Map Perl mode. -au BufEnter * if &ft == "perl" | call PerlMode_map() | endif -au BufLeave * if &ft == "perl" | call PerlMode_unmap() | endif - " Map Makefile mode. au BufEnter * if &ft == "make" | call MakeMode_map() | endif au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif -" Entering C mode. -fun! CMode_map() - let oldcinkeys=&cinkeys - let oldcinwords=&cinwords - set cinkeys=0{,0},:,0#,!^F,o,O,e - set cinwords=if,else,while,do,for,switch -endfun - -" Leaving C mode. -fun! CMode_unmap() - set cinkeys=oldcinkeys - set cinwords=oldcinwords -endfun - -" Entering Perl mode. -fun! PerlMode_map() - let oldcinkeys=&cinkeys - let oldcinwords=&cinwords - set cinkeys=0{,0},:,!^F,o,O,e - set cinwords=if,else,while,do,for,eval -endfun - -" Leaving Perl mode. -fun! PerlMode_unmap() - set cinkeys=oldcinkeys - set cinwords=oldcinwords -endfun - " Entering Make mode. fun! MakeMode_map() set list @@ -209,6 +217,48 @@ endfun " Show the status line for the first time. call Show_StatusLine() + +" Function to create mappings with either a hardcoded \ or . +fun! Mapping(keysequence,mapping) + if version >= "600" + exec "map \\" . a:keysequence . " " . a:mapping + else + exec "map " . a:keysequence . " " . a:mapping + endif +endfun + +" Use - and = to create underlines. +call Mapping("-", "yyp:s/./-/g:let @/='':") +call Mapping("=", "yyp:s/./=/g:let @/='':") + +" Change to ts=2 with \2. +call Mapping("2", ":se ts=2:") +" Change to ts=4 with \4. +call Mapping("4", ":se ts=4:") +" Change to ts=8 with \8. +call Mapping("8", ":se ts=8:") +" Change to ts=16 with \6. +call Mapping("6", ":se ts=16:") +" Change to ts=32 with \3. +call Mapping("3", ":se ts=32:") +" Toggle paste mode with \p. +call Mapping("p", ":se paste!:") +" Swap case-sensitivity with \c. +call Mapping("c", ":call Invert_Case():") +" Change number mode with \n. +call Mapping("n", ":se number!:") +" Expand or shrink window size with \> and \<. For use after toggling number. +call Mapping(">", ":exe 'se columns+=' . numberwidth:") +call Mapping("<", ":exe 'se columns-=' . numberwidth:") +" Clear search pattern with \/. +call Mapping("/", ":let @/=\"\":") + +" Forget the Ex mode mapping. +map Q + +" 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\") . \">\"") + endif """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -217,25 +267,43 @@ endif if version >= "600" version 6.0 +" Remember quickfix state. +let g:quickfixing=0 + +" Set indenting by filetype. +filetype indent on + " Less intrusive syntax highlighting. syn enable " Nice GUI colour. if has("gui_running") - se guifont=Bitstream\ Vera\ Sans\ Mono\ 12 + se guifont=DejaVu\ Sans\ Mono\ 10 colo darkblue +elseif &t_Co > 16 + try + colo iain + catch + endtry endif if has("win32") - se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI + se guifont=DejaVu_Sans_Mono:h10:cANSI endif +" Ignore whitespace when diffing. +se diffopt=filler,iwhite + " Expand window when doing a vertical diff. if &diff let &columns = 164 endif -" Status bar matches the colour. -highlight StatusLine guifg=white guibg=blue ctermbg=white ctermfg=blue +" Numbers in blue. +highlight LineNr term=underline cterm=bold guifg=blue ctermfg=blue + +" 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 " Make * and # work the way you expect in visual mode. vnoremap * y/\V=substitute(escape(@@,"/\\"),"\n","\\\\n","ge") @@ -267,60 +335,86 @@ fun! Cycle_HexStatusLine() call Show_StatusLine() endfun -fun! Cycle_Number() - if &number - " Restore width. - if &t_WS =~ '^.' - let &columns=g:numbercols +" Cycle verbose display of toolbar stuff. +fun! Cycle_VerboseStatusLine() + call Iain_Vars() + let b:iainverbose = ! b:iainverbose + call Show_StatusLine() +endfun + +" Toggle quickfix window. +fun! Cycle_Quickfix() + if g:quickfixing == 1 + cclose + let g:quickfixing=0 + else + copen + endif +endfun + +" Swap hex/decimal statusline with \x. +call Mapping("x", ":call Cycle_HexStatusLine():") +" Change statusline verbosity with \v. +call Mapping("v", ":call Cycle_VerboseStatusLine():") +" Cycle list styles with \l. +call Mapping("l", ":call Cycle_List():") +" Toggle tags with \t. +call Mapping("t", ":Tlist") +" Change foldmethod with \f. +call Mapping("f", ":se foldenable!:") +" Toggle quickfix window with \q. +call Mapping("q", ":call Cycle_Quickfix():") +" Rerun filetype detection with \s. The s is for syntax, as this will be +" updated as a side-effect. +call Mapping("s", ":filetype detect:") + +" Change status bar colour when various things happen. +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 s:colour = "darkblue" + let s:termcolour = "" + let s:term88colour = "17" + let s:term256colour = "17" + " 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 = "darkmagenta" + else + let s:colour = "darkred" + endif + let s:term88colour = "32" + let s:term256colour = "88" endif - set nonumber else - " Save width between number toggling. - if &t_WS =~ '^' - let g:numbercols=&columns - let &columns=&columns+5 + if b:iainstatus =~# "I" + " Regular insert mode. + let s:colour = "darkred" + let s:term88colour = "32" + let s:term256colour = "88" endif - set number endif -endfun -fun! Invert_Case() - let &ic = ! &ic -endfun -" We'll use Q for various commands. Unmap it. -map Q - -" Change to ts=2 with Q2. -map Q2 :se ts=2: -" Change to ts=4 with Q4. -map Q4 :se ts=4: -" Change to ts=8 with Q8. -map Q8 :se ts=8: -" Change to ts=16 with Q6. -map Q6 :se ts=16: -" Change to ts=32 with Q3. -map Q3 :se ts=32: -" Change foldmethod with Qf. -map Qf :se foldenable!: -" Toggle paste mode with Qp. -map Qp :se paste!: -" 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 number mode with Qn. -map Qn :call Cycle_Number(): -" Toggle tags with Qt. -map Qt :Tlist - -" Leaving Perl mode. -fun! PerlMode_unmap() - set cinkeys=oldcinkeys - set cinwords=oldcinwords - set foldmethod=manual + if &t_Co == 88 + let s:termcolour = s:term88colour + elseif &t_Co == 256 + let s:termcolour = s:term256colour + else + let s:termcolour = s:colour + endif + + exec "highlight StatusLine guifg=white guibg=" . s:colour . " ctermbg=white ctermfg=" . s:termcolour endfun + +call Highlight_StatusLine("") endif """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -329,6 +423,19 @@ 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") + +" 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