Version tidying up.

Enable wildmenu and ignore object files.
Use personal colourscheme if the terminal supports it.

git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@132 6be0d1a5-5cfe-0310-89b6-964be062b18b

diff --git a/.vim/colors/iain.vim b/.vim/colors/iain.vim
index e23c8dd..f3111cf 100644 (file)
--- a/.vim/colors/iain.vim
+++ b/.vim/colors/iain.vim
@@ -14,7 +14,7 @@ let g:colors_name="iain"
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " functions {{{
     " returns an approximate grey index for the given grey level
-    fun <SID>grey_number(x)
+    fun! <SID>grey_number(x)
         if &t_Co == 88
             if a:x < 23
                 return 0
@@ -53,7 +53,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns the actual grey level represented by the grey index
-    fun <SID>grey_level(n)
+    fun! <SID>grey_level(n)
         if &t_Co == 88
             if a:n == 0
                 return 0
@@ -86,7 +86,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns the palette index for the given grey index
-    fun <SID>grey_color(n)
+    fun! <SID>grey_color(n)
         if &t_Co == 88
             if a:n == 0
                 return 16
@@ -107,7 +107,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns an approximate color index for the given color level
-    fun <SID>rgb_number(x)
+    fun! <SID>rgb_number(x)
         if &t_Co == 88
             if a:x < 69
                 return 0
@@ -134,7 +134,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns the actual color level for the given color index
-    fun <SID>rgb_level(n)
+    fun! <SID>rgb_level(n)
         if &t_Co == 88
             if a:n == 0
                 return 0
@@ -155,7 +155,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns the palette index for the given R/G/B color indices
-    fun <SID>rgb_color(x, y, z)
+    fun! <SID>rgb_color(x, y, z)
         if &t_Co == 88
             return 16 + (a:x * 16) + (a:y * 4) + a:z
         else
@@ -164,7 +164,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns the palette index to approximate the given R/G/B color levels
-    fun <SID>color(r, g, b)
+    fun! <SID>color(r, g, b)
         " get the closest grey
         let l:gx = <SID>grey_number(a:r)
         let l:gy = <SID>grey_number(a:g)
@@ -199,7 +199,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " returns the palette index to approximate the 'rrggbb' hex string
-    fun <SID>rgb(rgb)
+    fun! <SID>rgb(rgb)
         let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
         let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
         let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
@@ -208,81 +208,98 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
 
     " sets the highlighting for the given group
-    fun <SID>X(group, fg, bg, attr)
+    fun! <SID>X(group, fg, bg, attr)
         if a:fg != ""
-            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
+            if a:fg =~ '^#'
+                let l:fg = <SID>rgb(substitute(a:fg, '^#', '', ''))
+            else
+                let l:fg=a:fg
+            endif
+            exec "hi " . a:group . " guifg=" . a:fg . " ctermfg=" . l:fg
         endif
         if a:bg != ""
-            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
+            if a:bg =~ '^#'
+                let l:bg = <SID>rgb(substitute(a:bg, '^#', '', ''))
+            else
+                let l:bg=a:bg
+            endif
+            exec "hi " . a:group . " guibg=" . a:bg . " ctermbg=" . l:bg
         endif
         if a:attr != ""
             exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
         endif
     endfun
     " }}}
-    call <SID>X("ErrorMsg", "ffffff", "287eff", "")
-    call <SID>X("Visual", "ffffff", "8080ff", "")
-    call <SID>X("VisualNOS", "", "8080ff", "underline")
-    call <SID>X("Todo", "d14a14", "1248d1", "")
-    call <SID>X("Search", "90fff0", "2050d0", "")
-    call <SID>X("IncSearch", "b0ffff", "2050d0", "")
-    call <SID>X("SpecialKey", "00ffff", "", "")
-    call <SID>X("Directory", "00ffff", "", "")
-    call <SID>X("Title", "ff00ff", "", "none")
-    call <SID>X("WarningMsg", "ff0000", "", "")
-    call <SID>X("WildMenu", "ffff00", "000000", "")
-    call <SID>X("ModeMsg", "22cce2", "", "")
-    call <SID>X("Question", "00ff00", "", "none")
-    call <SID>X("NonText", "0030ff", "", "")
-    call <SID>X("VertSplit", "000000", "a9a9a9", "none")
-    call <SID>X("Folded", "808080", "000040", "")
-    call <SID>X("FoldColumn", "808080", "000040", "")
-    call <SID>X("LineNr", "90f020", "", "")
-    call <SID>X("DiffAdd", "00008b", "", "")
-    call <SID>X("DiffChange", "8b008b", "", "")
-    call <SID>X("DiffDelete", "0000ff", "008b8b", "bold")
-    call <SID>X("DiffText", "", "ff0000", "bold")
-    call <SID>X("Cursor", "000000", "ffff00", "")
-    call <SID>X("lCursor", "000000", "ffffff", "")
-    call <SID>X("Comment", "80a0ff", "", "")
-    "call <SID>X("Constant", "ffa0a0", "", "")
-    "call <SID>X("Special", "ffa500", "", "")
-    "call <SID>X("Identifier", "40ffff", "", "")
-    "call <SID>X("Statement", "ffff60", "", "none")
-    "call <SID>X("PreProc", "ff80ff", "", "none")
-    "call <SID>X("Type", "60ff60", "", "none")
-    call <SID>X("Ignore", "ffffff", "", "")
+    " From darkblue.
+    call <SID>X("ErrorMsg", "#ffffff", "#287eff", "")
+    call <SID>X("Visual", "#ffffff", "#8080ff", "")
+    call <SID>X("VisualNOS", "", "#8080ff", "underline")
+    "call <SID>X("Todo", "#d14a14", "#1248d1", "")
+    call <SID>X("Search", "#ffffff", "#2050d0", "")
+    call <SID>X("IncSearch", "#b0ffff", "#2050d0", "")
+    "call <SID>X("SpecialKey", "#00ffff", "", "")
+    call <SID>X("Directory", "#00ffff", "", "")
+    call <SID>X("Title", "#ff00ff", "", "none")
+    call <SID>X("WarningMsg", "#ff0000", "", "")
+    "call <SID>X("WildMenu", "#ffff00", "#000000", "")
+    call <SID>X("ModeMsg", "#22cce2", "", "")
+    call <SID>X("Question", "#00ff00", "", "none")
+    call <SID>X("NonText", "#0030ff", "", "")
+    call <SID>X("VertSplit", "#000000", "#a9a9a9", "none")
+    call <SID>X("Folded", "#808080", "#000040", "")
+    call <SID>X("FoldColumn", "#808080", "#000040", "")
+    call <SID>X("LineNr", "#90f020", "", "")
+    call <SID>X("DiffAdd", "#00008b", "", "")
+    call <SID>X("DiffChange", "#8b008b", "", "")
+    call <SID>X("DiffDelete", "#0000ff", "#008b8b", "bold")
+    call <SID>X("DiffText", "", "#ff0000", "bold")
+    call <SID>X("Cursor", "#000000", "#ffff00", "")
+    call <SID>X("lCursor", "#000000", "#ffffff", "")
+    "call <SID>X("Comment", "#80a0ff", "", "")
+    "call <SID>X("Constant", "#ffa0a0", "", "")
+    "call <SID>X("Special", "#ffa500", "", "")
+    "call <SID>X("Identifier", "#40ffff", "", "")
+    "call <SID>X("Statement", "#ffff60", "", "none")
+    "call <SID>X("PreProc", "#ff80ff", "", "none")
+    "call <SID>X("Type", "#60ff60", "", "none")
+    call <SID>X("Ignore", "#ffffff", "", "")
+
+    " My stuff.
+    call <SID>X("WildMenu", "blue", "white", "bold")
+    call <SID>X("Todo", "black", "green", "bold")
+    call <SID>X("MoreMsg", "#00ff00", "", "none")
 
-    hi Repeat ctermfg=yellow cterm=none
-    call <SID>X("Label", "90f020", "", "none")
-    call <SID>X("Conditional", "ffff60", "", "none")
-    call <SID>X("Statement", "ffff00", "", "none")
+    call <SID>X("Repeat", "yellow", "", "none")
+    call <SID>X("Label", "#90f020", "", "none")
+    call <SID>X("Conditional", "#ffff60", "", "none")
+    call <SID>X("Operator", "#e0e000", "", "none")
+    call <SID>X("Statement", "#ffff00", "", "none")
 
-    hi Comment ctermfg=cyan cterm=none
+    hi Comment ctermfg=lightblue cterm=none guifg=#80a0ff gui=none
 
-    hi Function ctermfg=darkgreen cterm=none
-    call <SID>X("Identifier", "40ffff", "", "none")
+    call <SID>X("Function", "darkgreen", "", "none")
+    call <SID>X("Identifier", "#40ffff", "", "none")
 
-    hi Character ctermfg=darkmagenta cterm=none
-    hi String ctermfg=darkmagenta cterm=bold
-    hi Float ctermfg=magenta cterm=bold
-    hi Number ctermfg=magenta cterm=none
-    hi Boolean ctermfg=darkred cterm=bold
-    call <SID>X("Constant", "ffa500", "", "none")
+    hi Character ctermfg=darkmagenta cterm=bold guifg=magenta gui=bold
+    hi String ctermfg=darkmagenta cterm=none guifg=magenta gui=none
+    call <SID>X("Float", "magenta", "", "none")
+    call <SID>X("Number", "magenta", "", "bold")
+    call <SID>X("Boolean", "darkred", "", "bold")
+    call <SID>X("Constant", "darkmagenta", "", "bold")
 
-    hi SpecialChar ctermfg=green cterm=none
-    call <SID>X("Special", "ff0000", "", "none")
+    call <SID>X("SpecialChar", "#ff0000", "", "none")
+    call <SID>X("Special", "#ff0000", "", "none")
 
-    hi Include ctermfg=red cterm=none
-    hi Macro ctermfg=red cterm=none
-    hi PreCondit ctermfg=darkred cterm=none
-    hi PreProc ctermfg=darkred cterm=bold
+    call <SID>X("Include", "red", "", "none")
+    call <SID>X("Macro", "red", "", "none")
+    call <SID>X("PreCondit", "darkred", "", "none")
+    call <SID>X("PreProc", "darkred", "", "bold")
 
-    hi StorageClass ctermfg=green cterm=none
-    hi Structure ctermfg=darkgreen cterm=bold
-    hi Type ctermfg=darkgreen cterm=none
+    hi StorageClass ctermfg=green cterm=none guifg=lightgreen gui=none
+    hi Structure ctermfg=darkgreen cterm=bold guifg=green gui=bold
+    hi Type ctermfg=darkgreen cterm=none guifg=green gui=none
 
-    " Fix up shell stuff.
+    " Fix up shell stuff. XXX: Should this go in ~/.vim/after/syntax/sh.vim?
     hi link shShellVariables Identifier
 
     " Fix up Perl stuff.

diff --git a/.vimrc b/.vimrc
index 24b6530..91fd6c1 100644 (file)
--- 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=\e[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