Merge branch 'term-pwd-in-precmd' into title-disable-check

Conflicts:
	lib/termsupport.zsh
This commit is contained in:
Andrew Janke 2015-01-27 21:26:02 -06:00
commit 7cc42e3aea

View file

@ -26,11 +26,19 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
# Called when you have a prompt
function omz_termsupport_precmd {
# 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
if [[ $DISABLE_AUTO_TITLE == true ]]; then
return
fi
title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
}
# Called at the beginning of command execution
@ -49,18 +57,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)