Merge branch 'master' into wsr_shared

Just setting the background color may result in unreadable combinations.
A black foreground should always work well with a light background.

.vimrc

@@ -41,3 +41,10 @@ autocmd FileType perl syntax on
 autocmd FileType go set sw=8
 autocmd FileType go set tw=79
 autocmd FileType go set noexpandtab
+
+autocmd BufRead,BufNewFile *.ts set filetype=javascript
+autocmd FileType javascript set sw=2
+
+autocmd FileType html set sw=2
+
+autocmd FileType crontab set tw=0

.znewterm

@@ -66,7 +66,7 @@ then
 	then
 	    . ~/.zxtermcolors
 	else
-	    perl -e 'printf(qq{if whence xtermcontrol >/dev/null\nthen\nxtermcontrol --bg "#%02X%02X%02X"\nexport BG=light\nfi\n}, map { rand(128)+128 } qw(1 1 1))' > ~/.zxtermcolors
+	    perl -e 'printf(qq{if whence xtermcontrol >/dev/null\nthen\nxtermcontrol --bg "#%02X%02X%02X" --fg "#000000"\nexport BG=light\nfi\n}, map { rand(128)+128 } qw(1 1 1))' > ~/.zxtermcolors
 	fi
 fi
 

.zshenv

@@ -59,6 +59,7 @@ then
     `$preppath -c -e /usr/local/node-v8.9.4-linux-x86/bin`
     `$preppath -c -e /usr/local/node-v8.9.4-linux-x64/bin`
     `$preppath -c -e -r /usr/lib/go-1.*/bin`
+    `$preppath -c -e -r /usr/local/go-1.*/bin`
     `$preppath -c -e -r $HOME/go/bin`
     PATH=`$preppath -c $HOME/scripts`
     PATH=`$preppath -c $HOME/bin/hosts:$HOME/bin`

.zshrc

@@ -27,8 +27,8 @@ if ack=`whence ack-grep`
 then
     alias ack=$ack
 fi
-alias   darkbg='xtermcontrol --bg "#000" --fg "#FFF --highlight="#00F""; export BG=dark'
-alias   lightbg='xtermcontrol --bg "#EEE" --fg "#000" --highlight="#0FF"; export BG=light'
+alias   darkbg='xtermcontrol --bg "#000" --fg "#FFF" --highlight="#00F"; export BG=dark'
+alias   lightbg='xtermcontrol --bg "#F0F0F0" --fg "#000" --highlight="#0FF"; export BG=light'
 alias   defaultbg='. ~/.zxtermcolors'
 alias   ag='ag --color-path "34;47"'
 
@@ -121,7 +121,16 @@ fi
 # don't want to recreate that mess manually.
 if [ -d ~/bin/func ]
 then
+    export FPATH
     FPATH=`preppath -v FPATH ~/bin/func`
+    # We also have to mark all functions explicitely as undefined,
+    # or zsh won't look for them. (Is this new? I thought that zsh would
+    # automatically search for unknown commands in FPATH, too. Maybe
+    # there's an option for that.)
+    for f in ~/bin/func/*
+    do
+        typeset -fu $(basename $f)
+    done
 fi
 
 # for new style completion: