except SunOS only

Calculates ignored users at runtime by extracting them from
passwd database and considering all users with UID < 100
(on Solaris systems) or UID < 500 (everywhere else).

By my timings, this doesn't make it any noticably slower.

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "modules/completion/external"]
 	path = modules/completion/external
 	url = https://github.com/zsh-users/zsh-completions.git
-[submodule "modules/opp/external"]
-	path = modules/opp/external
-	url = https://github.com/hchbaw/opp.zsh.git

modules/completion/init.zsh

@@ -99,14 +99,13 @@ zstyle -e ':completion:*:hosts' hosts 'reply=(
 )'
 
 # Don't complete uninteresting users...
-zstyle ':completion:*:*:*:users' ignored-patterns \
+zstyle ':completion:*:*:*:users' ignored-patterns nobody nobody4 noaccess '_*' \
-  adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
+  $([[ "$OSTYPE" = SunOS ]] && uid_min=100 || uid_min=500
-  dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
+    IFS=:
-  hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
+    while read -r user pass uid remainder; do
-  mailman mailnull mldonkey mysql nagios \
+      [[ "$user" != (\#*|root) ]] && ((uid < uid_min)) && echo $user
-  named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
+    done </etc/passwd
-  operator pcap postfix postgres privoxy pulse pvm quagga radvd \
+  )
-  rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs '_*'
 
 # ... unless we really want to.
 zstyle '*' single-ignored show

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/opp/README.md

@@ -1,19 +0,0 @@
-VIM text objects
-========================
-
-Integrates [opp][1] into Prezto, which implements [vim text objects][2] right into vim mode of prezto.
-
-Due to some conflicts with prezto loading, opp will get compiled during initial run.
-
-
-Authors
--------
-
-*The authors of this module should be contacted via the [issue tracker][3].*
-
-  - [Takeshi Banse](https://github.com/hchbaw)
-
-[1]: https://github.com/hchbaw/opp.zsh
-[2]: http://blog.carbonfive.com/2011/10/17/vim-text-objects-the-definitive-guide/
-[3]: https://github.com/hchbaw/opp.zsh/issues?state=open
-

modules/opp/init.zsh

@@ -1,20 +0,0 @@
-# Vim's text-objects-ish for zsh.
-
-# Author: Takeshi Banse <takebi@laafc.net>
-# License: Public Domain
-
-# Thank you very much, Bram Moolenaar!
-# I want to use the Vim's text-objects in zsh.
-if [[ ! -f ${0:h}/functions/opp.zwc ]] ||
-   [[ ! -f ${0:h}/functions/opp-install.zwc ]]; then
-  (
-    . "${0:h}/external/opp.zsh"
-    . "${0:h}/external/opp/surround.zsh"
-    . "${0:h}/external/opp/textobj-between.zsh"
-    opp-zcompile "${0:h}/external/opp.zsh" ${0:h}/functions > /dev/null
-  )
-  fpath+=${0:h}/functions > /dev/null
-  . ${0:h}/functions/opp-install
-  autoload opp
-fi
-opp-install

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,15 +20,12 @@ following line to *zpreztorc*:
 
     zstyle ':prezto:module:tmux:auto-start' remote 'yes'
 
-In both cases, it will create a background session named _prezto_ if the tmux
+In both cases, it will create a background session named _#Prezto_ and attach
-server is not started.
+every new shell to it.
 
-With `auto-start` enabled, you may want to control how multiple sessions are
+To avoid keeping open sessions, this module sets `destroy-unattached off` on
-managed. The `destroy-unattached` option of tmux controls if the unattached
+the background session and `destroy-unattached on` on every other session
-sessions must be kept alive, making sessions available for later use, configured
+(global setting).
-in *tmux.conf*:
-
-    set-option -g destroy-unattached [on | off]
 
 Aliases
 -------
@@ -44,7 +41,7 @@ connected** to be displayed, which can be fixed by installing
 [reattach-to-user-namespace][3], available in [Homebrew][4], and adding the
 following to *tmux.conf*:
 
-    set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
+   set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
 
 Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion
 about this and Prezto has already been [opened][2].
@@ -57,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,22 +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 start-server
+  tmux_session='prezto'
 
-  # Create a 'prezto' session if no session has been defined in tmux.conf.
+  if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
-  if ! tmux has-session 2> /dev/null; then
+    # Ensure that tmux server is started.
-    tmux_session='prezto'
+    tmux start-server
-    tmux \
+
-      new-session -d -s "$tmux_session" \; \
+    # Disable the destruction of unattached sessions globally.
-      set-option -t "$tmux_session" destroy-unattached off &> /dev/null
+    tmux set-option -g destroy-unattached off &> /dev/null
+
+    # Create a new session.
+    tmux new-session -d -s "$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
 
-  # Attach to the 'prezto' session or to the last session used.
+  exec tmux new-session -t "$tmux_session"
-  exec tmux attach-session
 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'
+