projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update changelog for uploading
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
899cc33
..
6141171
100644
(file)
--- 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
# change vcs_info formats for the grml prompt
if [[ "$TERM" == dumb ]] ; then
- zstyle ':vcs_info:*'
prompt
actionformat "(%s%)-[%b|%a] "
- zstyle ':vcs_info:*'
prompt
format "(%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:
else
# these are the same, just with a lot of colours:
- zstyle ':vcs_info:*'
prompt
actionformat "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} "
- zstyle ':vcs_info:*'
prompt
format "${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
zstyle ':vcs_info:(sv[nk]|bzr)' branchformat "%b${YELLOW}:%r"
fi
@@
-1627,11
+1627,6
@@
fi
setopt prompt_subst
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
# 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
# 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
# return 0
fi
# just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT
@@
-1664,8
+1659,6
@@
is4 && [[ -z $NOPRECMD ]] && precmd () {
esac
}
esac
}
-# chpwd () => a function which is executed whenever the directory is changed
-
# preexec() => a function running before every command
is4 && [[ -z $NOPRECMD ]] && \
preexec () {
# preexec() => a function running before every command
is4 && [[ -z $NOPRECMD ]] && \
preexec () {
@@
-1696,7
+1689,7
@@
preexec () {
}
EXITCODE="%(?..%?%1v )"
}
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>'
PS3='?# ' # selection prompt used within a select loop.
PS4='+%N:%i:%_> ' # the execution trace prompt (setopt xtrace). default: '+%N:%i>'