Merge branch 'master' into wsr

The terminal defintions with a + are just building blocks, not full
definitions. We can't use them.

OTOH, the definitions in /lib/terminfo seem to work fine in current
Debian and Ubuntu versions (which is what I care about these days), so
we accept them.

.znewterm

@@ -23,11 +23,26 @@ then
 	stty erase 
 fi
 
-if [[ $TERM == xterm-256color && ! -f /usr/share/terminfo/x/xterm-256color ]]
+if [[ $TERM == xterm-256color && ! -f /usr/share/terminfo/x/xterm-256color && ! -f /lib/terminfo/x/xterm-256color ]]
 then
 	TERM=xterm
 fi
 
+if [[ $TERM == xterm ]]
+then
+        for t in xterm-256color
+        do
+                for dir in /usr/share/terminfo/x /lib/terminfo/x
+                do
+                    if [[ -f $dir/$t ]]
+                    then
+                            TERM=$t
+                            break 2
+                    fi
+                done
+        done
+fi
+
 case "$TERM" in
     xterm*|screen)
 	# indicated exit status by smiley (suggested by Stig Sandbeck Mathisen)

.zshrc

@@ -27,7 +27,7 @@ if ack=`whence ack-grep`
 then
     alias ack=$ack
 fi
-alias   darkbg='xtermcontrol --bg "#000" --fg "#FFF"; export BG=dark'
+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   defaultbg='. ~/.zxtermcolors'
 alias   ag='ag --color-path "34;47"'