summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Janke <janke@pobox.com>2015-01-27 21:00:07 -0600
committerAndrew Janke <janke@pobox.com>2015-01-27 21:00:07 -0600
commit5f79ab5547f51bd32dcd0a1b21fc26c8720711ba (patch)
treea3ee4aef04d8623ba123952f91dcf901f8e7b716 /lib
parentc78277fd8bda5fec87504469afdf121355876006 (diff)
downloadzsh-5f79ab5547f51bd32dcd0a1b21fc26c8720711ba.tar.gz
zsh-5f79ab5547f51bd32dcd0a1b21fc26c8720711ba.tar.bz2
zsh-5f79ab5547f51bd32dcd0a1b21fc26c8720711ba.zip
Move chpwd update output from chpwd hook to precmd to avoid
contaminating script/function output
Diffstat (limited to 'lib')
-rw-r--r--lib/termsupport.zsh24
1 files changed, 9 insertions, 15 deletions
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index d9f2b64d4..ce36f229f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -16,12 +16,19 @@ function title {
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
+# Runs when you have the prompt
function omz_termsupport_precmd {
title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+
+ # Notify Terminal.app of current directory using undocumented OSC sequence
+ # found in OS X 10.9 and 10.10's /etc/bashrc
+ if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
+ local PWD_URL="file://$HOSTNAME${PWD// /%20}"
+ printf '\e]7;%s\a' "$PWD_URL"
+ fi
}
-#Appears at the beginning of (and during) of command execution
+# Runs at the beginning of (and during) of command execution
function omz_termsupport_preexec {
emulate -L zsh
setopt extended_glob
@@ -33,18 +40,5 @@ function omz_termsupport_preexec {
title '$CMD' '%100>...>$LINE%<<'
}
-#Appears each time pwd is changed
-function omz_termsupport_chpwd {
- #Notify Terminal.app of current directory using undocumented OSC sequence
- #found in OS X 10.10's /etc/bashrc
- if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
- local PWD_URL="file://$HOSTNAME${PWD// /%20}"
- printf '\e]7;%s\a' "$PWD_URL"
- fi
-}
-#Fire it once so the pwd is set properly upon shell startup
-omz_termsupport_chpwd
-
precmd_functions+=(omz_termsupport_precmd)
preexec_functions+=(omz_termsupport_preexec)
-chpwd_functions+=(omz_termsupport_chpwd)