diff options
author | Renaud (Nel) Morvan <nel@w3fu.com> | 2011-04-04 14:02:50 +0200 |
---|---|---|
committer | Renaud (Nel) Morvan <nel@w3fu.com> | 2011-04-04 14:02:50 +0200 |
commit | 0cc0915bf83c1915575182d1287abfc6dd3e6f3c (patch) | |
tree | 979e5b50bc05b86d25681cefa21b0786f4c78c9d | |
parent | a3e92892bbc95acc270d93b45be05c55348da55c (diff) | |
download | zsh-0cc0915bf83c1915575182d1287abfc6dd3e6f3c.tar.gz zsh-0cc0915bf83c1915575182d1287abfc6dd3e6f3c.tar.bz2 zsh-0cc0915bf83c1915575182d1287abfc6dd3e6f3c.zip |
Refactor DISABLE_AUTO_TITLE to be more DRY
-rw-r--r-- | lib/termsupport.zsh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index 42bbb9ef2..3152751e4 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -3,6 +3,7 @@ #Fully support screen, iterm, and probably most modern xterm and rxvt #Limited support for Apple Terminal (Terminal can't set window or tab separately) function title { + [ "$DISABLE_AUTO_TITLE" != "true" ] || return 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 @@ -16,17 +17,13 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~" #Appears when you have the prompt function precmd { - if [ "$DISABLE_AUTO_TITLE" != "true" ]; then - title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE - fi + title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE } #Appears at the beginning of (and during) of command execution function preexec { - if [ "$DISABLE_AUTO_TITLE" != "true" ]; then - 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%<<" - fi + 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%<<" } |