# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1378187123 -7200
# Node ID 37fb3d013086cef59ec269c15658df81ed16404c
# Parent  46fb22ffffa8882cc8d0aa72471f083f962ed41a# Parent  b2d78d66fa8c1e81789e121266281f897ec44a2e
Automated merge with https://xanthippe/hg/zsh-env

diff -r b2d78d66fa8c -r 37fb3d013086 zshrc
--- a/zshrc	Sat Feb 09 05:18:47 2013 +0100
+++ b/zshrc	Tue Sep 03 07:45:23 2013 +0200
@@ -42,6 +42,9 @@
 # turn of the "helpful" zsh feature of pushing each directory to the dir stack on cd
 unsetopt autopushd
 
+# turn off "helpful" auto correction
+unsetopt correct_all
+
 # utility function that is used by various other modules
 removeFromPath() {
     search_term="$1"
diff -r b2d78d66fa8c -r 37fb3d013086 zshrc-bindkey
--- a/zshrc-bindkey	Sat Feb 09 05:18:47 2013 +0100
+++ b/zshrc-bindkey	Tue Sep 03 07:45:23 2013 +0200
@@ -12,3 +12,9 @@
 
 # Ctrl-Right
 bindkey '^[[1;5C' forward-word
+
+# cursor up just goes back in history
+bindkey '^[[A' up-history
+
+# cursor down just goes forward in history
+bindkey '^[[B' down-history
diff -r b2d78d66fa8c -r 37fb3d013086 zshrc-cassiopeia
--- a/zshrc-cassiopeia	Sat Feb 09 05:18:47 2013 +0100
+++ b/zshrc-cassiopeia	Tue Sep 03 07:45:23 2013 +0200
@@ -5,9 +5,7 @@
 . $HOME/.zsh-env/zshrc-jdk
 . $HOME/.zsh-env/zshrc-maven
 . $HOME/.zsh-env/zshrc-bindkey
-#. /usr/local/GNUstep/share/GNUstep/Makefiles/GNUstep.sh
 
-export ANT_HOME=/usr/share/ant-bin
 export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/trunk
 export MULE_TEST_OPTS="-Dmule.verbose=false"
 export MULE_TEST_TIMEOUTSECS=9999
@@ -17,6 +15,7 @@
 #
 # aliases
 #
+alias ant="/opt/eclipse-4.3/plugins/org.apache.ant_1.8.4.v201303080030/bin/ant"
 alias bzip=pbzip2
 alias cvscheck='sh -c "cvs -n update 2>&1 | grep \?"'
 alias cvsupdate='cvs -q -z3 update -dP | egrep -v "^\?.*\.d"'
diff -r b2d78d66fa8c -r 37fb3d013086 zshrc-it1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zshrc-it1	Tue Sep 03 07:45:23 2013 +0200
@@ -0,0 +1,1 @@
+. $HOME/.zsh-env/zshrc-bindkey