From 1c4c66c448d65b2fe21eddb717ef3d9fa3b9a39c Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Mon, 2 Apr 2012 11:36:02 -0400
Subject: [PATCH] [Fix #83] Always respect the auto-title option

---
 terminal.zsh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/terminal.zsh b/terminal.zsh
index 7679d83..6e9d3f2 100644
--- a/terminal.zsh
+++ b/terminal.zsh
@@ -78,15 +78,17 @@ autoload -Uz add-zsh-hook
 
 # Sets the tab and window titles before the prompt is displayed.
 function set-title-precmd {
-  if [[ "$TERM_PROGRAM" != "Apple_Terminal" ]] && zstyle -t ':omz:terminal' auto-title; then
-    set-window-title "${(%):-%~}"
-    for kind in tab screen; do
-      # Left-truncate the current working directory to 15 characters.
-      set-${kind}-title "${(%):-%15<...<%~%<<}"
-    done
-  else
-    # Set Apple Terminal current working directory.
-    printf '\e]7;%s\a' "file://$HOST${PWD// /%20}"
+  if zstyle -t ':omz:terminal' auto-title; then
+    if [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]]; then
+      # Set the current working directory in Apple Terminal.
+      printf '\e]7;%s\a' "file://$HOST${PWD// /%20}"
+    else
+      set-window-title "${(%):-%~}"
+      for kind in tab screen; do
+        # Left-truncate the current working directory to 15 characters.
+        set-${kind}-title "${(%):-%15<...<%~%<<}"
+      done
+    fi
   fi
 }
 add-zsh-hook precmd set-title-precmd