mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
Merge pull request #3525 from apjanke/term-pwd-in-precmd
Move pwd update output to precmd to avoid contamination
This commit is contained in:
commit
c3eb54839a
1 changed files with 9 additions and 15 deletions
|
@ -16,12 +16,19 @@ function title {
|
||||||
ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
|
ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
|
||||||
ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
|
ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
|
||||||
|
|
||||||
#Appears when you have the prompt
|
# Runs before showing the prompt
|
||||||
function omz_termsupport_precmd {
|
function omz_termsupport_precmd {
|
||||||
title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
|
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 before executing the command
|
||||||
function omz_termsupport_preexec {
|
function omz_termsupport_preexec {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
setopt extended_glob
|
setopt extended_glob
|
||||||
|
@ -33,18 +40,5 @@ function omz_termsupport_preexec {
|
||||||
title '$CMD' '%100>...>$LINE%<<'
|
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)
|
precmd_functions+=(omz_termsupport_precmd)
|
||||||
preexec_functions+=(omz_termsupport_preexec)
|
preexec_functions+=(omz_termsupport_preexec)
|
||||||
chpwd_functions+=(omz_termsupport_chpwd)
|
|
||||||
|
|
Loading…
Reference in a new issue