Merge branch 'master' into wsr
This commit is contained in:
commit
750cc994b2
1
.psqlrc
1
.psqlrc
|
@ -3,3 +3,4 @@
|
||||||
\pset border 2
|
\pset border 2
|
||||||
\pset unicode_border_linestyle double
|
\pset unicode_border_linestyle double
|
||||||
\timing on
|
\timing on
|
||||||
|
\x auto
|
||||||
|
|
8
.vimrc
8
.vimrc
|
@ -19,12 +19,20 @@ set sm
|
||||||
set sw=4
|
set sw=4
|
||||||
set tw=72
|
set tw=72
|
||||||
set viminfo='100,<50,s10,h,%
|
set viminfo='100,<50,s10,h,%
|
||||||
|
|
||||||
if has('reltime')
|
if has('reltime')
|
||||||
set incsearch
|
set incsearch
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if $BG == "light"
|
||||||
|
set bg=light
|
||||||
colorscheme hjp
|
colorscheme hjp
|
||||||
syntax on
|
syntax on
|
||||||
|
elseif $BG == "dark"
|
||||||
|
set bg=dark
|
||||||
|
syntax on
|
||||||
|
endif
|
||||||
|
|
||||||
map <F7> :cp
|
map <F7> :cp
|
||||||
map <F8> :cn
|
map <F8> :cn
|
||||||
map! >I<yypa/O
|
map! >I<yypa/O
|
||||||
|
|
|
@ -51,7 +51,7 @@ then
|
||||||
then
|
then
|
||||||
. ~/.zxtermcolors
|
. ~/.zxtermcolors
|
||||||
else
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue