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

47
zsh/icc
View file

@ -1,25 +1,24 @@
local iccvars_path;
# are we linux?
case `uname -s` in
Linux)
iccvars_path=/opt/intel/Compiler/11.0/074/bin/iccvars.sh
if [[ -r $iccvars_path ]] ; then
case `uname -m` in
x86_64)
source $iccvars_path intel64
;;
i*86)
source $iccvars_path ia32
;;
ia64)
source $iccvars_path ia64
;;
esac
else
iccvars_path=/opt/intel/cc/10.1.018/bin/iccvars.sh
if [[ -r $iccvars_path ]] ; then
source $iccvars_path
fi
fi
;;
esac
iccvars_path=$(echo /opt/intel/Compiler/11.*/*/bin/iccvars.sh(On[1]))
if [[ -r $iccvars_path ]] ; then
case `uname -m` in
x86_64)
source $iccvars_path intel64
;;
i*86)
source $iccvars_path ia32
;;
ia64)
source $iccvars_path ia64
;;
esac
else
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
source $iccvars_path
fi
fi

3
zshrc
View file

@ -177,9 +177,6 @@ bindkey ' ' magic-space
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
xterm*)
bindkey '\e[H' beginning-of-line