Merge branch 'master' into wsr_shared

.psqlrc

@@ -0,0 +1,6 @@
+\pset null '(∅)'
+\pset linestyle unicode
+\pset border 2
+\pset unicode_border_linestyle double
+\timing on
+\x auto

.vimrc

@@ -18,8 +18,20 @@ set sm
 set sw=4
 set viminfo='100,<50,s10,h,%
 
-colorscheme default
-syntax on
+if has('reltime')
+  set incsearch
+endif
+
+if $BG == "light"
+    set bg=light
+    colorscheme hjp
+    syntax on
+elseif $BG == "dark"
+    set bg=dark
+    colorscheme default
+    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
 

GNUmakefile

@@ -7,6 +7,7 @@ ALLSRC = \
 	.zshenv \
 	.zshrc \
 	.gitconfig \
+        .psqlrc \
         .vim/colors/hjp.vim \
         .vimrc \