projects
/
grml-etc-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9dbdd75
)
Clean up fallback prompt code
author
Frank Terbeck
<ft@grml.org>
Fri, 6 May 2016 11:01:01 +0000
(13:01 +0200)
committer
Frank Terbeck
<ft@grml.org>
Fri, 6 May 2016 11:01:01 +0000
(13:01 +0200)
etc/zsh/zshrc
patch
|
blob
|
history
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
84d37a9
..
1376e4e
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-2360,9
+2360,7
@@
function prompt_grml_precmd_worker () {
grml_prompt_fallback() {
setopt prompt_subst
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_}'"%# "
p0="${RED}%(?..%? )${WHITE}${debian_chroot:+($debian_chroot)}"
p1="${BLUE}%n${NO_COLOR}@%m %40<...<%B%~%b%<< "'${vcs_info_msg_0_}'"%# "
@@
-2371,7
+2369,6
@@
grml_prompt_fallback() {
else
PROMPT="${RED}${p0}${BLUE}${p1}"
fi
else
PROMPT="${RED}${p0}${BLUE}${p1}"
fi
- unset p0 p1
}
if zrcautoload promptinit && promptinit 2>/dev/null ; then
}
if zrcautoload promptinit && promptinit 2>/dev/null ; then
@@
-2384,6
+2381,7
@@
if zrcautoload promptinit && promptinit 2>/dev/null ; then
else
print 'Notice: no promptinit available :('
grml_prompt_fallback
else
print 'Notice: no promptinit available :('
grml_prompt_fallback
+ precmd() { (( ${+functions[vcs_info]} )) && vcs_info; }
fi
if is437; then
fi
if is437; then
@@
-2416,6
+2414,7
@@
if is437; then
fi
else
grml_prompt_fallback
fi
else
grml_prompt_fallback
+ precmd() { (( ${+functions[vcs_info]} )) && vcs_info; }
fi
# Terminal-title wizardry
fi
# Terminal-title wizardry