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
New Vim script for P4 merge.
[profile.git]
/
.vimrc
diff --git
a/.vimrc
b/.vimrc
index
21de57f
..
26ce8db
100644
(file)
--- a/
.vimrc
+++ b/
.vimrc
@@
-19,7
+19,7
@@
version 4.0
se nocp
" Find stuff.
se nocp
" Find stuff.
-if has("win32")
+if has("win32")
|| has("win64")
se rtp=~/.vim,$VIMRUNTIME
endif
se rtp=~/.vim,$VIMRUNTIME
endif
@@
-145,7
+145,12
@@
se t_WS=
\e
[8;%p1%d;%p2%dt
se hlsearch
" Set graphical window title.
se hlsearch
" Set graphical window title.
-se titlestring=%{Show_TitleString()}
+if has("win32") || has("win64")
+ " Windows taskbar entries are probably too small to show full titles.
+ se titlestring=%t
+else
+ se titlestring=%{Show_TitleString()}
+endif
" Syntax highlighting. New versions will use syn enable instead.
if version < "600"
" Syntax highlighting. New versions will use syn enable instead.
if version < "600"
@@
-591,7
+596,7
@@
endif "}}}1
if version >= "600" "{{{1
version 6.0
if version >= "600" "{{{1
version 6.0
-if has("win32")
+if has("
gui_
win32")
se encoding=utf-8
endif
se encoding=utf-8
endif
@@
-606,7
+611,7
@@
syn enable
" Set colours.
if has("gui_running")
" Set colours.
if has("gui_running")
- if has("win32")
+ if has("win32")
|| has("win64")
exe "silent se guifont=DejaVu_Sans_Mono:h10:cANSI"
else
exe "silent se guifont=DejaVu\\ Sans\\ Mono\\ 10"
exe "silent se guifont=DejaVu_Sans_Mono:h10:cANSI"
else
exe "silent se guifont=DejaVu\\ Sans\\ Mono\\ 10"