X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=8385302ef6b55a807fb0babc7afaf0208309640b;hp=77a1d45b38d9a25a070df700ed03c86b27eaec3c;hb=cf5f78bd9314e698743b785236369e245473e3f0;hpb=35791acb36710ee87b19309ef97f300b76bdbddc diff --git a/.vimrc b/.vimrc index 77a1d45..8385302 100644 --- a/.vimrc +++ b/.vimrc @@ -58,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. @@ -68,11 +67,23 @@ 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-platoform. +" cross-platform. se ssop+=unix,slash " Nuke any pre-existing autocommands. @@ -90,8 +101,13 @@ se t_WS=[8;%p1%d;%p2%dt " Highlight search results. se hlsearch -" Syntax highlighting. -syn on +" Set graphical window title. +se titlestring=%{Show_TitleString()} + +" 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. @@ -161,6 +177,16 @@ fun! Show_Paste() endif endfun +" Show the window title. +fun! Show_TitleString() + if bufname("") == "" + let ts1='Vim' + else + let ts1=printf("%2d: %s", bufnr(""), expand('%t')) + endif + return printf("%s (%s) %s", ts1, getcwd(), v:servername) +endfun + " Show the status line. fun! Show_StatusLine() call Iain_Vars() @@ -192,40 +218,63 @@ au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif " Entering Make mode. fun! MakeMode_map() - set list + call Iain_Vars() + let b:iainlist=1 + call Cycle_List() + set ts=8 set noexpandtab endfun " Leaving Make mode. fun! MakeMode_unmap() - set nolist + call Cycle_List() + set ts=2 set expandtab endfun " Show the status line for the first time. call Show_StatusLine() -" 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: -" Toggle paste mode with Qp. -map Qp :se paste!: -" 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 @/="": +" 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 @@ -248,6 +297,11 @@ syn enable if has("gui_running") se guifont=DejaVu\ Sans\ Mono\ 10 colo darkblue +elseif &t_Co > 16 + try + colo iain + catch + endtry endif if has("win32") se guifont=DejaVu_Sans_Mono:h10:cANSI @@ -261,16 +315,13 @@ if &diff let &columns = 164 endif -" Status bar matches the colour. -highlight StatusLine guifg=white guibg=darkblue ctermbg=white ctermfg=darkblue - -" 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 +" Allow in-place editing of crontabs. +au FileType crontab set backupcopy=yes + " 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") @@ -318,37 +369,23 @@ fun! Cycle_Quickfix() endif endfun -" 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 - -" 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 +" 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. -map Qs :filetype detect: - -endif +call Mapping("s", ":filetype detect:") -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Handle options only available in Vim 7 and above. -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -if version >= "700" -version 7.0 - -" Change status bar colour when entering insert mode. +" Change status bar colour when various things happen. fun! Highlight_StatusLine(flag) " Get current status. call Iain_Vars() @@ -358,27 +395,51 @@ fun! Highlight_StatusLine(flag) let b:iainstatus = substitute(b:iainstatus, re, a:flag, "") " Default colour. - let colour = "darkblue" + 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 colour = "darkmagenta" + let s:colour = "darkred" else - let colour = "darkred" + let s:colour = "darkmagenta" endif + let s:term88colour = "33" + let s:term256colour = "89" endif else if b:iainstatus =~# "I" " Regular insert mode. - let colour = "darkred" + let s:colour = "darkmagenta" + let s:term88colour = "33" + let s:term256colour = "89" endif endif - exec "highlight StatusLine guifg=white guibg=" . colour . " ctermbg=white ctermfg=" . colour + 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 + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" Handle options only available in Vim 7 and above. +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if version >= "700" +version 7.0 + au CursorHoldI * call Highlight_StatusLine("H") au CursorMovedI * call Highlight_StatusLine("h") au FocusGained * call Highlight_StatusLine("F") @@ -394,4 +455,13 @@ se numberwidth=5 " Add "previous tab" mapping as gb. map gb :tabPrev + +" Transparency. +if has("gui_macvim") + se transparency=15 +endif + +" Perforce. +let g:p4EnableMenu=1 +let g:p4Presets='P4CONFIG' endif