summaryrefslogtreecommitdiff
path: root/lib/termsupport.zsh
diff options
context:
space:
mode:
authorSébastien <seb@Macbook.local>2012-06-25 17:41:06 +0200
committerSébastien <seb@Macbook.local>2012-06-25 17:41:06 +0200
commit29fb24487cce4e61bdc24a9a0308f04a739a3d1f (patch)
tree7ef05913a12a6f67cd095dac9161e663035e53e2 /lib/termsupport.zsh
parent579f33d489c8b61e77279894cd467c3207955c09 (diff)
parentd165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff)
downloadzsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.gz
zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.bz2
zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/termsupport.zsh')
-rw-r--r--lib/termsupport.zsh4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 221989502..e26fef6d3 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -3,7 +3,9 @@
#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 [[ "$DISABLE_AUTO_TITLE" == "true" ]] || [[ "$EMACS" == *term* ]]; then
+ return
+ fi
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