Allow perlbrew environment to be loaded via zstyle

modules/git/functions/git-info

@@ -348,13 +348,13 @@ function git-info {
     # Format added.
     if (( added > 0 )); then
       zstyle -s ':prezto:module:git:info:added' format 'added_format'
-      zformat -f added_formatted "$added_format" "a:$added"
+      zformat -f added_formatted "$added_format" "a:$added_format"
     fi
 
     # Format deleted.
     if (( deleted > 0 )); then
       zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
-      zformat -f deleted_formatted "$deleted_format" "d:$deleted"
+      zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
     fi
 
     # Format modified.

modules/perl/README.md

@@ -30,6 +30,10 @@ Perlbrew
 An alternative to the above is to use [Perlbrew][2], which allows for the
 management of multiple, isolated Perl installations in the home directory.
 
+You can specify the perlbrew location so the environment is automatically loaded.
+
+    zstyle ':prezto:module:perl:perlbrew' location '/path/to/perlbrew'
+
 Aliases
 -------
 

modules/perl/init.zsh

@@ -29,6 +29,13 @@ if [[ "$OSTYPE" == darwin* ]]; then
 
   unset perl_path
   unset cache_file
+
+  # Perlbrew
+  zstyle -s ':prezto:module:perl:perlbrew' location '_perlbrew_root' 
+  if [[ -s "${_perlbrew_root}/etc/bashrc" ]]; then
+    export PERLBREW_ROOT="${_perlbrew_root}"
+    source "${_perlbrew_root}/etc/bashrc"
+  fi
 fi
 
 #

modules/python/init.zsh

@@ -16,12 +16,9 @@ elif (( $+commands[pyenv] )); then
   eval "$(pyenv init -)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
-# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
+# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
-# path can be overridden using PYTHONUSERBASE.
 else
-  if [[ -n "$PYTHONUSERBASE" ]]; then
+  if [[ "$OSTYPE" == darwin* ]]; then
-    path=($PYTHONUSERBASE/bin $path)
-  elif [[ "$OSTYPE" == darwin* ]]; then
     path=($HOME/Library/Python/*/bin(N) $path)
   else
     # This is subject to change.

modules/screen/init.zsh

@@ -15,7 +15,7 @@ fi
 # Auto Start
 #
 
-if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \
+if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
 ); then

modules/tmux/README.md

@@ -20,25 +20,12 @@ following line to *zpreztorc*:
 
     zstyle ':prezto:module:tmux:auto-start' remote 'yes'
 
-In both cases the tmux server will be started and a background session
+In both cases, it will create a background session named _#Prezto_ and attach
-named _prezto_ will be created if a session doesn't already exist.
+every new shell to it.
-
-By default every shell shares a set of windows but has an independent
-view. Detaching from one of these sessions removes the view but the
-open windows persist. This is accomplished by setting the
-`destroy-unattached` option to `on` for each session.
-
-Some users prefer that all new shells share the same session so that
-the view for each shell is in sync. This useful for advanced users
-that create multiple sessions and want to manually navigate between
-them. To accomplish this behavior set the `mode` option to `shared` in
-*zpreztorc*,
-
-    zstyle ':prezto:module:tmux:auto-start' mode shared
-
-You can customize the background session by creating a new session in
-your `.tmux.conf` file.
 
+To avoid keeping open sessions, this module sets `destroy-unattached off` on
+the background session and `destroy-unattached on` on every other session
+(global setting).
 
 Aliases
 -------
@@ -67,7 +54,6 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
   - [Colin Hebert](https://github.com/ColinHebert)
   - [Georges Discry](https://github.com/gdiscry)
-  - [Xavier Cambar](https://github.com/xcambar)
 
 [1]: http://tmux.sourceforge.net
 [2]: https://github.com/sorin-ionescu/prezto/issues/62

modules/tmux/init.zsh

@@ -5,7 +5,6 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #   Colin Hebert <hebert.colin@gmail.com>
 #   Georges Discry <georges@discry.be>
-#   Xavier Cambar <xcambar@gmail.com>
 #
 
 # Return if requirements are not found.
@@ -17,29 +16,31 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
+if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
+  tmux_session='prezto'
+
+  if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
+    # Ensure that tmux server is started.
     tmux start-server
 
-  # Create a 'prezto' session if no session has been defined in tmux.conf.
+    # Disable the destruction of unattached sessions globally.
-  if ! tmux has-session 2> /dev/null; then
+    tmux set-option -g destroy-unattached off &> /dev/null
-    tmux \
+
-      new-session -d -s prezto \; \
+    # Create a new session.
-      set-option -t prezto destroy-unattached off &> /dev/null
+    tmux new-session -d -s "$tmux_session"
-  else
+
-    tmux_session
+    # Disable the destruction of the new, unattached session.
+    tmux set-option -t "$tmux_session" destroy-unattached off &> /dev/null
+
+    # Enable the destruction of unattached sessions globally to prevent
+    # an abundance of open, detached sessions.
+    tmux set-option -g destroy-unattached on &> /dev/null
   fi
 
-  if zstyle -t ':prezto:module:tmux:auto-start' mode shared; then
+  exec tmux new-session -t "$tmux_session"
-      # Attach to the 'prezto' session or to the last session used.
-      exec tmux attach
-  else
-      # Find a session to share windows with.
-      tmux_session=`tmux list-sessions -F '#S' | head -n 1`
-      exec tmux new-session -t "$tmux_session"\; set-option destroy-unattached on
-  fi
 fi
 
 #

runcoms/zpreztorc

@@ -152,3 +152,4 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 
 # Auto start a session when Zsh is launched in a SSH connection.
 # zstyle ':prezto:module:tmux:auto-start' remote 'yes'
+