Merge branch 'disable_auto-title' of https://github.com/lorrin/oh-my-zsh into...

Merge branch 'disable_auto-title' of https://github.com/lorrin/oh-my-zsh into lorrin-disable_auto-title

lib/termsupport.zsh

@@ -16,11 +16,15 @@ 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
 }
 
 #Appears at the beginning of (and during) of command execution
 function preexec {
+  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
     local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
     title "$CMD" "%100>...>$2%<<"
+  fi
 }

templates/zshrc.zsh-template

@@ -14,6 +14,9 @@ export ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable colors in ls
 # export DISABLE_LS_COLORS="true"
 
+# Uncomment following line if you want to disable autosetting terminal title.
+# export DISABLE_AUTO_TITLE="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git)