X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=24b65306a43f66eeeabbfbe31c4a05490a482bd4;hb=a5638451e369c0fb8349790968755742532d536b;hp=77a1d45b38d9a25a070df700ed03c86b27eaec3c;hpb=35791acb36710ee87b19309ef97f300b76bdbddc;p=profile.git diff --git a/.vimrc b/.vimrc index 77a1d45..24b6530 100644 --- a/.vimrc +++ b/.vimrc @@ -58,9 +58,21 @@ se smartcase " 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 + +" 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. -map - yyp:s/./-/g:let @/='': -map = yyp:s/./=/g:let @/='': +call Mapping("-", "yyp:s/./-/g:let @/='':") +call Mapping("=", "yyp:s/./=/g:let @/='':") """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 5 and above. @@ -68,6 +80,11 @@ 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 + " Vim 5 hardcodes the size of numbers column to 8. let numberwidth=8 @@ -205,27 +222,30 @@ 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 @/="": +" 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 endif @@ -261,9 +281,6 @@ 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 @@ -318,37 +335,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 +361,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 = "darkmagenta" else - let colour = "darkred" + let s:colour = "darkred" endif + let s:term88colour = "32" + let s:term256colour = "88" endif else if b:iainstatus =~# "I" " Regular insert mode. - let colour = "darkred" + let s:colour = "darkred" + let s:term88colour = "32" + let s:term256colour = "88" 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")