X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=734a697ae41baf59142d4e11b5d2288634b24e95;hb=c0c162e75f6602f2cf654cdb5be3d982b42b1115;hp=af0e3a616613c89f1000526330276a9f99167c6a;hpb=d31a5151aac452632653417b842bef8f034b9412;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index af0e3a6..734a697 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -233,7 +233,12 @@ NOPRECMD=${NOPRECMD:-0}
 BATTERY=${BATTERY:-0}
 GRMLSMALL_SPECIFIC=${GRMLSMALL_SPECIFIC:-1}
 GRML_ALWAYS_LOAD_ALL=${GRML_ALWAYS_LOAD_ALL:-0}
-GRML_WARN_SKEL=${GRML_WARN_SKEL:-1}
+
+if isgrmlcd ; then
+    GRML_WARN_SKEL=${GRML_WARN_SKEL:-0}
+else
+    GRML_WARN_SKEL=${GRML_WARN_SKEL:-1}
+fi
 
 if (( GRML_WARN_SKEL != 0 )) ; then
 
@@ -521,10 +526,12 @@ if [[ -n "$BROKEN_COMPLETION_DIR" ]] ; then
 else
     [[ -d /etc/zsh/completion.d ]] && fpath=( $fpath /etc/zsh/completion.d )
     if [[ -d /etc/zsh/functions.d ]] ; then
-        fpath+=( /etc/zsh/functions.d )
-        for func in /etc/zsh/functions.d/[^_]*[^~](N.) ; do
-            zrcautoload -U ${func:t}
+        fdir='/etc/zsh/functions.d'
+        fpath=( ${fdir} ${fdir}/**/*(/N) ${fpath} )
+        for func in ${fdir}/**/[^_]*[^~](N.) ; do
+            zrcautoload ${func:t}
         done
+        unset fdir
     fi
 fi
 
@@ -1968,7 +1975,7 @@ is4 && [[ $NOPRECMD -eq 0 ]] && precmd () {
     # adjust title of xterm
     # see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
     case $TERM in
-        (xterm*|rxvt)
+        (xterm*|rxvt*)
             print -Pn "\e]0;%n@%m: %~\a"
             ;;
     esac
@@ -2342,7 +2349,7 @@ limit -s
 # {{{ completion system
 
 # called later (via is4 && grmlcomp)
-# notice: use 'zstyle' for getting current settings
+# note: use 'zstyle' for getting current settings
 #         press ^Xh (control-x h) for getting tags in context; ^X? (control-x ?) to run complete_debug with trace output
 grmlcomp() {
     # TODO: This could use some additional information
@@ -3298,7 +3305,7 @@ if [[ -r ~/.terminfo/m/mostlike ]] ; then
 fi
 
 # d():Copyright 2005 Nikolai Weibull <nikolai@bitwi.se>
-# notice: option AUTO_PUSHD has to be set
+# note: option AUTO_PUSHD has to be set
 #f5# Jump between directories
 d() {
     emulate -L zsh