" Use C indent style.
se cindent
se cinkeys=0{,0},0),:,!^F,o,O,e
+se cinoptions=b1,c2
" GUI options.
se go=aglmr
if version >= "500"
version 5.0
+" 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!
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=\e[8;%p1%d;%p2%dt
" 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
if ! exists("b:iainhex")
let b:iainhex = 0
endif
+ if ! exists("b:iainverbose")
+ let b:iainverbose = 0
+ endif
endfun
" Helper for 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
+
+" 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
" Show the status line for the first time.
call Show_StatusLine()
+
+" Change to ts=2 with Q2.
+map Q2 :se ts=2<CR>:<CR>
+" Change to ts=4 with Q4.
+map Q4 :se ts=4<CR>:<CR>
+" Change to ts=8 with Q8.
+map Q8 :se ts=8<CR>:<CR>
+" Change to ts=16 with Q6.
+map Q6 :se ts=16<CR>:<CR>
+" Change to ts=32 with Q3.
+map Q3 :se ts=32<CR>:<CR>
+" Toggle paste mode with Qp.
+map Qp :se paste!<CR>:<CR>
+" Swap case-sensitivity with Qc.
+map Qc :call Invert_Case()<CR>:<CR>
+" Change number mode with Qn.
+map Qn :se number!<CR>:<CR>
+" Expand or shrink window size with Q> and Q<. For use after toggling number.
+map Q> :exe 'se columns+=' . numberwidth<CR>:<CR>
+map Q< :exe 'se columns-=' . numberwidth<CR>:<CR>
+" Clear search pattern with Q/.
+map Q/ :let @/=""<CR>:<CR>
+
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
if version >= "600"
version 6.0
-" Allow room for numbers.
-se numberwidth=5
+" Remember quickfix state.
+let g:quickfixing=0
-" Track changing number mode.
-let g:numbercols=&columns
-let g:numberchanges=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
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
+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
+
" Make * and # work the way you expect in visual mode.
vnoremap * y/\V<C-R>=substitute(escape(@@,"/\\"),"\n","\\\\n","ge")<CR><CR>
vnoremap # y?\V<C-R>=substitute(escape(@@,"?\\"),"\n","\\\\n","ge")<CR><CR>
call Show_StatusLine()
endfun
-" Cycle between number mode.
-" FIXME: Toggling in a split window doesn't work properly. We need to track
-" the number of windows and number modes. Something for later...
-fun! Cycle_Number()
- if &number
- " Restore width.
- if &t_WS =~ '^\e.'
- " Track changes.
- let g:numberchanges=g:numberchanges-1
- if g:numberchanges<0
- g:numberchanges=0
- endif
-
- " Change size back if this was the last window.
- if g:numberchanges == 0
- let &columns=g:numbercols
- endif
- endif
- set nonumber
- else
- " Save width between number toggling.
- if &t_WS =~ '^\e'
- " Expand if this was the first change.
- if g:numberchanges == 0
- let g:numbercols=&columns
- let &columns=&columns+&numberwidth
- endif
-
- " Track changes.
- let g:numberchanges=g:numberchanges+1
- endif
- set number
- endif
+" Cycle verbose display of toolbar stuff.
+fun! Cycle_VerboseStatusLine()
+ call Iain_Vars()
+ let b:iainverbose = ! b:iainverbose
+ call Show_StatusLine()
endfun
-" Toggle case-sensitivity.
-fun! Invert_Case()
- let &ic = ! &ic
+" Toggle quickfix window.
+fun! Cycle_Quickfix()
+ if g:quickfixing == 1
+ cclose
+ let g:quickfixing=0
+ else
+ copen
+ endif
endfun
-" We'll use Q for various commands. Unmap it.
+" 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 <Nop>
-" Change to ts=2 with Q2.
-map Q2 :se ts=2<CR>:<CR>
-" Change to ts=4 with Q4.
-map Q4 :se ts=4<CR>:<CR>
-" Change to ts=8 with Q8.
-map Q8 :se ts=8<CR>:<CR>
-" Change to ts=16 with Q6.
-map Q6 :se ts=16<CR>:<CR>
-" Change to ts=32 with Q3.
-map Q3 :se ts=32<CR>:<CR>
-" Change foldmethod with Qf.
-map Qf :se foldenable!<CR>:<CR>
-" Toggle paste mode with Qp.
-map Qp :se paste!<CR>:<CR>
-" Swap hex/decimal statusline with Qx
+" Swap hex/decimal statusline with Qx.
map Qx :call Cycle_HexStatusLine()<CR>:<CR>
-" Swap case-sensitivity with Qc.
-map Qc :call Invert_Case()<CR>:<CR>
+" Change statusline verbosity with Qv.
+map Qv :call Cycle_VerboseStatusLine()<CR>:<CR>
" Cycle list styles with Ql.
map Ql :call Cycle_List()<CR>:<CR>
-" Change number mode with Qn.
-map Qn :call Cycle_Number()<CR>:<CR>
" Toggle tags with Qt.
map Qt :Tlist<CR>
+" Change foldmethod with Qf.
+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>
-" Leaving Perl mode.
-fun! PerlMode_unmap()
- set cinkeys=oldcinkeys
- set cinwords=oldcinwords
- set foldmethod=manual
-endfun
endif
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
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
+
+" Set size of numbers column.
+se numberwidth=5
+
" Add "previous tab" mapping as gb.
map gb :tabPrev<CR>
endif
git://git.iain.cx/iain / profile.git / blobdiff