Merge branch 'master' into wsr
This commit is contained in:
commit
86e7b7990a
|
@ -66,7 +66,7 @@ then
|
||||||
then
|
then
|
||||||
. ~/.zxtermcolors
|
. ~/.zxtermcolors
|
||||||
else
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
9
.zshrc
9
.zshrc
|
@ -121,7 +121,16 @@ fi
|
||||||
# don't want to recreate that mess manually.
|
# don't want to recreate that mess manually.
|
||||||
if [ -d ~/bin/func ]
|
if [ -d ~/bin/func ]
|
||||||
then
|
then
|
||||||
|
export FPATH
|
||||||
FPATH=`preppath -v FPATH ~/bin/func`
|
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
|
fi
|
||||||
|
|
||||||
# for new style completion:
|
# for new style completion:
|
||||||
|
|
Loading…
Reference in New Issue