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
Display filetype and buffer dirtiness in shorter form.
[profile.git]
/
.vimrc
diff --git
a/.vimrc
b/.vimrc
index
1744c59
..
ba4ec76
100755
(executable)
--- a/
.vimrc
+++ b/
.vimrc
@@
-27,12
+27,12
@@
endif
:autocmd!
" Set up our variables.
: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
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
call Iain_Vars()
let b:iainlist = b:iainlist + 1
if b:iainlist > 2 | let b:iainlist = 0 | endif
@@
-47,28
+47,28
@@
fun Cycle_List()
endif
endfun
endif
endfun
-fun Show_List()
+fun
!
Show_List()
call Iain_Vars()
if b:iainlist == 0
" No list.
call Iain_Vars()
if b:iainlist == 0
" No list.
- return "
"
+ return " "
elseif b:iainlist == 1
" Just tabs.
elseif b:iainlist == 1
" Just tabs.
- return "
\\
_"
+ return "_"
else
" Full list.
else
" Full list.
- return "\
.\
$"
+ return "\$"
endif
endfun
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
call Iain_Vars()
let b:iainhex = ! b:iainhex
if b:iainhex
- set statusline=%2n\:\ %<%f\ [%{Show_List()}
][%{Show_Case()}]%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
else
- set statusline=%2n\:\ %<%f\ [%{Show_List()}
][%{Show_Case()}]%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
endif
endfun
@@
-83,15
+83,19
@@
if &diff | let &columns = 164 | endif
map <C-"> viwvbi"<ESC>ea"<ESC>
map - yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>
map = yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>
map <C-"> viwvbi"<ESC>ea"<ESC>
map - yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>
map = yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>
-command W :w
+command
!
W :w
se tags=~/.ctags
se tags=~/.ctags
-fun Invert_Case()
+fun
!
Invert_Case()
let &ic = ! &ic
endfun
let &ic = ! &ic
endfun
-fun Show_Case()
- if &ic | return "ca" | else | return "Ca" | endif
+fun! Show_Case()
+ if &ic | return "c" | else | return "C" | endif
+endfun
+
+fun! Show_Tabstop()
+ return &ts
endfun
" Swap hex/decimal statusline with ,x
endfun
" Swap hex/decimal statusline with ,x
@@
-100,6
+104,12
@@
map ,x :call Cycle_StatusLine()<CR>:<CR>
map ,c :call Invert_Case()<CR>:<CR>
" Cycle list styles with ,l.
map ,l :call Cycle_List()<CR>:<CR>
map ,c :call Invert_Case()<CR>:<CR>
" Cycle list styles with ,l.
map ,l :call Cycle_List()<CR>:<CR>
+" Change to ts=2 with ,2.
+map ,2 :se ts=2<CR>:<CR>
+" Change to ts=4 with ,4.
+map ,4 :se ts=4<CR>:<CR>
+" Change to ts=8 with ,8.
+map ,8 :se ts=8<CR>:<CR>
call Cycle_StatusLine()
call Cycle_StatusLine()
@@
-131,43
+141,43
@@
au BufLeave * if &ft == "make" | call MakeMode_unmap() | endif
" ... For C-like languages:
" ... 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
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:
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
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
set foldmethod=manual
endfun
-fun PHPMode_map()
+fun
!
PHPMode_map()
set nocindent
set autoindent
endfun
set nocindent
set autoindent
endfun
-fun PHPMode_unmap()
+fun
!
PHPMode_unmap()
set noautoindent
set cindent
endfun
" ... For makefiles:
set noautoindent
set cindent
endfun
" ... For makefiles:
-fun MakeMode_map()
+fun
!
MakeMode_map()
set list
set noexpandtab
endfun
set list
set noexpandtab
endfun
-fun MakeMode_unmap()
+fun
!
MakeMode_unmap()
set nolist
set expandtab
endfun
set nolist
set expandtab
endfun