Merge 293828f32a into 291e96dcd0

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%<<'
 }

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
+fi

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' '         __                                     __   '