From fb31140e3edc5ade756d7f55a2c73ce18053fcb7 Mon Sep 17 00:00:00 2001
From: Werner Freund <wsfreund@gmail.com>
Date: Wed, 17 Jun 2015 17:46:39 +0200
Subject: [PATCH 1/3] Added parameter for fixed title

---
 lib/termsupport.zsh              | 6 +++---
 plugins/screen/screen.plugin.zsh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e1c2e2f93..fb65ce44d 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -30,7 +30,7 @@ function omz_termsupport_precmd {
     return
   fi
 
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  title ${MANUAL_TITLE:-$ZSH_THEME_TERM_TAB_TITLE_IDLE} ${MANUAL_TITLE:-$ZSH_THEME_TERM_TITLE_IDLE}
 }
 
 # Runs before executing the command
@@ -43,8 +43,8 @@ function omz_termsupport_preexec {
   setopt extended_glob
 
   # cmd name only, or if this is sudo or ssh, the next cmd
-  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%}
-  local LINE="${2:gs/%/%%}"
+  local CMD=${MANUAL_TITLE:-${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%}}
+  local LINE=${MANUAL_TITLE:-"${2:gs/%/%%}"}
 
   title '$CMD' '%100>...>$LINE%<<'
 }
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index 7009e7a91..3cec8d4f4 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -42,13 +42,13 @@ if [[ "$TERM" == screen* ]]; then
     local -a cmd; cmd=(${(z)1}) # the command string
     eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_EXEC"
     eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_EXEC"
-    screen_set $tab_title $tab_hardstatus
+    screen_set ${MANUAL_TITLE:-$tab_title} ${MANUAL_TITLE:-$tab_hardstatus}
   }
   # called by zsh before showing the prompt
   function precmd()
   {
     eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_PROMPT"
     eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_PROMPT"
-    screen_set $tab_title $tab_hardstatus
+    screen_set ${MANUAL_TITLE:-tab_title} ${MANUAL_TITLE:-$tab_hardstatus}
   }
-fi
\ No newline at end of file
+fi

From eee0128e5aa3ef4711c1cf2d71c3d8c30a531fb1 Mon Sep 17 00:00:00 2001
From: Werner Freund <wsfreund@gmail.com>
Date: Mon, 12 Oct 2015 16:50:14 +0200
Subject: [PATCH 2/3] Some modified changes on screen

---
 lib/termsupport.zsh              | 6 +++---
 plugins/screen/screen.plugin.zsh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 871ab28df..f386e671e 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -56,7 +56,7 @@ function omz_termsupport_precmd {
     return
   fi
 
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  title ${MANUAL_TITLE:-$ZSH_THEME_TERM_TAB_TITLE_IDLE} ${MANUAL_TITLE:-$ZSH_THEME_TERM_TITLE_IDLE}
 }
 
 # Runs before executing the command
@@ -69,8 +69,8 @@ function omz_termsupport_preexec {
   fi
 
   # cmd name only, or if this is sudo or ssh, the next cmd
-  local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}
-  local LINE="${2:gs/%/%%}"
+  local CMD=${MANUAL_TITLE:-${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}}
+  local LINE=${MANUAL_TITLE:-"${2:gs/%/%%}"}
 
   title '$CMD' '%100>...>$LINE%<<'
 }
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index 7009e7a91..3cec8d4f4 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -42,13 +42,13 @@ if [[ "$TERM" == screen* ]]; then
     local -a cmd; cmd=(${(z)1}) # the command string
     eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_EXEC"
     eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_EXEC"
-    screen_set $tab_title $tab_hardstatus
+    screen_set ${MANUAL_TITLE:-$tab_title} ${MANUAL_TITLE:-$tab_hardstatus}
   }
   # called by zsh before showing the prompt
   function precmd()
   {
     eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_PROMPT"
     eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_PROMPT"
-    screen_set $tab_title $tab_hardstatus
+    screen_set ${MANUAL_TITLE:-tab_title} ${MANUAL_TITLE:-$tab_hardstatus}
   }
-fi
\ No newline at end of file
+fi

From 3da2bcae8e59c47575b00bd594fa010178867b78 Mon Sep 17 00:00:00 2001
From: Werner Freund <wsfreund@gmail.com>
Date: Mon, 8 Feb 2016 21:48:42 -0200
Subject: [PATCH 3/3] upgrade points to original project

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index d5e7e8ba8..a8838dbdf 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -22,7 +22,7 @@ fi
 
 printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
 cd "$ZSH"
-if git pull --rebase --stat origin master
+if git pull --rebase --stat upstream master
 then
   printf '%s' "$GREEN"
   printf '%s\n' '         __                                     __   '