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
Gitify the working tree.
[profile.git]
/
.vimrc
diff --git
a/.vimrc
b/.vimrc
index
48a2cf2
..
b2b4a63
100644
(file)
--- a/
.vimrc
+++ b/
.vimrc
@@
-1,6
+1,4
@@
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" $Id$
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Multi-version vimrc compatible with version 4 and above.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Multi-version vimrc compatible with version 4 and above.
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@
-101,6
+99,9
@@
se t_WS=
\e
[8;%p1%d;%p2%dt
" Highlight search results.
se hlsearch
" Highlight search results.
se hlsearch
+" Set graphical window title.
+se titlestring=%{Show_TitleString()}
+
" Syntax highlighting. New versions will use syn enable instead.
if version < 600
syn on
" Syntax highlighting. New versions will use syn enable instead.
if version < 600
syn on
@@
-174,6
+175,16
@@
fun! Show_Paste()
endif
endfun
endif
endfun
+" Show the window title.
+fun! Show_TitleString()
+ if bufname("") == ""
+ let ts1='Vim'
+ else
+ let ts1=printf("%2d: %s", bufnr(""), expand('%t'))
+ endif
+ return printf("%s (%s) %s", ts1, getcwd(), v:servername)
+endfun
+
" Show the status line.
fun! Show_StatusLine()
call Iain_Vars()
" Show the status line.
fun! Show_StatusLine()
call Iain_Vars()
@@
-224,7
+235,7
@@
call Show_StatusLine()
" Function to create mappings with either a hardcoded \ or <Leader>.
fun! Mapping(keysequence,mapping)
" Function to create mappings with either a hardcoded \ or <Leader>.
fun! Mapping(keysequence,mapping)
- if version
>=
"600"
+ if version
<
"600"
exec "map \\" . a:keysequence . " " . a:mapping
else
exec "map <Leader>" . a:keysequence . " " . a:mapping
exec "map \\" . a:keysequence . " " . a:mapping
else
exec "map <Leader>" . a:keysequence . " " . a:mapping
@@
-391,19
+402,21
@@
fun! Highlight_StatusLine(flag)
if b:iainstatus =~# "I"
" Held in insert mode. Add extra highlight if we don't have focus.
if b:iainstatus =~# "f"
if b:iainstatus =~# "I"
" Held in insert mode. Add extra highlight if we don't have focus.
if b:iainstatus =~# "f"
- let s:colour = "darkmagenta"
- else
let s:colour = "darkred"
let s:colour = "darkred"
+ let s:term88colour = "32"
+ let s:term256colour = "88"
+ else
+ let s:colour = "darkmagenta"
+ let s:term88colour = "33"
+ let s:term256colour = "90"
endif
endif
- let s:term88colour = "32"
- let s:term256colour = "88"
endif
else
if b:iainstatus =~# "I"
" Regular insert mode.
endif
else
if b:iainstatus =~# "I"
" Regular insert mode.
- let s:colour = "dark
red
"
- let s:term88colour = "3
2
"
- let s:term256colour = "
88
"
+ let s:colour = "dark
magenta
"
+ let s:term88colour = "3
3
"
+ let s:term256colour = "
90
"
endif
endif
endif
endif
@@
-442,4
+455,13
@@
se numberwidth=5
" Add "previous tab" mapping as gb.
map gb :tabPrev<CR>
" Add "previous tab" mapping as gb.
map gb :tabPrev<CR>
+
+" Transparency.
+if has("gui_macvim")
+ se transparency=15
+endif
+
+" Perforce.
+let g:p4EnableMenu=1
+let g:p4Presets='P4CONFIG'
endif
endif