Merge branch 'master' into wsr

.psqlrc

@@ -3,3 +3,4 @@
 \pset border 2
 \pset unicode_border_linestyle double
 \timing on
+\x auto

.vimrc

@@ -19,12 +19,20 @@ set sm
 set sw=4
 set tw=72
 set viminfo='100,<50,s10,h,%
+
 if has('reltime')
   set incsearch
 endif
 
-colorscheme hjp
-syntax on
+if $BG == "light"
+    set bg=light
+    colorscheme hjp
+    syntax on
+elseif $BG == "dark"
+    set bg=dark
+    syntax on
+endif
+
 map <F7> :cp
 map <F8> :cn
 map!  >I<yypa/O

.znewterm

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