add magic dotdot rationalisation

[etc/zsh.git] / .zsh / zshrc / 30_aliases

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 787c617d14c3154a8ef00aeec6cadd1bf9923784..39c25565226ed4766a503fd478c2d50ecf355dc8 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -8,9 +8,6 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-alias -g ...=../..
-alias -g ....=../../..
-
 alias mv='nocorrect mv'
 alias cp='nocorrect cp'
 alias mkdir='nocorrect mkdir'
@@ -19,11 +16,12 @@ alias w3m='noglob w3m'
 alias links='noglob links'
 alias wb='noglob www-browser'
 
-if ls --group-directories-first >/dev/null 2>&1; then
-  alias ls='ls -bCF --color=auto --group-directories-first'
-else
-  alias ls='ls -bCF --color=auto'
-fi
+_LS_OPTS='-bCF --color=auto'
+ls --group-directories-first >/dev/null 2>&1 \
+  && _LS_OPTS="$_LS_OPTS --group-directories-first"
+# I prefer POSIX collation for ls
+alias ls="LC_COLLATE=POSIX ls $_LS_OPTS"
+unset _LS_OPTS
 
 alias ll='ls -l'
 alias la='ls -a'
@@ -41,8 +39,8 @@ alias fgrep='fgrep --color=auto -d skip'
 alias grep='grep --color=auto -d skip'
 
 alias mmv='noglob zmv -W'
-alias zcp=zmv
-alias zln=zmv
+alias zcp='zmv -C'
+alias zln='zmv -L'
 
 alias cal='cal -3'
 alias ftp=lftp