diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-08-17 20:59:39 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-08-17 20:59:39 -0400 |
| commit | 00eb4658304b010afdfa87f74be673c8aced4961 (patch) | |
| tree | 3d9e7f95f21265c3c60f10cdca720308bb2421c6 /lib/termsupport.zsh | |
| parent | 47d19cc56425aa7c550d845726111ee8bd9520d1 (diff) | |
| parent | 192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff) | |
| download | zsh-00eb4658304b010afdfa87f74be673c8aced4961.tar.gz zsh-00eb4658304b010afdfa87f74be673c8aced4961.tar.bz2 zsh-00eb4658304b010afdfa87f74be673c8aced4961.zip | |
Merge branch 'master' into fold-terminalapp-plugin-into-termsupport
Diffstat (limited to 'lib/termsupport.zsh')
| -rw-r--r-- | lib/termsupport.zsh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index ff61d5329..5f61fe8ef 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -8,6 +8,8 @@ # Limited support for Apple Terminal (Terminal can't set window and tab separately) function title { emulate -L zsh + setopt prompt_subst + [[ "$EMACS" == *term* ]] && return # if $2 is unset use $1 as default @@ -24,6 +26,10 @@ function title { ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~" +# Avoid duplication of directory in terminals with independent dir display +if [[ $TERM_PROGRAM == Apple_Terminal ]]; then + ZSH_THEME_TERM_TITLE_IDLE="%n@%m" +fi # Runs before showing the prompt function omz_termsupport_precmd { @@ -45,7 +51,7 @@ function omz_termsupport_preexec { setopt extended_glob # cmd name only, or if this is sudo or ssh, the next cmd - local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%} + local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%} local LINE="${2:gs/%/%%}" title '$CMD' '%100>...>$LINE%<<' |