X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=1376e4edd08f8a7d3229ae77839cfef8e4df9567;hb=a1d579b427362ea438947190338debb26cfd7e78;hp=c03b61435185ced591a67f16be498a8ed45936dc;hpb=ebd9d165348f511fa1082f9a4c0ce341e277f131;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index c03b614..1376e4e 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -1613,6 +1613,7 @@ if zstyle -T ':grml:chpwd:dirstack' enable; then } chpwd() { + (( ZSH_SUBSHELL )) && return (( $DIRSTACKSIZE <= 0 )) && return [[ -z $DIRSTACKFILE ]] && return grml_dirstack_filter $PWD && return @@ -2359,9 +2360,7 @@ function prompt_grml_precmd_worker () { grml_prompt_fallback() { setopt prompt_subst - precmd() { - (( ${+functions[vcs_info]} )) && vcs_info - } + local p0 p1 p0="${RED}%(?..%? )${WHITE}${debian_chroot:+($debian_chroot)}" p1="${BLUE}%n${NO_COLOR}@%m %40<...<%B%~%b%<< "'${vcs_info_msg_0_}'"%# " @@ -2370,7 +2369,6 @@ grml_prompt_fallback() { else PROMPT="${RED}${p0}${BLUE}${p1}" fi - unset p0 p1 } if zrcautoload promptinit && promptinit 2>/dev/null ; then @@ -2383,6 +2381,7 @@ if zrcautoload promptinit && promptinit 2>/dev/null ; then else print 'Notice: no promptinit available :(' grml_prompt_fallback + precmd() { (( ${+functions[vcs_info]} )) && vcs_info; } fi if is437; then @@ -2415,6 +2414,7 @@ if is437; then fi else grml_prompt_fallback + precmd() { (( ${+functions[vcs_info]} )) && vcs_info; } fi # Terminal-title wizardry