X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=91fd6c15205c345aff3525d751940f34a12e022d;hb=a444a2977d10626b30b822d5b4812d305c9bad22;hp=24b65306a43f66eeeabbfbe31c4a05490a482bd4;hpb=c8f2bc8400b3ee475e4970e14f5bdadd6595f064;p=profile.git

diff --git a/.vimrc b/.vimrc
index 24b6530..91fd6c1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -61,19 +61,6 @@ se tags=~/.tags,./tags,tags
 " Don't timeout waiting to interpet, eg, <ESC>OA as an escape code.
 se ttimeoutlen=100
 
-" Function to create mappings with either a hardcoded \ or <Leader>.
-fun! Mapping(keysequence,mapping)
-  if version >= "600"
-    exec "map \\" . a:keysequence . " " . a:mapping
-  else
-    exec "map <Leader>" . a:keysequence . " " . a:mapping
-  endif
-endfun
-
-" Use - and = to create underlines.
-call Mapping("-", "yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>")
-call Mapping("=", "yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>")
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 5 and above.
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -85,11 +72,18 @@ if ! has("gui_running")
   se bg=dark
 endif
 
+" Enable tab-completion prompting for commands.
+se wildmenu
+" Don't list object files when globbing files to load.
+se wildignore+=*.o,*.obj
+" So there's no need to assign them low priority.
+se suffixes-=*.o,*.obj
+
 " 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.
+" cross-platform.
 se ssop+=unix,slash
 
 " Nuke any pre-existing autocommands.
@@ -107,8 +101,10 @@ se t_WS=[8;%p1%d;%p2%dt
 " Highlight search results.
 se hlsearch
 
-" Syntax highlighting.
-syn on
+" Syntax highlighting.  New versions will use syn enable instead.
+if version < 600
+  syn on
+endif
 
 " Use a discernably different colour to highlight the cursor which shows 
 " matching brackets.  Our regular cursor is green so use blue instead of cyan.
@@ -222,6 +218,19 @@ endfun
 " Show the status line for the first time.
 call Show_StatusLine()
 
+" Function to create mappings with either a hardcoded \ or <Leader>.
+fun! Mapping(keysequence,mapping)
+  if version >= "600"
+    exec "map \\" . a:keysequence . " " . a:mapping
+  else
+    exec "map <Leader>" . a:keysequence . " " . a:mapping
+  endif
+endfun
+
+" Use - and = to create underlines.
+call Mapping("-", "yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>")
+call Mapping("=", "yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>")
+
 " Change to ts=2 with \2.
 call Mapping("2", ":se ts=2<CR>:<CR>")
 " Change to ts=4 with \4.
@@ -268,6 +277,8 @@ syn enable
 if has("gui_running")
   se guifont=DejaVu\ Sans\ Mono\ 10
   colo darkblue
+elseif &t_Co > 16
+  colo iain
 endif
 if has("win32")
   se guifont=DejaVu_Sans_Mono:h10:cANSI