don't overwrite the WORKON_HOME env var if the user has already set it

modules/python/init.zsh

@@ -34,10 +34,11 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
   return 1
 fi
 
-# Load virtualenvwrapper into the shell session.
-if (( $+commands[virtualenvwrapper.sh] )); then
+# Load virtualenvwrapper into the shell session, unless requested not to
+zstyle -t ':prezto:module:python' skip-virtualenvwrapper-init
+if (( $? && $+commands[virtualenvwrapper.sh] )); then
   # Set the directory where virtual environments are stored.
-  export WORKON_HOME="$HOME/.virtualenvs"
+  export WORKON_HOME="${WORKON_HOME:-$HOME/.virtualenvs}"
 
   # Disable the virtualenv prompt.
   VIRTUAL_ENV_DISABLE_PROMPT=1

modules/terminal/README.md

@@ -13,19 +13,14 @@ directory, add the following to *zpreztorc*:
 
     zstyle ':prezto:module:terminal' auto-title 'yes'
 
-Auto titling is disabled inside terminal multiplexers (except inside dvtm)
-since it interferes with window names defined in configuration files and
-profile managers. This can be overridden by setting it to `always`.
-
-    zstyle ':prezto:module:terminal' auto-title 'always'
-
-### Title formats
+Auto titling is disabled inside terminal multiplexers, except inside dvtm, since
+it interferes with window names defined in configuration files and profile
+managers.
 
 To format terminal window and tab titles, add the following to *zpreztorc*:
 
     zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
     zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
-    zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
 
 `%s` will be replaced with the current working directory path or the currently
 executing program name.
@@ -36,8 +31,7 @@ Functions
 ---------
 
 - `set-tab-title` sets the terminal tab title.
-- `set-window-title` sets the terminal window title.
-- `set-multiplexer-title` sets the terminal multiplexer title.
+- `set-window-title` sets the terminal or terminal multiplexer window title.
 
 Authors
 -------
@@ -45,7 +39,6 @@ Authors
 *The authors of this module should be contacted via the [issue tracker][2].*
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
-  - [Olaf Conradi](https://github.com/oohlaf)
 
 [1]: http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Expansion-of-Prompt-Sequences
 [2]: https://github.com/sorin-ionescu/prezto/issues

modules/terminal/init.zsh

@@ -3,7 +3,6 @@
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
-#   Olaf Conradi <olaf@conradi.org>
 #
 
 # Return if requirements are not found.
@@ -11,12 +10,19 @@ if [[ "$TERM" == (dumb|linux|*bsd*) ]]; then
   return 1
 fi
 
-# Sets the terminal window title.
+# Sets the terminal or terminal multiplexer window title.
 function set-window-title {
   local title_format{,ted}
   zstyle -s ':prezto:module:terminal:window-title' format 'title_format' || title_format="%s"
   zformat -f title_formatted "$title_format" "s:$argv"
-  printf '\e]2;%s\a' "${(V%)title_formatted}"
+
+  if [[ "$TERM" == screen* ]]; then
+    title_format="\ek%s\e\\"
+  else
+    title_format="\e]2;%s\a"
+  fi
+
+  printf "$title_format" "${(V%)title_formatted}"
 }
 
 # Sets the terminal tab title.
@@ -24,15 +30,8 @@ function set-tab-title {
   local title_format{,ted}
   zstyle -s ':prezto:module:terminal:tab-title' format 'title_format' || title_format="%s"
   zformat -f title_formatted "$title_format" "s:$argv"
-  printf '\e]1;%s\a' "${(V%)title_formatted}"
-}
 
-# Sets the terminal multiplexer tab title.
-function set-multiplexer-title {
-  local title_format{,ted}
-  zstyle -s ':prezto:module:terminal:multiplexer-title' format 'title_format' || title_format="%s"
-  zformat -f title_formatted "$title_format" "s:$argv"
-  printf '\ek%s\e\\' "${(V%)title_formatted}"
+  printf "\e]1;%s\a" ${(V%)title_formatted}
 }
 
 # Sets the tab and window titles with a given command.
@@ -60,11 +59,8 @@ function _terminal-set-titles-with-command {
     local truncated_cmd="${cmd/(#m)?(#c15,)/${MATCH[1,12]}...}"
     unset MATCH
 
-    if [[ "$TERM" == screen* ]]; then
-      set-multiplexer-title "$truncated_cmd"
-    fi
-    set-tab-title "$truncated_cmd"
     set-window-title "$cmd"
+    set-tab-title "$truncated_cmd"
   fi
 }
 
@@ -78,11 +74,8 @@ function _terminal-set-titles-with-path {
   local truncated_path="${abbreviated_path/(#m)?(#c15,)/...${MATCH[-12,-1]}}"
   unset MATCH
 
-  if [[ "$TERM" == screen* ]]; then
-    set-multiplexer-title "$truncated_path"
-  fi
-  set-tab-title "$truncated_path"
   set-window-title "$abbreviated_path"
+  set-tab-title "$truncated_path"
 }
 
 # Do not override precmd/preexec; append to the hook array.
@@ -117,13 +110,12 @@ then
 fi
 
 # Set up non-Apple terminals.
-if zstyle -t ':prezto:module:terminal' auto-title 'always' \
-  || (zstyle -t ':prezto:module:terminal' auto-title \
-    && ( ! [[ -n "$STY" || -n "$TMUX" ]] ))
+if zstyle -t ':prezto:module:terminal' auto-title \
+  && ( ! [[ -n "$STY" || -n "$TMUX" ]] )
 then
-  # Sets titles before the prompt is displayed.
+  # Sets the tab and window titles before the prompt is displayed.
   add-zsh-hook precmd _terminal-set-titles-with-path
 
-  # Sets titles before command execution.
+  # Sets the tab and window titles before command execution.
   add-zsh-hook preexec _terminal-set-titles-with-command
 fi

runcoms/zpreztorc

@@ -143,9 +143,6 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 # Set the tab title format.
 # zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
 
-# Set the terminal multiplexer title format.
-# zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
-
 #
 # Tmux
 #