Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/zsh

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 5aeb0a7de0c178b56662fd64e1b097c855dd9999..6cb0f9df77dac892222d4fabcfbc54fe094129ee 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -23,7 +23,7 @@ alias curl='noglob curl'
 alias apt-cache='noglob apt-cache'
 alias locate='noglob locate'
 
-_ls_opts=(-bCF --color=auto)
+_ls_opts=(-bC --color=auto)
 ls --group-directories-first >/dev/null 2>&1 \
   && _ls_opts+=--group-directories-first
 # I prefer POSIX collation for ls

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 2a672be6a5882a3c86b90403525d8d30b6e7044f..f9c440b7db0ad5a73e4fc64258e3c52fca61b48a 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -84,8 +84,7 @@ __vcs_get_prompt_path_components()
 
   # shortcut: if there are no arguments, return a default prompt
   if [ -z "${1:-}" ]; then
-    pwdnamed="%${_PROMPT_PATH_MAXLEN}<..<%~%<<"
-    pwdnamed="${(%)pwdnamed}"
+    pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<..<%~%<<}"
     echo "$pwdnamed"
     return
   fi
@@ -96,8 +95,8 @@ __vcs_get_prompt_path_components()
 
   # replace named directories in the PWD, we need thi for the proper component
   # count later
-  local pwdnamed="%~"
-  pwdnamed="${(%)pwdnamed}"
+  local pwdnamed
+  pwdnamed="${(%):-%~}"
 
   # store paths in arrays for component count calculation
   typeset -la apwd apwdnamed areporoot
@@ -114,10 +113,7 @@ __vcs_get_prompt_path_components()
   precomps=$(($#apwdnamed - $postcomps))
 
   local postfix
-  if (( $postcomps > 0 )); then
-    postfix="%${postcomps}~"
-    postfix="${(%)postfix}"
-  fi
+  (( $postcomps > 0 )) && postfix="${(%):-%${postcomps}~}"
 
   # we don't want the prompt to get too long, so keep the total prompt length
   # under $_PROMPT_PATH_MAXLEN (25), but ensure that the prefix is not shorter
@@ -126,8 +122,7 @@ __vcs_get_prompt_path_components()
   prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
   minlen=${_PROMPT_PATH_MINLEN:-10}
   (( $prelen < $minlen )) && prelen=$minlen
-  prefix="%${prelen}<..<%-${precomps}~%<<"
-  prefix="${(%)prefix}"
+  prefix="${(%):-%${prelen}<..<%-${precomps}~%<<}"
 
   echo "'$prefix'" "'$branch'" "'$postfix'"
 }
@@ -174,9 +169,7 @@ __vcs_set_prompt_variables()
       return
   esac
 
-  psvar[1]="$1"
-  psvar[2]="$2"
-  psvar[3]="$3"
+  psvar[1,3]=($1 $2 $3)
 }
 
 if ! is_root; then

diff --git a/.zsh/zshrc/90_cleanfiles b/.zsh/zshrc/90_cleanfiles
index 20820f19e938f73fe89e3162dfc522e88e50cd57..b558145174d2f6196da1231a05c1b97ac74c5bcb 100644 (file)
--- a/.zsh/zshrc/90_cleanfiles
+++ b/.zsh/zshrc/90_cleanfiles
@@ -16,12 +16,12 @@ builtin cd ~
 rmfiles+=plugin131.trace
 rmfiles+=minicom.log
 rmfiles+=.cshrc
-rmfiles+=java.log.*
+rmfiles+=java.log.*(N)
 rmfiles+=unison.log
 rmfiles+=.bzr.log
 rmfiles+=.fonts.cache-1
 rmfiles+=.gksu.lock
-rmfiles+=.*.sw[mnop]
+rmfiles+=.*.sw[mnop](N)
 rmfiles+=.viminfo
 rmfiles+=.bash_history
 rmfiles+=core