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.

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/alias.zsh

@@ -32,8 +32,8 @@ alias g='git'
 # Branch (b)
 alias gb='git branch'
 alias gbc='git checkout -b'
-alias gbl='git branch -vv'
+alias gbl='git branch -v'
-alias gbL='git branch -avv'
+alias gbL='git branch -av'
 alias gbx='git branch -d'
 alias gbX='git branch -D'
 alias gbm='git branch -m'

modules/ruby/README.md

@@ -20,6 +20,9 @@ home directory.
 Since RVM is loaded into the shell and is known to override shell commands, it
 may conflict with shell scripts.
 
+Load this module as late as possible when using RVM since RVM will complain if
+it is not first in `$PATH`.
+
 rbenv
 -----
 

modules/screen/init.zsh

@@ -15,7 +15,7 @@ fi
 # Auto Start
 #
 
-if [[ -z "$STY" ]] && ( \
+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/init.zsh

@@ -16,11 +16,11 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" ]] && ( \
+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'
+  tmux_session='prezto'
 
   if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
     # Ensure that tmux server is started.