Merge branch 'master' into wsr

.vim/colors/hjp-dark.vim

@@ -0,0 +1,67 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=8 sw=4
+" Vim color file
+" (adapted from zellner.vim)
+" Maintainer:	Peter J. Holzer
+" Last Change:	2009-08-14
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "hjp-dark"
+
+hi Comment    term=bold                      ctermfg=88          ctermbg=White                  guifg=Red
+hi Constant   term=underline                 ctermfg=201                                        guifg=Magenta
+hi Error      term=reverse                   ctermfg=15          ctermbg=9                      guifg=White    guibg=Red 
+hi ErrorMsg   term=standout     cterm=NONE   ctermfg=226         ctermbg=DarkRed  gui=NONE      guifg=Yellow   guibg=DarkRed
+hi Identifier term=underline    cterm=NONE   ctermfg=40          ctermbg=NONE                   guifg=Blue
+hi LineNr     term=bold      cterm=NONE      ctermfg=226         ctermbg=17       gui=NONE      guifg=DarkGrey guibg=NONE
+hi MatchParen                                                    ctermbg=yellow
+hi Normal                                                                                       guifg=black    guibg=white
+hi PreProc    term=underline                 ctermfg=Magenta     ctermbg=0                      guifg=Purple
+hi Search     term=reverse   cterm=NONE      ctermfg=White       ctermbg=19       gui=NONE      guifg=Black    guibg=Cyan
+hi Special    term=bold                      ctermfg=53          ctermbg=NONE                   guifg=Magenta
+hi Statement  term=bold                      ctermfg=105                          gui=NONE      guifg=Brown
+hi Underlined term=underline cterm=underline ctermfg=163                          gui=underline guifg=SlateBlue
+
+" Use color 226 (pale yellow) instead of the default yellow, because I refined
+" the default yellow to orange for better contrast against a light background
+" (there are way too many command line tools that assume a black background and
+" hilight stuff in yellow).
+hi StatusLine term=bold,reverse cterm=NONE ctermfg=226 ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
+
+hi String term=bold      ctermfg=177       ctermbg=NONE              guifg=Magenta
+hi Tag    term=bold      ctermfg=DarkGreen                           guifg=DarkGreen
+hi Todo   term=standout  ctermfg=Black     ctermbg=Yellow            guifg=Blue      guibg=Yellow
+hi Type   term=underline ctermfg=Blue                       gui=NONE guifg=Blue
+hi Visual term=reverse   ctermfg=White     ctermbg=DarkBlue gui=NONE guifg=Black     guibg=Yellow
+hi Title                 ctermfg=black
+hi link Boolean	Constant
+hi link Character	Constant
+hi link Conditional	Statement
+hi link Debug		Special
+hi link Define	PreProc
+hi link Delimiter	Special
+hi link Exception	Statement
+hi link Float		Number
+hi link Function	Identifier
+hi link Include	PreProc
+hi link Keyword	Statement
+hi link Label		Statement
+hi link Macro		PreProc
+hi link Number	Constant
+hi link Operator	Statement
+hi link PreCondit	PreProc
+hi link Repeat	Statement
+hi link SpecialChar	Special
+hi link SpecialComment Special
+hi link StorageClass	Type
+hi link String	Constant
+hi link Structure	Type
+hi link Typedef	Type
+hi! link ErrorMsg Visual
+hi! link MoreMsg Comment
+hi! link Question Comment
+hi! link WarningMsg ErrorMsg

.vimrc

@@ -4,6 +4,7 @@ set clipboard=
 set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
 set expandtab
 set exrc
+set hls
 set list
 set listchars=tab:»·,trail:·
 set modeline