Merge branch 'wsr' of github.com:hjp/dot into wsr

Conflicts:
	.gitconfig

.gitconfig

@@ -12,6 +12,6 @@
 [push]
         # 1.7.1:  nothing, matching, tracking, current
         # 2.11.0: nothing, matching, upstream, current, simple
-        # nothing is inconvenietn, matching is dangerous. 
+        # nothing is inconvenient, matching is dangerous. 
         # current is only compatible remaining option.
 	default = current

.vim/colors/hjp.vim

@@ -24,7 +24,13 @@ hi PreProc    term=underline            ctermfg=Magenta   ctermbg=253
 hi Search term=reverse cterm=NONE ctermfg=White ctermbg=Cyan gui=NONE guifg=Black guibg=Cyan
 hi Special    term=bold                 ctermfg=DarkMagenta ctermbg=253             guifg=Magenta
 hi Statement term=bold ctermfg=DarkBlue gui=NONE guifg=Brown
-hi StatusLine term=bold,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=NONE guifg=Yellow guibg=DarkGray
+
+" 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
+" lightlight 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=90     ctermbg=NONE              guifg=Magenta
 hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
 hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow

.zshrc

@@ -1,4 +1,3 @@
-echo ".zshrc: LANG=$LANG"
 umask 022
 bindkey -v
 

GNUmakefile

@@ -7,8 +7,6 @@ ALLSRC = \
 	.zshenv \
 	.zshrc \
 	.gitconfig \
-        .vim/ \
-        .vim/colors/ \
         .vim/colors/hjp.vim \
         .vimrc \
 
@@ -22,10 +20,7 @@ echo:
 	echo $(ALLDST)
 
 $(HOME)/%: %
-	cp $^ $@
-
-$(HOME)/%/:
-	mkdir $@
+	install -D $^ $@
 
 diff:
 	for i in $(ALLSRC); do diff -u $(HOME)/$$i $$i; done