summaryrefslogtreecommitdiff
path: root/lib/termsupport.zsh
diff options
context:
space:
mode:
authorHenry Yan <yanhonglei@gmail.com>2012-07-17 00:36:50 +0800
committerHenry Yan <yanhonglei@gmail.com>2012-07-17 00:36:50 +0800
commit4a11d2c35c7a526e648b37a5b02b7695be46b16a (patch)
tree1eb542466758885ee40f3f60cc57d6438f38dc4d /lib/termsupport.zsh
parente9feccf6a94f9f5238ff0b3501f62575d14ae148 (diff)
parent11034217a7ea3cffe6e0fe631837c518b8c7e1a5 (diff)
downloadzsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.gz
zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.bz2
zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.zip
merge from 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