From: Iain Patterson Date: Wed, 18 Jan 2006 17:16:53 +0000 (+0000) Subject: Display filetype and buffer dirtiness in shorter form. X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=a26d4be47a73651f248068ab25d5b38a09451b10;p=profile.git Display filetype and buffer dirtiness in shorter form. Declare functions and commands as override so you can source the .vimrc without errors. git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@22 6be0d1a5-5cfe-0310-89b6-964be062b18b --- diff --git a/.vimrc b/.vimrc index 6400b45..ba4ec76 100755 --- a/.vimrc +++ b/.vimrc @@ -27,12 +27,12 @@ endif :autocmd! " Set up our variables. -fun Iain_Vars() +fun! Iain_Vars() if ! exists("b:iainlist") | let b:iainlist = 0 | endif if ! exists("b:iainhex") | let b:iainhex = 1 | endif endfun -fun Cycle_List() +fun! Cycle_List() call Iain_Vars() let b:iainlist = b:iainlist + 1 if b:iainlist > 2 | let b:iainlist = 0 | endif @@ -47,7 +47,7 @@ fun Cycle_List() endif endfun -fun Show_List() +fun! Show_List() call Iain_Vars() if b:iainlist == 0 " No list. @@ -61,14 +61,14 @@ fun Show_List() endif endfun -" Cycle between hex and decimal display of toolbar stuff -fun Cycle_StatusLine() +" Cycle between hex and decimal display of toolbar stuff. +fun! Cycle_StatusLine() call Iain_Vars() let b:iainhex = ! b:iainhex if b:iainhex - set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}]%y%m%r\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P + set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%Y%M%R]\ %=0\x%02B\ (%3.6c,%-4.6l)\ 0\x%04.6O\ \|\ %4.6L\ %P else - set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}]%y%m%r\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P + set statusline=%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%Y%M%R]\ %=%b\ (%3.6c,%-4.6l)\ %4.6o\ \|\ %4.6L\ %P endif endfun @@ -83,18 +83,18 @@ if &diff | let &columns = 164 | endif map viwvbi"ea" map - yyp:s/./-/g:let @/='': map = yyp:s/./=/g:let @/='': -command W :w +command! W :w se tags=~/.ctags -fun Invert_Case() +fun! Invert_Case() let &ic = ! &ic endfun -fun Show_Case() +fun! Show_Case() if &ic | return "c" | else | return "C" | endif endfun -fun Show_Tabstop() +fun! Show_Tabstop() return &ts endfun @@ -141,43 +141,43 @@ au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif " ... For C-like languages: -fun CMode_map() +fun! CMode_map() set cinkeys=0{,0},:,0#,!^F,o,O,e set cinwords=if,else,while,do,for,switch endfun -fun CMode_unmap() +fun! CMode_unmap() endfun " .. For Perl files: -fun PerlMode_map() +fun! PerlMode_map() set cinkeys=0{,0},:,!^F,o,O,e set cinwords=if,else,while,do,for,eval endfun -fun PerlMode_unmap() +fun! PerlMode_unmap() set foldmethod=manual endfun -fun PHPMode_map() +fun! PHPMode_map() set nocindent set autoindent endfun -fun PHPMode_unmap() +fun! PHPMode_unmap() set noautoindent set cindent endfun " ... For makefiles: -fun MakeMode_map() +fun! MakeMode_map() set list set noexpandtab endfun -fun MakeMode_unmap() +fun! MakeMode_unmap() set nolist set expandtab endfun