Merge branch 'master' of gitosis@majnematic.com:davesdots

This commit is contained in:
David Majnemer 2008-12-11 23:11:58 -06:00
commit dcb2a1787c
2 changed files with 23 additions and 27 deletions

13
zsh/icc
View file

@ -1,8 +1,5 @@
local iccvars_path; local iccvars_path;
# are we linux? iccvars_path=$(echo /opt/intel/Compiler/11.*/*/bin/iccvars.sh(On[1]))
case `uname -s` in
Linux)
iccvars_path=/opt/intel/Compiler/11.0/074/bin/iccvars.sh
if [[ -r $iccvars_path ]] ; then if [[ -r $iccvars_path ]] ; then
case `uname -m` in case `uname -m` in
x86_64) x86_64)
@ -16,10 +13,12 @@ case `uname -s` in
;; ;;
esac esac
else else
iccvars_path=/opt/intel/cc/10.1.018/bin/iccvars.sh if [[ `uname -m` == x86_64 ]] ; then
iccvars_path=$(echo /opt/intel/cce/(10|9).*/bin/iccvars.sh(On[1]))
else
iccvars_path=$(echo /opt/intel/cc/(10|9).*/bin/iccvars.sh(On[1]))
fi
if [[ -r $iccvars_path ]] ; then if [[ -r $iccvars_path ]] ; then
source $iccvars_path source $iccvars_path
fi fi
fi fi
;;
esac

3
zshrc
View file

@ -177,9 +177,6 @@ bindkey ' ' magic-space
bindkey -M emacs '\ee' edit-command-line bindkey -M emacs '\ee' edit-command-line
bindkey -M emacs '^P' history-incremental-search-forward
bindkey -M emacs '^N' history-incremental-search-backward
case $TERM in case $TERM in
xterm*) xterm*)
bindkey '\e[H' beginning-of-line bindkey '\e[H' beginning-of-line