From e55dfcd63268787030430b6353ff0d8e49d64adf Mon Sep 17 00:00:00 2001
From: David Alexander Majnemer <dmajnem2@yt.acm.uiuc.edu>
Date: Thu, 11 Dec 2008 21:19:13 -0600
Subject: [PATCH 1/3] fixed icc

---
 zsh/icc | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/zsh/icc b/zsh/icc
index 4ba5fa5..97e8502 100755
--- a/zsh/icc
+++ b/zsh/icc
@@ -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

From 0ba4786f0079e15a70edeafca711d2198f6e2e44 Mon Sep 17 00:00:00 2001
From: David Alexander Majnemer <dmajnem2@hiro.acm.uiuc.edu>
Date: Thu, 11 Dec 2008 22:30:27 -0600
Subject: [PATCH 2/3] removed extra keybinding

---
 zshrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zshrc b/zshrc
index 8cae06c..1d6eabd 100644
--- a/zshrc
+++ b/zshrc
@@ -178,7 +178,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*)

From 1a4de233ec4494c931fa42f1dc6ddd769d51e28d Mon Sep 17 00:00:00 2001
From: David Alexander Majnemer <dmajnem2@hiro.acm.uiuc.edu>
Date: Thu, 11 Dec 2008 22:34:02 -0600
Subject: [PATCH 3/3] finished bindkey cleanup

---
 zshrc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/zshrc b/zshrc
index 1d6eabd..e89e0cb 100644
--- a/zshrc
+++ b/zshrc
@@ -177,8 +177,6 @@ bindkey ' ' magic-space
 
 bindkey -M emacs '\ee' edit-command-line
 
-bindkey -M emacs '^P' history-incremental-search-forward
-
 case $TERM in
 	xterm*)
 		bindkey '\e[H' beginning-of-line