zsh: use pushd_minus

[dotfiles.git] / zsh / lib / directories.zsh

diff --git a/zsh/lib/directories.zsh b/zsh/lib/directories.zsh
index 4d24fafedea240dbc16051773ca2827c9896d3e9..f1ec651b3df460431fb0db0d6d507e60ec8188e5 100644 (file)
--- a/zsh/lib/directories.zsh
+++ b/zsh/lib/directories.zsh
@@ -1,7 +1,11 @@
+setopt auto_cd
+setopt cdablevars
+

 # Changing/making/removing directory
 setopt auto_name_dirs
 setopt auto_pushd
 setopt pushd_ignore_dups
 # Changing/making/removing directory
 setopt auto_name_dirs
 setopt auto_pushd
 setopt pushd_ignore_dups

+setopt pushd_minus

 
 alias ..='cd ..'
 alias cd..='cd ..'
 
 alias ..='cd ..'
 alias cd..='cd ..'


@@ -10,16 +14,15 @@ alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
 alias cd/='cd /'
 
 alias cd.....='cd ../../../..'
 alias cd/='cd /'
 

-alias -- -='cd -'

 alias 1='cd -'
 alias 1='cd -'

-alias 2='cd +2'
-alias 3='cd +3'
-alias 4='cd +4'
-alias 5='cd +5'
-alias 6='cd +6'
-alias 7='cd +7'
-alias 8='cd +8'
-alias 9='cd +9'
+alias 2='cd -2'
+alias 3='cd -3'
+alias 4='cd -4'
+alias 5='cd -5'
+alias 6='cd -6'
+alias 7='cd -7'
+alias 8='cd -8'
+alias 9='cd -9'

 
 cd () {
   if   [[ "x$*" == "x..." ]]; then
 
 cd () {
   if   [[ "x$*" == "x..." ]]; then


@@ -27,9 +30,9 @@ cd () {
   elif [[ "x$*" == "x...." ]]; then
     cd ../../..
   elif [[ "x$*" == "x....." ]]; then
   elif [[ "x$*" == "x...." ]]; then
     cd ../../..
   elif [[ "x$*" == "x....." ]]; then

-    cd ../../..
-  elif [[ "x$*" == "x......" ]]; then

     cd ../../../..
     cd ../../../..

+  elif [[ "x$*" == "x......" ]]; then
+    cd ../../../../..

   else
     builtin cd "$@"
   fi
   else
     builtin cd "$@"
   fi