summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2011-12-14 21:52:42 -0800
committerRobby Russell <robby@planetargon.com>2011-12-14 21:52:42 -0800
commita9a0f580095bdf64c9a02e795b669e7126de4b65 (patch)
treec3ca51013ff8f0b6e4848e388c55d1e48f6adb77 /lib
parentd3cc18499d36e3ca878eb29a57453b503e29df9c (diff)
parent5277a0ffaacbc2e23c8753fefdf1c4fe6d1e7685 (diff)
downloadzsh-a9a0f580095bdf64c9a02e795b669e7126de4b65.tar.gz
zsh-a9a0f580095bdf64c9a02e795b669e7126de4b65.tar.bz2
zsh-a9a0f580095bdf64c9a02e795b669e7126de4b65.zip
Merge pull request #706 from docwhat/termsupport-hook
lib/termsupport now uses add-zsh-hook
Diffstat (limited to 'lib')
-rw-r--r--lib/termsupport.zsh10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 22e7f372f..221989502 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -4,7 +4,7 @@
#Limited support for Apple Terminal (Terminal can't set window or tab separately)
function title {
[ "$DISABLE_AUTO_TITLE" != "true" ] || return
- if [[ "$TERM" == screen* ]]; then
+ if [[ "$TERM" == screen* ]]; then
print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
print -Pn "\e]2;$2:q\a" #set window name
@@ -16,14 +16,18 @@ ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
#Appears when you have the prompt
-function precmd {
+function omz_termsupport_precmd {
title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
}
#Appears at the beginning of (and during) of command execution
-function preexec {
+function omz_termsupport_preexec {
emulate -L zsh
setopt extended_glob
local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
title "$CMD" "%100>...>$2%<<"
}
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd omz_termsupport_precmd
+add-zsh-hook preexec omz_termsupport_preexec