X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fzsh%2Fzshrc;h=61411712dac77bdc8c5b25e5ae9c93a15841aa39;hb=refs%2Ftags%2F0.3.57;hp=899cc337de2df1a4c5346c6eec24c3ec0026542c;hpb=5e588b6d52992e691b406d3f3df175d2cf972d9b;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 899cc33..6141171 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1607,12 +1607,12 @@ typeset -gx VCS_INFO_message_=''
 
 # change vcs_info formats for the grml prompt
 if [[ "$TERM" == dumb ]] ; then
-    zstyle ':vcs_info:*' promptactionformat "(%s%)-[%b|%a] "
-    zstyle ':vcs_info:*' promptformat       "(%s%)-[%b] "
+    zstyle ':vcs_info:*' actionformat "(%s%)-[%b|%a] "
+    zstyle ':vcs_info:*' format       "(%s%)-[%b] "
 else
     # these are the same, just with a lot of colours:
-    zstyle ':vcs_info:*' promptactionformat "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} "
-    zstyle ':vcs_info:*' promptformat       "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${MAGENTA}]${NO_COLOUR}%} "
+    zstyle ':vcs_info:*' actionformat "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} "
+    zstyle ':vcs_info:*' format       "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${MAGENTA}]${NO_COLOUR}%} "
     zstyle ':vcs_info:(sv[nk]|bzr)' branchformat "%b${YELLOW}:%r"
 fi
 
@@ -1627,11 +1627,6 @@ fi
 
 setopt prompt_subst
 
-# precmd() => a function which is executed just before each prompt
-# use 'NOPRECMD=1' to disable the precmd + preexec commands
-
-# precmd () { setopt promptsubst; [[ -o interactive ]] && jobs -l;
-
 # make sure to use right prompt only when not running a command
 is41 && setopt transient_rprompt
 
@@ -1642,7 +1637,7 @@ is4 && [[ -z $NOPRECMD ]] && precmd () {
 
     # allow manual overwriting of RPROMPT
     if [[ -n $RPROMPT ]] ; then
-        [[ $TERM == screen* ]] && echo -n $'\ekzsh\e\\'
+        [[ $TERM == screen* ]] && print -nP "\ekzsh\e\\"
         # return 0
     fi
     # just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT
@@ -1664,8 +1659,6 @@ is4 && [[ -z $NOPRECMD ]] && precmd () {
     esac
 }
 
-# chpwd () => a function which is executed whenever the directory is changed
-
 # preexec() => a function running before every command
 is4 && [[ -z $NOPRECMD ]] && \
 preexec () {
@@ -1696,7 +1689,7 @@ preexec () {
 }
 
 EXITCODE="%(?..%?%1v )"
-PS2='`%_> '       # secondary prompt, printed when the shell needs more information to complete a command.
+PS2='\`%_> '      # secondary prompt, printed when the shell needs more information to complete a command.
 PS3='?# '         # selection prompt used within a select loop.
 PS4='+%N:%i:%_> ' # the execution trace prompt (setopt xtrace). default: '+%N:%i>'