Merge remote-tracking branch 'origin/master'

This commit is contained in:
Eryn Wells 2013-01-23 11:14:33 -08:00
commit 167cd9c78c
3 changed files with 52 additions and 8 deletions

View file

@ -97,7 +97,9 @@ function set_prompt_info
function set_xterm_title
{
# Set xterm and screen titles
[[ -n "$DISPLAY" ]] && print -Pn "\e]2;%n@%m\a"
if [[ -n "$DISPLAY" || -n "$TERM_PROGRAM" ]]; then
print -Pn "\e]2;%n@%m\a"
fi
}