git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup completion variables.
[profile.git]
/
.vimrc
diff --git
a/.vimrc
b/.vimrc
index
1017617
..
1d33447
100644
(file)
--- a/
.vimrc
+++ b/
.vimrc
@@
-93,6
+93,10
@@
se hlsearch
" Syntax highlighting.
syn on
" 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
" Catch typos.
command! W :w
command! Wq :wq
@@
-254,7
+258,7
@@
if &diff
endif
" Status bar matches the colour.
endif
" Status bar matches the colour.
-highlight StatusLine guifg=white guibg=
blue ctermbg=white ctermfg=
blue
+highlight StatusLine guifg=white guibg=
darkblue ctermbg=white ctermfg=dark
blue
" Numbers in blue.
highlight LineNr term=underline cterm=bold guifg=blue ctermfg=blue
" Numbers in blue.
highlight LineNr term=underline cterm=bold guifg=blue ctermfg=blue
@@
-316,9
+320,9
@@
endfun
" the Qx sequence quickly enough. Vim 6 allows us to forget the Ex mapping.
map Q <Nop>
" the Qx sequence quickly enough. Vim 6 allows us to forget the Ex mapping.
map Q <Nop>
-" Swap hex/decimal statusline with Qx
+" Swap hex/decimal statusline with Qx
.
map Qx :call Cycle_HexStatusLine()<CR>:<CR>
map Qx :call Cycle_HexStatusLine()<CR>:<CR>
-" Change statusline verbosity with Qv
+" Change statusline verbosity with Qv
.
map Qv :call Cycle_VerboseStatusLine()<CR>:<CR>
" Cycle list styles with Ql.
map Ql :call Cycle_List()<CR>:<CR>
map Qv :call Cycle_VerboseStatusLine()<CR>:<CR>
" Cycle list styles with Ql.
map Ql :call Cycle_List()<CR>:<CR>
@@
-328,6
+332,9
@@
map Qt :Tlist<CR>
map Qf :se foldenable!<CR>:<CR>
" Toggle quickfix window with Qq.
map Qq :call Cycle_Quickfix()<CR>:<CR>
map Qf :se foldenable!<CR>:<CR>
" Toggle quickfix window with Qq.
map Qq :call Cycle_Quickfix()<CR>:<CR>
+" Rerun filetype detection with Qs. The s is for syntax, as this will be
+" updated as a side-effect.
+map Qs :filetype detect<CR>:<CR>
endif
endif
@@
-337,6
+344,10
@@
endif
if version >= "700"
version 7.0
if version >= "700"
version 7.0
+" Change status bar colour when entering insert mode.
+au InsertEnter * highlight StatusLine guifg=white guibg=darkred ctermbg=white ctermfg=darkred
+au InsertLeave * highlight StatusLine guifg=white guibg=blue ctermbg=white ctermfg=blue
+
" Make diffs vertical by default.
se diffopt+=vertical
" Make diffs vertical by default.
se diffopt+=vertical