From 5d90f58b37fd67184c4aed3d81a1d3703f8fe832 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 20:21:13 +0200
Subject: [PATCH 0001/1378] I should not have merged this here.

---
 plugins/git-svn/.gitignore         |  1 -
 plugins/git-svn/git-svn.plugin.zsh | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 plugins/git-svn/.gitignore
 delete mode 100644 plugins/git-svn/git-svn.plugin.zsh

diff --git a/plugins/git-svn/.gitignore b/plugins/git-svn/.gitignore
deleted file mode 100644
index bf5e1a14f..000000000
--- a/plugins/git-svn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-git-svn-clone-externals
diff --git a/plugins/git-svn/git-svn.plugin.zsh b/plugins/git-svn/git-svn.plugin.zsh
deleted file mode 100644
index 062d63e05..000000000
--- a/plugins/git-svn/git-svn.plugin.zsh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-if ! [ -d "$ZSH/plugins/git-svn/git-svn-clone-externals" ] ;then
-    git clone https://github.com/andrep/git-svn-clone-externals.git
-fi
-export PATH="$ZSH/plugins/git-svn/git-svn-clone-externals:$PATH"
-
-function git_svn_update {
-    (cd "$ZSH/plugins/git-svn/git-svn-clone-externals" && \
-        git pull origin master)
-}

From a183bcbc6d8d61bd9c1077b45d1c5b3239e96a71 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tristan.carel@gmail.com>
Date: Thu, 14 Apr 2011 07:17:10 +0200
Subject: [PATCH 0002/1378] More comments

---
 plugins/emacs/emacs.plugin.zsh | 25 ++++++++++++++++++++++---
 plugins/emacs/emacsclient.sh   |  1 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index bca79e70e..62d9fbccc 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -1,11 +1,30 @@
-# Use daemon capabilities of emacs 23
+# Emacs 23 daemon capability is a killing feature.
+# One emacs process handles all your frames whether
+# you use a frame opened in a terminal via a ssh connection or X frames 
+# opened on the same host.
+
+# Benefits are multiple
+# - You don't have the cost of starting Emacs all the time anymore
+# - Opening a file is as fast as Emacs does not have anything else to do.
+# - You can share opened buffered across opened frames.
+# - Configuration changes made at runtime are applied to all frames.
+
+
 if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     export EDITOR="$ZSH/plugins/emacs/emacsclient.sh"
     alias emacs="$EDITOR --no-wait"
     alias e=emacs
 
+    # same than M-x eval but from outside Emacs.
+    alias eeval="emacs --eval"
+    # create a new X frame
+    alias eframe='emacsclient --alternate-editor "" --create-frame'
+
+    # to code all night long
     alias emasc=emacs
     alias emcas=emacs
-    # create a new X frame
-    alias emacs_frame='emacsclient --alternate-editor "" --create-frame'
 fi
+
+## Local Variables:
+## mode: sh
+## End:
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 3475926a6..b098fd24a 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -6,5 +6,6 @@ x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 if [ -z "$x" ] ;then
     emacsclient --alternate-editor "" --create-frame $@
 else
+    # prevent creating another X frame if there is at least one present.
     emacsclient --alternate-editor "" $@
 fi

From 49c0a1381a7bd48464a1c33cac6e09770749f795 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Fri, 15 Apr 2011 18:13:01 +0200
Subject: [PATCH 0003/1378] - Fix pass of parameters - Add new function `ecd'.

---
 plugins/emacs/emacs.plugin.zsh | 18 +++++++++++++++++-
 plugins/emacs/emacsclient.sh   |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 62d9fbccc..58043040e 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -1,6 +1,6 @@
 # Emacs 23 daemon capability is a killing feature.
 # One emacs process handles all your frames whether
-# you use a frame opened in a terminal via a ssh connection or X frames 
+# you use a frame opened in a terminal via a ssh connection or X frames
 # opened on the same host.
 
 # Benefits are multiple
@@ -23,8 +23,24 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     # to code all night long
     alias emasc=emacs
     alias emcas=emacs
+
+    # jump to the directory of the current buffer
+    function ecd {
+        local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
+               (if buf-name
+                 (file-name-directory buf-name)))"
+
+        local dir=`$EDITOR --eval "$cmd" | tr -d \"`
+        if [ -n "$dir" ] ;then
+            cd "$dir"
+        else
+            echo "can not deduce current buffer filename." >/dev/stderr
+            return 1
+        fi
+    }
 fi
 
+
 ## Local Variables:
 ## mode: sh
 ## End:
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index b098fd24a..7fc2ad202 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -4,8 +4,8 @@
 
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 if [ -z "$x" ] ;then
-    emacsclient --alternate-editor "" --create-frame $@
+    emacsclient --alternate-editor "" --create-frame "$@"
 else
     # prevent creating another X frame if there is at least one present.
-    emacsclient --alternate-editor "" $@
+    emacsclient --alternate-editor "" "$@"
 fi

From 9b29136ec65953004f064ec4a834ae7b1f2949e7 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Fri, 15 Apr 2011 18:21:22 +0200
Subject: [PATCH 0004/1378] Fix alias `eeval'

---
 plugins/emacs/emacs.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 58043040e..fc6b8865e 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -16,7 +16,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     alias e=emacs
 
     # same than M-x eval but from outside Emacs.
-    alias eeval="emacs --eval"
+    alias eeval="$EDITOR --eval"
     # create a new X frame
     alias eframe='emacsclient --alternate-editor "" --create-frame'
 

From 6f1929f822d24c6cfc9cecf574cb21c6b3817bb5 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Fri, 15 Apr 2011 18:22:27 +0200
Subject: [PATCH 0005/1378] Fix indentation

---
 plugins/emacs/emacs.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index fc6b8865e..3e45e54d0 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -27,8 +27,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     # jump to the directory of the current buffer
     function ecd {
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
-               (if buf-name
-                 (file-name-directory buf-name)))"
+                     (if buf-name (file-name-directory buf-name)))"
 
         local dir=`$EDITOR --eval "$cmd" | tr -d \"`
         if [ -n "$dir" ] ;then

From e5f77b8f0496e5915383f2f456f91a20f5ff4ace Mon Sep 17 00:00:00 2001
From: Justin Riley <justin.t.riley@gmail.com>
Date: Thu, 28 Apr 2011 15:05:52 -0400
Subject: [PATCH 0006/1378] add git-prompt plugin from
 olivierverdier/zsh-git-prompt

---
 plugins/git-prompt/git-prompt.plugin.zsh | 60 +++++++++++++++++++++
 plugins/git-prompt/gitstatus.py          | 68 ++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 plugins/git-prompt/git-prompt.plugin.zsh
 create mode 100644 plugins/git-prompt/gitstatus.py

diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
new file mode 100644
index 000000000..01b8a88d9
--- /dev/null
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -0,0 +1,60 @@
+# ZSH Git Prompt Plugin from:
+# http://github.com/olivierverdier/zsh-git-prompt
+#
+export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt
+# Initialize colors.
+autoload -U colors
+colors
+
+# Allow for functions in the prompt.
+setopt PROMPT_SUBST
+
+## Enable auto-execution of functions.
+typeset -ga preexec_functions
+typeset -ga precmd_functions
+typeset -ga chpwd_functions
+
+# Append git functions needed for prompt.
+preexec_functions+='preexec_update_git_vars'
+precmd_functions+='precmd_update_git_vars'
+chpwd_functions+='chpwd_update_git_vars'
+
+## Function definitions
+function preexec_update_git_vars() {
+    case "$2" in
+        git*)
+        __EXECUTED_GIT_COMMAND=1
+        ;;
+    esac
+}
+
+function precmd_update_git_vars() {
+    if [ -n "$__EXECUTED_GIT_COMMAND" ]; then
+        update_current_git_vars
+        unset __EXECUTED_GIT_COMMAND
+    fi
+}
+
+function chpwd_update_git_vars() {
+    update_current_git_vars
+}
+
+function update_current_git_vars() {
+    unset __CURRENT_GIT_STATUS
+
+    local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
+    _GIT_STATUS=`python ${gitstatus}`
+    __CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}")
+}
+
+function prompt_git_info() {
+    if [ -n "$__CURRENT_GIT_STATUS" ]; then
+        echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})"
+    fi
+}
+
+# Set the prompt.
+#PROMPT='%B%m%~%b$(prompt_git_info) %# '
+# for a right prompt:
+#RPROMPT='%b$(prompt_git_info)'
+RPROMPT='$(prompt_git_info)'
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
new file mode 100644
index 000000000..ee6fab9bd
--- /dev/null
+++ b/plugins/git-prompt/gitstatus.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+# change those symbols to whatever you prefer
+symbols = {'ahead of': '↑', 'behind': '↓', 'staged':'♦', 'changed':'‣', 'untracked':'…', 'clean':'⚡', 'unmerged':'≠', 'sha1':':'}
+
+from subprocess import Popen, PIPE
+
+output,error = Popen(['git','status'], stdout=PIPE, stderr=PIPE).communicate()
+
+if error:
+	import sys
+	sys.exit(0)
+lines = output.splitlines()
+
+import re
+behead_re = re.compile(r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
+diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
+
+status = ''
+staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE)
+changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
+untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
+unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
+
+def execute(*command):
+	out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
+	if not err:
+		nb = len(out.splitlines())
+	else:
+		nb = '?'
+	return nb
+
+if staged.search(output):
+	nb = execute(['git','diff','--staged','--name-only','--diff-filter=ACDMRT'])
+	status += '%s%s' % (symbols['staged'], nb)
+if unmerged.search(output):
+	nb = execute(['git','diff', '--staged','--name-only', '--diff-filter=U'])
+	status += '%s%s' % (symbols['unmerged'], nb)
+if changed.search(output):
+	nb = execute(['git','diff','--name-only', '--diff-filter=ACDMRT'])
+	status += '%s%s' % (symbols['changed'], nb)
+if untracked.search(output):
+## 		nb = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
+## 		status += "%s" % (symbols['untracked']*(nb//3 + 1), )
+	status += symbols['untracked']
+if status == '':
+	status = symbols['clean']
+
+remote = ''
+
+bline = lines[0]
+if bline.find('Not currently on any branch') != -1:
+	branch = symbols['sha1']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
+else:
+	branch = bline.split(' ')[3]
+	bstatusline = lines[1]
+	match = behead_re.match(bstatusline)
+	if match:
+		remote = symbols[match.groups()[0]]
+		remote += match.groups()[2]
+	elif lines[2:]:
+		div_match = diverge_re.match(lines[2])
+	 	if div_match:
+			remote = "{behind}{1}{ahead of}{0}".format(*div_match.groups(), **symbols)
+
+print '\n'.join([branch,remote,status])
+

From 6c95c4b68a97b41682084834b6e30822b6f06ab9 Mon Sep 17 00:00:00 2001
From: Ryan Doenges <rhdoenges@gmail.com>
Date: Sun, 12 Jun 2011 13:57:00 -0700
Subject: [PATCH 0007/1378] use /home/ryan/d/.oh-my-zsh instead of ~/.oh-my-zsh
 for cache

---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index fdd0a8536..8c0e7701b 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -44,7 +44,7 @@ zstyle ':completion:*:hosts' hosts $hosts
 
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1
-zstyle ':completion::complete:*' cache-path ~/.oh-my-zsh/cache/
+zstyle ':completion::complete:*' cache-path $ZSH/cache/
 
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \

From f20cfc68e81be754521672541fd6ff25983f402c Mon Sep 17 00:00:00 2001
From: Randy Hancock <rhancock@genome.wustl.edu>
Date: Mon, 1 Aug 2011 10:10:42 -0500
Subject: [PATCH 0008/1378] Fix edit-command-line binding

This binding doesn't work when the edit-command-line.zsh file is loaded
after the key-bindings.zsh file because 'bindkey -e' in key-bindings.zsh
resets the binding. Moving the bindings to they key-bindings.zsh file
and removing edit-command-line.zsh.
---
 lib/edit-command-line.zsh | 3 ---
 lib/key-bindings.zsh      | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 lib/edit-command-line.zsh

diff --git a/lib/edit-command-line.zsh b/lib/edit-command-line.zsh
deleted file mode 100644
index db2000325..000000000
--- a/lib/edit-command-line.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-autoload -U edit-command-line
-zle -N edit-command-line
-bindkey '\C-x\C-e' edit-command-line
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9c2dda35a..d9611b557 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -26,6 +26,11 @@ bindkey "^[[3~" delete-char
 bindkey "^[3;5~" delete-char
 bindkey "\e[3~" delete-char
 
+# Edit the current command line in $EDITOR
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line
+
 # consider emacs keybindings:
 
 #bindkey -e  ## emacs key bindings

From 0061dda057bb3b8b67f2bf06b374ab0b786e80fe Mon Sep 17 00:00:00 2001
From: artemk <kramarenko.artyom@gmail.com>
Date: Sat, 6 Aug 2011 16:46:37 +0300
Subject: [PATCH 0009/1378] Add bundle open alias, which open gem using EDITOR
 var

---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index f005700ff..af5bf2b3b 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -3,6 +3,7 @@ alias bi="bundle install"
 alias bl="bundle list"
 alias bu="bundle update"
 alias bp="bundle package"
+alias bo="bundle open"
 
 # The following is based on https://github.com/gma/bundler-exec
 

From 574de93efbba22db0ec816ecec717d502dfa333e Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Tue, 6 Sep 2011 10:50:53 +0200
Subject: [PATCH 0010/1378] New function `efile`

---
 plugins/emacs/emacs.plugin.zsh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 3e45e54d0..737abe9d6 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -24,14 +24,22 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     alias emasc=emacs
     alias emcas=emacs
 
-    # jump to the directory of the current buffer
+    # Write to standard output the path to the file
+    # opened in the current buffer.
+    function efile {
+        local cmd="(buffer-file-name (window-buffer))"
+        $EDITOR --eval "$cmd" | tr -d \"
+    }
+
+    # display the directory of the file
+    # opened in the the current buffer
     function ecd {
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
                      (if buf-name (file-name-directory buf-name)))"
 
         local dir=`$EDITOR --eval "$cmd" | tr -d \"`
         if [ -n "$dir" ] ;then
-            cd "$dir"
+            echo "$dir"
         else
             echo "can not deduce current buffer filename." >/dev/stderr
             return 1
@@ -39,7 +47,6 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     }
 fi
 
-
 ## Local Variables:
 ## mode: sh
 ## End:

From deb8543bb48eb8bde85e2285ac9ce276113c433b Mon Sep 17 00:00:00 2001
From: "Marco A. Peraza" <marcoaperaza@gmail.com>
Date: Thu, 29 Sep 2011 14:39:09 -0400
Subject: [PATCH 0011/1378] Show if you're ahead of remote in the wedisagree
 theme

---
 themes/wedisagree.zsh-theme | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 7cb27934d..9bdbce40d 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -25,7 +25,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 
 # The right-hand prompt
 
-RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}'
+RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
 
 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
 # %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
@@ -46,6 +46,7 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡"  # ⓜ ⑁
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙"
 
 # More symbols to choose from:
 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
@@ -104,4 +105,4 @@ function git_time_since_commit() {
             echo "($(rvm_gemset)$COLOR~|"
         fi
     fi
-}
\ No newline at end of file
+}

From de29ef809dad9c1a1190a4b670cbb30b8b578f3c Mon Sep 17 00:00:00 2001
From: Jason Whittle <jason.whittle@gmail.com>
Date: Wed, 5 Oct 2011 00:57:48 -0300
Subject: [PATCH 0012/1378] Change default zshrc to export $ZSH (as required by
 check_for_upgrade.sh).

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1ab40aba6..6f0529972 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,5 +1,5 @@
 # Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
+export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/

From 7066bf7c6b522af9147ebf03c00361c4c6490d42 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Mon, 10 Oct 2011 14:54:20 +0200
Subject: [PATCH 0013/1378] Fix builtin `ecd' when file path contains space
 characters.

---
 plugins/emacs/emacs.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 737abe9d6..e22f10740 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -31,13 +31,13 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
         $EDITOR --eval "$cmd" | tr -d \"
     }
 
-    # display the directory of the file
+    # Write to standard output the directory of the file
     # opened in the the current buffer
     function ecd {
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
                      (if buf-name (file-name-directory buf-name)))"
 
-        local dir=`$EDITOR --eval "$cmd" | tr -d \"`
+        local dir="$($EDITOR --eval $cmd | tr -d \")"
         if [ -n "$dir" ] ;then
             echo "$dir"
         else

From 3a408f326f1436a81ae481610c76c8938903df4f Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Mon, 10 Oct 2011 18:04:13 +0200
Subject: [PATCH 0014/1378] Comment

---
 plugins/emacs/emacsclient.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 7fc2ad202..38d419813 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-# Starts emacs daemon if not already started.
-
+# get list of available X windows.
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
+
 if [ -z "$x" ] ;then
+    # Create one if there is no X window yet.
     emacsclient --alternate-editor "" --create-frame "$@"
 else
     # prevent creating another X frame if there is at least one present.

From a01b1fefe63101fdc36291d0ec2097bdc3994f22 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Mon, 10 Oct 2011 18:04:24 +0200
Subject: [PATCH 0015/1378] Do not overwrite EDITOR environment variable if
 already defined.

---
 plugins/emacs/emacs.plugin.zsh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index e22f10740..a3f0085a8 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -11,12 +11,16 @@
 
 
 if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
-    export EDITOR="$ZSH/plugins/emacs/emacsclient.sh"
-    alias emacs="$EDITOR --no-wait"
+    export EMACS_PLUGIN_LAUNCHER="$ZSH/plugins/emacs/emacsclient.sh"
+
+    # set EDITOR if not already defined.
+    export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
+
+    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
     alias e=emacs
 
     # same than M-x eval but from outside Emacs.
-    alias eeval="$EDITOR --eval"
+    alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
     # create a new X frame
     alias eframe='emacsclient --alternate-editor "" --create-frame'
 
@@ -28,7 +32,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
     # opened in the current buffer.
     function efile {
         local cmd="(buffer-file-name (window-buffer))"
-        $EDITOR --eval "$cmd" | tr -d \"
+        "$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \"
     }
 
     # Write to standard output the directory of the file
@@ -37,7 +41,7 @@ if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
         local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
                      (if buf-name (file-name-directory buf-name)))"
 
-        local dir="$($EDITOR --eval $cmd | tr -d \")"
+        local dir="$($EMACS_PLUGIN_LAUNCHER --eval $cmd | tr -d \")"
         if [ -n "$dir" ] ;then
             echo "$dir"
         else

From be6f0c90b8f7d56d812a0938cb2f6ef1a393c36c Mon Sep 17 00:00:00 2001
From: Fredrik Wallgren <fredrik.wallgren@gmail.com>
Date: Sat, 15 Oct 2011 23:31:27 +0200
Subject: [PATCH 0016/1378] Update the script to account for the changes in
 0.1.7 where .gas is a directory

---
 plugins/gas/_gas | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/gas/_gas b/plugins/gas/_gas
index befdc9459..23e6d99aa 100644
--- a/plugins/gas/_gas
+++ b/plugins/gas/_gas
@@ -13,6 +13,7 @@ case $state in
 		cmds=(
             "version:Prints Gas's version"
             "use:Uses author"
+            "ssh:Creates a new ssh key for an existing gas author"
             "show:Shows your current user"
             "list:Lists your authors"
             "import:Imports current user to gasconfig"
@@ -25,8 +26,12 @@ case $state in
 	args)
 		case $line[1] in
 			(use|delete)
-				_values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
-				;;
+        VERSION=$(gas -v)
+        if [[ $VERSION == <1->.*.* ]] || [[ $VERSION == 0.<2->.* ]] || [[ $VERSION == 0.1.<6-> ]] then
+          _values -S , 'authors' $(cat ~/.gas/gas.authors | sed -n -e 's/^.*\[\(.*\)\]/\1/p') && ret=0
+        else
+				  _values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
+        fi
 		esac
 		;;
 esac

From 40508b79a4d25b0548e771fb3698675595230a04 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Thu, 20 Oct 2011 13:10:20 +0200
Subject: [PATCH 0017/1378] Add zsh_reload which provides src function, this
 function will source .zshrc and rebuilds cache

---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/zsh_reload/zsh_reload.plugin.zsh

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
new file mode 100644
index 000000000..a435dbc8d
--- /dev/null
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -0,0 +1,13 @@
+zsh_cache=$HOME/.zsh_cache
+mkdir -p $zsh_cache
+
+# reload zshrc
+function src()
+{
+  autoload -U compinit zrecompile
+  compinit -d $zsh_cache/zcomp-$HOST
+  for f in $HOME/.zshrc $zsh_cache/zcomp-$HOST; do
+    zrecompile -p $f && rm -f $f.zwc.old
+  done
+  source ~/.zshrc
+}
\ No newline at end of file

From 9e3776f1ecbaa29d646cdfe8fc204597ca98746c Mon Sep 17 00:00:00 2001
From: Max Masnick <max@masnick.me>
Date: Sun, 30 Oct 2011 21:43:53 -0400
Subject: [PATCH 0018/1378] update fino theme to work with rbenv

also fix bug where prompt char did not reflect
whether or not you were in a git repo.
---
 themes/fino.zsh-theme | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 17cf59708..a7a63f661 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -1,7 +1,7 @@
 # Fino theme by Max Masnick (http://max.masnick.me)
 
 # Use with a dark background and 256-color terminal!
-# Meant for people with RVM and git. Tested only on OS X 10.7.
+# Meant for people with rbenv and git. Tested only on OS X 10.7.
 
 # You can set your computer name in the ~/.box-name file if you want.
 
@@ -11,27 +11,24 @@
 #
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
-function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
-}
 
 function prompt_char {
-    git branch >/dev/null 2>/dev/null && echo '±' && return
-    echo '○'
+  git branch >/dev/null 2>/dev/null && echo "±" && return
+  echo '○'
 }
 
 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 
-
-local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
 local current_dir='${PWD/#$HOME/~}'
 local git_info='$(git_prompt_info)'
+local prompt_char='$(prompt_char)'
+local rbenv_version='$(rbenv version-name)'
 
 
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby}
-╰─$(virtualenv_info)$(prompt_char) "
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ‹${rbenv_version}›%{$reset_color%}
+╰─${prompt_char} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From 914e1b52583e09298f10fab7a301711bd9613ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20M-B?= <essembeh@gmail.com>
Date: Sat, 5 Nov 2011 00:34:15 +0100
Subject: [PATCH 0019/1378] Adding custom theme

---
 themes/essembeh.zsh-theme | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 themes/essembeh.zsh-theme

diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
new file mode 100644
index 000000000..f9cd6c241
--- /dev/null
+++ b/themes/essembeh.zsh-theme
@@ -0,0 +1,29 @@
+# Theme with full path names and hostname
+# Handy if you work on different servers all the time;
+
+
+local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
+
+function my_git_prompt_info() {
+	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+	GIT_STATUS=$(git_prompt_status)
+	[[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS"
+	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+LOGIN_COLOR=green
+test -n "$SSH_CONNECTION" && LOGIN_COLOR=red
+test $UID -eq 0 && LOGIN_COLOR=pink
+
+PROMPT='%{$fg[$LOGIN_COLOR]%}%B%n@%M:%{$fg[yellow]%}%B%~%{$reset_color%}%b $(my_git_prompt_info)%(!.#.$) '
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
+ZSH_THEME_GIT_PROMPT_ADDED="+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="*"
+ZSH_THEME_GIT_PROMPT_RENAMED="~"
+ZSH_THEME_GIT_PROMPT_DELETED="!"
+ZSH_THEME_GIT_PROMPT_UNMERGED="?"
+

From c4434d2ddedd62737ad3f99111ef47d722e2b74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20M-B?= <essembeh@gmail.com>
Date: Sat, 5 Nov 2011 00:34:37 +0100
Subject: [PATCH 0020/1378] Update completion for SSH

Add all hosts found in ~/.ssh/config.
Tip found on: http://www.nerux.org/wiki/OpenSSH#coupler_avec_zsh_completion
---
 lib/completion.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index b3cc91822..dab9bb1d3 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -33,14 +33,17 @@ cdpath=(.)
 
 # use /etc/hosts and known_hosts for hostname completion
 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
+[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
 hosts=(
+  "$_ssh_config[@]"
   "$_ssh_hosts[@]"
   "$_etc_hosts[@]"
   `hostname`
   localhost
 )
 zstyle ':completion:*:hosts' hosts $hosts
+zstyle ':completion:*' users off
 
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1

From 8e6ce534a2cfa91d6398fecf42c4149fa1e5294f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20M-B?= <essembeh@gmail.com>
Date: Wed, 16 Nov 2011 19:44:02 +0100
Subject: [PATCH 0021/1378] Update theme

Use different colors in case of root or ssh connection for prompt.
---
 themes/essembeh.zsh-theme | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index f9cd6c241..8c98ea1ed 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -11,14 +11,16 @@ function my_git_prompt_info() {
 	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
-LOGIN_COLOR=green
-test -n "$SSH_CONNECTION" && LOGIN_COLOR=red
-test $UID -eq 0 && LOGIN_COLOR=pink
-
-PROMPT='%{$fg[$LOGIN_COLOR]%}%B%n@%M:%{$fg[yellow]%}%B%~%{$reset_color%}%b $(my_git_prompt_info)%(!.#.$) '
+# Colored prompt
+ZSH_THEME_COLOR_USER="green" 
+ZSH_THEME_COLOR_HOST="green" 
+ZSH_THEME_COLOR_PWD="yellow" 
+test -n "$SSH_CONNECTION" && ZSH_THEME_COLOR_USER="red" && ZSH_THEME_COLOR_HOST="red"
+test `id -u` = 0 && ZSH_THEME_COLOR_USER="magenta" && ZSH_THEME_COLOR_HOST="magenta"
+PROMPT='%{$fg_bold[$ZSH_THEME_COLOR_USER]%}%n@%{$fg_bold[$ZSH_THEME_COLOR_HOST]%}%M%{$reset_color%}:%{$fg_bold[$ZSH_THEME_COLOR_PWD]%}%~%{$reset_color%} $(my_git_prompt_info)%(!.#.$) '
 RPS1="${return_code}"
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
 ZSH_THEME_GIT_PROMPT_ADDED="+"

From 20b025ba2cd419a99630458052bfa9a9e8c99e91 Mon Sep 17 00:00:00 2001
From: Ian Yang <me@iany.me>
Date: Fri, 2 Dec 2011 18:32:15 +0800
Subject: [PATCH 0022/1378] tmuxinator completion

A utility to automate tmux session creation

https://github.com/aziz/tmuxinator
---
 plugins/tmuxinator/_tmuxinator | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 plugins/tmuxinator/_tmuxinator

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
new file mode 100644
index 000000000..f0ff304dd
--- /dev/null
+++ b/plugins/tmuxinator/_tmuxinator
@@ -0,0 +1,36 @@
+#compdef tmuxinator
+#autoload
+
+local curcontext="$curcontext" state line ret=1
+local -a _configs
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "tmuxinator command" \
+        "start[start a tmux session using project's tmuxinator config]" \
+        "open[create a new project file and open it in your editor]" \
+        "copy[copy source_project project file to a new project called new_project]" \
+        "delete[deletes the project called project_name]" \
+        "implode[deletes all existing projects!]" \
+        "list[list all existing projects]" \
+        "doctor[look for problems in your configuration]" \
+        "help[shows this help document]" \
+        "version[shows tmuxinator version number]"
+    ret=0
+    ;;
+  args)
+    case $line[1] in
+      start|open|copy|delete)
+        _configs=(`tmuxinator list | sed -n 's/^[ \t]\+//p'`)
+        _values 'configs' $_configs
+        ret=0
+        ;;
+    esac
+    ;;
+esac
+
+return ret
\ No newline at end of file

From 30890b9eb9e1b6fc4b553d94a97424049bd6003e Mon Sep 17 00:00:00 2001
From: Jason Gill <jasongill@gmail.com>
Date: Wed, 16 Nov 2011 15:51:30 -0500
Subject: [PATCH 0023/1378] Fixes and improves the behavior of the tm command

---
 plugins/textmate/textmate.plugin.zsh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index a11a097f5..773c4f8d2 100644
--- a/plugins/textmate/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
@@ -6,7 +6,16 @@ alias etts='mate app config lib db public script spec test vendor/plugins vendor
 # Edit Ruby app in TextMate
 alias mr='mate CHANGELOG app config db lib public script spec test'
 
+# If the tm command is called without an argument, open TextMate in the current directory
+# If tm is passed a directory, cd to it and open it in TextMate
+# If tm is passed a file, open it in TextMate
 function tm() {
-  cd $1
-  mate $1
+	if [[ -z $1 ]]; then
+		mate .
+	else
+		mate $1
+		if [[ -d $1 ]]; then
+			cd $1
+		fi
+	fi
 }

From 70e51186ec3f67b1126339c7570bd9f6549f0408 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 16 Dec 2011 14:01:59 +0100
Subject: [PATCH 0024/1378] Only `setopt correct`, not "correct_all".

Using the correct_all option is too distracting, and needs a lot of
`nocorrect` aliases to work around this.

Using only "correct" to correct the command itself is more friendly.
---
 lib/correction.zsh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index fc60dcdbd..176ec16d5 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,10 +1,2 @@
-setopt correct_all
-
-alias man='nocorrect man'
-alias mv='nocorrect mv'
-alias mysql='nocorrect mysql'
-alias mkdir='nocorrect mkdir'
-alias gist='nocorrect gist'
-alias heroku='nocorrect heroku'
-alias ebuild='nocorrect ebuild'
-alias hpodder='nocorrect hpodder'
+# correct commands, but not any arguments (correct_all would do that)
+setopt correct

From 98578ec2412d5b5d2e105f3ddd0d41eb21c3de14 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 16 Dec 2011 14:21:45 +0100
Subject: [PATCH 0025/1378] `setopt append_history` is not necessary.

Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.
---
 lib/history.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 876936b87..b162a5577 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -3,7 +3,6 @@ HISTFILE=$HOME/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
 
-setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first
 setopt hist_ignore_dups # ignore duplication command history list

From 77045230f4e2c80f4f312fbbeeb8583a41aa5a92 Mon Sep 17 00:00:00 2001
From: Philip Hofstetter <phofstetter@sensational.ch>
Date: Wed, 28 Dec 2011 15:54:47 +0100
Subject: [PATCH 0026/1378] make pygmalion theme use two lines when needed

if the length of the prompt (excluding color escapes) exceeds 40
characters, emit the arrow prompt on its own line

This helps a lot on smaller terminals
---
 themes/pygmalion.zsh-theme | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index cf3bb908f..435c05830 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -1,9 +1,34 @@
 # Yay! High voltage and arrows!
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+prompt_setup_pygmalion(){
+  ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
+  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+  ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
+  ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+  base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
+  post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
+
+  base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
+  post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
+
+  add-zsh-hook precmd prompt_pygmalion_precmd
+}
+
+prompt_pygmalion_precmd(){
+  local gitinfo=$(git_prompt_info)
+  local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
+  local exp_nocolor=$(print -P "$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor")
+  local prompt_length=${#exp_nocolor}
+
+  local nl=""
+
+  if [[ $prompt_length -gt 40 ]]; then
+    nl=$'\n%{\r%}';
+  fi
+  PROMPT="$base_prompt$gitinfo$nl$post_prompt"
+}
+
+prompt_setup_pygmalion
 
-PROMPT='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%}  '
 

From 3445dada95f7d5c4730b73ebb8b3abb0e5723e26 Mon Sep 17 00:00:00 2001
From: Philip Hofstetter <phofstetter@sensational.ch>
Date: Thu, 29 Dec 2011 14:35:38 +0100
Subject: [PATCH 0027/1378] correctly handle path names with spaces

---
 themes/pygmalion.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index 435c05830..654e0fc37 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -18,7 +18,7 @@ prompt_setup_pygmalion(){
 prompt_pygmalion_precmd(){
   local gitinfo=$(git_prompt_info)
   local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
-  local exp_nocolor=$(print -P "$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor")
+  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
   local prompt_length=${#exp_nocolor}
 
   local nl=""

From 730e0296640fed91b6db83745abf920428aa5abf Mon Sep 17 00:00:00 2001
From: Jordan MacDonald <jordan@wastedintelligence.com>
Date: Sat, 7 Jan 2012 15:36:58 -0500
Subject: [PATCH 0028/1378] Added alias for git diff.

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c1b382b2c..00667a215 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -3,6 +3,8 @@ alias g='git'
 compdef g=git
 alias gst='git status'
 compdef _git gst=git-status
+alias gd='git diff'
+compdef _git diff=git-diff
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git fetch && git rebase'

From 78a129ca06cbe9f9dbfd171491d734249e91dc2c Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Mon, 16 Jan 2012 16:39:28 +0100
Subject: [PATCH 0029/1378] Correct color and font issues on Ubuntu

---
 themes/sunrise.zsh-theme | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 88b371d79..acc6ed312 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -5,16 +5,15 @@
 #-------------------------------------------------------------------------------
 
 # Color shortcuts
-R=$fg[red]
-G=$fg[green]
-M=$fg[magenta]
-RB=$fg_bold[red]
-YB=$fg_bold[yellow]
-BB=$fg_bold[blue]
+R=$fg_no_bold[red]
+G=$fg_no_bold[green]
+M=$fg_no_bold[magenta]
+Y=$fg_no_bold[yellow]
+B=$fg_no_bold[blue]
 RESET=$reset_color
 
 if [ "$(whoami)" = "root" ]; then
-    PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
+    PROMPTCOLOR="%{$R%}" PREFIX="-!-";
 else
     PROMPTCOLOR="" PREFIX="---";
 fi
@@ -73,13 +72,14 @@ function custom_git_prompt() {
 PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
 RPS1="${return_code}"
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$Y%}›%{$RESET%} "
 
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➔"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$B%}➔"
+
 
 ZSH_THEME_GIT_STATUS_PREFIX=" "
 
@@ -90,7 +90,7 @@ ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
 ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
 
 # Not-staged
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}⁇"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}?"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"

From 49d44adb09f417fac24ea8e664b12f6546f22e9d Mon Sep 17 00:00:00 2001
From: Jordan MacDonald <jordan.macdonald@greatersudbury.ca>
Date: Fri, 20 Jan 2012 13:07:03 -0500
Subject: [PATCH 0030/1378] Fixed compdef alias to use 'gd' as shortcut.

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 00667a215..a42148fd9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -4,7 +4,7 @@ compdef g=git
 alias gst='git status'
 compdef _git gst=git-status
 alias gd='git diff'
-compdef _git diff=git-diff
+compdef _git gd=git-diff
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git fetch && git rebase'

From 72aeaa9d9ee55fbfe15b371c0bf127ab3948a965 Mon Sep 17 00:00:00 2001
From: Hao Hong <agate.hao@gmail.com>
Date: Mon, 6 Feb 2012 15:51:31 +0800
Subject: [PATCH 0031/1378] added "publish" and "track" command completion for
 git-flow plugin

---
 plugins/git-flow/git-flow.plugin.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 270bcbe38..b94f1a81f 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -88,6 +88,8 @@ __git-flow-release ()
 				'start:Start a new release branch.'
 				'finish:Finish a release branch.'
 				'list:List all your release branches. (Alias to `git flow release`)'
+				'publish: public'
+				'track: track'
 			)
 			_describe -t commands 'git flow release' subcommands
 			_arguments \
@@ -113,6 +115,16 @@ __git-flow-release ()
 						':version:__git_flow_version_list'
 				;;
 
+				(publish)
+					_arguments \
+						':version:__git_flow_version_list'\
+				;;
+
+				(track)
+					_arguments \
+						':version:__git_flow_version_list'\
+				;;
+
 				*)
 					_arguments \
 						-v'[Verbose (more) output]'

From fbf5b0ecb6b551b7d4ee2f1e85780c9fdbe052a0 Mon Sep 17 00:00:00 2001
From: Brent Faulkner <brent.faulkner@mosaic.com>
Date: Mon, 6 Feb 2012 21:50:17 -0500
Subject: [PATCH 0032/1378] add default rbenv_prompt_info implementation to
 close #878

---
 lib/rbenv.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 lib/rbenv.zsh

diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
new file mode 100644
index 000000000..a8b6c323c
--- /dev/null
+++ b/lib/rbenv.zsh
@@ -0,0 +1,2 @@
+# using the rbenv plugin will override this with a real implementation
+function rbenv_prompt_info() {}

From b62a3e89602bca23b794dd1e808d92a89880ad3f Mon Sep 17 00:00:00 2001
From: Brent Faulkner <brent.faulkner@mosaic.com>
Date: Sun, 12 Feb 2012 12:27:06 -0500
Subject: [PATCH 0033/1378] handle case where ~/.rvm/bin/rvm-prompt is not in
 path, so "which" can't find it

---
 themes/crunch.zsh-theme        | 2 +-
 themes/dallas.zsh-theme        | 2 +-
 themes/macovsky-ruby.zsh-theme | 2 +-
 themes/macovsky.zsh-theme      | 2 +-
 themes/superjarin.zsh-theme    | 2 +-
 themes/zhann.zsh-theme         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
index b2759a1b0..2fc066381 100644
--- a/themes/crunch.zsh-theme
+++ b/themes/crunch.zsh-theme
@@ -29,7 +29,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
 
 # Our elements:
 CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
-if which rvm-prompt &> /dev/null; then
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
   CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
 else
   if which rbenv &> /dev/null; then
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
index e9b4f852a..02285df52 100644
--- a/themes/dallas.zsh-theme
+++ b/themes/dallas.zsh-theme
@@ -3,7 +3,7 @@
 # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
 DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
-if which rvm-prompt &> /dev/null; then
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
   DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
 else
   if which rbenv &> /dev/null; then
diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby.zsh-theme
index 045376761..69d80d588 100644
--- a/themes/macovsky-ruby.zsh-theme
+++ b/themes/macovsky-ruby.zsh-theme
@@ -1,7 +1,7 @@
 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-if which rvm-prompt &> /dev/null; then
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
   PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
 else
   if which rbenv &> /dev/null; then
diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme
index b6978b929..2e6dce42d 100644
--- a/themes/macovsky.zsh-theme
+++ b/themes/macovsky.zsh-theme
@@ -1,7 +1,7 @@
 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-if which rvm-prompt &> /dev/null; then
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
   PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
 else
   if which rbenv &> /dev/null; then
diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
index 0be816de0..86955a560 100644
--- a/themes/superjarin.zsh-theme
+++ b/themes/superjarin.zsh-theme
@@ -1,5 +1,5 @@
 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
-if which rvm-prompt &> /dev/null; then
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
   JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
 else
   if which rbenv &> /dev/null; then
diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 574e0cec3..5c49fe79b 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -1,6 +1,6 @@
 PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
-if which rvm-prompt &> /dev/null; then
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
   RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
 else
   if which rbenv &> /dev/null; then

From ff7e0648965e027d1b8c995065b5152333a82b7a Mon Sep 17 00:00:00 2001
From: Rach Belaid <rachid.belaid@gmail.com>
Date: Sun, 19 Feb 2012 19:54:33 +0000
Subject: [PATCH 0034/1378] change the color of arrow when the command line
 return an error

---
 themes/robbyrussell.zsh-theme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme
index 7b524e82d..24e1e8c52 100644
--- a/themes/robbyrussell.zsh-theme
+++ b/themes/robbyrussell.zsh-theme
@@ -1,4 +1,5 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From bcd5b3b52b35a458df87b204119eb18a264a580b Mon Sep 17 00:00:00 2001
From: John Barker <jebarker@gmail.com>
Date: Mon, 20 Feb 2012 19:05:27 -0500
Subject: [PATCH 0035/1378] Added a peepcode theme

---
 themes/peepcode.zsh-theme | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 themes/peepcode.zsh-theme

diff --git a/themes/peepcode.zsh-theme b/themes/peepcode.zsh-theme
new file mode 100644
index 000000000..ca2a8862f
--- /dev/null
+++ b/themes/peepcode.zsh-theme
@@ -0,0 +1,44 @@
+#
+# Based on Geoffrey Grosenbach's peepcode zsh theme from
+# https://github.com/topfunky/zsh-simple
+#
+
+git_repo_path() {
+  git rev-parse --git-dir 2>/dev/null
+}
+
+git_commit_id() {
+  git rev-parse --short HEAD 2>/dev/null
+}
+
+git_mode() {
+  if [[ -e "$repo_path/BISECT_LOG" ]]; then
+    echo "+bisect"
+  elif [[ -e "$repo_path/MERGE_HEAD" ]]; then
+    echo "+merge"
+  elif [[ -e "$repo_path/rebase" || -e "$repo_path/rebase-apply" || -e "$repo_path/rebase-merge" || -e "$repo_path/../.dotest" ]]; then
+    echo "+rebase"
+  fi
+}
+
+git_dirty() {
+  if [[ "$repo_path" != '.' && `git ls-files -m` != "" ]]; then
+    echo " %{$fg_bold[grey]%}✗%{$reset_color%}"
+  fi
+}
+
+git_prompt() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    local repo_path=$(git_repo_path)
+    echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)"
+  fi
+}
+
+local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
+
+PROMPT='
+%~
+${smiley}  %{$reset_color%}'
+
+RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'

From 6272b4854c0b13fa778fe7d4f6f9bb12d716299f Mon Sep 17 00:00:00 2001
From: Jeff McClure <jmcclure@sonicradish.com>
Date: Mon, 20 Feb 2012 22:37:23 -0500
Subject: [PATCH 0036/1378] Added New Theme: sonicradish  (256 colors)

Forked from muse theme and inspired by mustang vim theme

Dark Background and Solarized Dark look great [ tested on OS X ]

Screenshot: https://img.skitch.com/20120221-eb1cxey5aun84tb1ak7fm376k.png

muse: https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/muse.zsh-theme
mustang: http://hcalves.deviantart.com/art/Mustang-Vim-Colorscheme-98974484http://hcalves.deviantart.com/art/Mustang-Vim-Colorscheme-98974484
---
 themes/sonicradish.zsh-theme | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 themes/sonicradish.zsh-theme

diff --git a/themes/sonicradish.zsh-theme b/themes/sonicradish.zsh-theme
new file mode 100644
index 000000000..cc7ba1c76
--- /dev/null
+++ b/themes/sonicradish.zsh-theme
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh 
+#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+setopt promptsubst
+
+autoload -U add-zsh-hook
+ROOT_ICON_COLOR=$FG[111]
+MACHINE_NAME_COLOR=$FG[208]
+PROMPT_SUCCESS_COLOR=$FG[103]
+PROMPT_FAILURE_COLOR=$FG[124]
+PROMPT_VCS_INFO_COLOR=$FG[242]
+PROMPT_PROMPT=$FG[208]
+GIT_DIRTY_COLOR=$FG[124]
+GIT_CLEAN_COLOR=$FG[148]
+GIT_PROMPT_INFO=$FG[148]
+
+# Hash
+ROOT_ICON="# "
+if [[ $EUID -ne 0 ]] ; then
+	ROOT_ICON=""
+fi
+
+PROMPT='%{$ROOT_ICON_COLOR%}$ROOT_ICON%{$reset_color%}%{$MACHINE_NAME_COLOR%}%m➜  %{$reset_color%}%{$PROMPT_SUCCESS_COLOR%}%c%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ %{$reset_color%} '
+
+#RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX=": "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%} :"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[103]%}✚%{$rset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[103]%}✹%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[103]%}═%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[103]%}✭%{$reset_color%}"
+
+export LSCOLORS=dxfxcxdxbxexexabagacad

From 867cb3f511fe8d0cad04ae799b595d7b0c86746a Mon Sep 17 00:00:00 2001
From: Jeff McClure <jmcclure@sonicradish.com>
Date: Tue, 21 Feb 2012 00:45:33 -0500
Subject: [PATCH 0037/1378] [JM] Removed LSCOLOR Declaration for Wider Support

---
 themes/sonicradish.zsh-theme | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/sonicradish.zsh-theme b/themes/sonicradish.zsh-theme
index cc7ba1c76..508611830 100644
--- a/themes/sonicradish.zsh-theme
+++ b/themes/sonicradish.zsh-theme
@@ -35,5 +35,3 @@ ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[103]%}═%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[103]%}✭%{$reset_color%}"
-
-export LSCOLORS=dxfxcxdxbxexexabagacad

From c9c021478ea4a2b55aac8cda3cd0d05137443f36 Mon Sep 17 00:00:00 2001
From: William Roe <willroe@gmail.com>
Date: Thu, 23 Feb 2012 14:11:52 +0000
Subject: [PATCH 0038/1378] Add completion for pip install -r - so that it
 autocompletes requirements filenames

---
 plugins/pip/_pip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index df53ba5ce..0b66913a0 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -58,6 +58,7 @@ case "$words[1]" in
   	_arguments \
       '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
       '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+      '(-r --requirement)'{-r,--requirement}'[Requirements file for packages to install]:File:_files' \
       '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
       '(--no-install)--no-install[only download packages]' \
       '(--no-download)--no-download[only install downloaded packages]' \

From 4e0b5be145cb0f4eda769906e9e72e31aec7c236 Mon Sep 17 00:00:00 2001
From: Andrew Ash <ash211@gmail.com>
Date: Thu, 23 Feb 2012 23:12:07 -0800
Subject: [PATCH 0039/1378] Fix spurious correction with sudo vim

user@host:~ $ sudo vim /etc/rc.conf
zsh: correct 'vim' to '.vim' [nyae]?

http://www.zsh.org/mla/users/2012/msg00028.html
---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index fc60dcdbd..53c477d46 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -8,3 +8,4 @@ alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
 alias ebuild='nocorrect ebuild'
 alias hpodder='nocorrect hpodder'
+alias sudo='nocorrect sudo'
\ No newline at end of file

From d49e98267a741075f889808b04b1f0c699917f8a Mon Sep 17 00:00:00 2001
From: Max Masnick <max@masnick.me>
Date: Sat, 25 Feb 2012 16:16:43 -0500
Subject: [PATCH 0040/1378] clean up rbenv support for 'fino' theme

---
 themes/fino.zsh-theme | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 2159e54a8..4c7aabcff 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -21,22 +21,21 @@ function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 
-local rvm_ruby=''
+local ruby_env=''
 if which rvm-prompt &> /dev/null; then
-  rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+  ruby_env=' ‹$(rvm-prompt i v g)›%{$reset_color%}'
 else
   if which rbenv &> /dev/null; then
-    rvm_ruby='‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
+    ruby_env=' ‹$(rbenv version-name)›%{$reset_color%}'
   fi
 fi
 
 local current_dir='${PWD/#$HOME/~}'
 local git_info='$(git_prompt_info)'
 local prompt_char='$(prompt_char)'
-local rbenv_version='$(rbenv version-name)'
 
 
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ‹${rbenv_version}›%{$reset_color%}
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env}
 ╰─${prompt_char} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"

From fa1657e10bc062394390d83d0bb5d3848905f5b6 Mon Sep 17 00:00:00 2001
From: David Lee <davidomundo@gmail.com>
Date: Sun, 26 Feb 2012 02:29:24 -0800
Subject: [PATCH 0041/1378] Add gem build autocompletion

---
 plugins/gem/_gem | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 83cba40d1..3c0922f2c 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -9,6 +9,7 @@ _gem_installed() {
 
 local -a _1st_arguments
 _1st_arguments=(
+  'build:Build a gem from a gemspec'
   'cert:Manage RubyGems certificates and signing settings'
   'check:Check installed gems'
   'cleanup:Clean up old versions of installed gems in the local repository'
@@ -53,6 +54,9 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
+  build)
+    _files -g "*.gemspec"
+    ;;
   list)
       if [[ "$state" == forms ]]; then
         _gem_installed

From 071d0d68ec1a7f883c10529fda47630dcc3f5afe Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Mon, 5 Mar 2012 11:55:30 +0000
Subject: [PATCH 0042/1378] Added link to wiki page for plugins to README.

The wiki is more readable than going to the plugins directory.
---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index bf6776665..64dbc96e9 100644
--- a/README.textile
+++ b/README.textile
@@ -43,7 +43,7 @@ You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some
 
 h2. Usage
 
-* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
+* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
 ** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.

From 4a88743d1eb28f7d928c6d7ce3ebeccc6b1991a8 Mon Sep 17 00:00:00 2001
From: William Ting <william.h.ting@gmail.com>
Date: Tue, 6 Mar 2012 14:31:03 -1000
Subject: [PATCH 0043/1378] fix gnzh theme to detect local rvm installations

---
 themes/gnzh.zsh-theme | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 3c6b8a409..33f187bc6 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -6,7 +6,7 @@ autoload -U colors zsh/terminfo # Used in the colour alias below
 colors
 setopt prompt_subst
 
-# make some aliases for the colours: (coud use normal escap.seq's too)
+# make some aliases for the colours: (could use normal escape sequences too)
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
   eval PR_$color='%{$fg[${(L)color}]%}'
 done
@@ -25,7 +25,7 @@ elif [[ $UID -eq 0 ]]; then # root
 fi
 
 # Check if we are on SSH or not
-if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
+if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
   eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
 else
   eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
@@ -36,12 +36,12 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
 local rvm_ruby=''
-if which rvm-prompt &> /dev/null; then
+if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
+  rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation
   rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-else
-  if which rbenv &> /dev/null; then
-    rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
-  fi
+elif which rbenv &> /dev/null; then # detect Simple Ruby Version management
+  rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
 fi
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 

From aefacb69509f8cdd4ad3b0bba9b77cd9ee63e115 Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Fri, 9 Mar 2012 08:53:09 -0500
Subject: [PATCH 0044/1378] added powed command to list pow urls

---
 plugins/pow/pow.plugin.zsh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 399a54cb0..c823cdb22 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -8,18 +8,18 @@
 # Supports command completion.
 #
 # If you are not already using completion you might need to enable it with
-# 
+#
 #    autoload -U compinit compinit
 #
 # Changes:
 #
-# Defaults to the current application, and will walk up the tree to find 
+# Defaults to the current application, and will walk up the tree to find
 # a config.ru file and restart the corresponding app
 #
-# Will Detect if a app does not exist in pow and print a (slightly) helpful 
+# Will Detect if a app does not exist in pow and print a (slightly) helpful
 # error message
 
-rack_root_detect(){
+rack_root(){
   setopt chaselinks
   local orgdir=$(pwd)
   local basedir=$(pwd)
@@ -32,6 +32,11 @@ rack_root_detect(){
 
   builtin cd $orgdir 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
+  echo $basedir
+}
+
+rack_root_detect(){
+  basedir=$(rack_root)
   echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
 
@@ -51,16 +56,21 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-	local basedir=$(pwd)
+  local basedir=$(pwd)
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
-	then
-		echo "pow: Symlinking your app with pow. ${vhost}"
-	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+  then
+    echo "pow: Symlinking your app with pow. ${vhost}"
+    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
     return 1
   fi
 }
 
+powed(){
+  local basedir=$(rack_root)
+  find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
+}
+
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From e652756fdb0495e58f3f4f3be3a82aa9f166731d Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 08:16:44 -0400
Subject: [PATCH 0045/1378] A plugin that makes it easier to interact with the
 (single) running instance of gvim

---
 plugins/vim-interaction/README.md             | 69 +++++++++++++++++++
 .../vim-interaction.plugin.zsh                | 67 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 plugins/vim-interaction/README.md
 create mode 100644 plugins/vim-interaction/vim-interaction.plugin.zsh

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
new file mode 100644
index 000000000..65e678b51
--- /dev/null
+++ b/plugins/vim-interaction/README.md
@@ -0,0 +1,69 @@
+# Vim Interaction #
+
+The plugin presents a function called `callvim` whose usage is:
+
+    usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+    
+      -b cmd     Run this command in GVIM before editing the first file
+      -a cmd     Run this command in GVIM after editing the first file
+      file       The file to edit
+      ... fileN  The other files to add to the argslist
+
+## Rationale ##
+
+The idea for this script is to give you some decent interaction with a running
+GVim session.  Normally you'll be running around your filesystem doing any
+number of amazing things and you'll need to load some files into GVim for
+editing, inspecting, destruction, or other bits of mayhem.  This script lets you
+do that.
+
+## Aliases ##
+
+There are a few aliases presented as well:
+
+* `v` A shorthand for `callvim`
+* `vvsp` Edits the passed in file but first makes a vertical split
+* `vhsp` Edits the passed in file but first makes a horizontal split
+
+## Examples ##
+
+This will load `/tmp/myfile.scala` into the running GVim session:
+
+    > v /tmp/myfile.scala
+
+This will load it after first doing a vertical split:
+
+    > vvsp /tmp/myfile.scala
+    or
+    > v -b':vsp' /tmp/myfile.scala
+
+This will load it after doing a horizontal split, then moving to the bottom of
+the file:
+
+    > vhsp -aG /tmp/myfile.scala
+    or
+    > v -b':sp' -aG /tmp/myfile.scala
+
+This will load the file and then copy the first line to the end (Why you would
+ever want to do this... I dunno):
+
+    > v -a':1t$' /tmp/myfile.scala
+
+And this will load all of the `*.txt` files into the args list:
+
+    > v *.txt
+
+If you want to load files into areas that are already split, use one of the
+aliases for that:
+
+    # Do a ':wincmd h' first
+    > vh /tmp/myfile.scala
+
+    # Do a ':wincmd j' first
+    > vj /tmp/myfile.scala
+
+    # Do a ':wincmd k' first
+    > vk /tmp/myfile.scala
+
+    # Do a ':wincmd l' first
+    > vl /tmp/myfile.scala
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
new file mode 100644
index 000000000..3f346dfc3
--- /dev/null
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -0,0 +1,67 @@
+#
+# See README.md
+#
+# Derek Wyatt (derek@{myfirstnamemylastname}.org
+# 
+
+function resolveFile
+{
+  if [ -f "$1" ]; then
+    echo $(readlink -f "$1")
+  else
+    echo "$1"
+  fi
+}
+
+function callvim
+{
+  if [[ $# == 0 ]]; then
+    cat <<EOH
+usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+
+  -b cmd     Run this command in GVIM before editing the first file
+  -a cmd     Run this command in GVIM after editing the first file
+  file       The file to edit
+  ... fileN  The other files to add to the argslist
+EOH
+    return 0
+  fi
+
+  local cmd=""
+  local before=""
+  local after=""
+  while getopts ":b:a:" option
+  do
+    case $option in
+      a) after="$OPTARG"
+         ;;
+      b) before="$OPTARG"
+         ;;
+    esac
+  done
+  shift $((OPTIND-1))
+  if [[ ${after#:} != $after && ${after%<cr>} == $after ]]; then
+    after="$after<cr>"
+  fi
+  if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
+    before="$before<cr>"
+  fi
+  local files=""
+  for f in $@
+  do
+    files="$files $(resolveFile $f)"
+  done
+  if [[ -n $files ]]; then
+    files=':args! '"$files<cr>"
+  fi
+  cmd="$before$files$after"
+  gvim --remote-send "$cmd"
+}
+
+alias v=callvim
+alias vvsp="callvim -b':vsp'"
+alias vhsp="callvim -b':sp'"
+alias vk="callvim -b':wincmd k'"
+alias vj="callvim -b':wincmd j'"
+alias vl="callvim -b':wincmd l'"
+alias vh="callvim -b':wincmd h'"

From 92227f171ad3777c2671395a9e1d7fbb86a11428 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 09:55:25 -0400
Subject: [PATCH 0046/1378] Fixed: If you callvim on a non-existant file with a
 relative path, the CWD of the running gvim process is used, and that's not
 right.  We use the PWD explicitly instead, in this case

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 3f346dfc3..309012b34 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,8 +8,10 @@ function resolveFile
 {
   if [ -f "$1" ]; then
     echo $(readlink -f "$1")
+  elif [[ "${1#/}" == "$1" ]]; then
+    echo "$(pwd)/$1"
   else
-    echo "$1"
+    echo $1
   fi
 }
 

From ce6a21c3b3c6b0fb6a8b8a2cb20991fec91ec86a Mon Sep 17 00:00:00 2001
From: Piotr Solnica <piotr.solnica@gmail.com>
Date: Fri, 23 Mar 2012 20:31:13 +0100
Subject: [PATCH 0047/1378] [themes/josh] Use $(current_branch) in prompt

---
 themes/josh.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index 142e76838..12dfe4069 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -31,7 +31,7 @@ function josh_prompt {
     prompt=" $prompt"
   done
   
-  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_prompt_info)"
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(current_branch)"
   
   echo $prompt
 }

From 04a7536641621e0188987b5bb1362e6b922a8771 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:33:06 -0400
Subject: [PATCH 0048/1378] Added an optional callout to the end of the
 interaction function. I put it in to allow me to put the window focus on
 MacVim / GVim depending on the different OS I happen to be on

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 309012b34..af7e60c88 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -58,6 +58,9 @@ EOH
   fi
   cmd="$before$files$after"
   gvim --remote-send "$cmd"
+  if typeset -f postCallVim > /dev/null; then
+    postCallVim
+  fi
 }
 
 alias v=callvim

From c2e459ad43b060c9dc2548e378a2f2d412d6da60 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:39:49 -0400
Subject: [PATCH 0049/1378] Updated the README to include documentation on the
 postCallVim callout

---
 plugins/vim-interaction/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
index 65e678b51..681648018 100644
--- a/plugins/vim-interaction/README.md
+++ b/plugins/vim-interaction/README.md
@@ -25,6 +25,19 @@ There are a few aliases presented as well:
 * `vvsp` Edits the passed in file but first makes a vertical split
 * `vhsp` Edits the passed in file but first makes a horizontal split
 
+## Post Callout ##
+
+At the end of the `callvim` function we invoke the `postCallVim` function if it
+exists.  If you're using MacVim, for example, you could define a function that
+brings window focus to it after the file is loaded:
+
+    function postCallVim
+    {
+      osascript -e 'tell application "MacVim" to activate'
+    }
+
+This'll be different depending on your OS / Window Manager.
+
 ## Examples ##
 
 This will load `/tmp/myfile.scala` into the running GVim session:

From 94dd6515365e0d2655485c5afc27e75a921fa6ec Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Sun, 1 Apr 2012 15:41:39 -0400
Subject: [PATCH 0050/1378] Added an <esc> to the begining of everything. I ran
 something when I was in insert mode once and all it did was shove !args...
 into the buffer.  <esc> first.

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index af7e60c88..5142f1f9b 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -30,7 +30,7 @@ EOH
   fi
 
   local cmd=""
-  local before=""
+  local before="<esc>"
   local after=""
   while getopts ":b:a:" option
   do

From a75aabad1e455dcbf62891ba7370f6c0ea1108b2 Mon Sep 17 00:00:00 2001
From: Corey Woodcox <corey.woodcox@gmail.com>
Date: Wed, 9 Nov 2011 14:43:32 -0700
Subject: [PATCH 0051/1378] add the half-life theme based on steeef and lambda

---
 themes/half-life.zsh-theme | 99 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 themes/half-life.zsh-theme

diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
new file mode 100644
index 000000000..699880027
--- /dev/null
+++ b/themes/half-life.zsh-theme
@@ -0,0 +1,99 @@
+# prompt style and colors based on Steve Losh's Prose theme:
+# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
+#
+# vcs_info modifications from Bart Trojanowski's zsh prompt:
+# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
+#
+# git untracked files modification from Brian Carper:
+# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+PR_GIT_UPDATE=1
+
+setopt prompt_subst
+autoload colors
+colors
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+#use extended color pallete if available
+if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
+    turquoise="%F{81}"
+    orange="%F{166}"
+    purple="%F{135}"
+    hotpink="%F{161}"
+    limegreen="%F{118}"
+else
+    turquoise="$fg[cyan]"
+    orange="$fg[yellow]"
+    purple="$fg[magenta]"
+    hotpink="$fg[red]"
+    limegreen="$fg[green]"
+fi
+
+# enable VCS systems you use
+zstyle ':vcs_info:*' enable git svn
+
+# check-for-changes can be really slow.
+# you should disable it, if you work with large repositories
+zstyle ':vcs_info:*:prompt:*' check-for-changes true
+
+# set formats
+# %b - branchname
+# %u - unstagedstr (see below)
+# %c - stagedstr (see below)
+# %a - action (e.g. rebase-i)
+# %R - repository path
+# %S - path in the repository
+PR_RST="%{${reset_color}%}"
+FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
+FMT_UNSTAGED="%{$orange%}●"
+FMT_STAGED="%{$limegreen%}●"
+
+zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
+zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
+zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
+zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
+
+
+function steeef_preexec {
+    case "$(history $HISTCMD)" in
+        *git*)
+            PR_GIT_UPDATE=1
+            ;;
+        *svn*)
+            PR_GIT_UPDATE=1
+            ;;
+    esac
+}
+add-zsh-hook preexec steeef_preexec
+
+function steeef_chpwd {
+    PR_GIT_UPDATE=1
+}
+add-zsh-hook chpwd steeef_chpwd
+
+function steeef_precmd {
+    if [[ -n "$PR_GIT_UPDATE" ]] ; then
+        # check for untracked files or updated submodules, since vcs_info doesn't
+        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+            PR_GIT_UPDATE=1
+            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST}"
+        else
+            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c${PR_RST}"
+        fi
+        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
+        vcs_info 'prompt'
+        PR_GIT_UPDATE=
+    fi
+}
+add-zsh-hook precmd steeef_precmd
+
+PROMPT=$'
+%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(rvm-prompt " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '

From 0b70b6d0483210b7fcc74ee1073c7de887f4f3ac Mon Sep 17 00:00:00 2001
From: Corey Woodcox <corey.woodcox@gmail.com>
Date: Wed, 4 Apr 2012 00:58:09 -0600
Subject: [PATCH 0052/1378] small changes to make it prettier

---
 themes/half-life.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index 699880027..c8d09ce47 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -49,8 +49,8 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 # %R - repository path
 # %S - path in the repository
 PR_RST="%{${reset_color}%}"
-FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
-FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
+FMT_BRANCH=" on %{$turquoise%}%b%u%c${PR_RST}"
+FMT_ACTION=" performing a %{$limegreen%}%a${PR_RST}"
 FMT_UNSTAGED="%{$orange%}●"
 FMT_STAGED="%{$limegreen%}●"
 

From 8762b27d67156886d144213ba656aa3e8edfcf8b Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Wed, 4 Apr 2012 12:54:31 -0400
Subject: [PATCH 0053/1378] command to restart pow process

---
 plugins/pow/pow.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index c823cdb22..7f86c0c76 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -72,5 +72,14 @@ powed(){
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
+# Restart pow process
+# taken from http://www.matthewratzloff.com/blog/2011/12/23/restarting-pow-when-dns-stops-responding
+repow(){
+  lsof | grep 20560 | awk '{print $2}' | xargs kill -9
+  launchctl unload ~/Library/LaunchAgents/cx.pow.powd.plist
+  launchctl load ~/Library/LaunchAgents/cx.pow.powd.plist
+  echo "restarted pow"
+}
+
 # View the standard out (puts) from any pow app
 alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From 9b05a44387f84ae0b24e24023286534d0bbdf65f Mon Sep 17 00:00:00 2001
From: "Steven G. Harms" <sharms@shopittome.com>
Date: Thu, 5 Apr 2012 10:18:16 -0700
Subject: [PATCH 0054/1378] Adds glo; glp (arg)

* glo := git log --oneline
* glp := git log --pretty=arg
---
 plugins/git/git.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c1b382b2c..63a276d25 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -30,6 +30,8 @@ alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
 alias glgg='git log --graph --max-count=5'
 compdef _git glgg=git-log
+alias glo='git log --oneline'
+compdef _git glo=git-log
 alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'
@@ -59,3 +61,12 @@ alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
+
+# Pretty log messages
+function _git_log_prettily(){
+  if ! [ -z $1 ]; then
+    git log --pretty=$1
+  fi
+}
+alias glp="_git_log_prettily"
+compdef _git glp=git-log

From 8942d304ff55ad9467872ecab3f343552b5c2083 Mon Sep 17 00:00:00 2001
From: Daniel Bayerlein <daniel.bayerlein@googlemail.com>
Date: Sat, 7 Apr 2012 18:23:12 +0200
Subject: [PATCH 0055/1378] Add Theme "itchy"

---
 themes/itchy.zsh-theme | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 themes/itchy.zsh-theme

diff --git a/themes/itchy.zsh-theme b/themes/itchy.zsh-theme
new file mode 100644
index 000000000..afc2abf69
--- /dev/null
+++ b/themes/itchy.zsh-theme
@@ -0,0 +1,19 @@
+# Created by Daniel Bayerlein https://github.com/danielbayerlein
+# Inspired by http://peepcode.com/blog/2012/my-command-line-prompt
+
+local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
+
+local user="%{$fg[cyan]%}%n%{$reset_color%}"
+local host="%{$fg[cyan]%}@%m%{$reset_color%}"
+local pwd="%{$fg[yellow]%}%~%{$reset_color%}"
+
+PROMPT='${user}${host} ${pwd}
+${smiley}  '
+
+RPROMPT='$(rvm-prompt || rbenv version) %{$fg[white]%}$(git_prompt_info)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔%{$reset_color%}"
+

From 6f4c69cb48d6fb746149afddee264509a5245305 Mon Sep 17 00:00:00 2001
From: Justin Mazzi <hh@mailheist.com>
Date: Wed, 25 Apr 2012 11:59:53 -0300
Subject: [PATCH 0056/1378] Add instructions on handling updates and prompts.

---
 README.textile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.textile b/README.textile
index bf6776665..f6b59fa26 100644
--- a/README.textile
+++ b/README.textile
@@ -59,6 +59,14 @@ If you want to override any of the default behavior, just add a new file (ending
 If you have many functions which go well together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
 If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
 
+h3. Updates
+By default you will be prompted to check for updates. If you would like oh-my-zsh to automatically update itself without prompting you, set the following in your ~/.zshrc
+
+@DISABLE_UPDATE_PROMPT=true@
+
+To disable updates entirely, put this in your ~/.zshrc
+
+@DISABLE_AUTO_UPDATE=true@
 
 h3. Uninstalling
 

From 7fd1bf597fd866480d41a4208fa23d04b1a79044 Mon Sep 17 00:00:00 2001
From: Justin Mazzi <jmazzi@gmail.com>
Date: Wed, 25 Apr 2012 11:02:17 -0400
Subject: [PATCH 0057/1378] Fix formatting

---
 README.textile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.textile b/README.textile
index f6b59fa26..701485690 100644
--- a/README.textile
+++ b/README.textile
@@ -60,6 +60,7 @@ If you have many functions which go well together you can put them as a *.plugin
 If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
 
 h3. Updates
+
 By default you will be prompted to check for updates. If you would like oh-my-zsh to automatically update itself without prompting you, set the following in your ~/.zshrc
 
 @DISABLE_UPDATE_PROMPT=true@

From 79847ad77d1613fa823b2c6e097895b3b5193074 Mon Sep 17 00:00:00 2001
From: Dr Nic Williams <drnicwilliams@gmail.com>
Date: Wed, 2 May 2012 10:32:30 -0700
Subject: [PATCH 0058/1378] added 'gcl'for 'git config --list'; and gd for 'git
 diff'

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e1d682508..340485104 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -9,6 +9,7 @@ alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
+alias gd='git diff'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
@@ -24,6 +25,7 @@ alias gba='git branch -a'
 compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
+alias gcl='git config --list'
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=5'

From af03da0dc91a32175f99f85ab1fc09dc4246fef9 Mon Sep 17 00:00:00 2001
From: Peter Jaros <peter.a.jaros@gmail.com>
Date: Wed, 16 May 2012 14:51:52 -0400
Subject: [PATCH 0059/1378] Move example plugin to the custom plugins dir.

---
 .gitignore                                      | 4 ++--
 custom/{ => plugins}/example/example.plugin.zsh | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename custom/{ => plugins}/example/example.plugin.zsh (100%)

diff --git a/.gitignore b/.gitignore
index 2e8db7341..fdd13bb87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*
-!custom/example
+custom
+!custom/plugins/example
 !custom/example.zsh
 cache
 *.swp
diff --git a/custom/example/example.plugin.zsh b/custom/plugins/example/example.plugin.zsh
similarity index 100%
rename from custom/example/example.plugin.zsh
rename to custom/plugins/example/example.plugin.zsh

From dbef8b1a92f789f4109435a3b7278f899e328767 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:39:05 +0200
Subject: [PATCH 0060/1378] Add helper to get the value of an alias only

---
 lib/functions.zsh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index d2dcadd0c..b4d89a64a 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -15,3 +15,33 @@ function take() {
   cd $1
 }
 
+#
+# Get the value of an alias.
+#
+# Arguments:
+#    1. alias - The alias to get its value from
+# STDOUT:
+#    The value of alias $1 (if it has one).
+# Return value:
+#    0 if the alias was found,
+#    1 if it does not exist
+#
+function alias_value() {
+    alias "$1" | sed "s/^$1='\(.*\)'$/\1/"
+    test $(alias "$1")
+}
+
+#
+# Try to get the value of an alias,
+# otherwise return the input.
+#
+# Arguments:
+#    1. alias - The alias to get its value from
+# STDOUT:
+#    The value of alias $1, or $1 if there is no alias $1.
+# Return value:
+#    Always 0
+#
+function try_alias_value() {
+    alias_value "$1" || echo "$1"
+}
\ No newline at end of file

From 8f71efc09b42d69cc053649fade92485d282a561 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:39:31 +0200
Subject: [PATCH 0061/1378] Add helper to easily define default values for
 variables and env variables.

---
 lib/functions.zsh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index b4d89a64a..3770d4e82 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -44,4 +44,32 @@ function alias_value() {
 #
 function try_alias_value() {
     alias_value "$1" || echo "$1"
+}
+
+#
+# Set variable "$1" to default value "$2" if "$1" is not yet defined.
+#
+# Arguments:
+#    1. name - The variable to set
+#    2. val  - The default value 
+# Return value:
+#    0 if the variable exists, 3 if it was set
+#
+function default() {
+    test `typeset +m "$1"` && return 0
+    typeset -g "$1"="$2"   && return 3
+}
+
+#
+# Set enviroment variable "$1" to default value "$2" if "$1" is not yet defined.
+#
+# Arguments:
+#    1. name - The env variable to set
+#    2. val  - The default value 
+# Return value:
+#    0 if the env variable exists, 3 if it was set
+#
+function env_default() {
+    env | grep -q "^$1=" && return 0 
+    export "$1=$2"       && return 3
 }
\ No newline at end of file

From fcb153c2e32641bb13649bfdd8d3bbe8c17798c8 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 00:05:50 +0200
Subject: [PATCH 0062/1378] Add the singlechar plugin

---
 plugins/singlechar/singlechar.plugin.zsh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/singlechar/singlechar.plugin.zsh

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
new file mode 100644
index 000000000..1440a6237
--- /dev/null
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -0,0 +1,24 @@
+###########################
+# Settings 
+#
+# These can be overwritten any time.
+# If they are not set yet, they will be
+# overwritten with their default values
+
+default GREP grep
+default ROOT sudo
+
+###########################
+# Alias
+
+alias y='"$GREP" -i'
+alias n='"$GREP" -vi'
+
+alias x='xargs'
+alias xy='xargs "$GREP" -i'
+alias xn='xargs "$GREP" -iv'
+
+alias s='"$ROOT"'
+alias sx='"$ROOT" xargs'
+alias sxy='"$ROOT" xargs "$GREP" -i'
+alias sxn='"$ROOT" xargs "$GREP" -iv'
\ No newline at end of file

From f970d8206e9245eb2f78728623fdfff354402644 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:52:46 +0200
Subject: [PATCH 0063/1378] Add cat (+write, +append), enhance formatting

---
 plugins/singlechar/singlechar.plugin.zsh | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 1440a6237..3635dd19a 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -11,14 +11,35 @@ default ROOT sudo
 ###########################
 # Alias
 
+# CAT, GREP
+
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
+alias c='cat'
+alias w='cat >'
+alias a='cat >>'
+
+# XARGS
+
 alias x='xargs'
+
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
+alias xc='xargs cat'
+alias xw='xargs cat >'
+alias xa='xargs cat >>'
+
+# SUDO
+
 alias s='"$ROOT"'
+
 alias sx='"$ROOT" xargs'
+
 alias sxy='"$ROOT" xargs "$GREP" -i'
-alias sxn='"$ROOT" xargs "$GREP" -iv'
\ No newline at end of file
+alias sxn='"$ROOT" xargs "$GREP" -iv'
+
+alias sxc='"$ROOT" xargs cat'
+alias sxw='"$ROOT" xargs cat >'
+alias sxa='"$ROOT" xargs cat >>'

From 4c0b5c71d5332f6961156fc1cda0ab9cc54b8787 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 10:58:55 +0200
Subject: [PATCH 0064/1378] Add a description

---
 plugins/singlechar/singlechar.plugin.zsh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 3635dd19a..06fa78b9c 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -1,6 +1,16 @@
+################################################################################
+#          FILE:  singlechar.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Michael Varner (musikmichael@web.de)
+#       VERSION:  1.0.0
+#
+# This plugin adds single char shortcuts (and combinations) for some commands.
+#
+################################################################################
+
 ###########################
 # Settings 
-#
+
 # These can be overwritten any time.
 # If they are not set yet, they will be
 # overwritten with their default values

From e0b271264460219e624ac378c40421490a8e193c Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:03:48 +0200
Subject: [PATCH 0065/1378] Add download shortcuts

---
 plugins/singlechar/singlechar.plugin.zsh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 06fa78b9c..f4517d274 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -17,11 +17,13 @@
 
 default GREP grep
 default ROOT sudo
+default WGET wget
+default CURL curl
 
 ###########################
 # Alias
 
-# CAT, GREP
+# CAT, GREP, CURL, WGET
 
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
@@ -30,6 +32,9 @@ alias c='cat'
 alias w='cat >'
 alias a='cat >>'
 
+alias d='"$WGET"'
+alias u='"$CURL"'
+
 # XARGS
 
 alias x='xargs'
@@ -41,6 +46,9 @@ alias xc='xargs cat'
 alias xw='xargs cat >'
 alias xa='xargs cat >>'
 
+alias xd='xargs "$WGET"'
+alias xu='xargs "$CURL"'
+
 # SUDO
 
 alias s='"$ROOT"'
@@ -53,3 +61,6 @@ alias sxn='"$ROOT" xargs "$GREP" -iv'
 alias sxc='"$ROOT" xargs cat'
 alias sxw='"$ROOT" xargs cat >'
 alias sxa='"$ROOT" xargs cat >>'
+
+alias sxd='"$ROOT" xargs "$WGET"'
+alias sxu='"$ROOT" xargs "$CURL"'
\ No newline at end of file

From 712f850f3a860e87458d35a7d8ebba13b9975a06 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:07:05 +0200
Subject: [PATCH 0066/1378] Add pager shortcuts

---
 plugins/singlechar/singlechar.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index f4517d274..aadcde423 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -20,6 +20,8 @@ default ROOT sudo
 default WGET wget
 default CURL curl
 
+env_defaul PAGER less
+
 ###########################
 # Alias
 
@@ -32,6 +34,8 @@ alias c='cat'
 alias w='cat >'
 alias a='cat >>'
 
+alias p='"$PAGER"'
+
 alias d='"$WGET"'
 alias u='"$CURL"'
 
@@ -46,6 +50,8 @@ alias xc='xargs cat'
 alias xw='xargs cat >'
 alias xa='xargs cat >>'
 
+alias xp='xargs "$PAGER"'
+
 alias xd='xargs "$WGET"'
 alias xu='xargs "$CURL"'
 
@@ -62,5 +68,7 @@ alias sxc='"$ROOT" xargs cat'
 alias sxw='"$ROOT" xargs cat >'
 alias sxa='"$ROOT" xargs cat >>'
 
+alias sxp='"$ROOT" xargs "$PAGER"'
+
 alias sxd='"$ROOT" xargs "$WGET"'
 alias sxu='"$ROOT" xargs "$CURL"'
\ No newline at end of file

From 6f5599474f31516cec641242c0bdb391d8930cf2 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:08:40 +0200
Subject: [PATCH 0067/1378] Add sudo without xargs shortcuts

---
 plugins/singlechar/singlechar.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index aadcde423..0a815736d 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -59,6 +59,19 @@ alias xu='xargs "$CURL"'
 
 alias s='"$ROOT"'
 
+alias sy='"$ROOT" "$GREP" -i'
+alias sn='"$ROOT" "$GREP" -iv'
+
+alias sc='"$ROOT" cat'
+alias sw='"$ROOT" cat >'
+alias sa='"$ROOT" cat >>'
+
+alias sp='"$ROOT" "$PAGER"'
+
+alias sd='"$ROOT" "$WGET"'
+
+# SUDO-XARGS
+
 alias sx='"$ROOT" xargs'
 
 alias sxy='"$ROOT" xargs "$GREP" -i'

From 88f3f28e8c634e54e68769d72f2ec40f7c5d35f9 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:10:52 +0200
Subject: [PATCH 0068/1378] env_defaul=>env_default

---
 plugins/singlechar/singlechar.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 0a815736d..b6c9665c5 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -20,7 +20,7 @@ default ROOT sudo
 default WGET wget
 default CURL curl
 
-env_defaul PAGER less
+env_default PAGER less
 
 ###########################
 # Alias

From 67290ffca93d3fb7ebeb9253cc551a5632299c16 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 5 May 2012 16:17:26 +0200
Subject: [PATCH 0069/1378] Enhance writing routines

---
 plugins/singlechar/singlechar.plugin.zsh | 40 ++++++++++++++++--------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index b6c9665c5..ea9b34324 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -30,15 +30,20 @@ env_default PAGER less
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
-alias c='cat'
-alias w='cat >'
-alias a='cat >>'
+alias w='echo >'
+alias a='echo >>'
 
+alias c='cat'
 alias p='"$PAGER"'
 
 alias d='"$WGET"'
 alias u='"$CURL"'
 
+# enhanced writeing
+
+alias w:='cat >'
+alias a:='cat >>'
+
 # XARGS
 
 alias x='xargs'
@@ -46,15 +51,18 @@ alias x='xargs'
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
-alias xc='xargs cat'
-alias xw='xargs cat >'
-alias xa='xargs cat >>'
+alias xw='xargs echo >'
+alias xa='xargs echo >>'
 
+alias xc='xargs cat'
 alias xp='xargs "$PAGER"'
 
 alias xd='xargs "$WGET"'
 alias xu='xargs "$CURL"'
 
+alias xw:='xargs cat >'
+alias xa:='xargs >>'
+
 # SUDO
 
 alias s='"$ROOT"'
@@ -62,14 +70,17 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
-alias sc='"$ROOT" cat'
-alias sw='"$ROOT" cat >'
-alias sa='"$ROOT" cat >>'
+alias sw='"$ROOT" echo >'
+alias sa='"$ROOT" echo >>'
 
+alias sc='"$ROOT" cat'
 alias sp='"$ROOT" "$PAGER"'
 
 alias sd='"$ROOT" "$WGET"'
 
+alias sw:='"$ROOT" cat >'
+alias sa:='"$ROOT" cat >>'
+
 # SUDO-XARGS
 
 alias sx='"$ROOT" xargs'
@@ -77,11 +88,14 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -i'
 alias sxn='"$ROOT" xargs "$GREP" -iv'
 
-alias sxc='"$ROOT" xargs cat'
-alias sxw='"$ROOT" xargs cat >'
-alias sxa='"$ROOT" xargs cat >>'
+alias sxw='"$ROOT" xargs echo >'
+alias sxa='"$ROOT" xargs echo >>'
 
+alias sxc='"$ROOT" xargs cat'
 alias sxp='"$ROOT" xargs "$PAGER"'
 
 alias sxd='"$ROOT" xargs "$WGET"'
-alias sxu='"$ROOT" xargs "$CURL"'
\ No newline at end of file
+alias sxu='"$ROOT" xargs "$CURL"'
+
+alias sxw:='"$ROOT" xargs cat >'
+alias sxa:='"$ROOT" xargs cat >>'
\ No newline at end of file

From 3af5cf3b1d40312101dae89c1d43c9d6afef8fcd Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Thu, 10 May 2012 09:21:50 +0200
Subject: [PATCH 0070/1378] Add file finders

---
 plugins/singlechar/singlechar.plugin.zsh | 26 +++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index ea9b34324..cd5191cbd 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -30,6 +30,12 @@ env_default PAGER less
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
+alias f.='find .'
+alias f:='find'
+
+alias f='"$GREP" -li'
+alias fn='"$GREP" -lvi'
+
 alias w='echo >'
 alias a='echo >>'
 
@@ -39,7 +45,7 @@ alias p='"$PAGER"'
 alias d='"$WGET"'
 alias u='"$CURL"'
 
-# enhanced writeing
+# enhanced writing
 
 alias w:='cat >'
 alias a:='cat >>'
@@ -51,6 +57,12 @@ alias x='xargs'
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
+alias xf.='xargs find .'
+alias xf:='xargs find'
+
+alias xf='xargs "$GREP" -li'
+alias xfn='xargs "$GREP" -lvi'
+
 alias xw='xargs echo >'
 alias xa='xargs echo >>'
 
@@ -70,6 +82,12 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
+alias xf.='"$ROOT" find .'
+alias xf:='"$ROOT" find'
+
+alias xf='"$ROOT" "$GREP" -li'
+alias xfn='"$ROOT" "$GREP" -lvi'
+
 alias sw='"$ROOT" echo >'
 alias sa='"$ROOT" echo >>'
 
@@ -88,6 +106,12 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -i'
 alias sxn='"$ROOT" xargs "$GREP" -iv'
 
+alias sxf.='"$ROOT" xargs find .'
+alias sxf:='"$ROOT" xargs find'
+
+alias sxf='"$ROOT" xargs "$GREP" -li'
+alias sxfn='"$ROOT" xargs "$GREP" -lvi'
+
 alias sxw='"$ROOT" xargs echo >'
 alias sxa='"$ROOT" xargs echo >>'
 

From 7a338ab6a5208a9f9b9fcbf69d225159fc4ae600 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Thu, 10 May 2012 09:35:29 +0200
Subject: [PATCH 0071/1378] Add Man

---
 plugins/singlechar/singlechar.plugin.zsh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index cd5191cbd..d44a0e80f 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -42,6 +42,8 @@ alias a='echo >>'
 alias c='cat'
 alias p='"$PAGER"'
 
+alias m='man'
+
 alias d='"$WGET"'
 alias u='"$CURL"'
 
@@ -69,6 +71,8 @@ alias xa='xargs echo >>'
 alias xc='xargs cat'
 alias xp='xargs "$PAGER"'
 
+alias xm='xargs man'
+
 alias xd='xargs "$WGET"'
 alias xu='xargs "$CURL"'
 
@@ -82,11 +86,11 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
-alias xf.='"$ROOT" find .'
-alias xf:='"$ROOT" find'
+alias sf.='"$ROOT" find .'
+alias sf:='"$ROOT" find'
 
-alias xf='"$ROOT" "$GREP" -li'
-alias xfn='"$ROOT" "$GREP" -lvi'
+alias sf='"$ROOT" "$GREP" -li'
+alias sfn='"$ROOT" "$GREP" -lvi'
 
 alias sw='"$ROOT" echo >'
 alias sa='"$ROOT" echo >>'
@@ -94,6 +98,8 @@ alias sa='"$ROOT" echo >>'
 alias sc='"$ROOT" cat'
 alias sp='"$ROOT" "$PAGER"'
 
+alias sm='"$ROOT" man'
+
 alias sd='"$ROOT" "$WGET"'
 
 alias sw:='"$ROOT" cat >'
@@ -118,6 +124,8 @@ alias sxa='"$ROOT" xargs echo >>'
 alias sxc='"$ROOT" xargs cat'
 alias sxp='"$ROOT" xargs "$PAGER"'
 
+alias sxm='"$ROOT" xargs man'
+
 alias sxd='"$ROOT" xargs "$WGET"'
 alias sxu='"$ROOT" xargs "$CURL"'
 

From d573cddcc937be8c253b97b7343a0670aea3e9b7 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Tue, 29 May 2012 03:07:15 +0200
Subject: [PATCH 0072/1378] Enhance file find

---
 plugins/singlechar/singlechar.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index d44a0e80f..4d3e16b12 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -30,7 +30,7 @@ env_default PAGER less
 alias y='"$GREP" -i'
 alias n='"$GREP" -vi'
 
-alias f.='find .'
+alias f.='find . | "$GREP"'
 alias f:='find'
 
 alias f='"$GREP" -li'
@@ -59,7 +59,7 @@ alias x='xargs'
 alias xy='xargs "$GREP" -i'
 alias xn='xargs "$GREP" -iv'
 
-alias xf.='xargs find .'
+alias xf.='xargs find . | "$GREP"'
 alias xf:='xargs find'
 
 alias xf='xargs "$GREP" -li'
@@ -86,7 +86,7 @@ alias s='"$ROOT"'
 alias sy='"$ROOT" "$GREP" -i'
 alias sn='"$ROOT" "$GREP" -iv'
 
-alias sf.='"$ROOT" find .'
+alias sf.='"$ROOT" find . | "$GREP"'
 alias sf:='"$ROOT" find'
 
 alias sf='"$ROOT" "$GREP" -li'
@@ -112,7 +112,7 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -i'
 alias sxn='"$ROOT" xargs "$GREP" -iv'
 
-alias sxf.='"$ROOT" xargs find .'
+alias sxf.='"$ROOT" xargs find . | "$GREP"'
 alias sxf:='"$ROOT" xargs find'
 
 alias sxf='"$ROOT" xargs "$GREP" -li'

From b1977d4049cbb7fd203f53511c1067a17150d3e4 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 13 May 2012 10:22:45 +0200
Subject: [PATCH 0073/1378] Make grep recoursive

---
 plugins/singlechar/singlechar.plugin.zsh | 28 ++++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 4d3e16b12..58837407d 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -27,14 +27,14 @@ env_default PAGER less
 
 # CAT, GREP, CURL, WGET
 
-alias y='"$GREP" -i'
-alias n='"$GREP" -vi'
+alias y='"$GREP" -Ri'
+alias n='"$GREP" -Rvi'
 
 alias f.='find . | "$GREP"'
 alias f:='find'
 
-alias f='"$GREP" -li'
-alias fn='"$GREP" -lvi'
+alias f='"$GREP" -Rli'
+alias fn='"$GREP" -Rlvi'
 
 alias w='echo >'
 alias a='echo >>'
@@ -56,14 +56,14 @@ alias a:='cat >>'
 
 alias x='xargs'
 
-alias xy='xargs "$GREP" -i'
-alias xn='xargs "$GREP" -iv'
+alias xy='xargs "$GREP" -Ri'
+alias xn='xargs "$GREP" -Riv'
 
 alias xf.='xargs find . | "$GREP"'
 alias xf:='xargs find'
 
-alias xf='xargs "$GREP" -li'
-alias xfn='xargs "$GREP" -lvi'
+alias xf='xargs "$GREP" -Rli'
+alias xfn='xargs "$GREP" -Rlvi'
 
 alias xw='xargs echo >'
 alias xa='xargs echo >>'
@@ -83,14 +83,14 @@ alias xa:='xargs >>'
 
 alias s='"$ROOT"'
 
-alias sy='"$ROOT" "$GREP" -i'
-alias sn='"$ROOT" "$GREP" -iv'
+alias sy='"$ROOT" "$GREP" -Ri'
+alias sn='"$ROOT" "$GREP" -Riv'
 
 alias sf.='"$ROOT" find . | "$GREP"'
 alias sf:='"$ROOT" find'
 
-alias sf='"$ROOT" "$GREP" -li'
-alias sfn='"$ROOT" "$GREP" -lvi'
+alias sf='"$ROOT" "$GREP" -Rli'
+alias sfn='"$ROOT" "$GREP" -Rlvi'
 
 alias sw='"$ROOT" echo >'
 alias sa='"$ROOT" echo >>'
@@ -109,8 +109,8 @@ alias sa:='"$ROOT" cat >>'
 
 alias sx='"$ROOT" xargs'
 
-alias sxy='"$ROOT" xargs "$GREP" -i'
-alias sxn='"$ROOT" xargs "$GREP" -iv'
+alias sxy='"$ROOT" xargs "$GREP" -Ri'
+alias sxn='"$ROOT" xargs "$GREP" -Riv'
 
 alias sxf.='"$ROOT" xargs find . | "$GREP"'
 alias sxf:='"$ROOT" xargs find'

From 0f35726a003e133daf8879aa05ba276ed565c0dd Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 13 May 2012 10:23:20 +0200
Subject: [PATCH 0074/1378] Make (s)xf not search in current dir

---
 plugins/singlechar/singlechar.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/singlechar/singlechar.plugin.zsh b/plugins/singlechar/singlechar.plugin.zsh
index 58837407d..44bd998aa 100644
--- a/plugins/singlechar/singlechar.plugin.zsh
+++ b/plugins/singlechar/singlechar.plugin.zsh
@@ -59,7 +59,7 @@ alias x='xargs'
 alias xy='xargs "$GREP" -Ri'
 alias xn='xargs "$GREP" -Riv'
 
-alias xf.='xargs find . | "$GREP"'
+alias xf.='xargs find | "$GREP"'
 alias xf:='xargs find'
 
 alias xf='xargs "$GREP" -Rli'
@@ -112,7 +112,7 @@ alias sx='"$ROOT" xargs'
 alias sxy='"$ROOT" xargs "$GREP" -Ri'
 alias sxn='"$ROOT" xargs "$GREP" -Riv'
 
-alias sxf.='"$ROOT" xargs find . | "$GREP"'
+alias sxf.='"$ROOT" xargs find | "$GREP"'
 alias sxf:='"$ROOT" xargs find'
 
 alias sxf='"$ROOT" xargs "$GREP" -li'

From b7bad0f69b064225a4557667eb1e95d3df8ad819 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 6 May 2012 00:05:22 +0200
Subject: [PATCH 0075/1378] Add the fastfile plugin

---
 plugins/fastfile/fastfile.plugin.zsh | 128 +++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 plugins/fastfile/fastfile.plugin.zsh

diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
new file mode 100644
index 000000000..51e48df5b
--- /dev/null
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -0,0 +1,128 @@
+################################################################################
+#          FILE:  fastfile.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Michael Varner (musikmichael@web.de)
+#       VERSION:  1.0.0
+#
+# This plugin adds the ability to on the fly generate and access file shortcuts.
+#
+################################################################################
+
+###########################
+# Settings 
+
+# These can be overwritten any time.
+# If they are not set yet, they will be
+# overwritten with their default values
+
+default fastfile_dir        "${HOME}/.fastfile/"
+default fastfile_var_prefix "§"
+
+###########################
+# Impl
+
+#
+# Generate a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut (default: name of the file)
+#    2. file - The file or directory to make the shortcut for
+# STDOUT:
+#    => fastfle_print
+#
+function fastfile() {
+    test "$2" || 2="."
+    2=$(readlink -f "$2")
+    test "$1" || 1="$(basename "$2")"
+
+    mkdir -p "${fastfile_dir}"
+    echo "$2" > "$(fastfile_resolv "$1")"
+
+    fastfile_sync
+    fastfile_print "$1"
+}
+
+#
+# Resolve the location of a shortcut file (the database file, where the value is written!)
+#
+# Arguments:
+#    1. name - The name of the shortcut
+# STDOUT:
+#   The path
+#
+function fastfile_resolv() {
+    echo "${fastfile_dir}${1}"
+}
+
+#
+# Get the real path of a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut
+# STDOUT:
+#    The path
+#
+function fastfile_get() {
+    cat "$(fastfile_resolv "$1")"
+}
+
+#
+# Print a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut
+# STDOUT:
+#    Name and value of the shortcut
+#
+function fastfile_print() {
+    echo "${fastfile_var_prefix}${1} -> $(fastfile_get "$1")"
+}
+
+#
+# List all shortcuts
+#
+# STDOUT:
+#    (=> fastfle_print) for each shortcut
+#
+function fastfile_ls() {
+    for f in $(ls "${fastfile_dir}"); do
+	fastfile_print "$f"
+    done | column -t
+}
+
+#
+# Remove a shortcut
+#
+# Arguments:
+#    1. name - The name of the shortcut (default: name of the file)
+#    2. file - The file or directory to make the shortcut for
+# STDOUT:
+#    => fastfle_print
+#
+function fastfile_rm() {
+    fastfile_print "$1"
+    rm "$(fastfile_resolv "$1")"
+}
+
+#
+# Generate the aliases for the shortcuts
+#
+function fastfile_sync() {
+    for f in $(ls "${fastfile_dir}"); do
+	alias -g "${fastfile_var_prefix}${f}"="$(fastfile_get "$f")"
+    done
+}
+
+##################################
+# Shortcuts
+
+alias ff=fastfile
+alias ffp=fastfile_print
+alias ffrm=fastfile_rm
+alias ffls=fastfile_ls
+alias ffsync=fastfile_sync
+
+##################################
+# Init 
+
+fastfile_sync
\ No newline at end of file

From 8c18f007131eb242eacae16db85b07f986b08063 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sun, 6 May 2012 22:26:12 +0200
Subject: [PATCH 0076/1378] Enhance handleing of spaces in filenames

---
 plugins/fastfile/fastfile.plugin.zsh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index 51e48df5b..775e9483e 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -32,14 +32,17 @@ default fastfile_var_prefix "§"
 #
 function fastfile() {
     test "$2" || 2="."
-    2=$(readlink -f "$2")
-    test "$1" || 1="$(basename "$2")"
+    file=$(readlink -f "$2")
+    
+    test "$1" || 1="$(basename "$file")"
+    name=$(echo "$1" | tr " " "_")
+
 
     mkdir -p "${fastfile_dir}"
-    echo "$2" > "$(fastfile_resolv "$1")"
+    echo "$file" > "$(fastfile_resolv "$name")"
 
     fastfile_sync
-    fastfile_print "$1"
+    fastfile_print "$name"
 }
 
 #
@@ -85,9 +88,13 @@ function fastfile_print() {
 #    (=> fastfle_print) for each shortcut
 #
 function fastfile_ls() {
-    for f in $(ls "${fastfile_dir}"); do
-	fastfile_print "$f"
-    done | column -t
+    for f in "${fastfile_dir}"/*; do 
+	file=`basename "$f"` # To enable simpler handeling of spaces in file names
+	varkey=`echo "$file" | tr " " "_"`
+
+	# Special format for colums
+	echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
+    done | column -t -s "|"
 }
 
 #
@@ -108,8 +115,11 @@ function fastfile_rm() {
 # Generate the aliases for the shortcuts
 #
 function fastfile_sync() {
-    for f in $(ls "${fastfile_dir}"); do
-	alias -g "${fastfile_var_prefix}${f}"="$(fastfile_get "$f")"
+    for f in "${fastfile_dir}"/*; do 
+	file=`basename "$f"` # To enable simpler handeling of spaces in file names
+	varkey=`echo "$file" | tr " " "_"`
+
+	alias -g "${fastfile_var_prefix}${varkey}"="'$(fastfile_get "$file")'"
     done
 }
 

From ce4431a160350e4d2d384251a9471cfed493b834 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <razor.psp@gmail.com>
Date: Mon, 4 Jun 2012 11:50:42 +0300
Subject: [PATCH 0077/1378] Added spin to bundled_commands (Bundler plugin)

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 2b80b76e6..7d2d1dcfd 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber ey foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber ey foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spin spork thin thor unicorn unicorn_rails)
 
 ## Functions
 

From 4f9cfee9bdfcab18bb83d17129f090a62dc05eac Mon Sep 17 00:00:00 2001
From: nXqd <nxqd.inbox@gmail.com>
Date: Thu, 14 Jun 2012 08:06:36 +0300
Subject: [PATCH 0078/1378] avoid VCS folders

---
 lib/grep.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 93c4270b6..25345bd06 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -2,5 +2,11 @@
 # Color grep results
 # Examples: http://rubyurl.com/ZXv
 #
-export GREP_OPTIONS='--color=auto'
+
+# avoid VCS folders
+GREP_OPTIONS=
+for PATTERN in .cvs .git .hg .svn; do
+    GREP_OPTIONS+="--exclude-dir=$PATTERN "
+done
+export GREP_OPTIONS+='--color=auto '
 export GREP_COLOR='1;32'
\ No newline at end of file

From 18cb11903f8208403a0ba5a8f2ece1a0bd4ef9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20M-B?= <essembeh@gmail.com>
Date: Wed, 27 Jun 2012 00:12:21 +0200
Subject: [PATCH 0079/1378] Comment l alias

---
 lib/aliases.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0555be264..d33d71cf0 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -16,7 +16,7 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
+#alias l='ls -la'
 alias ll='ls -l'
 alias sl=ls # often screw this up
 

From 0aa4456d5657c957eaf0c54f6eb24e58b9149d4b Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 01:42:35 +0200
Subject: [PATCH 0080/1378] Add completion instructions for apt/aptitude
 commands

---
 plugins/debian/debian.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 39d3ef36a..22803ee1b 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -107,6 +107,20 @@ else
         ?not(~n`uname -r`))'\'' root'
 fi
 
+# Completion ################################################################
+
+# TODO: These definitions won't change between apt-get and uptitude automaticaly
+compdef _apt aac="$apt_pref autoclean"
+compdef _apt abd="$apt_pref build-dep"
+compdef _apt ac="$apt_pref clean"
+compdef _apt ad="$apt_pref update"
+compdef _apt afu="$apt_pref update"
+compdef _apt ag="$apt_pref upgrade"
+compdef _apt ai="$apt_pref install"
+compdef _apt ail="$apt_pref install"
+compdef _apt ap="$apt_pref purge"
+compdef _apt ar="$apt_pref remove"
+compdef _apt ads="apt-get dselect-upgrade"
 
 # Misc. #####################################################################
 # print all installed packages

From 7d24f4cd407d61a17bd88157c594215ecc3b0bcd Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 01:42:47 +0200
Subject: [PATCH 0081/1378] Use a static apt-get where only apt-get works

---
 plugins/debian/debian.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 22803ee1b..55e2be06c 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -56,7 +56,7 @@ if [[ $use_sudo -eq 1 ]]; then
     alias ar='sudo $apt_pref remove'
 
     # apt-get only
-    alias ads='sudo $apt_pref dselect-upgrade'
+    alias ads='sudo apt-get dselect-upgrade'
 
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:

From e3c87611fc75ff5149b13fdd84ee8c87c7c1d129 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 01:44:08 +0200
Subject: [PATCH 0082/1378] Add myself to the authors list

---
 plugins/debian/debian.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 55e2be06c..c556cb0b5 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,6 +1,7 @@
 # Authors:
 # https://github.com/AlexBio
 # https://github.com/dbb
+# https://github.com/Mappleconfusers
 #
 # Debian-related zsh aliases and functions for zsh
 

From 5f37649508f6b6323e78249671d7897af8076886 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 04:44:26 +0200
Subject: [PATCH 0083/1378] Dynamicly generate completion functions to support
 changing apt_pref

---
 plugins/debian/debian.plugin.zsh | 45 +++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index c556cb0b5..b6f9fd2bf 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -110,18 +110,39 @@ fi
 
 # Completion ################################################################
 
-# TODO: These definitions won't change between apt-get and uptitude automaticaly
-compdef _apt aac="$apt_pref autoclean"
-compdef _apt abd="$apt_pref build-dep"
-compdef _apt ac="$apt_pref clean"
-compdef _apt ad="$apt_pref update"
-compdef _apt afu="$apt_pref update"
-compdef _apt ag="$apt_pref upgrade"
-compdef _apt ai="$apt_pref install"
-compdef _apt ail="$apt_pref install"
-compdef _apt ap="$apt_pref purge"
-compdef _apt ar="$apt_pref remove"
-compdef _apt ads="apt-get dselect-upgrade"
+#
+# Registers a compdef for $1 that calls $apt_pref with the commands $2
+# To do that it creates a new completion function called _apt_pref_$2
+#
+apt_pref_compdef() {
+    local f fb
+    f="_apt_pref_${2}"
+
+    fb="function ${f}() {
+        shift words; 
+	service=\"\$apt_pref\"; 
+	words=(\"\$apt_pref\" '$2' \$words); 
+	((CURRENT++))
+	test \"\${apt_pref}\" = 'aptitude' && _aptitude || _apt
+    }"
+    
+    eval "$fb"
+    echo "$fb"
+
+    compdef "$f" "$1"
+}
+
+apt_pref_compdef aac "autoclean"
+apt_pref_compdef abd "build-dep"
+apt_pref_compdef ac  "clean"
+apt_pref_compdef ad  "update"
+apt_pref_compdef afu "update"
+apt_pref_compdef ag  "upgrade"
+apt_pref_compdef ai  "install"
+apt_pref_compdef ail "install"
+apt_pref_compdef ap  "purge"
+apt_pref_compdef ar  "remove"
+apt_pref_compdef ads "dselect-upgrade"
 
 # Misc. #####################################################################
 # print all installed packages

From 1b36c1beae21dafead692f83a099bdd69a0c6e50 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Sat, 30 Jun 2012 05:37:10 +0200
Subject: [PATCH 0084/1378] Remove debug info

---
 plugins/debian/debian.plugin.zsh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index b6f9fd2bf..722b83c30 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -118,16 +118,13 @@ apt_pref_compdef() {
     local f fb
     f="_apt_pref_${2}"
 
-    fb="function ${f}() {
+    eval "function ${f}() {
         shift words; 
 	service=\"\$apt_pref\"; 
 	words=(\"\$apt_pref\" '$2' \$words); 
 	((CURRENT++))
 	test \"\${apt_pref}\" = 'aptitude' && _aptitude || _apt
     }"
-    
-    eval "$fb"
-    echo "$fb"
 
     compdef "$f" "$1"
 }

From c23392ac5b9e8655a42e827983ba93636801136b Mon Sep 17 00:00:00 2001
From: jaischeema <jaischeema@gmail.com>
Date: Tue, 3 Jul 2012 13:02:29 +1000
Subject: [PATCH 0085/1378] Add new theme : jaischeema

---
 themes/jaischeema.zsh-theme | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 themes/jaischeema.zsh-theme

diff --git a/themes/jaischeema.zsh-theme b/themes/jaischeema.zsh-theme
new file mode 100644
index 000000000..06778216d
--- /dev/null
+++ b/themes/jaischeema.zsh-theme
@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#          FILE:  jaischeema.zsh-theme
+#   DESCRIPTION:  oh-my-zsh theme file.
+#        AUTHOR:  Jais Cheema
+#       VERSION:  0.0.1
+# ------------------------------------------------------------------------------
+
+
+
+PROMPT='%{$fg_bold[magenta]%}%m%{$reset_color%} at %{$fg_bold[green]%}%~%{$reset_color%} %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%}%{$fg[red]%}❯%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="±(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) "
+
+if which rbenv &> /dev/null; then
+  RPROMPT='%{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}'
+else
+if which rvm-prompt &> /dev/null; then
+  RPROMPT='%{$fg[red]%}$(rvm-prompt)%{$reset_color%}'
+fi

From 8d60f9a0d8eaf7f72eb64f600fcecbe48a26300f Mon Sep 17 00:00:00 2001
From: jais <jais@www2.cybersecure.com.au>
Date: Tue, 3 Jul 2012 15:12:55 +1000
Subject: [PATCH 0086/1378] Fix the rvm gemset right prompt:wq

---
 themes/jaischeema.zsh-theme | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/jaischeema.zsh-theme b/themes/jaischeema.zsh-theme
index 06778216d..aecc5b961 100644
--- a/themes/jaischeema.zsh-theme
+++ b/themes/jaischeema.zsh-theme
@@ -17,6 +17,7 @@ ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) "
 if which rbenv &> /dev/null; then
   RPROMPT='%{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}'
 else
-if which rvm-prompt &> /dev/null; then
-  RPROMPT='%{$fg[red]%}$(rvm-prompt)%{$reset_color%}'
+  if which rvm-prompt &> /dev/null; then
+    RPROMPT='%{$fg[red]%}$(rvm-prompt)%{$reset_color%}'
+  fi
 fi

From 4d0c135798368a6241752060ffc6a2190a94a810 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:49:32 +0200
Subject: [PATCH 0087/1378] added completion for all asadmin subcommands

---
 plugins/glassfish/_asadmin | 345 +++++++++++++++++++++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 plugins/glassfish/_asadmin

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
new file mode 100644
index 000000000..c8f62c67c
--- /dev/null
+++ b/plugins/glassfish/_asadmin
@@ -0,0 +1,345 @@
+#compdef asadmin
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+    "add-library:adds one or more library JAR files to GlassFish Server"
+    "add-resources:creates the resources specified in an XML file"
+    "apply-http-lb-changes:applies load balancer configuration changes to the load balancer"
+    "backup-domain:performs a backup on the domain"
+    "change-admin-password:changes the administrator password"
+    "change-master-broker:changes the master broker in a Message Queue cluster providing JMS services for a GlassFish Server cluster."
+    "change-master-password:changes the master password"
+    "collect-log-files:creates a ZIP archive of all available log files"
+    "configure-jms-cluster:configures the Message Queue cluster providing JMS services to a GlassFish Server cluster"
+    "configure-lb-weight:sets load balancing weights for clustered instances"
+    "configure-ldap-for-admin:configures the authentication realm named admin-realm for the given LDAP"
+    "copy-config:copies an existing named configuration to create another configuration"
+    "create-admin-object:adds the administered object with the specified JNDI name for a resource adapter"
+    "create-application-ref:creates a reference to an application"
+    "create-audit-module:adds an audit module"
+    "create-auth-realm:adds the named authentication realm"
+    "create-cluster:creates a GlassFish Server cluster"
+    "create-connector-connection-pool:adds a connection pool with the specified connection pool name"
+    "create-connector-resource:registers the connector resource with the specified JNDI name"
+    "create-connector-security-map:creates a security map for the specified connector connection pool"
+    "create-connector-work-security-map:creates a work security map for the specified resource adapter"
+    "create-custom-resource:creates a custom resource"
+    "create-domain:creates a domain"
+    "create-file-user:creates a new file user"
+    "create-http:sets HTTP parameters for a protocol"
+    "create-http-health-checker:creates a health-checker for a specified load balancer configuration"
+    "create-http-lb:creates a load balancer"
+    "create-http-lb-config:creates a configuration for the load balancer"
+    "create-http-lb-ref:adds an existing cluster or server instance to an existing load balancer configuration or load balancer"
+    "create-http-listener:adds a new HTTP network listener socket"
+    "create-http-redirect:adds a new HTTP redirect"
+    "create-iiop-listener:adds an IIOP listener"
+    "create-instance:creates a GlassFish Server instance"
+    "create-jacc-provider:enables administrators to create a JACC provider that can be used by third-party authorization modules for applications running in GlassFish Server"
+    "create-javamail-resource:creates a JavaMail session resource"
+    "create-jdbc-connection-pool:registers a JDBC connection pool"
+    "create-jdbc-resource:creates a JDBC resource with the specified JNDI name"
+    "create-jms-host:creates a JMS host"
+    "create-jms-resource:creates a JMS resource"
+    "create-jmsdest:creates a JMS physical destination"
+    "create-jndi-resource:registers a JNDI resource"
+    "create-jvm-options:creates options for the Java application launcher"
+    "create-lifecycle-module:creates a lifecycle module"
+    "create-local-instance:creates a GlassFish Server instance on the host where the subcommand is run"
+    "create-message-security-provider:enables administrators to create a message security provider, which specifies how SOAP messages will be secured."
+    "create-network-listener:adds a new network listener socket"
+    "create-node-config:creates a node that is not enabled for remote communication"
+    "create-node-dcom:creates a node that is enabled for com munication over DCOM"
+    "create-node-ssh:creates a node that is enabled for communication over SSH"
+    "create-password-alias:creates a password alias"
+    "create-profiler:creates the profiler element"
+    "create-protocol:adds a new protocol"
+    "create-protocol-filter:adds a new protocol filter"
+    "create-protocol-finder:adds a new protocol finder"
+    "create-resource-adapter-config:creates the configuration information for the connector module"
+    "create-resource-ref:creates a reference to a resource"
+    "create-service:configures the starting of a DAS or a GlassFish Server instance on an unattended boot"
+    "create-ssl:creates and configures the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "create-system-properties:adds one or more system property elements that can be referenced elsewhere in the configuration."
+    "create-threadpool:adds a thread pool"
+    "create-transport:adds a new transport"
+    "create-virtual-server:creates the named virtual server"
+    "delete-admin-object:removes the administered object with the specified JNDI name."
+    "delete-application-ref:removes a reference to an applica tion"
+    "delete-audit-module:removes the named audit-module"
+    "delete-auth-realm:removes the named authentication realm"
+    "delete-cluster:deletes a GlassFish Server cluster"
+    "delete-config:deletes an existing named configuration"
+    "delete-connector-connection-pool:removes the specified connector connection pool"
+    "delete-connector-resource:removes the connector resource with the specified JNDI name"
+    "delete-connector-security-map:deletes a security map for the specified connector connection pool"
+    "delete-connector-work-security-map:deletes a work security map for the specified resource adapter"
+    "delete-custom-resource:removes a custom resource"
+    "delete-domain:deletes a domain"
+    "delete-file-user:removes the named file user"
+    "delete-http:removes HTTP parameters from a protocol"
+    "delete-http-health-checker:deletes the health-checker for a specified load balancer configuration"
+    "delete-http-lb:deletes a load balancer"
+    "delete-http-lb-config:deletes a load balancer configuration"
+    "delete-http-lb-ref:deletes the cluster or server instance from a load balancer"
+    "delete-http-listener:removes a network listener"
+    "delete-http-redirect:removes an HTTP redirect"
+    "delete-iiop-listener:removes an IIOP listener"
+    "delete-instance:deletes a GlassFish Server instance"
+    "delete-jacc-provider:enables administrators to delete JACC providers defined for a domain"
+    "delete-javamail-resource:removes a JavaMail session resource"
+    "delete-jdbc-connection-pool:removes the specified JDBC connection pool"
+    "delete-jdbc-resource:removes a JDBC resource with the specified JNDI name"
+    "delete-jms-host:removes a JMS host"
+    "delete-jms-resource:removes a JMS resource"
+    "delete-jmsdest:removes a JMS physical destination"
+    "delete-jndi-resource:removes a JNDI resource"
+    "delete-jvm-options:removes one or more options for the Java application launcher"
+    "delete-lifecycle-module:removes the lifecycle module"
+    "delete-local-instance:deletes a GlassFish Server instance on the machine where the subcommand is run"
+    "delete-log-levels:"
+    "delete-message-security-provider:enables administrators to delete a message security provider"
+    "delete-network-listener:removes a network listener"
+    "delete-node-config:deletes a node that is not enabled for remote communication"
+    "delete-node-dcom:deletes a node that is enabled for communication over DCOM"
+    "delete-node-ssh:deletes a node that is enabled for communication over SSH"
+    "delete-password-alias:deletes a password alias"
+    "delete-profiler:removes the profiler element"
+    "delete-protocol:removes a protocol"
+    "delete-protocol-filter:removes a protocol filter"
+    "delete-protocol-finder:removes a protocol finder"
+    "delete-resource-adapter-config:deletes the resource adapter configuration"
+    "delete-resource-ref:removes a reference to a resource"
+    "delete-ssl:deletes the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "delete-system-property:removes a system property of the domain, configuration, cluster, or server instance, one at a time"
+    "delete-threadpool:removes a thread pool"
+    "delete-transport:removes a transport"
+    "delete-virtual-server:removes a virtual server"
+    "deploy:deploys the specified component"
+    "deploydir:deploys an exploded format of application archive"
+    "environment variable"
+    "disable:disables the component"
+    "disable-http-lb-application:disables an application managed by a load balancer"
+    "disable-http-lb-server:disables a sever or cluster managed by a load balancer"
+    "disable-monitoring:disables monitoring for the server or for specific monitorable modules"
+    "disable-secure-admin:disables secure admin if it is already enabled."
+    "disable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to not use the specified admin user to authenticate with each other and to authorize admin operations."
+    "disable-secure-admin-principal:disables the certificate for authorizing access in secure administration."
+    "enable:enables the component"
+    "enable-http-lb-application:enables a previously-disabled application managed by a load balancer"
+    "enable-http-lb-server:enables a previously disabled sever or cluster managed by a load balancer"
+    "enable-monitoring:enables monitoring for the server or for specific monitorable modules"
+    "enable-secure-admin:enables secure admin (if it is not already enabled), optionally changing the alias used for DAS-to-instance admin messages or the alias used for instance-to-DAS admin messages."
+    "enable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to use the specified admin user and the password associated with the password alias to authenticate with each other and to authorize admin operations."
+    "enable-secure-admin-principal:Instructs GlassFish Server, when secure admin is enabled, to accept admin requests from clients identified by the specified SSL certificate."
+    "export:marks a variable name for automatic export to the environment of subsequent commands in multimode"
+    "export-http-lb-config:exports the load balancer configuration or load balancer to a file"
+    "export-sync-bundle:exports the configuration data of a cluster or standalone instance to an archive file"
+    "flush-connection-pool:reintializes all connections established in the specified connection pool"
+    "flush-jmsdest:purges messages in a JMS destination."
+    "freeze-transaction-service:freezes the transaction subsystem"
+    "generate-domain-schema:"
+    "generate-jvm-report:shows the JVM machine statistics for a given target instance"
+    "get:gets the values of configurable or monitorable attributes"
+    "get-client-stubs:retrieves the application JAR files needed to launch the application client."
+    "get-health:provides information on the cluster health"
+    "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
+    "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
+    "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
+    "install-node-dcom:installs GlassFish Server software on specified DCOM-enabled hosts"
+    "install-node-ssh:installs GlassFish Server software on specified SSH-enabled hosts"
+    "jms-ping:checks if the JMS service is up and running"
+    "list:lists configurable or monitorable elements"
+    "list-admin-objects:gets all the administered objects"
+    "list-application-refs:lists the existing application references"
+    "list-applications:lists deployed applications"
+    "list-audit-modules:gets all audit modules and displays them"
+    "list-auth-realms:lists the authentication realms"
+    "list-backups:lists all backups"
+    "list-clusters:lists existing clusters in a domain"
+    "list-commands:lists available commands"
+    "list-components:lists deployed components"
+    "list-configs:lists named configurations"
+    "list-connector-connection-pools:lists the existing connector connection pools"
+    "list-connector-resources:lists all connector resources"
+    "list-connector-security-maps:lists the security maps belonging to the specified connector connection pool"
+    "list-connector-work-security-maps:lists the work security maps belonging to the specified resource adapter"
+    "list-containers:lists application containers"
+    "list-custom-resources:gets all custom resources"
+    "list-domains:lists the domains in the specified directory"
+    "list-file-groups:lists file groups"
+    "list-file-users:lists the file users"
+    "list-http-lb-configs:lists load balancer configurations"
+    "list-http-lbs:lists load balancers"
+    "list-http-listeners:lists the existing network listeners"
+    "list-iiop-listeners:lists the existing IIOP listeners"
+    "list-instances:lists GlassFish Server instances in a domain"
+    "list-jacc-providers:enables administrators to list JACC providers defined for a domain"
+    "list-javamail-resources:lists the existing JavaMail session resources"
+    "list-jdbc-connection-pools:lists all JDBC connection pools"
+    "list-jdbc-resources:lists all JDBC resources"
+    "list-jms-hosts:lists the existing JMS hosts"
+    "list-jms-resources:lists the JMS resources"
+    "list-jmsdest:lists the existing JMS physical destinations"
+    "list-jndi-entries:browses and queries the JNDI tree"
+    "list-jndi-resources:lists all existing JNDI resources"
+    "list-jvm-options:lists options for the Java application launcher"
+    "list-libraries:lists library JAR files on GlassFish Server"
+    "list-lifecycle-modules:lists the lifecycle modules"
+    "list-log-attributes:lists all logging attributes defined for a specified target in a domain"
+    "list-log-levels:lists the loggers and their log levels"
+    "list-message-security-providers:lists all security message providers for the given message layer"
+    "list-modules:lists GlassFish Server modules"
+    "list-network-listeners:lists the existing network listeners"
+    "list-nodes:lists all GlassFish Server nodes in a domain"
+    "list-nodes-config:lists all GlassFish Server nodes that do not support remote communication in a domain"
+    "list-nodes-dcom:lists all GlassFish Server nodes that support communication over DCOM in a domain"
+    "list-nodes-ssh:lists all GlassFish Server nodes that support communication over SSH in a domain"
+    "list-password-aliases:lists all password aliases"
+    "list-persistence-types:lists registered persistence types for HTTP sessions and SFSB instances"
+    "list-protocol-filters:lists the existing protocol filters"
+    "list-protocol-finders:lists the existing protocol finders"
+    "list-protocols:lists the existing protocols"
+    "list-resource-adapter-configs:lists the names of the current resource adapter configurations"
+    "list-resource-refs:lists existing resource references"
+    "list-secure-admin-internal-users:lists the user names that the GlassFish Server DAS and instances use to authenticate with each other and to authorize admin operations."
+    "list-secure-admin-principals:lists the certificates for which GlassFish Server accepts admin requests from clients."
+    "list-sub-components:lists EJB or servlet components in a deployed module or module of a deployed application"
+    "list-supported-cipher-suites:enables administrators to list the cipher suites that are supported and available to a specified GlassFish Server target"
+    "list-system-properties:lists the system properties of the domain, configuration, cluster, or server instance"
+    "list-threadpools:lists all the thread pools"
+    "list-timers:lists all of the persistent timers owned by server instance(s)"
+    "list-transports:lists the existing transports"
+    "list-virtual-servers:lists the existing virtual servers"
+    "list-web-context-param:lists servlet contextinitialization parameters of a deployed web application or module"
+    "list-web-env-entry:lists environment entries for a deployed web application or module"
+    "login:logs you into a domain"
+    "migrate-timers:moves EJB timers when a clustered instance was stopped or has crashed"
+    "monitor:displays monitoring data for commonly used components and services"
+    "multimode:allows multiple subcommands to be run while preserving environment settings and remaining in the asadmin utility"
+    "ping-connection-pool:tests if a connection pool is usable"
+    "ping-node-dcom:tests if a node that is enabled for communication over DCOM is usable"
+    "ping-node-ssh:tests if a node that is enabled for communication over SSH is usable"
+    "recover-transactions:manually recovers pending transactions"
+    "redeploy:redeploys the specified component"
+    "remove-library:removes one or more library JAR files from GlassFish Server"
+    "restart-domain:restarts the DAS of the specified domain"
+    "restart-instance:restarts a running GlassFish Server instance"
+    "restart-local-instance:restarts a running GlassFish Server instance on the host where the subcommand is run"
+    "restore-domain:restores files from backup"
+    "rollback-transaction:rolls back the named transaction"
+    "rotate-log:rotates the log file"
+    "set:sets the values of configurable attributes"
+    "set-log-attributes:sets the logging attributes for one or more loggers"
+    "set-log-levels:sets the log level for one or more loggers"
+    "set-web-context-param:sets a servlet context initialization parameter of a deployed web application or module"
+    "set-web-env-entry:sets an environment entry for a deployed web application or module"
+    "setup-ssh:sets up an SSH key on specified hosts"
+    "show-component-status:displays the status of the deployed component"
+    "start-cluster:starts a cluster"
+    "start-database:starts the Java DB"
+    "start-domain:starts the DAS of the specified domain"
+    "start-instance:starts a GlassFish Server instance"
+    "start-local-instance:starts a GlassFish Server instance on the host where the subcommand is run"
+    "stop-cluster:stops a GlassFish Server cluster"
+    "stop-database:stops the Java DB"
+    "stop-domain:stops the Domain Administration Server of the specified domain"
+    "stop-instance:stops a running GlassFish Server instance"
+    "stop-local-instance:stops a GlassFish Server instance on the machine where the subcommand is run"
+    "undeploy:removes a deployed component"
+    "unfreeze-transaction-service:resumes all suspended transactions"
+    "uninstall-node:uninstalls GlassFish Server software from specified hosts"
+    "uninstall-node-dcom:uninstalls GlassFish Server software from specified DCOM-enabled hosts"
+    "uninstall-node-ssh:uninstalls GlassFish Server software from specified SSH-enabled hosts"
+    "unset:removes one or more variables from the multimode environment"
+    "unset-web-context-param:unsets a servlet context initialization parameter of a deployed web application or module"
+    "unset-web-env-entry:unsets an environment entry for a deployed web application or module"
+    "update-connector-security-map:modifies a security map for the specified connector connection pool"
+    "update-connector-work-security-map:modifies a work security map for the specified resource adapter"
+    "update-file-user:updates a current file user as specified"
+    "update-node-config:updates the configuration data of anode"
+    "update-node-dcom:updates the configuration data of a node"
+    "update-node-ssh:updates the configuration data of a node"
+    "update-password-alias:updates a password alias"
+    "uptime:returns the length of time that the DAS has been running"
+    "validate-dcom:tests the connection over DCOM to a remote host"
+    "validate-multicast:validates that multicast transport is available for clusters"
+    "verify-domain-xml:verifies the content of the domain.xml file"
+    "version:displays version information forGlassFish Server"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "glassfish command" _1st_arguments
+    return
+fi
+
+local -a _command_args
+case "$words[1]" in
+    apps:info)
+        _command_args=(
+            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
+                )
+        ;;
+    apps:create)
+        _command_args=(
+            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
+                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
+                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
+                )
+        ;;
+    config)
+        _command_args=(
+            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
+                )
+        ;;
+    db:push)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
+                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
+                )
+        ;;
+    db:pull)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
+                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
+                )
+        ;;
+    keys)
+        _command_args=(
+            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
+                )
+        ;;
+    logs)
+        _command_args=(
+            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
+                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
+                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
+                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
+                )
+        ;;
+    pgbackups:capture)
+        _command_args=(
+            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
+                )
+        ;;
+    stack)
+        _command_args=(
+            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
+                )
+        ;;
+esac
+
+_arguments \
+    $_command_args \
+    &&  return 0

From d2116f355742ffe3f0c44ee865d136cb979eedea Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:57:59 +0200
Subject: [PATCH 0088/1378] apparently, this file must exist for the plugin to
 load

---
 plugins/glassfish/_glassfish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/glassfish/_glassfish

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/plugins/glassfish/_glassfish
@@ -0,0 +1 @@
+

From 0b2da8f11b2e84a73f3fbe019a086da28ae6d2a3 Mon Sep 17 00:00:00 2001
From: Justin Caratzas <justin.caratzas@gmail.com>
Date: Wed, 11 Jul 2012 23:40:12 -0400
Subject: [PATCH 0089/1378] Add very basic virtualenv plugin

checks for $VIRTUAL_ENV and provides to basename in a function for the prompt.
---
 plugins/virtualenv/virtualenv.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/virtualenv/virtualenv.plugin.zsh

diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
new file mode 100644
index 000000000..e8458389f
--- /dev/null
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -0,0 +1,9 @@
+function virtualenv_prompt_info(){
+  local virtualenv_path="$VIRTUAL_ENV"
+  if [[ -n $virtualenv_path ]]; then
+    local virtualenv_name=`basename $virtualenv_path`
+    printf "%s[%s] " "%{${fg[yellow]}%}" $virtualenv_name
+  fi
+}
+
+export VIRTUAL_ENV_DISABLE_PROMPT=1

From 5001412f6d127d8360ea8e0d775e7184aae2091d Mon Sep 17 00:00:00 2001
From: Bob Maerten <bob.maerten@gmail.com>
Date: Thu, 12 Jul 2012 14:19:10 +0300
Subject: [PATCH 0090/1378] vagrant uses 'ssh-config' command, not 'ssh_config'

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 483b29c53..1eed7f988 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -15,7 +15,7 @@ _1st_arguments=(
     'reload:Reload the vagrant environment'
     'resume:Resumes a suspend vagrant environment'
     'ssh:SSH into the currently running environment'
-    'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
+    'ssh-config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
     'status:Shows the status of the current Vagrant environment.'
     'suspend:Suspends the currently running vagrant environment'
     'up:Creates the vagrant environment'

From 350720eca171513a5e959d01dbeceaf15f268c5c Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:05:33 +0200
Subject: [PATCH 0091/1378] added completions for all known arguments to all
 known commands

---
 plugins/glassfish/_asadmin | 684 +++++++++++++++++++++++++++++++++----
 1 file changed, 624 insertions(+), 60 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index c8f62c67c..08ae9d461 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -278,66 +278,630 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-    apps:info)
-        _command_args=(
-            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
-                )
-        ;;
-    apps:create)
-        _command_args=(
-            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
-                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
-                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
-                )
-        ;;
-    config)
-        _command_args=(
-            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
-                )
-        ;;
-    db:push)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
-                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
-                )
-        ;;
-    db:pull)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
-                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
-                )
-        ;;
-    keys)
-        _command_args=(
-            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
-                )
-        ;;
-    logs)
-        _command_args=(
-            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
-                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
-                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
-                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
-                )
-        ;;
-    pgbackups:capture)
-        _command_args=(
-            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
-                )
-        ;;
-    stack)
-        _command_args=(
-            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
-                )
-        ;;
+	add-library)
+		_command_args=('--type')
+	;;
+	add-resources)
+		_command_args=('--target')
+	;;
+	apply-http-lb-changes)
+		_command_args=('--ping')
+	;;
+	backup-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+	;;
+	change-admin-password)
+		_command_args=('--domain_name' '--domaindir')
+	;;
+	change-master-password)
+		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+	;;
+	collect-log-files)
+		_command_args=('--retrieve' '--target')
+	;;
+	configure-jms-cluster)
+		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+	;;
+	configure-lb-weight)
+		_command_args=('--cluster')
+	;;
+	configure-ldap-for-admin)
+		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+	;;
+	copy-config)
+		_command_args=('--systemproperties')
+	;;
+	create-admin-object)
+		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+	;;
+	create-application-ref)
+		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+	;;
+	create-audit-module)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-auth-realm)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-connector-connection-pool)
+		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+	;;
+	create-connector-resource)
+		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+	;;
+	create-connector-security-map)
+		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+	;;
+	create-connector-work-security-map)
+		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+	;;
+	create-custom-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+	;;
+	create-domain)
+		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+	;;
+	create-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	create-http)
+		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+	;;
+	create-http-health-checker)
+		_command_args=('--config' '--interval' '--timeout' '--url')
+	;;
+	create-http-lb)
+		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+	;;
+	create-http-lb-ref)
+		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+	;;
+	create-http-listener)
+		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+	;;
+	create-http-redirect)
+		_command_args=('--redirect-port' '--secure-redirect' '--target')
+	;;
+	create-iiop-listener)
+		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+	;;
+	create-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+	;;
+	create-jacc-provider)
+		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+	;;
+	create-javamail-resource)
+		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+	;;
+	create-jdbc-connection-pool)
+		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+	;;
+	create-jdbc-resource)
+		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+	;;
+	create-jms-host)
+		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+	;;
+	create-jms-resource)
+		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+	;;
+	create-jmsdest)
+		_command_args=('--desttype' '--property' '--target')
+	;;
+	create-jndi-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+	;;
+	create-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	create-lifecycle-module)
+		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+	;;
+	create-local-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+	;;
+	create-message-security-provider)
+		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+	;;
+	create-network-listener)
+		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+	;;
+	create-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	create-node-dcom)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	create-node-ssh)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	create-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	create-profiler)
+		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+	;;
+	create-protocol)
+		_command_args=('--securityenabled' '--target')
+	;;
+	create-protocol-filter)
+		_command_args=('--classname' '--protocol' '--target')
+	;;
+	create-protocol-finder)
+		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+	;;
+	create-resource-adapter-config)
+		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+	;;
+	create-resource-ref)
+		_command_args=('--enabled' '--target')
+	;;
+	create-service)
+		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+	;;
+	create-ssl)
+		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+	;;
+	create-system-properties)
+		_command_args=('--target')
+	;;
+	create-threadpool)
+		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+	;;
+	create-transport)
+		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+	;;
+	create-virtual-server)
+		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+	;;
+	delete-admin-object)
+		_command_args=('--target')
+	;;
+	delete-application-ref)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-audit-module)
+		_command_args=('--target')
+	;;
+	delete-auth-realm)
+		_command_args=('--target')
+	;;
+	delete-connector-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-connector-resource)
+		_command_args=('--target')
+	;;
+	delete-connector-security-map)
+		_command_args=('--poolname' '--target')
+	;;
+	delete-connector-work-security-map)
+		_command_args=('--raname')
+	;;
+	delete-custom-resource)
+		_command_args=('--target')
+	;;
+	delete-domain)
+		_command_args=('--domaindir')
+	;;
+	delete-file-user)
+		_command_args=('--authrealmname' '--target')
+	;;
+	delete-http)
+		_command_args=('--target')
+	;;
+	delete-http-health-checker)
+		_command_args=('--config')
+	;;
+	delete-http-lb-ref)
+		_command_args=('--config' '--force' '--lbname')
+	;;
+	delete-http-listener)
+		_command_args=('--secure' '--target')
+	;;
+	delete-http-redirect)
+		_command_args=('--target')
+	;;
+	delete-iiop-listener)
+		_command_args=('--target')
+	;;
+	delete-instance)
+		_command_args=('--terse')
+	;;
+	delete-jacc-provider)
+		_command_args=('--target')
+	;;
+	delete-javamail-resource)
+		_command_args=('--target')
+	;;
+	delete-jdbc-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-jdbc-resource)
+		_command_args=('--target')
+	;;
+	delete-jms-host)
+		_command_args=('--target')
+	;;
+	delete-jms-resource)
+		_command_args=('--target')
+	;;
+	delete-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	delete-jndi-resource)
+		_command_args=('--target')
+	;;
+	delete-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	delete-lifecycle-module)
+		_command_args=('--target')
+	;;
+	delete-local-instance)
+		_command_args=('--node' '--nodedir')
+	;;
+	delete-log-levels)
+		_command_args=('--target')
+	;;
+	delete-message-security-provider)
+		_command_args=('--layer' '--target')
+	;;
+	delete-network-listener)
+		_command_args=('--target')
+	;;
+	delete-profiler)
+		_command_args=('--target')
+	;;
+	delete-protocol)
+		_command_args=('--target')
+	;;
+	delete-protocol-filter)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-protocol-finder)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-resource-adapter-config)
+		_command_args=('--target')
+	;;
+	delete-resource-ref)
+		_command_args=('--target')
+	;;
+	delete-ssl)
+		_command_args=('--target' '--type')
+	;;
+	delete-system-property)
+		_command_args=('--target')
+	;;
+	delete-threadpool)
+		_command_args=('--target')
+	;;
+	delete-transport)
+		_command_args=('--target')
+	;;
+	delete-virtual-server)
+		_command_args=('--target')
+	;;
+	deploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	deploydir)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	disable)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	disable-http-lb-application)
+		_command_args=('--name' '--timeout')
+	;;
+	disable-http-lb-server)
+		_command_args=('--timeout')
+	;;
+	disable-monitoring)
+		_command_args=('--modules' '--target')
+	;;
+	enable)
+		_command_args=('--target')
+	;;
+	enable-http-lb-application)
+		_command_args=('--name')
+	;;
+	enable-monitoring)
+		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+	;;
+	enable-secure-admin)
+		_command_args=('--adminalias' '--instancealias')
+	;;
+	export-http-lb-config)
+		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+	;;
+	export-sync-bundle)
+		_command_args=('--retrieve' '--target')
+	;;
+	flush-connection-pool)
+		_command_args=('--appname' '--modulename')
+	;;
+	flush-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	freeze-transaction-service)
+		_command_args=('--target')
+	;;
+	generate-domain-schema)
+		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+	;;
+	generate-jvm-report)
+		_command_args=('--target' '--type')
+	;;
+	get)
+		_command_args=('--monitor')
+	;;
+	get-client-stubs)
+		_command_args=('--appname')
+	;;
+	import-sync-bundle)
+		_command_args=('--instance' '--node' '--nodedir')
+	;;
+	install-node-dcom)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+	;;
+	install-node-ssh)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	jms-ping)
+		_command_args=('--target')
+	;;
+	list)
+		_command_args=('--monitor')
+	;;
+	list-application-refs)
+		_command_args=('--long' '--terse')
+	;;
+	list-backups)
+		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+	;;
+	list-commands)
+		_command_args=('--localonly' '--remoteonly')
+	;;
+	list-components)
+		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+	;;
+	list-connector-security-maps)
+		_command_args=('--long' '--securitymap' '--target')
+	;;
+	list-connector-work-security-maps)
+		_command_args=('--securitymap')
+	;;
+	list-custom-resources)
+		_command_args=('--target')
+	;;
+	list-domains)
+		_command_args=('--domaindir')
+	;;
+	list-file-groups)
+		_command_args=('--authrealmname' '--name')
+	;;
+	list-file-users)
+		_command_args=('--authrealmname')
+	;;
+	list-http-listeners)
+		_command_args=('--long')
+	;;
+	list-instances)
+		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+	;;
+	list-javamail-resources)
+		_command_args=('--target')
+	;;
+	list-jms-hosts)
+		_command_args=('--target')
+	;;
+	list-jms-resources)
+		_command_args=('--restype')
+	;;
+	list-jmsdest)
+		_command_args=('--desttype' '--property')
+	;;
+	list-jndi-entries)
+		_command_args=('--context')
+	;;
+	list-jndi-resources)
+		_command_args=('--target')
+	;;
+	list-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	list-libraries)
+		_command_args=('--type')
+	;;
+	list-lifecycle-modules)
+		_command_args=('--terse')
+	;;
+	list-message-security-providers)
+		_command_args=('--layer')
+	;;
+	list-nodes)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-config)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-dcom)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-ssh)
+		_command_args=('--long' '--terse')
+	;;
+	list-persistence-types)
+		_command_args=('--type')
+	;;
+	list-protocol-filters)
+		_command_args=('--target')
+	;;
+	list-protocol-finders)
+		_command_args=('--target')
+	;;
+	list-resource-adapter-configs)
+		_command_args=('--long' '--raname')
+	;;
+	list-sub-components)
+		_command_args=('--appname' '--resources' '--terse' '--type')
+	;;
+	list-virtual-servers)
+		_command_args=('--target')
+	;;
+	list-web-context-param)
+		_command_args=('--name')
+	;;
+	list-web-env-entry)
+		_command_args=('--name')
+	;;
+	login)
+		_command_args=('--target')
+	;;
+	migrate-timers)
+		_command_args=('--target')
+	;;
+	monitor)
+		_command_args=('--filename' '--filter' '--interval' '--type')
+	;;
+	multimode)
+		_command_args=('--encoding' '--file' '--printprompt')
+	;;
+	ping-connection-pool)
+		_command_args=('--appname' '--modulename' '--target')
+	;;
+	recover-transactions)
+		_command_args=('--target' '--transactionlogdir')
+	;;
+	redeploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	remove-library)
+		_command_args=('--type')
+	;;
+	restart-domain)
+		_command_args=('--debug' '--domaindir' '--force' '--kill')
+	;;
+	restart-instance)
+		_command_args=('--debug')
+	;;
+	restart-local-instance)
+		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+	;;
+	restore-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+	;;
+	rollback-transaction)
+		_command_args=('--target' '--transaction_id')
+	;;
+	rotate-log)
+		_command_args=('--target')
+	;;
+	set-log-attributes)
+		_command_args=('--target')
+	;;
+	set-log-levels)
+		_command_args=('--target')
+	;;
+	set-web-context-param)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+	;;
+	set-web-env-entry)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+	;;
+	setup-ssh)
+		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+	;;
+	show-component-status)
+		_command_args=('--target')
+	;;
+	start-cluster)
+		_command_args=('--autohadboverride' '--verbose')
+	;;
+	start-database)
+		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+	;;
+	start-domain)
+		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+	;;
+	start-instance)
+		_command_args=('--debug' '--setenv' '--sync' '--terse')
+	;;
+	start-local-instance)
+		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+	;;
+	stop-cluster)
+		_command_args=('--autohadboverride' '--kill' '--verbose')
+	;;
+	stop-database)
+		_command_args=('--dbhost' '--dbport' '--dbuser')
+	;;
+	stop-domain)
+		_command_args=('--domaindir' '--force' '--kill')
+	;;
+	stop-instance)
+		_command_args=('--force' '--kill')
+	;;
+	stop-local-instance)
+		_command_args=('--force' '--kill' '--node' '--nodedir')
+	;;
+	undeploy)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	unfreeze-transaction-service)
+		_command_args=('--target')
+	;;
+	uninstall-node-dcom)
+		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+	;;
+	uninstall-node-ssh)
+		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	unset-web-context-param)
+		_command_args=('--name')
+	;;
+	unset-web-env-entry)
+		_command_args=('--name')
+	;;
+	update-connector-security-map)
+		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+	;;
+	update-connector-work-security-map)
+		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+	;;
+	update-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	update-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	update-node-dcom)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	update-node-ssh)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	update-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	uptime)
+		_command_args=('--milliseconds')
+	;;
+	validate-dcom)
+		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	validate-multicast)
+		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+	;;
+	verify-domain-xml)
+		_command_args=('--domaindir')
+	;;
+	version)
+		_command_args=('--local' '--terse' '--verbose')
+	;;
 esac
 
 _arguments \

From df176fb3dcdc036ecd6165beea47e64e307ea978 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:17:59 +0200
Subject: [PATCH 0092/1378] added alias

---
 plugins/glassfish/_glassfish           | 1 -
 plugins/glassfish/glassfish.plugin.zsh | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 plugins/glassfish/_glassfish
 create mode 100644 plugins/glassfish/glassfish.plugin.zsh

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
deleted file mode 100644
index 8b1378917..000000000
--- a/plugins/glassfish/_glassfish
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
new file mode 100644
index 000000000..49ca23299
--- /dev/null
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -0,0 +1,3 @@
+# if there is a user named 'glassfish' on the system, we'll assume
+# that is the user asadmin should be run as
+grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From 4caea1f7e143ac84583618cf8d2109212ba6909a Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 12:08:41 +0200
Subject: [PATCH 0093/1378] completion options

---
 plugins/glassfish/_asadmin | 418 ++++++++++++++++++-------------------
 1 file changed, 209 insertions(+), 209 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 08ae9d461..f0ebea9f2 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -272,635 +272,635 @@ _1st_arguments=(
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then
-    _describe -t commands "glassfish command" _1st_arguments
+    _describe -t commands "asadmin command" _1st_arguments
     return
 fi
 
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	apply-http-lb-changes)
-		_command_args=('--ping')
+		_command_args=('--ping+:')
 	;;
 	backup-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	change-admin-password)
-		_command_args=('--domain_name' '--domaindir')
+		_command_args=('--domain_name+:' '--domaindir+:')
 	;;
 	change-master-password)
-		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
 	;;
 	collect-log-files)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	configure-jms-cluster)
-		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
 	;;
 	configure-lb-weight)
-		_command_args=('--cluster')
+		_command_args=('--cluster+:')
 	;;
 	configure-ldap-for-admin)
-		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
 	;;
 	copy-config)
-		_command_args=('--systemproperties')
+		_command_args=('--systemproperties+:')
 	;;
 	create-admin-object)
-		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
 	;;
 	create-application-ref)
-		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
 	;;
 	create-audit-module)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-auth-realm)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-connector-connection-pool)
-		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
 	;;
 	create-connector-resource)
-		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
 	;;
 	create-connector-security-map)
-		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
 	;;
 	create-connector-work-security-map)
-		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
 	;;
 	create-custom-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-domain)
-		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	create-http)
-		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-health-checker)
-		_command_args=('--config' '--interval' '--timeout' '--url')
+		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
 	;;
 	create-http-lb)
-		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
 	;;
 	create-http-lb-ref)
-		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
 	;;
 	create-http-listener)
-		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-redirect)
-		_command_args=('--redirect-port' '--secure-redirect' '--target')
+		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
 	;;
 	create-iiop-listener)
-		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
 	;;
 	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
 	;;
 	create-javamail-resource)
-		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
 	;;
 	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
 	;;
 	create-jdbc-resource)
-		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
 	;;
 	create-jms-host)
-		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
 	;;
 	create-jms-resource)
-		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jmsdest)
-		_command_args=('--desttype' '--property' '--target')
+		_command_args=('--desttype+:' '--property+:' '--target+:')
 	;;
 	create-jndi-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	create-lifecycle-module)
-		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
 	;;
 	create-local-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-message-security-provider)
-		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
 	;;
 	create-network-listener)
-		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
 	;;
 	create-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	create-node-dcom)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	create-node-ssh)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	create-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	create-profiler)
-		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
 	;;
 	create-protocol)
-		_command_args=('--securityenabled' '--target')
+		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-protocol-filter)
-		_command_args=('--classname' '--protocol' '--target')
+		_command_args=('--classname+:' '--protocol+:' '--target+:')
 	;;
 	create-protocol-finder)
-		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
 	;;
 	create-resource-adapter-config)
-		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
 	;;
 	create-resource-ref)
-		_command_args=('--enabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
-		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	create-system-properties)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	create-threadpool)
-		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
 	;;
 	create-transport)
-		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
 	;;
 	create-virtual-server)
-		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
 	;;
 	delete-admin-object)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-application-ref)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-audit-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-auth-realm)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-connector-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-security-map)
-		_command_args=('--poolname' '--target')
+		_command_args=('--poolname+:' '--target+:')
 	;;
 	delete-connector-work-security-map)
-		_command_args=('--raname')
+		_command_args=('--raname+:')
 	;;
 	delete-custom-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-domain)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	delete-file-user)
-		_command_args=('--authrealmname' '--target')
+		_command_args=('--authrealmname+:' '--target+:')
 	;;
 	delete-http)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-http-health-checker)
-		_command_args=('--config')
+		_command_args=('--config+:')
 	;;
 	delete-http-lb-ref)
-		_command_args=('--config' '--force' '--lbname')
+		_command_args=('--config+:' '--force+:' '--lbname+:')
 	;;
 	delete-http-listener)
-		_command_args=('--secure' '--target')
+		_command_args=('--secure+:' '--target+:')
 	;;
 	delete-http-redirect)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-iiop-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-instance)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	delete-jacc-provider)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-javamail-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jdbc-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-jdbc-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-host)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	delete-jndi-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	delete-lifecycle-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-local-instance)
-		_command_args=('--node' '--nodedir')
+		_command_args=('--node+:' '--nodedir+:')
 	;;
 	delete-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-message-security-provider)
-		_command_args=('--layer' '--target')
+		_command_args=('--layer+:' '--target+:')
 	;;
 	delete-network-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-profiler)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol-filter)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-protocol-finder)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-resource-adapter-config)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-resource-ref)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-ssl)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	delete-system-property)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-threadpool)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-transport)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-virtual-server)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	disable-http-lb-application)
-		_command_args=('--name' '--timeout')
+		_command_args=('--name+:' '--timeout+:')
 	;;
 	disable-http-lb-server)
-		_command_args=('--timeout')
+		_command_args=('--timeout+:')
 	;;
 	disable-monitoring)
-		_command_args=('--modules' '--target')
+		_command_args=('--modules+:' '--target+:')
 	;;
 	enable)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	enable-http-lb-application)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	enable-monitoring)
-		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
 	;;
 	enable-secure-admin)
-		_command_args=('--adminalias' '--instancealias')
+		_command_args=('--adminalias+:' '--instancealias+:')
 	;;
 	export-http-lb-config)
-		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
 	;;
 	export-sync-bundle)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	flush-connection-pool)
-		_command_args=('--appname' '--modulename')
+		_command_args=('--appname+:' '--modulename+:')
 	;;
 	flush-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	freeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	generate-domain-schema)
-		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
 	;;
 	generate-jvm-report)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
 	;;
 	get)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	get-client-stubs)
-		_command_args=('--appname')
+		_command_args=('--appname+:')
 	;;
 	import-sync-bundle)
-		_command_args=('--instance' '--node' '--nodedir')
+		_command_args=('--instance+:' '--node+:' '--nodedir+:')
 	;;
 	install-node-dcom)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	install-node-ssh)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	jms-ping)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	list-application-refs)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-backups)
-		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	list-commands)
-		_command_args=('--localonly' '--remoteonly')
+		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
 	;;
 	list-components)
-		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-connector-security-maps)
-		_command_args=('--long' '--securitymap' '--target')
+		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
 	;;
 	list-connector-work-security-maps)
-		_command_args=('--securitymap')
+		_command_args=('--securitymap+:')
 	;;
 	list-custom-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-domains)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	list-file-groups)
-		_command_args=('--authrealmname' '--name')
+		_command_args=('--authrealmname+:' '--name+:')
 	;;
 	list-file-users)
-		_command_args=('--authrealmname')
+		_command_args=('--authrealmname+:')
 	;;
 	list-http-listeners)
-		_command_args=('--long')
+		_command_args=('--long+:long:(true false)')
 	;;
 	list-instances)
-		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
 	;;
 	list-javamail-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-hosts)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-resources)
-		_command_args=('--restype')
+		_command_args=('--restype+:')
 	;;
 	list-jmsdest)
-		_command_args=('--desttype' '--property')
+		_command_args=('--desttype+:' '--property+:')
 	;;
 	list-jndi-entries)
-		_command_args=('--context')
+		_command_args=('--context+:')
 	;;
 	list-jndi-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	list-libraries)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	list-lifecycle-modules)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	list-message-security-providers)
-		_command_args=('--layer')
+		_command_args=('--layer+:layer:(SOAP HttpServlet)')
 	;;
 	list-nodes)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-config)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-dcom)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-ssh)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-persistence-types)
-		_command_args=('--type')
+		_command_args=('--type+:')
 	;;
 	list-protocol-filters)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-protocol-finders)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-resource-adapter-configs)
-		_command_args=('--long' '--raname')
+		_command_args=('--long+:long:(true false)' '--raname+:')
 	;;
 	list-sub-components)
-		_command_args=('--appname' '--resources' '--terse' '--type')
+		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-virtual-servers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	list-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	login)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	migrate-timers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename' '--filter' '--interval' '--type')
+		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding' '--file' '--printprompt')
+		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
-		_command_args=('--appname' '--modulename' '--target')
+		_command_args=('--appname+:' '--modulename+:' '--target+:')
 	;;
 	recover-transactions)
-		_command_args=('--target' '--transactionlogdir')
+		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	restart-domain)
-		_command_args=('--debug' '--domaindir' '--force' '--kill')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	restart-instance)
-		_command_args=('--debug')
+		_command_args=('--debug+:')
 	;;
 	restart-local-instance)
-		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	restore-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
 	;;
 	rollback-transaction)
-		_command_args=('--target' '--transaction_id')
+		_command_args=('--target+:' '--transaction_id+:')
 	;;
 	rotate-log)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-attributes)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-web-context-param)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
 	;;
 	set-web-env-entry)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
 	;;
 	setup-ssh)
-		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
 	;;
 	show-component-status)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	start-cluster)
-		_command_args=('--autohadboverride' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-database)
-		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
 	;;
 	start-domain)
-		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-instance)
-		_command_args=('--debug' '--setenv' '--sync' '--terse')
+		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
 	;;
 	start-local-instance)
-		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
 	;;
 	stop-cluster)
-		_command_args=('--autohadboverride' '--kill' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	stop-database)
-		_command_args=('--dbhost' '--dbport' '--dbuser')
+		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
 	;;
 	stop-domain)
-		_command_args=('--domaindir' '--force' '--kill')
+		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-instance)
-		_command_args=('--force' '--kill')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-local-instance)
-		_command_args=('--force' '--kill' '--node' '--nodedir')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	undeploy)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	unfreeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	uninstall-node-dcom)
-		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	uninstall-node-ssh)
-		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	unset-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	unset-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	update-connector-security-map)
-		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
 	;;
 	update-connector-work-security-map)
-		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
 	;;
 	update-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	update-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	update-node-dcom)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	update-node-ssh)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	update-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	uptime)
-		_command_args=('--milliseconds')
+		_command_args=('--milliseconds+:milliseconds:(true false)')
 	;;
 	validate-dcom)
-		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	validate-multicast)
-		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
 	;;
 	verify-domain-xml)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	version)
-		_command_args=('--local' '--terse' '--verbose')
+		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
 	;;
 esac
 

From e4ffac154d4af9187b4d052c9fc1b3305a538076 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 16:24:45 +0200
Subject: [PATCH 0094/1378] added _files values for certain options

---
 plugins/glassfish/_asadmin | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index f0ebea9f2..2ae6064e9 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -279,10 +279,10 @@ fi
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type+:type:(common ext app)')
+		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target+:')
+		_command_args=('*:directory:_files' '--target+:')
 	;;
 	apply-http-lb-changes)
 		_command_args=('--ping+:')
@@ -438,7 +438,7 @@ case "$words[1]" in
 		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
 		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -585,10 +585,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
 		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
@@ -765,10 +765,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
+		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
+		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
 		_command_args=('--appname+:' '--modulename+:' '--target+:')
@@ -777,7 +777,7 @@ case "$words[1]" in
 		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
 		_command_args=('--type+:type:(common ext app)')

From 3fea7c3b278ccf73421cbdcc61a1c1dd6d4a0a70 Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sun, 6 Nov 2011 04:07:16 -0800
Subject: [PATCH 0095/1378] Added avit theme

---
 themes/avit.zsh-theme | 120 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 themes/avit.zsh-theme

diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
new file mode 100644
index 000000000..51f5e375a
--- /dev/null
+++ b/themes/avit.zsh-theme
@@ -0,0 +1,120 @@
+#
+# Author:: Andrew Vit (<andrew@avit.ca>)
+#
+# AVIT ZSH Theme
+#
+# Copyright 2011, Andrew Vit
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+PROMPT='
+$(_user_host)${_current_dir} $(git_prompt_info) $(_ruby_version)
+▶ '
+
+PROMPT2='%{$fg[grey]%}◀%{$reset_color%} '
+
+RPROMPT='$(_vi_status)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
+
+local _current_dir="%{$fg[blue]%}%3~%{$reset_color%} "
+local _return_status="%{$fg[red]%}%(?..⍉)%{$reset_color%}"
+local _hist_no="%{$fg[grey]%}%h%{$reset_color%}"
+
+function _user_host() {
+  if [[ -n $SSH_CONNECTION ]]; then
+    me="%n@%m"
+  elif [[ $LOGNAME != $USER ]]; then
+    me="%n"
+  fi
+  if [[ -n $me ]]; then
+    echo "%{$fg[cyan]%}$me%{$reset_color%}:"
+  fi
+}
+
+function _vi_status() {
+  if {echo $fpath | grep -q "plugins/vi-mode"}; then
+    echo "$(vi_mode_prompt_info)"
+  fi
+}
+
+function _ruby_version() {
+  if {echo $fpath | grep -q "plugins/rvm"}; then
+    echo "%{$fg[grey]%}$(rvm_prompt_info)%{$reset_color%}"
+  fi
+}
+
+# Determine the time since last commit. If branch is clean,
+# use a neutral color, otherwise colors will vary according to time.
+function _git_time_since_commit() {
+  if git rev-parse --git-dir > /dev/null 2>&1; then
+    # Only proceed if there is actually a commit.
+    if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
+      # Get the last commit.
+      last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null)
+      now=$(date +%s)
+      seconds_since_last_commit=$((now-last_commit))
+
+      # Totals
+      minutes=$((seconds_since_last_commit / 60))
+      hours=$((seconds_since_last_commit/3600))
+
+      # Sub-hours and sub-minutes
+      days=$((seconds_since_last_commit / 86400))
+      sub_hours=$((hours % 24))
+      sub_minutes=$((minutes % 60))
+
+      if [ $hours -gt 24 ]; then
+          commit_age="${days}d"
+      elif [ $minutes -gt 60 ]; then
+          commit_age="${sub_hours}h${sub_minutes}m"
+      else
+          commit_age="${minutes}m"
+      fi
+
+      color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL
+      echo "$color$commit_age%{$reset_color%}"
+    fi
+  fi
+}
+
+if [[ $USER == "root" ]]; then
+  CARETCOLOR="red"
+else
+  CARETCOLOR="white"
+fi
+
+MODE_INDICATOR="%{$fg_bold[yellow]%}❮%{$reset_color%}%{$fg[yellow]%}❮❮%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}✚ "
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}⚑ "
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✖ "
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}▴ "
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[cyan]%}§ "
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}◒ "
+
+# Colors vary depending on time lapsed.
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
+ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[grey]%}"
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+export LSCOLORS="exfxcxdxbxegedabagacad"
+export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
+export GREP_COLOR='1;33'
+

From b49c97e08ee5abc705b001d846575c33dee1bf56 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 12:15:36 +0200
Subject: [PATCH 0096/1378] help command, node completion

---
 plugins/glassfish/_asadmin | 1394 ++++++++++++++++++++----------------
 1 file changed, 769 insertions(+), 625 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 2ae6064e9..b29d65d3b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -144,6 +144,7 @@ _1st_arguments=(
     "get:gets the values of configurable or monitorable attributes"
     "get-client-stubs:retrieves the application JAR files needed to launch the application client."
     "get-health:provides information on the cluster health"
+    "help"
     "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
     "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
     "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
@@ -278,632 +279,775 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-	add-library)
-		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
-	;;
-	add-resources)
-		_command_args=('*:directory:_files' '--target+:')
-	;;
-	apply-http-lb-changes)
-		_command_args=('--ping+:')
-	;;
-	backup-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	change-admin-password)
-		_command_args=('--domain_name+:' '--domaindir+:')
-	;;
-	change-master-password)
-		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
-	;;
-	collect-log-files)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	configure-jms-cluster)
-		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
-	;;
-	configure-lb-weight)
-		_command_args=('--cluster+:')
-	;;
-	configure-ldap-for-admin)
-		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
-	;;
-	copy-config)
-		_command_args=('--systemproperties+:')
-	;;
-	create-admin-object)
-		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
-	;;
-	create-application-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
-	;;
-	create-audit-module)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-auth-realm)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-connector-connection-pool)
-		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
-	;;
-	create-connector-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
-	;;
-	create-connector-security-map)
-		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
-	;;
-	create-connector-work-security-map)
-		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
-	;;
-	create-custom-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-domain)
-		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	create-http)
-		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-health-checker)
-		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
-	;;
-	create-http-lb)
-		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
-	;;
-	create-http-lb-ref)
-		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
-	;;
-	create-http-listener)
-		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-redirect)
-		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
-	;;
-	create-iiop-listener)
-		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
-	;;
-	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
-	;;
-	create-javamail-resource)
-		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
-	;;
-	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
-	;;
-	create-jdbc-resource)
-		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
-	;;
-	create-jms-host)
-		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
-	;;
-	create-jms-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jmsdest)
-		_command_args=('--desttype+:' '--property+:' '--target+:')
-	;;
-	create-jndi-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	create-lifecycle-module)
-		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
-	;;
-	create-local-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-message-security-provider)
-		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
-	;;
-	create-network-listener)
-		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
-	;;
-	create-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	create-node-dcom)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	create-node-ssh)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	create-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	create-profiler)
-		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
-	;;
-	create-protocol)
-		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-protocol-filter)
-		_command_args=('--classname+:' '--protocol+:' '--target+:')
-	;;
-	create-protocol-finder)
-		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
-	;;
-	create-resource-adapter-config)
-		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
-	;;
-	create-resource-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--target+:')
-	;;
-	create-service)
-		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
-	;;
-	create-ssl)
-		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	create-system-properties)
-		_command_args=('--target+:')
-	;;
-	create-threadpool)
-		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
-	;;
-	create-transport)
-		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
-	;;
-	create-virtual-server)
-		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
-	;;
-	delete-admin-object)
-		_command_args=('--target+:')
-	;;
-	delete-application-ref)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-audit-module)
-		_command_args=('--target+:')
-	;;
-	delete-auth-realm)
-		_command_args=('--target+:')
-	;;
-	delete-connector-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-connector-resource)
-		_command_args=('--target+:')
-	;;
-	delete-connector-security-map)
-		_command_args=('--poolname+:' '--target+:')
-	;;
-	delete-connector-work-security-map)
-		_command_args=('--raname+:')
-	;;
-	delete-custom-resource)
-		_command_args=('--target+:')
-	;;
-	delete-domain)
-		_command_args=('--domaindir+:')
-	;;
-	delete-file-user)
-		_command_args=('--authrealmname+:' '--target+:')
-	;;
-	delete-http)
-		_command_args=('--target+:')
-	;;
-	delete-http-health-checker)
-		_command_args=('--config+:')
-	;;
-	delete-http-lb-ref)
-		_command_args=('--config+:' '--force+:' '--lbname+:')
-	;;
-	delete-http-listener)
-		_command_args=('--secure+:' '--target+:')
-	;;
-	delete-http-redirect)
-		_command_args=('--target+:')
-	;;
-	delete-iiop-listener)
-		_command_args=('--target+:')
-	;;
-	delete-instance)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	delete-jacc-provider)
-		_command_args=('--target+:')
-	;;
-	delete-javamail-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jdbc-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-jdbc-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jms-host)
-		_command_args=('--target+:')
-	;;
-	delete-jms-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	delete-jndi-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	delete-lifecycle-module)
-		_command_args=('--target+:')
-	;;
-	delete-local-instance)
-		_command_args=('--node+:' '--nodedir+:')
-	;;
-	delete-log-levels)
-		_command_args=('--target+:')
-	;;
-	delete-message-security-provider)
-		_command_args=('--layer+:' '--target+:')
-	;;
-	delete-network-listener)
-		_command_args=('--target+:')
-	;;
-	delete-profiler)
-		_command_args=('--target+:')
-	;;
-	delete-protocol)
-		_command_args=('--target+:')
-	;;
-	delete-protocol-filter)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-protocol-finder)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-resource-adapter-config)
-		_command_args=('--target+:')
-	;;
-	delete-resource-ref)
-		_command_args=('--target+:')
-	;;
-	delete-ssl)
-		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	delete-system-property)
-		_command_args=('--target+:')
-	;;
-	delete-threadpool)
-		_command_args=('--target+:')
-	;;
-	delete-transport)
-		_command_args=('--target+:')
-	;;
-	delete-virtual-server)
-		_command_args=('--target+:')
-	;;
-	deploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	deploydir)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	disable)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	disable-http-lb-application)
-		_command_args=('--name+:' '--timeout+:')
-	;;
-	disable-http-lb-server)
-		_command_args=('--timeout+:')
-	;;
-	disable-monitoring)
-		_command_args=('--modules+:' '--target+:')
-	;;
-	enable)
-		_command_args=('--target+:')
-	;;
-	enable-http-lb-application)
-		_command_args=('--name+:')
-	;;
-	enable-monitoring)
-		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
-	;;
-	enable-secure-admin)
-		_command_args=('--adminalias+:' '--instancealias+:')
-	;;
-	export-http-lb-config)
-		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
-	;;
-	export-sync-bundle)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	flush-connection-pool)
-		_command_args=('--appname+:' '--modulename+:')
-	;;
-	flush-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	freeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	generate-domain-schema)
-		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
-	;;
-	generate-jvm-report)
-		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
-	;;
-	get)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	get-client-stubs)
-		_command_args=('--appname+:')
-	;;
-	import-sync-bundle)
-		_command_args=('--instance+:' '--node+:' '--nodedir+:')
-	;;
-	install-node-dcom)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	install-node-ssh)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	jms-ping)
-		_command_args=('--target+:')
-	;;
-	list)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	list-application-refs)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-backups)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	list-commands)
-		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
-	;;
-	list-components)
-		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-connector-security-maps)
-		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
-	;;
-	list-connector-work-security-maps)
-		_command_args=('--securitymap+:')
-	;;
-	list-custom-resources)
-		_command_args=('--target+:')
-	;;
-	list-domains)
-		_command_args=('--domaindir+:')
-	;;
-	list-file-groups)
-		_command_args=('--authrealmname+:' '--name+:')
-	;;
-	list-file-users)
-		_command_args=('--authrealmname+:')
-	;;
-	list-http-listeners)
-		_command_args=('--long+:long:(true false)')
-	;;
-	list-instances)
-		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
-	;;
-	list-javamail-resources)
-		_command_args=('--target+:')
-	;;
-	list-jms-hosts)
-		_command_args=('--target+:')
-	;;
-	list-jms-resources)
-		_command_args=('--restype+:')
-	;;
-	list-jmsdest)
-		_command_args=('--desttype+:' '--property+:')
-	;;
-	list-jndi-entries)
-		_command_args=('--context+:')
-	;;
-	list-jndi-resources)
-		_command_args=('--target+:')
-	;;
-	list-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	list-libraries)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	list-lifecycle-modules)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	list-message-security-providers)
-		_command_args=('--layer+:layer:(SOAP HttpServlet)')
-	;;
-	list-nodes)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-config)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-dcom)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-ssh)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-persistence-types)
-		_command_args=('--type+:')
-	;;
-	list-protocol-filters)
-		_command_args=('--target+:')
-	;;
-	list-protocol-finders)
-		_command_args=('--target+:')
-	;;
-	list-resource-adapter-configs)
-		_command_args=('--long+:long:(true false)' '--raname+:')
-	;;
-	list-sub-components)
-		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-virtual-servers)
-		_command_args=('--target+:')
-	;;
-	list-web-context-param)
-		_command_args=('--name+:')
-	;;
-	list-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	login)
-		_command_args=('--target+:')
-	;;
-	migrate-timers)
-		_command_args=('--target+:')
-	;;
-	monitor)
-		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
-	;;
-	multimode)
-		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
-	;;
-	ping-connection-pool)
-		_command_args=('--appname+:' '--modulename+:' '--target+:')
-	;;
-	recover-transactions)
-		_command_args=('--target+:' '--transactionlogdir+:')
-	;;
-	redeploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	remove-library)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	restart-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	restart-instance)
-		_command_args=('--debug+:')
-	;;
-	restart-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	restore-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
-	;;
-	rollback-transaction)
-		_command_args=('--target+:' '--transaction_id+:')
-	;;
-	rotate-log)
-		_command_args=('--target+:')
-	;;
-	set-log-attributes)
-		_command_args=('--target+:')
-	;;
-	set-log-levels)
-		_command_args=('--target+:')
-	;;
-	set-web-context-param)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
-	;;
-	set-web-env-entry)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
-	;;
-	setup-ssh)
-		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
-	;;
-	show-component-status)
-		_command_args=('--target+:')
-	;;
-	start-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-database)
-		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
-	;;
-	start-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-instance)
-		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
-	;;
-	start-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
-	;;
-	stop-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	stop-database)
-		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
-	;;
-	stop-domain)
-		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-local-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	undeploy)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	unfreeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	uninstall-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	uninstall-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	unset-web-context-param)
-		_command_args=('--name+:')
-	;;
-	unset-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	update-connector-security-map)
-		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
-	;;
-	update-connector-work-security-map)
-		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
-	;;
-	update-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	update-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	update-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	update-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	update-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	uptime)
-		_command_args=('--milliseconds+:milliseconds:(true false)')
-	;;
-	validate-dcom)
-		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	validate-multicast)
-		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
-	;;
-	verify-domain-xml)
-		_command_args=('--domaindir+:')
-	;;
-	version)
-		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
-	;;
+    add-library)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    add-resources)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        ;;
+    apply-http-lb-changes)
+        _command_args=('--host+:' '--ping+:' '--port+:')
+        ;;
+    backup-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    change-admin-password)
+        _command_args=('--domain_name+:' '--domaindir+:')
+        ;;
+    change-master-broker)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    change-master-password)
+        _command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
+        ;;
+    collect-log-files)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    configure-jms-cluster)
+        _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
+        ;;
+    configure-lb-weight)
+        _command_args=('--cluster+:' '--host+:' '--port+:')
+        ;;
+    configure-ldap-for-admin)
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        ;;
+    copy-config)
+        _command_args=('--host+:' '--port+:' '--systemproperties+:')
+        ;;
+    create-admin-object)
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        ;;
+    create-application-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        ;;
+    create-audit-module)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-auth-realm)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-connection-pool)
+        _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
+        ;;
+    create-connector-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-security-map)
+        _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
+        ;;
+    create-connector-work-security-map)
+        _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
+        ;;
+    create-custom-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-domain)
+        _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    create-http)
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
+        ;;
+    create-http-lb)
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        ;;
+    create-http-lb-ref)
+        _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
+        ;;
+    create-http-listener)
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-redirect)
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        ;;
+    create-iiop-listener)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        ;;
+    create-jacc-provider)
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-javamail-resource)
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        ;;
+    create-jdbc-connection-pool)
+        _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
+        ;;
+    create-jdbc-resource)
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-host)
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jndi-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    create-lifecycle-module)
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-local-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-message-security-provider)
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        ;;
+    create-network-listener)
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        ;;
+    create-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    create-node-dcom)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    create-node-ssh)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    create-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    create-profiler)
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-protocol)
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-protocol-filter)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    create-protocol-finder)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        ;;
+    create-resource-adapter-config)
+        _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
+        ;;
+    create-resource-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    create-service)
+        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        ;;
+    create-ssl)
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    create-system-properties)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    create-threadpool)
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        ;;
+    create-transport)
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        ;;
+    create-virtual-server)
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        ;;
+    delete-admin-object)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-application-ref)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-audit-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-auth-realm)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-connector-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-security-map)
+        _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-work-security-map)
+        _command_args=('--host+:' '--port+:' '--raname+:')
+        ;;
+    delete-custom-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-domain)
+        _command_args=('--domaindir+:')
+        ;;
+    delete-file-user)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--port+:')
+        ;;
+    delete-http-lb-ref)
+        _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
+        ;;
+    delete-http-listener)
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        ;;
+    delete-http-redirect)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-iiop-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-instance)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    delete-jacc-provider)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-javamail-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-host)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jndi-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    delete-lifecycle-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-local-instance)
+        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    delete-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-message-security-provider)
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        ;;
+    delete-network-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-node-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-password-alias)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-profiler)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol-filter)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-protocol-finder)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-resource-adapter-config)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-resource-ref)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-ssl)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    delete-system-property)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-threadpool)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-transport)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-virtual-server)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    deploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    deploydir)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    disable)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    disable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
+        ;;
+    disable-http-lb-server)
+        _command_args=('--host+:' '--port+:' '--timeout+:')
+        ;;
+    disable-monitoring)
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        ;;
+    disable-secure-admin)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    enable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    enable-http-lb-server)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable-monitoring)
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        ;;
+    enable-secure-admin)
+        _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
+        ;;
+    export-http-lb-config)
+        _command_args=('--config+:' '--host+:' '--lbname+:' '--lbtargets+:' '--port+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
+        ;;
+    export-sync-bundle)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    flush-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
+        ;;
+    flush-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    freeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    generate-domain-schema)
+        _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
+        ;;
+    generate-jvm-report)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        ;;
+    get)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    get-client-stubs)
+        _command_args=('--appname+:' '--host+:' '--port+:')
+        ;;
+    get-health)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    help)
+        _describe -t help-commands "asadmin help command" _1st_arguments
+    ;;
+    import-sync-bundle)
+        _command_args=('--instance+:' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    install-node)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    install-node-dcom)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    install-node-ssh)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    jms-ping)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    list-admin-objects)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-application-refs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-applications)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-audit-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-auth-realms)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-backups)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    list-clusters)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-commands)
+        _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
+        ;;
+    list-components)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-security-maps)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        ;;
+    list-connector-work-security-maps)
+        _command_args=('--host+:' '--port+:' '--securitymap+:')
+        ;;
+    list-containers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-custom-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-descriptors)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-domains)
+        _command_args=('--domaindir+:')
+        ;;
+    list-file-groups)
+        _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
+        ;;
+    list-file-users)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        ;;
+    list-http-lb-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-http-listeners)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        ;;
+    list-iiop-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-instances)
+        _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
+        ;;
+    list-jacc-providers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-javamail-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jdbc-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jdbc-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jms-hosts)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jms-resources)
+        _command_args=('--host+:' '--port+:' '--restype+:')
+        ;;
+    list-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        ;;
+    list-jndi-entries)
+        _command_args=('--context+:' '--host+:' '--port+:')
+        ;;
+    list-jndi-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    list-libraries)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    list-lifecycle-modules)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-log-attributes)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-log-levels)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-message-security-providers)
+        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        ;;
+    list-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-network-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-nodes)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-config)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-dcom)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-ssh)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-password-aliases)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-persistence-types)
+        _command_args=('--host+:' '--port+:' '--type+:')
+        ;;
+    list-protocol-filters)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocol-finders)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocols)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-resource-adapter-configs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
+        ;;
+    list-resource-refs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-sub-components)
+        _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-supported-cipher-suites)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-system-properties)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-threadpools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-timers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-transports)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-virtual-servers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    list-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    login)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    migrate-timers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    monitor)
+        _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
+        ;;
+    multimode)
+        _command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
+        ;;
+    ping-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
+        ;;
+    ping-node-dcom)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    ping-node-ssh)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    recover-transactions)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        ;;
+    redeploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    remove-library)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    restart-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    restart-instance)
+        _command_args=('--debug+:' '--host+:' '--port+:')
+        ;;
+    restart-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    restore-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
+        ;;
+    rollback-transaction)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        ;;
+    rotate-log)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    set-log-attributes)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-web-context-param)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
+        ;;
+    set-web-env-entry)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--type+:' '--value+:')
+        ;;
+    setup-ssh)
+        _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
+        ;;
+    show-component-status)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    start-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    start-database)
+        _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
+        ;;
+    start-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
+        ;;
+    start-instance)
+        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        ;;
+    start-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        ;;
+    stop-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    stop-database)
+        _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
+        ;;
+    stop-domain)
+        _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    stop-instance)
+        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        ;;
+    stop-local-instance)
+        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    test-upgrade)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    undeploy)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    unfreeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    uninstall-node)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    uninstall-node-dcom)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    uninstall-node-ssh)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    unset-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    unset-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    update-connector-security-map)
+        _command_args=('--addprincipals+:' '--addusergroups+:' '--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
+        ;;
+    update-connector-work-security-map)
+        _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
+        ;;
+    update-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    update-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    update-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    update-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    update-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    uptime)
+        _command_args=('--host+:' '--milliseconds+:milliseconds:(true false)' '--port+:')
+        ;;
+    validate-dcom)
+        _command_args=('--host+:' '--port+:' '--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    validate-multicast)
+        _command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
+        ;;
+    verify-domain-xml)
+        _command_args=('--domaindir+:')
+        ;;
+    version)
+        _command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
+        ;;
 esac
 
+
+_asadmin_instances() {
+    compadd $(command asadmin list-instances --terse --nostatus domain)
+}
+
+_asadmin_libraries() {
+    compadd $(command asadmin list-libraries --terse)
+}
+
+_asadmin_nodes() {
+    compadd $(command asadmin list-nodes --terse)
+}
+
+compadd '--help'
 _arguments \
     $_command_args \
-    &&  return 0
+    &&  return 0;

From 0ebeb562523a33e636309a07b37fc1c291643f22 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 16:16:55 +0200
Subject: [PATCH 0097/1378] node completion

---
 plugins/glassfish/_asadmin | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index b29d65d3b..32b15b61d 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -559,13 +559,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-node-config)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
         ;;
     delete-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-password-alias)
         _command_args=('--host+:' '--port+:')
@@ -889,10 +889,10 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
         ;;
     ping-node-dcom)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     ping-node-ssh)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
         _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
@@ -1006,13 +1006,13 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
         ;;
     update-node-config)
-        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
         ;;
     update-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
         ;;
     update-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
         ;;
     update-password-alias)
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
@@ -1047,6 +1047,18 @@ _asadmin_nodes() {
     compadd $(command asadmin list-nodes --terse)
 }
 
+_asadmin_nodes_config() {
+    compadd $(command asadmin list-nodes-config --terse)
+}
+
+_asadmin_nodes_dcom() {
+    compadd $(command asadmin list-nodes-dcom --terse)
+}
+
+_asadmin_nodes_ssh() {
+    compadd $(command asadmin list-nodes-ssh --terse)
+}
+
 compadd '--help'
 _arguments \
     $_command_args \

From 9ee4b9c8f7b21db2c20500cacd72471e8cdbf6a5 Mon Sep 17 00:00:00 2001
From: oemer <oemer@systemfreund.com>
Date: Thu, 26 Jul 2012 16:05:03 +0200
Subject: [PATCH 0098/1378] Added go completion script. Taken from /misc/zsh/go

---
 plugins/go/go.plugin.zsh | 151 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 plugins/go/go.plugin.zsh

diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
new file mode 100644
index 000000000..23afa9656
--- /dev/null
+++ b/plugins/go/go.plugin.zsh
@@ -0,0 +1,151 @@
+# install in /etc/zsh/zshrc or your personal .zshrc
+
+# gc
+prefixes=(5 6 8)
+for p in $prefixes; do
+	compctl -g "*.${p}" ${p}l
+	compctl -g "*.go" ${p}g
+done
+
+# standard go tools
+compctl -g "*.go" gofmt
+
+# gccgo
+compctl -g "*.go" gccgo
+
+# go tool
+__go_tool_complete() {
+  typeset -a commands build_flags
+  commands+=(
+    'build[compile packages and dependencies]'
+    'clean[remove object files]'
+    'doc[run godoc on package sources]'
+    'fix[run go tool fix on packages]'
+    'fmt[run gofmt on package sources]'
+    'get[download and install packages and dependencies]'
+    'help[display help]'
+    'install[compile and install packages and dependencies]'
+    'list[list packages]'
+    'run[compile and run Go program]'
+    'test[test packages]'
+    'tool[run specified go tool]'
+    'version[print Go version]'
+    'vet[run go tool vet on packages]'
+  )
+  if (( CURRENT == 2 )); then
+    # explain go commands
+    _values 'go tool commands' ${commands[@]}
+    return
+  fi
+  build_flags=(
+    '-a[force reinstallation of packages that are already up-to-date]'
+    '-n[print the commands but do not run them]'
+    "-p[number of parallel builds]:number"
+    '-x[print the commands]'
+    "-work[print temporary directory name and keep it]"
+    "-gcflags[flags for 5g/6g/8g]:flags"
+    "-ldflags[flags for 5l/6l/8l]:flags"
+    "-gccgoflags[flags for gccgo]:flags"
+  )
+  __go_list() {
+      local expl importpaths
+      declare -a importpaths
+      importpaths=($(go list ${words[$CURRENT]}... 2>/dev/null))
+      _wanted importpaths expl 'import paths' compadd "$@" - "${importpaths[@]}"
+  }
+  case ${words[2]} in
+  clean|doc)
+      _arguments -s -w : '*:importpaths:__go_list'
+      ;;
+  fix|fmt|list|vet)
+      _alternative ':importpaths:__go_list' ':files:_path_files -g "*.go"'
+      ;;
+  install)
+      _arguments -s -w : ${build_flags[@]} \
+        "-v[show package names]" \
+	'*:importpaths:__go_list'
+      ;;
+  get)
+      _arguments -s -w : \
+        ${build_flags[@]}
+      ;;
+  build)
+      _arguments -s -w : \
+        ${build_flags[@]} \
+        "-v[show package names]" \
+        "-o[output file]:file:_files" \
+        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
+      ;;
+  test)
+      _arguments -s -w : \
+        ${build_flags[@]} \
+        "-c[do not run, compile the test binary]" \
+        "-i[do not run, install dependencies]" \
+        "-v[print test output]" \
+        "-x[print the commands]" \
+        "-short[use short mode]" \
+        "-parallel[number of parallel tests]:number" \
+        "-cpu[values of GOMAXPROCS to use]:number list" \
+        "-run[run tests and examples matching regexp]:regexp" \
+        "-bench[run benchmarks matching regexp]:regexp" \
+        "-benchtime[run each benchmark during n seconds]:duration" \
+        "-timeout[kill test after that duration]:duration" \
+        "-cpuprofile[write CPU profile to file]:file:_files" \
+        "-memprofile[write heap profile to file]:file:_files" \
+        "-memprofilerate[set heap profiling rate]:number" \
+        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
+      ;;
+  help)
+      _values "${commands[@]}" \
+        'gopath[GOPATH environment variable]' \
+        'importpath[description of import paths]' \
+        'remote[remote import path syntax]' \
+        'testflag[description of testing flags]' \
+        'testfunc[description of testing functions]'
+      ;;
+  run)
+      _arguments -s -w : \
+          ${build_flags[@]} \
+          '*:file:_path_files -g "*.go"'
+      ;;
+  tool)
+      if (( CURRENT == 3 )); then
+          _values "go tool" $(go tool)
+          return
+      fi
+      case ${words[3]} in
+      [568]g)
+          _arguments -s -w : \
+              '-I[search for packages in DIR]:includes:_path_files -/' \
+              '-L[show full path in file:line prints]' \
+              '-S[print the assembly language]' \
+              '-V[print the compiler version]' \
+              '-e[no limit on number of errors printed]' \
+              '-h[panic on an error]' \
+              '-l[disable inlining]' \
+              '-m[print optimization decisions]' \
+              '-o[file specify output file]:file' \
+              '-p[assumed import path for this code]:importpath' \
+              '-u[disable package unsafe]' \
+              "*:file:_files -g '*.go'"
+          ;;
+      [568]l)
+          local O=${words[3]%l}
+          _arguments -s -w : \
+              '-o[file specify output file]:file' \
+              '-L[search for packages in DIR]:includes:_path_files -/' \
+              "*:file:_files -g '*.[ao$O]'"
+          ;;
+      dist)
+          _values "dist tool" banner bootstrap clean env install version
+          ;;
+      *)
+          # use files by default
+          _files
+          ;;
+      esac
+      ;;
+  esac
+}
+
+compdef __go_tool_complete go

From 682961e9304c6bf7bd500d741b01640682d35ac9 Mon Sep 17 00:00:00 2001
From: Morgan Larosa <chaos95@gmail.com>
Date: Sat, 28 Jul 2012 08:25:15 +1000
Subject: [PATCH 0099/1378] Add a configuration option to disable autocorrect

---
 lib/correction.zsh           | 22 +++++++++++++---------
 templates/zshrc.zsh-template |  3 +++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index fc60dcdbd..07fbcfd36 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,10 +1,14 @@
-setopt correct_all
+if [[ "$DISABLE_CORRECTION" == "true" ]]; then
+  return
+else
+  setopt correct_all
 
-alias man='nocorrect man'
-alias mv='nocorrect mv'
-alias mysql='nocorrect mysql'
-alias mkdir='nocorrect mkdir'
-alias gist='nocorrect gist'
-alias heroku='nocorrect heroku'
-alias ebuild='nocorrect ebuild'
-alias hpodder='nocorrect hpodder'
+  alias man='nocorrect man'
+  alias mv='nocorrect mv'
+  alias mysql='nocorrect mysql'
+  alias mkdir='nocorrect mkdir'
+  alias gist='nocorrect gist'
+  alias heroku='nocorrect heroku'
+  alias ebuild='nocorrect ebuild'
+  alias hpodder='nocorrect hpodder'
+fi
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..cb9c5855e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,6 +23,9 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
+# Uncomment following line if you want to disable command autocorrection
+# DISABLE_CORRECTION="true"
+
 # Uncomment following line if you want red dots to be displayed while waiting for completion
 # COMPLETION_WAITING_DOTS="true"
 

From fb3cae1b8f9740e03c8e107727c810feb97b5ec2 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 15:02:12 +0200
Subject: [PATCH 0100/1378] instance and cluster completion

---
 plugins/glassfish/_asadmin | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 32b15b61d..1623cd274 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -307,7 +307,7 @@ case "$words[1]" in
         _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
         ;;
     configure-lb-weight)
-        _command_args=('--cluster+:' '--host+:' '--port+:')
+        _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
         _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
@@ -370,7 +370,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
         ;;
     create-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
         _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
@@ -403,7 +403,7 @@ case "$words[1]" in
         _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
         ;;
     create-local-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
         _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
@@ -442,7 +442,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     create-service)
-        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
         _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -514,7 +514,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-instance)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -547,7 +547,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-local-instance)
-        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -907,10 +907,10 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     restart-instance)
-        _command_args=('--debug+:' '--host+:' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:' '--host+:' '--port+:')
         ;;
     restart-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     restore-domain)
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
@@ -943,7 +943,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     start-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     start-database)
         _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
@@ -952,13 +952,13 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
         ;;
     start-instance)
-        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
         ;;
     start-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
         ;;
     stop-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     stop-database)
         _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
@@ -967,10 +967,10 @@ case "$words[1]" in
         _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     stop-instance)
-        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
         ;;
     stop-local-instance)
-        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     test-upgrade)
         _command_args=('--host+:' '--port+:')
@@ -1035,6 +1035,10 @@ case "$words[1]" in
 esac
 
 
+_asadmin_clusters() {
+    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }

From a4e6a2ce9fe2edd98dd654763fac87cc08660dc3 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 16:59:56 +0200
Subject: [PATCH 0101/1378] completion of targets

---
 plugins/glassfish/_asadmin | 323 +++++++++++++++++++++++--------------
 1 file changed, 200 insertions(+), 123 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 1623cd274..9d6b5687b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -283,7 +283,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     add-resources)
-        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     apply-http-lb-changes)
         _command_args=('--host+:' '--ping+:' '--port+:')
@@ -310,28 +310,28 @@ case "$words[1]" in
         _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
-        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--url+:')
         ;;
     copy-config)
         _command_args=('--host+:' '--port+:' '--systemproperties+:')
         ;;
     create-admin-object)
-        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-application-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance' '--virtualservers+:')
         ;;
     create-audit-module)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-auth-realm)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-connector-connection-pool)
         _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
         ;;
     create-connector-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-connector-security-map)
         _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
@@ -340,76 +340,76 @@ case "$words[1]" in
         _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
         ;;
     create-custom-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-domain)
         _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     create-http)
-        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-health-checker)
         _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
         ;;
     create-http-lb)
-        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:target:_asadmin_targets_cluster_standalone_instance')
         ;;
     create-http-lb-ref)
         _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
         ;;
     create-http-listener)
-        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-redirect)
-        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-iiop-listener)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
-        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-javamail-resource)
-        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--transprotocol+:' '--transprotocolclass+:')
         ;;
     create-jdbc-connection-pool)
         _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
         ;;
     create-jdbc-resource)
-        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jms-host)
-        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jms-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jndi-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-lifecycle-module)
-        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-local-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
-        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-network-listener)
-        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--threadpool+:' '--transport+:')
         ;;
     create-node-config)
         _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -424,52 +424,52 @@ case "$words[1]" in
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
         ;;
     create-profiler)
-        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol)
-        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-filter)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-finder)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--targetprotocol+:')
         ;;
     create-resource-adapter-config)
         _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
         ;;
     create-resource-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     create-service)
         _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
-        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     create-system-properties)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     create-threadpool)
-        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--workqueues+:')
         ;;
     create-transport)
-        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
         ;;
     create-virtual-server)
-        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-admin-object)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-application-ref)
-        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-audit-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-auth-realm)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-config)
         _command_args=('--host+:' '--port+:')
@@ -478,7 +478,7 @@ case "$words[1]" in
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-connector-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-connector-security-map)
         _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
@@ -487,16 +487,16 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--raname+:')
         ;;
     delete-custom-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-domain)
         _command_args=('--domaindir+:')
         ;;
     delete-file-user)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-health-checker)
         _command_args=('--config+:' '--host+:' '--port+:')
@@ -505,58 +505,58 @@ case "$words[1]" in
         _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
         ;;
     delete-http-listener)
-        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-redirect)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-iiop-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-instance)
         _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-javamail-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jdbc-connection-pool)
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-jdbc-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jms-host)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jms-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jndi-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-lifecycle-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-local-instance)
         _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-message-security-provider)
-        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-network-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
@@ -571,46 +571,46 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     delete-profiler)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-filter)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-finder)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-resource-adapter-config)
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-resource-ref)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-ssl)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     delete-system-property)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     delete-threadpool)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-transport)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-virtual-server)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     deploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     deploydir)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     disable)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     disable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
@@ -619,13 +619,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--timeout+:')
         ;;
     disable-monitoring)
-        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     disable-secure-admin)
         _command_args=('--host+:' '--port+:')
         ;;
     enable)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     enable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -634,7 +634,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     enable-monitoring)
-        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     enable-secure-admin)
         _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
@@ -649,16 +649,16 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
         ;;
     flush-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     freeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     generate-domain-schema)
         _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
         ;;
     generate-jvm-report)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--type+:type:(summary thread class memory log)')
         ;;
     get)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
@@ -685,25 +685,25 @@ case "$words[1]" in
         _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
         ;;
     jms-ping)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     list)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
         ;;
     list-admin-objects)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-application-refs)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-applications)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-audit-modules)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-auth-realms)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-backups)
         _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
@@ -715,19 +715,19 @@ case "$words[1]" in
         _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
         ;;
     list-components)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-configs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-connection-pools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-connector-resources)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-security-maps)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-connector-work-security-maps)
         _command_args=('--host+:' '--port+:' '--securitymap+:')
@@ -736,7 +736,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-custom-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-descriptors)
         _command_args=('--host+:' '--port+:')
@@ -748,25 +748,25 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
         ;;
     list-file-users)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--authrealmname+:' '--host+:' '--port+:')
         ;;
     list-http-lb-configs)
         _command_args=('--host+:' '--port+:')
         ;;
     list-http-listeners)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:')
         ;;
     list-iiop-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-instances)
         _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
         ;;
     list-jacc-providers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-javamail-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jdbc-connection-pools)
         _command_args=('--host+:' '--port+:')
@@ -775,43 +775,43 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-jms-hosts)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-jms-resources)
-        _command_args=('--host+:' '--port+:' '--restype+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--restype+:')
         ;;
     list-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--desttype+:' '--host+:' '--port+:' '--property+:')
         ;;
     list-jndi-entries)
-        _command_args=('--context+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--context+:' '--host+:' '--port+:')
         ;;
     list-jndi-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-libraries)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     list-lifecycle-modules)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-log-attributes)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-log-levels)
         _command_args=('--host+:' '--port+:')
         ;;
     list-message-security-providers)
-        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
         ;;
     list-modules)
         _command_args=('--host+:' '--port+:')
         ;;
     list-network-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-nodes)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
@@ -832,19 +832,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--type+:')
         ;;
     list-protocol-filters)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocol-finders)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocols)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-resource-adapter-configs)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
         ;;
     list-resource-refs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-sub-components)
         _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
@@ -853,19 +853,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-system-properties)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-threadpools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-timers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-transports)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-virtual-servers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-web-context-param)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -874,10 +874,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--name+:' '--port+:')
         ;;
     login)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     migrate-timers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das')
         ;;
     monitor)
         _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
@@ -895,10 +895,10 @@ case "$words[1]" in
         _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transactionlogdir+:')
         ;;
     redeploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
@@ -916,19 +916,19 @@ case "$words[1]" in
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
         ;;
     rollback-transaction)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transaction_id+:')
         ;;
     rotate-log)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_standalone_instance')
         ;;
     set)
         _command_args=('--host+:' '--port+:')
         ;;
     set-log-attributes)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-web-context-param)
         _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
@@ -940,7 +940,7 @@ case "$words[1]" in
         _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
         ;;
     show-component-status)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     start-cluster)
         _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
@@ -976,10 +976,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     uninstall-node)
         _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
@@ -1003,7 +1003,7 @@ case "$words[1]" in
         _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
         ;;
     update-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     update-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -1039,10 +1039,18 @@ _asadmin_clusters() {
     compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
 }
 
+_asadmin_configs() {
+    compadd $(command asadmin list-configs --terse)
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }
 
+_asadmin_instances_standalone() {
+    compadd $(command asadmin list-instances --terse --standaloneonly --nostatus domain)
+}
+
 _asadmin_libraries() {
     compadd $(command asadmin list-libraries --terse)
 }
@@ -1063,6 +1071,75 @@ _asadmin_nodes_ssh() {
     compadd $(command asadmin list-nodes-ssh --terse)
 }
 
+_asadmin_targets() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_config_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_das_domain_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_cluster_standalone_instance() {
+    _asadmin_clusters
+    _asadmin_instances_standalone
+}
+
+
 compadd '--help'
 _arguments \
     $_command_args \

From 8f0c617f6a7bdee3d6b3e61794f7035ceb90d545 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:19 +0200
Subject: [PATCH 0102/1378] in hindsight, this is probably a bad idea

---
 plugins/glassfish/glassfish.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
index 49ca23299..fde2edb2a 100644
--- a/plugins/glassfish/glassfish.plugin.zsh
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -1,3 +1,3 @@
 # if there is a user named 'glassfish' on the system, we'll assume
 # that is the user asadmin should be run as
-grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file
+# grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From c24d7f75d325b9d869036ecb06dcf020edec916c Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:27 +0200
Subject: [PATCH 0103/1378] library completion

---
 plugins/glassfish/_asadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 9d6b5687b..e5401c918 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -901,7 +901,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
-        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        _command_args=('*:libraries:_asadmin_libraries' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     restart-domain)
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')

From 265b2a559b60d1a36c63a82ab2c2071faf81e3fe Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:15:01 +0200
Subject: [PATCH 0104/1378] application completion

---
 plugins/glassfish/_asadmin | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index e5401c918..a6a7af549 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -976,7 +976,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
+        _command_args=('*:applications:_asadmin_applications' '--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
         _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
@@ -1035,8 +1035,12 @@ case "$words[1]" in
 esac
 
 
+_asadmin_applications() {
+    compadd $(command asadmin list-applications --terse | sed 's/\s.*//')
+}
+
 _asadmin_clusters() {
-    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+    compadd $(command asadmin list-clusters --terse | sed 's/\s.*//')
 }
 
 _asadmin_configs() {

From 3ef82a908a10979d9a4d14e0674902c85b14a99e Mon Sep 17 00:00:00 2001
From: mikka <miklos.martin@gmail.com>
Date: Sun, 2 Sep 2012 15:43:20 +0200
Subject: [PATCH 0105/1378] nginx and php-fpm plugins

---
 plugins/nginx/nginx.plugin.zsh     | 195 +++++++++++++++++++++++++++++
 plugins/nginx/templates/plain_php  |  27 ++++
 plugins/nginx/templates/symfony2   |  27 ++++
 plugins/php-fpm/php-fpm.plugin.zsh |  75 +++++++++++
 plugins/php-fpm/templates/pool     |  11 ++
 5 files changed, 335 insertions(+)
 create mode 100644 plugins/nginx/nginx.plugin.zsh
 create mode 100644 plugins/nginx/templates/plain_php
 create mode 100644 plugins/nginx/templates/symfony2
 create mode 100644 plugins/php-fpm/php-fpm.plugin.zsh
 create mode 100644 plugins/php-fpm/templates/pool

diff --git a/plugins/nginx/nginx.plugin.zsh b/plugins/nginx/nginx.plugin.zsh
new file mode 100644
index 000000000..6dd90c6d5
--- /dev/null
+++ b/plugins/nginx/nginx.plugin.zsh
@@ -0,0 +1,195 @@
+: ${NGINX_DIR:=/etc/nginx}
+: ${NGINX_VHOST_TEMPLATE:=$ZSH/plugins/nginx/templates/symfony2}
+
+if [ $use_sudo -eq 1 ]; then
+    sudo="sudo"
+else
+    sudo=""
+fi
+
+# nginx basic completition
+
+_nginx_get_en_command_list () {
+    ls -a $NGINX_DIR/sites-available | awk '/^[a-z][a-z.-]+$/ { print $1 }'
+}
+
+_nginx_get_dis_command_list () {
+    ls -a $NGINX_DIR/sites-enabled | awk '/^[a-z][a-z.-]+$/ { print $1 }'
+}
+
+_nginx_en () {
+   compadd `_nginx_get_en_command_list`
+}
+
+_nginx_dis () {
+   compadd `_nginx_get_dis_command_list`
+}
+
+# Enabling a site
+en () {
+    if [ ! $1 ]; then
+        echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m";
+        return
+    fi
+    
+    if [ ! -e $NGINX_DIR/sites-available/$1 ]; then
+        echo "\033[31m$1\033[0m doesn't exist";
+        return
+    fi
+
+    if [ ! -e $NGINX_DIR/sites-enabled/$1 ]; then
+  	    $sudo ln -s $NGINX_DIR/sites-available/$1 $NGINX_DIR/sites-enabled/$1;
+	    if [ -e /etc/nginx/sites-enabled/$1 ]; then
+        	echo "\033[32m$1\033[0m successfully enabled";
+        else
+            echo "An error occured during the enabling of \033[31m$1\033[0m";
+        fi
+    else
+        echo "\033[31m$1\033[0m is already enabled";
+    fi
+}
+compdef _nginx_en en
+
+# Disabling a site
+dis () {
+    if [ ! $1 ]; then
+        echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m";
+        return
+    fi
+
+    if [ ! -e $NGINX_DIR/sites-enabled/$1 ]; then
+        echo "\033[31m$1\033[0m doesn't exist";
+    else
+	    $sudo rm -f $NGINX_DIR/sites-enabled/$1;
+	    if [ ! -e $NGINX_DIR/sites-enabled/$1 ]; then
+        	echo "\033[32m$1\033[0m successfully disabled";
+        else
+            echo "An error occured during the disabling of \033[31m$1\033[0m";
+        fi
+    fi
+}
+compdef _nginx_dis dis
+
+# Completition of vhost
+_nginx_get_possible_vhost_list () {
+    ls -a $HOME/www | awk '/^[^.][a-z0-9._]+$/ { print $1 }'
+}
+
+_nginx_vhost () {
+   compadd `_nginx_get_possible_vhost_list`
+}
+
+# Parsing arguments
+vhost () {
+    user=$USER;
+    template=$NGINX_VHOST_TEMPLATE
+    tpl="non_existing_template"
+    enable=1
+    write_hosts=0
+    args=""
+
+    while getopts ":lu:t:nwh" option
+    do
+      case $option in
+        l ) ls $NGINX_DIR/sites-enabled; return ;;
+        u ) user=$OPTARG; args="$args -u $OPTARG" ;;
+        t ) tpl=$OPTARG; args="$args -t $OPTARG" ;;
+        n ) enable=0; args="$args -n" ;;
+        w ) write_hosts=1; args="$args -w" ;;
+        h ) _vhost_usage; return ;;
+      esac
+    done
+    
+    vhost=${@: -1}
+    vhostNotGiven=0
+    
+    if [ ! $vhost ]; then
+        vhostNotGiven=1
+    else
+        if [ $(echo $args | grep -o $vhost) ]; then
+            vhostNotGiven=1
+        fi
+    fi
+    
+    if [ $vhostNotGiven -eq 1 ]; then
+        echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m"
+        return
+    fi
+    
+    if [ -e $ZSH/plugins/nginx/templates/$tpl ]; then
+        template=$ZSH/plugins/nginx/templates/$tpl
+    elif [ -e $tpl ]; then
+        template=$tpl
+    fi
+        
+    _vhost_generate $vhost $user
+    
+    if [ $enable -eq 1 ]; then
+        en $vhost
+    fi
+    
+    if [ $write_hosts -eq 1 ]; then
+        _write_hosts $vhost
+    fi
+}
+compdef _nginx_vhost vhost
+
+_vhost_usage () {
+    echo "Usage: vhost [options] [vhost_name]"
+    echo
+    echo "Options"
+    echo "  -l   Lists enabled vhosts"
+    echo "  -u   Sets the user - defaults to the current user ($USER)"
+    echo "  -t   Sets the template"
+    echo "  -n   Does not enable the generated vhost"
+    echo "  -w   Write the vhost to the /etc/hosts file pointing to 127.0.0.1 (writes it at the end of the first line actually)"
+    echo "  -h   Get this help message"
+    return
+}
+
+# Generate config file
+_vhost_generate () {
+    user=$(cat /etc/passwd | grep $2 | awk -F : '{print $1 }')
+    
+    if [ ! $user ]; then
+      echo "User \033[31m$2\033[0m doesn't have an account on \033[33m$HOST\033[0m"
+      return
+    fi
+
+    echo "Generating \033[32m$1\033[0m vhost for \033[33m$user\033[0m user"
+        
+    user_id=$(cat /etc/passwd | grep $2 | awk -F : '{print $3 }')
+    pool_port=1$user_id
+    
+    conf=$(sed -e 's/{vhost}/'$1'/g' -e 's/{user}/'$user'/g' -e 's/{pool_port}/'$pool_port'/g' $template )
+    
+    echo $conf > $1.tmp
+    $sudo mv $1.tmp $NGINX_DIR/sites-available/$1
+    
+    if [ -e $NGINX_DIR/sites-available/$1 ]; then
+        echo "\033[32m$1\033[0m vhost has been successfully created"
+    else
+        echo "An error occured during the creating of \033[31m$1\033[0m vhost"
+    fi
+}
+
+# Write the /etc/hosts file
+_write_hosts () {
+    temp=$HOME/hosts.temp
+    exec < /etc/hosts
+	while read line
+	do
+		if [ -e $temp ]; then
+			echo "$line" >> $temp;
+		else
+			echo "$line $1" > $temp;		
+		fi
+	done
+	
+	$sudo mv $temp /etc/hosts;
+	
+	"\033[32m$1\033[0m vhost has been successfully written in /etc/hosts"
+}
+
+alias ngt="$sudo nginx -t"
+alias ngr="$sudo service nginx restart"
diff --git a/plugins/nginx/templates/plain_php b/plugins/nginx/templates/plain_php
new file mode 100644
index 000000000..f7995f5d5
--- /dev/null
+++ b/plugins/nginx/templates/plain_php
@@ -0,0 +1,27 @@
+server {
+    root /home/{user}/www/{vhost};
+    index index.php;
+
+    server_name {vhost};
+
+    error_log /var/log/nginx/{vhost}.error.log;
+    access_log /var/log/nginx/{vhost}.access.log;
+
+    location / {
+        try_files $uri $uri/ $uri/index.php;
+    }
+
+    location ~ \.php$ {
+        include fastcgi_params;
+        fastcgi_index index.php;
+        fastcgi_pass   127.0.0.1:{pool_port};
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+
+        fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+        fastcgi_param  HTTPS              off;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}
diff --git a/plugins/nginx/templates/symfony2 b/plugins/nginx/templates/symfony2
new file mode 100644
index 000000000..4d5754ca1
--- /dev/null
+++ b/plugins/nginx/templates/symfony2
@@ -0,0 +1,27 @@
+server {
+    root /home/{user}/www/{vhost}/web;
+    index app_dev.php;
+
+    server_name {vhost};
+    client_max_body_size 10M;
+    
+    error_log /var/log/nginx/{vhost}.error.log;
+	access_log /var/log/nginx/{vhost}.access.log;
+    
+    location / {
+        try_files $uri $uri/ /app_dev.php;
+    }
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:{pool_port}
+    location ~ ^/(app|app_dev|check)\.php(/|$) {
+        fastcgi_pass   127.0.0.1:{pool_port};
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+        fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+        fastcgi_param  HTTPS              off;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}
diff --git a/plugins/php-fpm/php-fpm.plugin.zsh b/plugins/php-fpm/php-fpm.plugin.zsh
new file mode 100644
index 000000000..3c095058a
--- /dev/null
+++ b/plugins/php-fpm/php-fpm.plugin.zsh
@@ -0,0 +1,75 @@
+: ${FPM_DIR:=/etc/php5/fpm}
+
+if [ $use_sudo -eq 1 ]; then
+    sudo="sudo"
+else
+    sudo=""
+fi
+
+_fpm_get_possible_pool_list () {
+    cat /etc/passwd | awk -F : '{print $1 }'
+}
+
+_fpm_pool () {
+    compadd `_fpm_get_possible_pool_list`
+    
+}
+
+pool () {
+    while getopts ":lh" option
+    do
+      case $option in
+        l ) ls $FPM_DIR/pool.d; return ;;
+        h ) _pool_usage; return ;;
+       * ) _pool_usage; return ;; # Default.
+      esac
+    done
+    
+    if [ ! $1 ]; then
+      user=$USER
+    else
+      user=$1
+    fi
+    
+    _pool_generate $user
+}
+compdef _fpm_pool pool
+
+_pool_usage () {
+    echo "Usage: pool [options] [user]"
+    echo
+    echo "Options"
+    echo "  -l   Lists fpm pools"
+    echo "  -h   Get this help message"
+    return
+}
+
+_pool_generate () {
+    user=$(cat /etc/passwd | grep $1 | awk -F : '{print $1 }')
+    
+    if [ ! $user ]; then
+      echo "User \033[31m$1\033[0m doesn't have an account on \033[33m$HOST\033[0m"
+      return
+    fi
+
+    group=$(groups $user | cut -d " " -f 3)
+    
+    echo "Generating pool for \033[33m$user\033[0m user with \033[33m$group\033[0m group"
+        
+    user_id=$(cat /etc/passwd | grep $1 | awk -F : '{print $3 }')
+    pool_port=1$user_id
+    : ${FPM_POOL_TEMPLATE:=$ZSH/plugins/php-fpm/templates/pool}
+    
+    conf=$(sed -e 's/{user}/'$user'/g' -e 's/{group}/'$group'/g' -e 's/{pool_port}/'$pool_port'/g' $FPM_POOL_TEMPLATE )
+    
+    echo $conf > $user.conf
+    $sudo mv $user.conf $FPM_DIR/pool.d/$user.conf
+    
+    if [ -e $FPM_DIR/pool.d/$user.conf ]; then
+        echo "Pool for \033[32m$user\033[0m user has been successfully created"
+    else
+        echo "An error occured during the creating of pool for \033[31m$user\033[0m user"
+    fi
+}
+
+alias fpmr="$sudo service php5-fpm restart"
diff --git a/plugins/php-fpm/templates/pool b/plugins/php-fpm/templates/pool
new file mode 100644
index 000000000..80f6693e0
--- /dev/null
+++ b/plugins/php-fpm/templates/pool
@@ -0,0 +1,11 @@
+[{user}]
+user = {user}
+group = {group}
+
+listen = 127.0.0.1:{pool_port}
+
+pm = dynamic
+pm.max_children = 10
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+pm.max_requests = 100

From 97ec5de7244c419c4ca484f318e15062910247ba Mon Sep 17 00:00:00 2001
From: cybozuty <ty_c@cybozu.co.jp>
Date: Mon, 3 Sep 2012 15:31:54 +0900
Subject: [PATCH 0106/1378] Rendering the 'vagrant box (remove|repackage)'
 completion code independant of Vagrant implementation details.

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 483b29c53..b161ba2be 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -43,7 +43,7 @@ __task_list ()
 
 __box_list ()
 {
-    _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
+    _wanted application expl 'command' compadd $(command vagrant box list | sed -e 's/ /\\ /g')
 }
 
 __vagrant-box ()

From 91303246ecb4f103a1a3e21dfd9bcb65d1d5e832 Mon Sep 17 00:00:00 2001
From: mikka <miklos.martin@gmail.com>
Date: Fri, 7 Sep 2012 22:15:43 +0200
Subject: [PATCH 0107/1378] added lesscss plugin

---
 plugins/lesscss/lesscss.plugin.zsh | 46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 plugins/lesscss/lesscss.plugin.zsh

diff --git a/plugins/lesscss/lesscss.plugin.zsh b/plugins/lesscss/lesscss.plugin.zsh
new file mode 100644
index 000000000..6c666adb2
--- /dev/null
+++ b/plugins/lesscss/lesscss.plugin.zsh
@@ -0,0 +1,46 @@
+# basics taken from here:
+# http://www.ravelrumba.com/blog/watch-compile-less-command-line/comment-page-1/#comment-2464
+# Requires watchr: https://github.com/mynyml/watchr
+
+watchless () {
+    compressed=0
+    compile=""
+    
+    while getopts ":xc:h" option
+    do
+      case $option in
+        x ) compressed=1 ;;
+        c ) compile=$OPTARG ;;
+        h ) _watchless_usage; return ;;
+      esac
+    done
+    
+    if [ $compressed -eq 1 ]; then
+        x=' -x'
+    else
+        x=''
+    fi
+    
+    if [ -n "$compile" ]; then
+        if [ ! -e $compile ]; then
+            echo "\033[337;41m\n$compile doesn't exist!\n\033[0m"
+            return
+        fi
+        
+        name=$(echo $compile | cut -d . -f 1)
+        
+        watchr -e 'watch(".*\.less$") { |f| system("lessc '$name'.less > '$name'.css'$x' && echo \"'$name'.less > '$name'.css\" ") }'
+    else
+        watchr -e 'watch(".*\.less$") { |f| system("lessc #{f[0]} > $(echo #{f[0]} | cut -d\. -f1).css'$x' && echo \"#{f[0]} > $(echo #{f[0]} | cut -d\. -f1).css\" ") }'
+    fi
+}
+
+_watchless_usage () {
+    echo "Usage: watchless [options]"
+    echo
+    echo "Options"
+    echo "  -x   Compiles less files into minified css files"
+    echo "  -c   Watch all files but compile only the one given here"
+    echo "  -h   Get this help message"
+    return
+}

From 08f4d8b9ce43bae69a2d712456cc6bde68b4f0d1 Mon Sep 17 00:00:00 2001
From: mikka <miklos.martin@gmail.com>
Date: Tue, 11 Sep 2012 22:04:56 +0200
Subject: [PATCH 0108/1378] fixed nginx vhost template, made variables local,
 imroved parameter validation

---
 plugins/nginx/nginx.plugin.zsh   | 49 +++++++++++++-------------------
 plugins/nginx/templates/symfony2 |  2 +-
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/plugins/nginx/nginx.plugin.zsh b/plugins/nginx/nginx.plugin.zsh
index 6dd90c6d5..4d2c4122d 100644
--- a/plugins/nginx/nginx.plugin.zsh
+++ b/plugins/nginx/nginx.plugin.zsh
@@ -81,45 +81,36 @@ _nginx_vhost () {
 
 # Parsing arguments
 vhost () {
-    user=$USER;
-    template=$NGINX_VHOST_TEMPLATE
-    tpl="non_existing_template"
-    enable=1
-    write_hosts=0
-    args=""
+    local user=$USER;
+    local template=$NGINX_VHOST_TEMPLATE
+    local tpl="non_existing_template"
+    local enable=1
+    local write_hosts=0
 
     while getopts ":lu:t:nwh" option
     do
       case $option in
         l ) ls $NGINX_DIR/sites-enabled; return ;;
-        u ) user=$OPTARG; args="$args -u $OPTARG" ;;
-        t ) tpl=$OPTARG; args="$args -t $OPTARG" ;;
-        n ) enable=0; args="$args -n" ;;
-        w ) write_hosts=1; args="$args -w" ;;
+        u ) user=$OPTARG ;;
+        t ) tpl=$OPTARG ;;
+        n ) enable=0 ;;
+        w ) write_hosts=1 ;;
         h ) _vhost_usage; return ;;
       esac
     done
     
-    vhost=${@: -1}
-    vhostNotGiven=0
-    
-    if [ ! $vhost ]; then
-        vhostNotGiven=1
-    else
-        if [ $(echo $args | grep -o $vhost) ]; then
-            vhostNotGiven=1
-        fi
-    fi
-    
-    if [ $vhostNotGiven -eq 1 ]; then
+    shift $[ $OPTIND - 1 ]
+    local vhost=$1
+  
+    if [ -z "$vhost" ]; then
         echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m"
         return
     fi
     
     if [ -e $ZSH/plugins/nginx/templates/$tpl ]; then
-        template=$ZSH/plugins/nginx/templates/$tpl
+        local template=$ZSH/plugins/nginx/templates/$tpl
     elif [ -e $tpl ]; then
-        template=$tpl
+        local template=$tpl
     fi
         
     _vhost_generate $vhost $user
@@ -149,7 +140,7 @@ _vhost_usage () {
 
 # Generate config file
 _vhost_generate () {
-    user=$(cat /etc/passwd | grep $2 | awk -F : '{print $1 }')
+    local user=$(cat /etc/passwd | grep $2 | awk -F : '{print $1 }')
     
     if [ ! $user ]; then
       echo "User \033[31m$2\033[0m doesn't have an account on \033[33m$HOST\033[0m"
@@ -158,10 +149,10 @@ _vhost_generate () {
 
     echo "Generating \033[32m$1\033[0m vhost for \033[33m$user\033[0m user"
         
-    user_id=$(cat /etc/passwd | grep $2 | awk -F : '{print $3 }')
-    pool_port=1$user_id
+    local user_id=$(cat /etc/passwd | grep $2 | awk -F : '{print $3 }')
+    local pool_port=1$user_id
     
-    conf=$(sed -e 's/{vhost}/'$1'/g' -e 's/{user}/'$user'/g' -e 's/{pool_port}/'$pool_port'/g' $template )
+    local conf=$(sed -e 's/{vhost}/'$1'/g' -e 's/{user}/'$user'/g' -e 's/{pool_port}/'$pool_port'/g' $template )
     
     echo $conf > $1.tmp
     $sudo mv $1.tmp $NGINX_DIR/sites-available/$1
@@ -188,7 +179,7 @@ _write_hosts () {
 	
 	$sudo mv $temp /etc/hosts;
 	
-	"\033[32m$1\033[0m vhost has been successfully written in /etc/hosts"
+	echo "\033[32m$1\033[0m vhost has been successfully written in /etc/hosts"
 }
 
 alias ngt="$sudo nginx -t"
diff --git a/plugins/nginx/templates/symfony2 b/plugins/nginx/templates/symfony2
index 4d5754ca1..c2eeaec0a 100644
--- a/plugins/nginx/templates/symfony2
+++ b/plugins/nginx/templates/symfony2
@@ -9,7 +9,7 @@ server {
 	access_log /var/log/nginx/{vhost}.access.log;
     
     location / {
-        try_files $uri $uri/ /app_dev.php;
+        try_files $uri $uri/ /app_dev.php$uri /app_dev.php$is_args$args;
     }
 
     # pass the PHP scripts to FastCGI server listening on 127.0.0.1:{pool_port}

From 68cec79d32baeb96efc357ba94c0bfe5b4059c90 Mon Sep 17 00:00:00 2001
From: Kyle West <kswest@gmail.com>
Date: Mon, 30 Jan 2012 22:51:58 -0500
Subject: [PATCH 0109/1378] Added documentation to key bindings.

Conflicts:
	lib/key-bindings.zsh
---
 lib/key-bindings.zsh | 50 --------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 5f499f3e8..e69de29bb 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,50 +0,0 @@
-# TODO: Explain what some of this does..
-
-bindkey -e
-bindkey '\ew' kill-region
-bindkey -s '\el' "ls\n"
-bindkey '^r' history-incremental-search-backward
-bindkey "^[[5~" up-line-or-history
-bindkey "^[[6~" down-line-or-history
-
-# make search up and down work, so partially type and hit up/down to find relevant stuff
-bindkey '^[[A' up-line-or-search
-bindkey '^[[B' down-line-or-search
-
-bindkey "^[[H" beginning-of-line
-bindkey "^[[1~" beginning-of-line
-bindkey "^[OH" beginning-of-line
-bindkey "^[[F"  end-of-line
-bindkey "^[[4~" end-of-line
-bindkey "^[OF" end-of-line
-bindkey ' ' magic-space    # also do history expansion on space
-
-bindkey "^[[1;5C" forward-word
-bindkey "^[[1;5D" backward-word
-
-bindkey '^[[Z' reverse-menu-complete
-
-# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
-bindkey '^?' backward-delete-char
-bindkey "^[[3~" delete-char
-bindkey "^[3;5~" delete-char
-bindkey "\e[3~" delete-char
-
-# consider emacs keybindings:
-
-#bindkey -e  ## emacs key bindings
-#
-#bindkey '^[[A' up-line-or-search
-#bindkey '^[[B' down-line-or-search
-#bindkey '^[^[[C' emacs-forward-word
-#bindkey '^[^[[D' emacs-backward-word
-#
-#bindkey -s '^X^Z' '%-^M'
-#bindkey '^[e' expand-cmd-path
-#bindkey '^[^I' reverse-menu-complete
-#bindkey '^X^N' accept-and-infer-next-history
-#bindkey '^W' kill-region
-#bindkey '^I' complete-word
-## Fix weird sequence that rxvt produces
-#bindkey -s '^[[Z' '\t'
-#

From f7708d4181374cfbd223e071f7253018f28e5509 Mon Sep 17 00:00:00 2001
From: Kyle West <kswest@gmail.com>
Date: Mon, 30 Jan 2012 23:04:06 -0500
Subject: [PATCH 0110/1378] forgot to save before committing. doh

---
 lib/key-bindings.zsh | 54 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index e69de29bb..195bbb38e 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -0,0 +1,54 @@
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Standard-Widgets
+
+bindkey -e                                          # Use emacs key bindings
+
+bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
+bindkey -s '\e.' '..\n'                             # [Esc-.] - run command: .. (up directory)
+bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey '^[[5~' up-line-or-history                  # [PageUp] - Up a line of history
+bindkey '^[[6~' down-line-or-history                # [PageDown] - Down a line of history
+
+bindkey '^[[A' up-line-or-search                    # start typing + [Up-Arrow] - fuzzy find history forward
+bindkey '^[[B' down-line-or-search                  # start typing + [Down-Arrow] - fuzzy find history backward
+
+bindkey '^[[H' beginning-of-line                    # [Home] - Go to beginning of line
+bindkey '^[[1~' beginning-of-line                   # [Home] - Go to beginning of line
+bindkey '^[OH' beginning-of-line                    # [Home] - Go to beginning of line
+bindkey '^[[F'  end-of-line                         # [End] - Go to end of line
+bindkey '^[[4~' end-of-line                         # [End] - Go to end of line
+bindkey '^[OF' end-of-line                          # [End] - Go to end of line
+
+bindkey ' ' magic-space                             # [Space] - do history expansion
+
+bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
+bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
+
+bindkey '^[[Z' reverse-menu-complete                # [TODO] - Perform menu completion, like menu-complete, except that if a menu completion is already in progress, move to the previous completion rather than the next.
+
+# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
+bindkey '^?' backward-delete-char                   # [Delete] - delete backward
+bindkey '^[[3~' delete-char                         # [fn-Delete] - delete forward
+bindkey '^[3;5~' delete-char                        # [TODO] - delete forward
+bindkey '\e[3~' delete-char                         # [TODO] - delete forward
+
+# consider emacs keybindings:
+
+#bindkey -e  ## emacs key bindings
+#
+#bindkey '^[[A' up-line-or-search
+#bindkey '^[[B' down-line-or-search
+#bindkey '^[^[[C' emacs-forward-word
+#bindkey '^[^[[D' emacs-backward-word
+#
+#bindkey -s '^X^Z' '%-^M'
+#bindkey '^[e' expand-cmd-path
+#bindkey '^[^I' reverse-menu-complete
+#bindkey '^X^N' accept-and-infer-next-history
+#bindkey '^W' kill-region
+#bindkey '^I' complete-word
+## Fix weird sequence that rxvt produces
+#bindkey -s '^[[Z' '\t'
+#

From 3839c6e9e62a2671b1d3f5662e4d2bc3984c3f9e Mon Sep 17 00:00:00 2001
From: Mat Schaffer <mat@schaffer.me>
Date: Sat, 17 Mar 2012 22:03:01 -0300
Subject: [PATCH 0111/1378] Don't clobber standard Esc+. behavior

Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.

Conflicts:
	lib/key-bindings.zsh
---
 lib/key-bindings.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 195bbb38e..8168c8d90 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -6,7 +6,6 @@ bindkey -e                                          # Use emacs key bindings
 
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
-bindkey -s '\e.' '..\n'                             # [Esc-.] - run command: .. (up directory)
 bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 bindkey '^[[5~' up-line-or-history                  # [PageUp] - Up a line of history
 bindkey '^[[6~' down-line-or-history                # [PageDown] - Down a line of history

From ff0cafa14db5b728f823ee486ec1bf5a9d2725eb Mon Sep 17 00:00:00 2001
From: Felix Dreissig <f30@f30.me>
Date: Sun, 14 Oct 2012 00:07:47 +0200
Subject: [PATCH 0112/1378] Make sure the terminal is always in application
 mode when zle is active.

---
 lib/key-bindings.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 8168c8d90..a57b04122 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -2,6 +2,19 @@
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Standard-Widgets
 
+# Make sure that the terminal is in application mode when zle is active, since
+# only then values from $terminfo are valid
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+  function zle-line-init() {
+    echoti smkx
+  }
+  function zle-line-finish() {
+    echoti rmkx
+  }
+  zle -N zle-line-init
+  zle -N zle-line-finish
+fi
+
 bindkey -e                                          # Use emacs key bindings
 
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark

From 174c9177aa34b4c05bb5a1c6f637e6fa479a8e10 Mon Sep 17 00:00:00 2001
From: Felix Dreissig <f30@f30.me>
Date: Sun, 14 Oct 2012 02:32:48 +0200
Subject: [PATCH 0113/1378] Replace hardcoded key escape sequeneces with
 dynamic ones from terminfo.

---
 lib/key-bindings.zsh | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index a57b04122..4a00764da 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -20,31 +20,24 @@ bindkey -e                                          # Use emacs key bindings
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
-bindkey '^[[5~' up-line-or-history                  # [PageUp] - Up a line of history
-bindkey '^[[6~' down-line-or-history                # [PageDown] - Down a line of history
+bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
+bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
 
-bindkey '^[[A' up-line-or-search                    # start typing + [Up-Arrow] - fuzzy find history forward
-bindkey '^[[B' down-line-or-search                  # start typing + [Down-Arrow] - fuzzy find history backward
+bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
+bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
 
-bindkey '^[[H' beginning-of-line                    # [Home] - Go to beginning of line
-bindkey '^[[1~' beginning-of-line                   # [Home] - Go to beginning of line
-bindkey '^[OH' beginning-of-line                    # [Home] - Go to beginning of line
-bindkey '^[[F'  end-of-line                         # [End] - Go to end of line
-bindkey '^[[4~' end-of-line                         # [End] - Go to end of line
-bindkey '^[OF' end-of-line                          # [End] - Go to end of line
+bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
+bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 
 bindkey ' ' magic-space                             # [Space] - do history expansion
 
 bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
 
-bindkey '^[[Z' reverse-menu-complete                # [TODO] - Perform menu completion, like menu-complete, except that if a menu completion is already in progress, move to the previous completion rather than the next.
+bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
 
-# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
-bindkey '^?' backward-delete-char                   # [Delete] - delete backward
-bindkey '^[[3~' delete-char                         # [fn-Delete] - delete forward
-bindkey '^[3;5~' delete-char                        # [TODO] - delete forward
-bindkey '\e[3~' delete-char                         # [TODO] - delete forward
+bindkey '^?' backward-delete-char                   # [Backspace] - delete backward
+bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 
 # consider emacs keybindings:
 

From ebeae4abe9b3ef2e626eb545e991bb5696c57de0 Mon Sep 17 00:00:00 2001
From: Sergey Lukin <contact@sergeylukinlukinlukin.com>
Date: Fri, 9 Nov 2012 23:53:22 +0200
Subject: [PATCH 0114/1378] Fix /bin/sh compatibility issue in install.sh

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index b080be3a1..0558c96ce 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -36,4 +36,4 @@ echo "\033[0;32m"'                        /____/                       '"\033[0m
 
 echo "\n\n \033[0;32m....is now installed.\033[0m"
 /usr/bin/env zsh
-source ~/.zshrc
+. ~/.zshrc

From 55f09f89c8602efa6545411448e377aa87f64e7b Mon Sep 17 00:00:00 2001
From: Artie Kh <khrt@ya.ru>
Date: Thu, 13 Dec 2012 19:09:28 +0200
Subject: [PATCH 0115/1378] Added `verisions` option for `homebrew` completion

---
 plugins/brew/_brew | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index 1dcf0a4bf..e43ba2900 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -35,6 +35,7 @@ _1st_arguments=(
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'
   'uses:show formulas which depend on a formula'
+  'versions:show all available formula versions'
 )
 
 local expl
@@ -71,7 +72,7 @@ case "$words[1]" in
         _brew_installed_formulae
         _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|homepage|log|info|abv|uses|cat|deps|edit|options)
+  install|home|homepage|log|info|abv|uses|cat|deps|edit|options|versions)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
   remove|rm|uninstall|unlink|cleanup|link|ln)

From 46ad7338333b57ce5966ca481d132d8626304d83 Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro@ratanagiri.org.uk>
Date: Tue, 18 Dec 2012 08:16:28 +0000
Subject: [PATCH 0116/1378] more catspeak

---
 plugins/lol/lol.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index ae065c12f..3b92533a8 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -36,3 +36,12 @@ alias nomnom='killall'
 alias byes='exit'
 alias cya='reboot'
 alias kthxbai='halt'
+
+alias pwned='ssh'
+
+alias hackzor='git init'
+alias rulz='git push'
+alias bringz='git pull'
+alias moarhack='git checkout'
+alias chicken='git add'
+

From c95b6d91f7e45ac4ca9a1ce2207db7d515ba450b Mon Sep 17 00:00:00 2001
From: Gambhiro <gambhiro@ratanagiri.org.uk>
Date: Tue, 18 Dec 2012 08:47:04 +0000
Subject: [PATCH 0117/1378] git lol

---
 plugins/lol/lol.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index 3b92533a8..1b32ec2e4 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -42,6 +42,9 @@ alias pwned='ssh'
 alias hackzor='git init'
 alias rulz='git push'
 alias bringz='git pull'
-alias moarhack='git checkout'
 alias chicken='git add'
+alias oanward='git commit -m'
+alias ooanward='git commit -am'
+alias letcat='git checkout'
+alias violenz='git rebase'
 

From fdb3c0e68d36d20d1b75163755d568d42def5ac1 Mon Sep 17 00:00:00 2001
From: Anton Eicher <antone@antone-3.desktop.amazon.com>
Date: Wed, 19 Dec 2012 07:22:03 -0800
Subject: [PATCH 0118/1378] Added check for .git directory in current, before
 wasting time querying git. This saves seconds on my pc.

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 154aa6db1..79300a166 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -73,12 +73,14 @@ alias gsd='git svn dcommit'
 # Usage example: git pull origin $(current_branch)
 #
 function current_branch() {
+  if [ ! -d .git ]; then return; fi
   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
   echo ${ref#refs/heads/}
 }
 
 function current_repository() {
+  if [ ! -d .git ]; then return; fi
   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
   echo $(git remote -v | cut -d':' -f 2)

From e7f24a831990f7dc87b7931aac2a3c2cd6b6c7e8 Mon Sep 17 00:00:00 2001
From: Jack Henahan <jhenahan@uvm.edu>
Date: Mon, 24 Dec 2012 13:43:45 -0500
Subject: [PATCH 0119/1378] add symbol in darcs repos to match git and
 mercurial

---
 themes/smt.zsh-theme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index 7a287523e..bbd1031e1 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -29,6 +29,7 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
 function prompt_char() {
   git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
   hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
+  darcs show repo >/dev/null 2>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return
   echo "%{$fg[cyan]%}◯%{$reset_color%}"
 }
 

From dde4a8b6a3aaa69feb3243bb374a0af07fb5d033 Mon Sep 17 00:00:00 2001
From: Nandor Kracser <bonifaido@gmail.com>
Date: Fri, 28 Dec 2012 12:28:47 +0100
Subject: [PATCH 0120/1378] Maven plugin completion fix for other (than Java)
 JVM languages

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index da29b4f0a..c2d8e7ed7 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -163,7 +163,7 @@ function listMavenCompletions {
         cli:execute cli:execute-phase 
         archetype:generate generate-sources 
         cobertura:cobertura
-        -Dtest= `if [ -d ./src ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`
+        -Dtest= `if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`
     ); 
 }
 

From d0842b431e9ebae66ae9373e9e5614341c6f5803 Mon Sep 17 00:00:00 2001
From: Filipe Chagas <filipe@ochagas.com>
Date: Fri, 28 Dec 2012 17:37:48 -0200
Subject: [PATCH 0121/1378] Fix gitfast problem for untracket files

When showing the char % for untracket files, it was not being escaped
so there was shown a space in the place. It was also removing any char
that was right just after.
---
 plugins/gitfast/git-prompt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index bf20491ec..afd76e86e 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -275,7 +275,7 @@ __git_ps1 ()
 
 			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
 				if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-					u="%"
+					u="%%"
 				fi
 			fi
 

From 021e6de3237402aabd7e8bc0b99726a5149c33ef Mon Sep 17 00:00:00 2001
From: Filipe Chagas <filipe@ochagas.com>
Date: Fri, 28 Dec 2012 18:04:15 -0200
Subject: [PATCH 0122/1378] added crcandy theme

it's just the candy theme with a new line before.
in order to make easier to see the result of the
commands and to avoid confusing
---
 themes/crcandy.zsh-theme | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 themes/crcandy.zsh-theme

diff --git a/themes/crcandy.zsh-theme b/themes/crcandy.zsh-theme
new file mode 100644
index 000000000..0a63c1245
--- /dev/null
+++ b/themes/crcandy.zsh-theme
@@ -0,0 +1,8 @@
+PROMPT=$'
+%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\
+%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 1f4bb8deb7bf166a43ed690b0961ab5a0b84523d Mon Sep 17 00:00:00 2001
From: Anders Andersson <anders.per.andersson@gmail.com>
Date: Sun, 30 Dec 2012 09:52:32 +0100
Subject: [PATCH 0123/1378] OpenBSD doesn't have -ef flags for ps. Both linux
 and OpenBSD have -x flags which works just as greate here

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index c4e92a1fe..650eb3f3c 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -48,7 +48,7 @@ if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
 elif [ -f "${_plugin__ssh_env}" ]; then
   # Source SSH settings, if applicable
   . ${_plugin__ssh_env} > /dev/null
-  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+  ps -x | grep ${SSH_AGENT_PID} | grep ssh-agent > /dev/null || {
     _plugin__start_agent;
   }
 else

From 6ce08acb27f14a2e73fdbd4c92f258a7e6899f64 Mon Sep 17 00:00:00 2001
From: Artie Kh <khrt@ya.ru>
Date: Sun, 30 Dec 2012 21:18:12 +0200
Subject: [PATCH 0124/1378] added support for subversion 1.7 for svn plugin

---
 plugins/svn/svn.plugin.zsh | 110 +++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e38e8920b..4f008ba4e 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,62 +1,76 @@
-
-function svn_prompt_info {
-    if [ $(in_svn) ]; then
-        if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
-            unset SVN_SHOW_BRANCH
-            _DISPLAY=$(svn_get_branch_name)
-        else
-            _DISPLAY=$(svn_get_repo_name)
-        fi
-        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
-        unset _DISPLAY
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+function svn_prompt_info() {
+  if in_svn; then
+    if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
+      unset SVN_SHOW_BRANCH
+      _DISPLAY=$(svn_get_branch_name)
+    else
+      _DISPLAY=$(svn_get_repo_name)
     fi
+    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+    unset _DISPLAY
+  fi
 }
 
 
 function in_svn() {
-    if [[ -d .svn ]]; then
-        echo 1
-    fi
+  if $(svn info >/dev/null 2>&1); then
+    return 0
+  fi
+  return 1
 }
 
-function svn_get_repo_name {
-    if [ $(in_svn) ]; then
-        svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-
-        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
-    fi
+function svn_get_repo_name() {
+  if in_svn; then
+    svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+    svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+  fi
 }
 
-function svn_get_branch_name {
-    _DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }')
-    if [ "x$_DISPLAY" = "x" ]; then
-        svn_get_repo_name
+function svn_get_branch_name() {
+  _DISPLAY=$(
+    svn info 2> /dev/null | \
+      awk -F/ \
+      '/^URL:/ { \
+        for (i=0; i<=NF; i++) { \
+          if ($i == "branches" || $i == "tags" ) { \
+            print $(i+1); \
+            break;\
+          }; \
+          if ($i == "trunk") { print $i; break; } \
+        } \
+      }'
+  )
+  
+  if [ "x$_DISPLAY" = "x" ]; then
+    svn_get_repo_name
+  else
+    echo $_DISPLAY
+  fi
+  unset _DISPLAY
+}
+
+function svn_get_rev_nr() {
+  if in_svn; then
+    svn info 2> /dev/null | sed -n 's/Revision:\ //p'
+  fi
+}
+
+function svn_dirty_choose() {
+  if in_svn; then
+    root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
+    if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
+      # Grep exits with 0 when "One or more lines were selected", return "dirty".
+      echo $1
     else
-        echo $_DISPLAY
+      # Otherwise, no lines were found, or an error occurred. Return clean.
+      echo $2
     fi
-    unset _DISPLAY
+  fi
 }
 
-function svn_get_rev_nr {
-    if [ $(in_svn) ]; then
-        svn info 2> /dev/null | sed -n s/Revision:\ //p
-    fi
-}
-
-function svn_dirty_choose {
-    if [ $(in_svn) ]; then
-        svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
-        if [ $pipestatus[-1] -eq 0 ]; then
-            # Grep exits with 0 when "One or more lines were selected", return "dirty".
-            echo $1
-        else
-            # Otherwise, no lines were found, or an error occurred. Return clean.
-            echo $2
-        fi
-    fi
-}
-
-function svn_dirty {
-    svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+function svn_dirty() {
+  svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
 }

From fa355a798c165fab65462238162c258394b1c7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cosmin=20Lu=3F=C4=83?= <q4break@gmail.com>
Date: Mon, 31 Dec 2012 14:02:22 +0200
Subject: [PATCH 0125/1378] Fixed issue with NetBSD's ls

---
 lib/theme-and-appearance.zsh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index aec67721a..351ec22b0 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -7,7 +7,14 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 if [ "$DISABLE_LS_COLORS" != "true" ]
 then
   # Find the option for using colors in ls, depending on the version: Linux or BSD
-  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
+  if [[ "$(uname -s)" == "NetBSD" ]]
+  then
+      # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); 
+      # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
+      gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
+  else
+      ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
+  fi
 fi
 
 #setopt no_beep

From 3362899493662ae8295521bc8fa8eccec79c7550 Mon Sep 17 00:00:00 2001
From: Ryan Neufeld <ryan@neufeldmail.com>
Date: Tue, 1 Jan 2013 19:51:55 -0800
Subject: [PATCH 0126/1378] Adding torrent tools plugin.

Only one tool exists right now, that is to convert a magnetlink into a
torrent file.
---
 plugins/torrent/torrent.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/torrent/torrent.plugin.zsh

diff --git a/plugins/torrent/torrent.plugin.zsh b/plugins/torrent/torrent.plugin.zsh
new file mode 100644
index 000000000..656e337de
--- /dev/null
+++ b/plugins/torrent/torrent.plugin.zsh
@@ -0,0 +1,17 @@
+#
+# Algorithm borrowed from http://wiki.rtorrent.org/MagnetUri and adapted to work with zsh.
+#
+
+function magnet_to_torrent() {
+	[[ "$1" =~ xt=urn:btih:([^\&/]+) ]] || return 1
+
+	hashh=${match[1]}
+
+	if [[ "$1" =~ dn=([^\&/]+) ]];then
+	  filename=${match[1]}
+	else
+	  filename=$hashh
+	fi
+
+	echo "d10:magnet-uri${#1}:${1}e" > "$filename.torrent"
+}
\ No newline at end of file

From c5d575ccae5ae5f30dd59037210edb8220de2cbe Mon Sep 17 00:00:00 2001
From: mikka <miklos.martin@gmail.com>
Date: Thu, 3 Jan 2013 07:07:40 +0100
Subject: [PATCH 0127/1378] cleaned up

---
 plugins/lesscss/lesscss.plugin.zsh |  46 -------
 plugins/nginx/nginx.plugin.zsh     | 186 -----------------------------
 plugins/nginx/templates/plain_php  |  27 -----
 plugins/nginx/templates/symfony2   |  27 -----
 plugins/php-fpm/php-fpm.plugin.zsh |  75 ------------
 plugins/php-fpm/templates/pool     |  11 --
 6 files changed, 372 deletions(-)
 delete mode 100644 plugins/lesscss/lesscss.plugin.zsh
 delete mode 100644 plugins/nginx/nginx.plugin.zsh
 delete mode 100644 plugins/nginx/templates/plain_php
 delete mode 100644 plugins/nginx/templates/symfony2
 delete mode 100644 plugins/php-fpm/php-fpm.plugin.zsh
 delete mode 100644 plugins/php-fpm/templates/pool

diff --git a/plugins/lesscss/lesscss.plugin.zsh b/plugins/lesscss/lesscss.plugin.zsh
deleted file mode 100644
index 6c666adb2..000000000
--- a/plugins/lesscss/lesscss.plugin.zsh
+++ /dev/null
@@ -1,46 +0,0 @@
-# basics taken from here:
-# http://www.ravelrumba.com/blog/watch-compile-less-command-line/comment-page-1/#comment-2464
-# Requires watchr: https://github.com/mynyml/watchr
-
-watchless () {
-    compressed=0
-    compile=""
-    
-    while getopts ":xc:h" option
-    do
-      case $option in
-        x ) compressed=1 ;;
-        c ) compile=$OPTARG ;;
-        h ) _watchless_usage; return ;;
-      esac
-    done
-    
-    if [ $compressed -eq 1 ]; then
-        x=' -x'
-    else
-        x=''
-    fi
-    
-    if [ -n "$compile" ]; then
-        if [ ! -e $compile ]; then
-            echo "\033[337;41m\n$compile doesn't exist!\n\033[0m"
-            return
-        fi
-        
-        name=$(echo $compile | cut -d . -f 1)
-        
-        watchr -e 'watch(".*\.less$") { |f| system("lessc '$name'.less > '$name'.css'$x' && echo \"'$name'.less > '$name'.css\" ") }'
-    else
-        watchr -e 'watch(".*\.less$") { |f| system("lessc #{f[0]} > $(echo #{f[0]} | cut -d\. -f1).css'$x' && echo \"#{f[0]} > $(echo #{f[0]} | cut -d\. -f1).css\" ") }'
-    fi
-}
-
-_watchless_usage () {
-    echo "Usage: watchless [options]"
-    echo
-    echo "Options"
-    echo "  -x   Compiles less files into minified css files"
-    echo "  -c   Watch all files but compile only the one given here"
-    echo "  -h   Get this help message"
-    return
-}
diff --git a/plugins/nginx/nginx.plugin.zsh b/plugins/nginx/nginx.plugin.zsh
deleted file mode 100644
index 4d2c4122d..000000000
--- a/plugins/nginx/nginx.plugin.zsh
+++ /dev/null
@@ -1,186 +0,0 @@
-: ${NGINX_DIR:=/etc/nginx}
-: ${NGINX_VHOST_TEMPLATE:=$ZSH/plugins/nginx/templates/symfony2}
-
-if [ $use_sudo -eq 1 ]; then
-    sudo="sudo"
-else
-    sudo=""
-fi
-
-# nginx basic completition
-
-_nginx_get_en_command_list () {
-    ls -a $NGINX_DIR/sites-available | awk '/^[a-z][a-z.-]+$/ { print $1 }'
-}
-
-_nginx_get_dis_command_list () {
-    ls -a $NGINX_DIR/sites-enabled | awk '/^[a-z][a-z.-]+$/ { print $1 }'
-}
-
-_nginx_en () {
-   compadd `_nginx_get_en_command_list`
-}
-
-_nginx_dis () {
-   compadd `_nginx_get_dis_command_list`
-}
-
-# Enabling a site
-en () {
-    if [ ! $1 ]; then
-        echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m";
-        return
-    fi
-    
-    if [ ! -e $NGINX_DIR/sites-available/$1 ]; then
-        echo "\033[31m$1\033[0m doesn't exist";
-        return
-    fi
-
-    if [ ! -e $NGINX_DIR/sites-enabled/$1 ]; then
-  	    $sudo ln -s $NGINX_DIR/sites-available/$1 $NGINX_DIR/sites-enabled/$1;
-	    if [ -e /etc/nginx/sites-enabled/$1 ]; then
-        	echo "\033[32m$1\033[0m successfully enabled";
-        else
-            echo "An error occured during the enabling of \033[31m$1\033[0m";
-        fi
-    else
-        echo "\033[31m$1\033[0m is already enabled";
-    fi
-}
-compdef _nginx_en en
-
-# Disabling a site
-dis () {
-    if [ ! $1 ]; then
-        echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m";
-        return
-    fi
-
-    if [ ! -e $NGINX_DIR/sites-enabled/$1 ]; then
-        echo "\033[31m$1\033[0m doesn't exist";
-    else
-	    $sudo rm -f $NGINX_DIR/sites-enabled/$1;
-	    if [ ! -e $NGINX_DIR/sites-enabled/$1 ]; then
-        	echo "\033[32m$1\033[0m successfully disabled";
-        else
-            echo "An error occured during the disabling of \033[31m$1\033[0m";
-        fi
-    fi
-}
-compdef _nginx_dis dis
-
-# Completition of vhost
-_nginx_get_possible_vhost_list () {
-    ls -a $HOME/www | awk '/^[^.][a-z0-9._]+$/ { print $1 }'
-}
-
-_nginx_vhost () {
-   compadd `_nginx_get_possible_vhost_list`
-}
-
-# Parsing arguments
-vhost () {
-    local user=$USER;
-    local template=$NGINX_VHOST_TEMPLATE
-    local tpl="non_existing_template"
-    local enable=1
-    local write_hosts=0
-
-    while getopts ":lu:t:nwh" option
-    do
-      case $option in
-        l ) ls $NGINX_DIR/sites-enabled; return ;;
-        u ) user=$OPTARG ;;
-        t ) tpl=$OPTARG ;;
-        n ) enable=0 ;;
-        w ) write_hosts=1 ;;
-        h ) _vhost_usage; return ;;
-      esac
-    done
-    
-    shift $[ $OPTIND - 1 ]
-    local vhost=$1
-  
-    if [ -z "$vhost" ]; then
-        echo "\033[337;41m\nThe name of the vhost is required!\n\033[0m"
-        return
-    fi
-    
-    if [ -e $ZSH/plugins/nginx/templates/$tpl ]; then
-        local template=$ZSH/plugins/nginx/templates/$tpl
-    elif [ -e $tpl ]; then
-        local template=$tpl
-    fi
-        
-    _vhost_generate $vhost $user
-    
-    if [ $enable -eq 1 ]; then
-        en $vhost
-    fi
-    
-    if [ $write_hosts -eq 1 ]; then
-        _write_hosts $vhost
-    fi
-}
-compdef _nginx_vhost vhost
-
-_vhost_usage () {
-    echo "Usage: vhost [options] [vhost_name]"
-    echo
-    echo "Options"
-    echo "  -l   Lists enabled vhosts"
-    echo "  -u   Sets the user - defaults to the current user ($USER)"
-    echo "  -t   Sets the template"
-    echo "  -n   Does not enable the generated vhost"
-    echo "  -w   Write the vhost to the /etc/hosts file pointing to 127.0.0.1 (writes it at the end of the first line actually)"
-    echo "  -h   Get this help message"
-    return
-}
-
-# Generate config file
-_vhost_generate () {
-    local user=$(cat /etc/passwd | grep $2 | awk -F : '{print $1 }')
-    
-    if [ ! $user ]; then
-      echo "User \033[31m$2\033[0m doesn't have an account on \033[33m$HOST\033[0m"
-      return
-    fi
-
-    echo "Generating \033[32m$1\033[0m vhost for \033[33m$user\033[0m user"
-        
-    local user_id=$(cat /etc/passwd | grep $2 | awk -F : '{print $3 }')
-    local pool_port=1$user_id
-    
-    local conf=$(sed -e 's/{vhost}/'$1'/g' -e 's/{user}/'$user'/g' -e 's/{pool_port}/'$pool_port'/g' $template )
-    
-    echo $conf > $1.tmp
-    $sudo mv $1.tmp $NGINX_DIR/sites-available/$1
-    
-    if [ -e $NGINX_DIR/sites-available/$1 ]; then
-        echo "\033[32m$1\033[0m vhost has been successfully created"
-    else
-        echo "An error occured during the creating of \033[31m$1\033[0m vhost"
-    fi
-}
-
-# Write the /etc/hosts file
-_write_hosts () {
-    temp=$HOME/hosts.temp
-    exec < /etc/hosts
-	while read line
-	do
-		if [ -e $temp ]; then
-			echo "$line" >> $temp;
-		else
-			echo "$line $1" > $temp;		
-		fi
-	done
-	
-	$sudo mv $temp /etc/hosts;
-	
-	echo "\033[32m$1\033[0m vhost has been successfully written in /etc/hosts"
-}
-
-alias ngt="$sudo nginx -t"
-alias ngr="$sudo service nginx restart"
diff --git a/plugins/nginx/templates/plain_php b/plugins/nginx/templates/plain_php
deleted file mode 100644
index f7995f5d5..000000000
--- a/plugins/nginx/templates/plain_php
+++ /dev/null
@@ -1,27 +0,0 @@
-server {
-    root /home/{user}/www/{vhost};
-    index index.php;
-
-    server_name {vhost};
-
-    error_log /var/log/nginx/{vhost}.error.log;
-    access_log /var/log/nginx/{vhost}.access.log;
-
-    location / {
-        try_files $uri $uri/ $uri/index.php;
-    }
-
-    location ~ \.php$ {
-        include fastcgi_params;
-        fastcgi_index index.php;
-        fastcgi_pass   127.0.0.1:{pool_port};
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
-
-        fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
-        fastcgi_param  HTTPS              off;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}
diff --git a/plugins/nginx/templates/symfony2 b/plugins/nginx/templates/symfony2
deleted file mode 100644
index c2eeaec0a..000000000
--- a/plugins/nginx/templates/symfony2
+++ /dev/null
@@ -1,27 +0,0 @@
-server {
-    root /home/{user}/www/{vhost}/web;
-    index app_dev.php;
-
-    server_name {vhost};
-    client_max_body_size 10M;
-    
-    error_log /var/log/nginx/{vhost}.error.log;
-	access_log /var/log/nginx/{vhost}.access.log;
-    
-    location / {
-        try_files $uri $uri/ /app_dev.php$uri /app_dev.php$is_args$args;
-    }
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:{pool_port}
-    location ~ ^/(app|app_dev|check)\.php(/|$) {
-        fastcgi_pass   127.0.0.1:{pool_port};
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
-        include fastcgi_params;
-        fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
-        fastcgi_param  HTTPS              off;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
-}
diff --git a/plugins/php-fpm/php-fpm.plugin.zsh b/plugins/php-fpm/php-fpm.plugin.zsh
deleted file mode 100644
index 3c095058a..000000000
--- a/plugins/php-fpm/php-fpm.plugin.zsh
+++ /dev/null
@@ -1,75 +0,0 @@
-: ${FPM_DIR:=/etc/php5/fpm}
-
-if [ $use_sudo -eq 1 ]; then
-    sudo="sudo"
-else
-    sudo=""
-fi
-
-_fpm_get_possible_pool_list () {
-    cat /etc/passwd | awk -F : '{print $1 }'
-}
-
-_fpm_pool () {
-    compadd `_fpm_get_possible_pool_list`
-    
-}
-
-pool () {
-    while getopts ":lh" option
-    do
-      case $option in
-        l ) ls $FPM_DIR/pool.d; return ;;
-        h ) _pool_usage; return ;;
-       * ) _pool_usage; return ;; # Default.
-      esac
-    done
-    
-    if [ ! $1 ]; then
-      user=$USER
-    else
-      user=$1
-    fi
-    
-    _pool_generate $user
-}
-compdef _fpm_pool pool
-
-_pool_usage () {
-    echo "Usage: pool [options] [user]"
-    echo
-    echo "Options"
-    echo "  -l   Lists fpm pools"
-    echo "  -h   Get this help message"
-    return
-}
-
-_pool_generate () {
-    user=$(cat /etc/passwd | grep $1 | awk -F : '{print $1 }')
-    
-    if [ ! $user ]; then
-      echo "User \033[31m$1\033[0m doesn't have an account on \033[33m$HOST\033[0m"
-      return
-    fi
-
-    group=$(groups $user | cut -d " " -f 3)
-    
-    echo "Generating pool for \033[33m$user\033[0m user with \033[33m$group\033[0m group"
-        
-    user_id=$(cat /etc/passwd | grep $1 | awk -F : '{print $3 }')
-    pool_port=1$user_id
-    : ${FPM_POOL_TEMPLATE:=$ZSH/plugins/php-fpm/templates/pool}
-    
-    conf=$(sed -e 's/{user}/'$user'/g' -e 's/{group}/'$group'/g' -e 's/{pool_port}/'$pool_port'/g' $FPM_POOL_TEMPLATE )
-    
-    echo $conf > $user.conf
-    $sudo mv $user.conf $FPM_DIR/pool.d/$user.conf
-    
-    if [ -e $FPM_DIR/pool.d/$user.conf ]; then
-        echo "Pool for \033[32m$user\033[0m user has been successfully created"
-    else
-        echo "An error occured during the creating of pool for \033[31m$user\033[0m user"
-    fi
-}
-
-alias fpmr="$sudo service php5-fpm restart"
diff --git a/plugins/php-fpm/templates/pool b/plugins/php-fpm/templates/pool
deleted file mode 100644
index 80f6693e0..000000000
--- a/plugins/php-fpm/templates/pool
+++ /dev/null
@@ -1,11 +0,0 @@
-[{user}]
-user = {user}
-group = {group}
-
-listen = 127.0.0.1:{pool_port}
-
-pm = dynamic
-pm.max_children = 10
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-pm.max_requests = 100

From df7cae0f4fdd8221d6cf256cc29c48b1d0d54dbd Mon Sep 17 00:00:00 2001
From: mikka <miklos.martin@gmail.com>
Date: Thu, 3 Jan 2013 07:18:38 +0100
Subject: [PATCH 0128/1378] moved bower plugin to a separate branch

---
 plugins/bower/bower.plugin.zsh | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 plugins/bower/bower.plugin.zsh

diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
new file mode 100644
index 000000000..ed9c04840
--- /dev/null
+++ b/plugins/bower/bower.plugin.zsh
@@ -0,0 +1,38 @@
+alias bi="bower install"
+alias bl="bower list"
+alias bs="bower search"
+
+bower_package_list=''
+
+_bower ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(${=$(bower help | grep help | sed -e 's/,//g')})
+			_describe -t commands 'bower' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(install)
+				    if [ -z "$bower_package_list" ];then
+                    bower_package_list=$(bower search | awk 'NR > 2' | cut -d '-' -f 2 | cut -d ' ' -f 2 | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g")
+                fi
+				    compadd "$@" $(echo $bower_package_list)
+                ;;
+			esac
+		;;
+	esac
+}
+
+compdef _bower bower

From e5736d39103c59b115270dcf91d31419d3f08130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cosmin=20Lu=3F=C4=83?= <q4break@gmail.com>
Date: Thu, 3 Jan 2013 14:44:17 +0200
Subject: [PATCH 0129/1378] Fixed coding style

---
 lib/theme-and-appearance.zsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 351ec22b0..2677615c0 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -7,13 +7,12 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 if [ "$DISABLE_LS_COLORS" != "true" ]
 then
   # Find the option for using colors in ls, depending on the version: Linux or BSD
-  if [[ "$(uname -s)" == "NetBSD" ]]
-  then
-      # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); 
-      # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
-      gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
+  if [[ "$(uname -s)" == "NetBSD" ]]; then
+    # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); 
+    # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
+    gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
   else
-      ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
+    ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
   fi
 fi
 

From 692dca07158413ae27b2064c303240f5b9621cff Mon Sep 17 00:00:00 2001
From: Stephen Zhuang <stephen.zhuang@gmail.com>
Date: Sun, 6 Jan 2013 14:08:12 +0800
Subject: [PATCH 0130/1378] Add new plugin to autocomplete fabric commands

---
 plugins/fabric/fabric.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/fabric/fabric.plugin.zsh

diff --git a/plugins/fabric/fabric.plugin.zsh b/plugins/fabric/fabric.plugin.zsh
new file mode 100644
index 000000000..d44e2d916
--- /dev/null
+++ b/plugins/fabric/fabric.plugin.zsh
@@ -0,0 +1,8 @@
+#compdef fab
+
+_fab_list() {
+    reply=(`fab --shortlist`)
+}
+compctl -K _fab_list fab
+
+# DECLARION: This plugin was created by kennethreitz. What I did is just making a portal from https://github.com/kennethreitz-archive/fabric-zsh-completion.

From 22da0a00b8a05652c08ba6744962c572746462ae Mon Sep 17 00:00:00 2001
From: goofansu <goofan.su@gmail.com>
Date: Tue, 8 Jan 2013 13:34:33 +0800
Subject: [PATCH 0131/1378] Add rebar to plugin

---
 plugins/rebar/_rebar | 79 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 plugins/rebar/_rebar

diff --git a/plugins/rebar/_rebar b/plugins/rebar/_rebar
new file mode 100644
index 000000000..7ac5a510c
--- /dev/null
+++ b/plugins/rebar/_rebar
@@ -0,0 +1,79 @@
+#compdef rebar
+
+local curcontext=$curcontext state ret=1
+typeset -ga _rebar_global_opts
+
+_rebar_global_opts=(
+  '(--help -h)'{--help,-h}'[Show the program options]'
+  '(--commands -c)'{--commands,-c}'[Show available commands]'
+  '(--version -V)'{--version,-V}'[Show version information]'
+  '(-vvv -vv -v)'--verbose+'[Verbosity level. Default: 0]:verbosity level:(0 1 2 3)'
+  '(-vvv)-v[Slightly more verbose output]'
+  '(-vvv)-vv[More verbose output]'
+  '(-v -vv)-vvv[Most verbose output]'
+  '(--force -f)'{--force,-f}'[Force]'
+  '-D+[Define compiler macro]'
+  '(--jobs -j)'{--jobs+,-j+}'[Number of concurrent workers a command may use. Default: 3]:workers:(1 2 3 4 5 6 7 8 9)'
+  '(--config -C)'{--config,-C}'[Rebar config file to use]:files:_files'
+  '(--profile -p)'{--profile,-p}'[Profile this run of rebar]'
+  '(--keep-going -k)'{--keep-going,-k}'[Keep running after a command fails]'
+)
+
+_rebar () {
+  _arguments -C $_rebar_global_opts \
+    '*::command and variable:->cmd_and_var' \
+    && return
+
+  case $state in
+    cmd_and_var)
+      _values -S = 'variables' \
+        'clean[Clean]' \
+        'compile[Compile sources]' \
+        'create[Create skel based on template and vars]' \
+        'create-app[Create simple app skel]' \
+        'create-node[Create simple node skel]' \
+        'list-template[List avaiavle templates]' \
+        'doc[Generate Erlang program documentation]' \
+        'check-deps[Display to be fetched dependencies]' \
+        'get-deps[Fetch dependencies]' \
+        'update-deps[Update fetched dependencies]' \
+        'delete-deps[Delete fetched dependencies]' \
+        'list-deps[List dependencies]' \
+        'generate[Build release with reltool]' \
+        'overlay[Run reltool overlays only]' \
+        'generate-appups[Generate appup files]' \
+        'generate-upgrade[Build an upgrade package]' \
+        'eunit[Run eunit tests]' \
+        'ct[Run common_test suites]' \
+        'qc[Test QuickCheck properties]' \
+        'xref[Run cross reference analysis]' \
+        'help[Show the program options]' \
+        'version[Show version information]' \
+        'apps[Application names to process]:' \
+        'case[Common Test case]:' \
+        'dump_spec[Dump reltool spec]:' \
+        'jobs[Number of workers]::workers:(0 1 2 3 4 5 6 7 8 9)' \
+        'suites[Common Test suites]::suite name:_path_files -W "(src test)" -g "*.erl(:r)"' \
+        'verbose[Verbosity level]::verbosity level:(0 1 2 3)' \
+        'appid[Application id]:' \
+        'previous_release[Previous release path]:' \
+        'nodeid[Node id]:' \
+        'root_dir[Reltool config root directory]::directory:_files -/' \
+        'skip_deps[Skip deps]::flag:(true false)' \
+        'skip_apps[Application names to not process]::flag:(true false)' \
+        'template[Template name]:' \
+        'template_dir[Template directory]::directory:_files -/' \
+        && ret=0
+      ;;
+  esac
+}
+
+_rebar
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: sw=2 ts=2 et filetype=sh

From cd9c47430349826d4461d7c9e73f6c58e567f01b Mon Sep 17 00:00:00 2001
From: Stephen Zhuang <stephen.zhuang@gmail.com>
Date: Thu, 10 Jan 2013 13:56:55 +0800
Subject: [PATCH 0132/1378] Update to a better fab compeletion script.

---
 plugins/fabric/_fab              | 60 ++++++++++++++++++++++++++++++++
 plugins/fabric/fabric.plugin.zsh |  9 +----
 2 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 plugins/fabric/_fab

diff --git a/plugins/fabric/_fab b/plugins/fabric/_fab
new file mode 100644
index 000000000..9628e1224
--- /dev/null
+++ b/plugins/fabric/_fab
@@ -0,0 +1,60 @@
+#compdef fab
+#autoload
+
+local curcontext=$curcontext state line
+declare -A opt_args
+
+declare target_list
+target_list=(`fab --shortlist 2>/dev/null`)
+
+_targets() {
+    _describe -t commands "fabric targets" target_list
+}
+
+output_levels=(
+    'status: Status messages, i.e. noting when Fabric is done running, if the user used a keyboard interrupt, or when servers are disconnected from. These messages are almost always relevant and rarely verbose.'
+    'aborts: Abort messages. Like status messages, these should really only be turned off when using Fabric as a library, and possibly not even then. Note that even if this output group is turned off, aborts will still occur – there just won’t be any output about why Fabric aborted!'
+    'warnings: Warning messages. These are often turned off when one expects a given operation to fail, such as when using grep to test existence of text in a file. If paired with setting env.warn_only to True, this can result in fully silent warnings when remote programs fail. As with aborts, this setting does not control actual warning behavior, only whether warning messages are printed or hidden.'
+    'running: Printouts of commands being executed or files transferred, e.g. [myserver] run: ls /var/www. Also controls printing of tasks being run, e.g. [myserver] Executing task ''foo''.'
+    'stdout: Local, or remote, stdout, i.e. non-error output from commands.'
+    'stderr: Local, or remote, stderr, i.e. error-related output from commands.'
+    'user: User-generated output, i.e. local output printed by fabfile code via use of the fastprint or puts functions.'
+)
+
+_arguments -w -S -C \
+  '(-)'{-h,--help}'[show this help message and exit]: :->noargs' \
+  '(-)'{-V,--version}'[show program''s version number and exit]: :->noargs' \
+  '(-)--list[print list of possible commands and exit]: :->noargs' \
+  '(-)--shortlist[print non-verbose list of possible commands and exit]: :->noargs' \
+  '(--reject-unknown-hosts)--reject-unknown-hosts[reject unknown hosts]' \
+  '(--no-pty)--no-pty[do not use pseudo-terminal in run/sudo]' \
+  "(-d+ --display=-)"{-d+,--display=-}"[print detailed info about a given command]: :_targets" \
+  '(-D --disable-known-hosts)'{-D,--disable-known-hosts}'[do not load user known_hosts file]' \
+  '(-r --reject-unknown-hosts)'{-r,--reject-unknown-hosts}'[reject unknown hosts]' \
+  '(-u+ --user=-)'{-u+,--user=-}'[username to use when connecting to remote hosts]: :' \
+  '(-p+ --password=-)'{-p+,--password=-}'[password for use with authentication and/or sudo]: :' \
+  '(-H+ --hosts=-)'{-H+,--hosts=-}'[comma separated list of hosts to operate on]: :' \
+  '(-R+ --roles=-)'{-R+,--roles=-}'[comma separated list of roles to operate on]: :' \
+  '(-a --no-agent)'{-a,--no-agent}'[don''t use the running SSH agent]' \
+  '(-k --no-keys)'{-k,--no-keys}'[don''t load private key files from ~/.ssh/]' \
+  '(-w --warn-only)'{-w,--warn-only}'[warn instead of abort, when commands fail]' \
+  '-i+[path to SSH private key file. May be repeated]: :_files' \
+  "(-f+ --fabfile=)"{-f+,--fabfile=}"[Python module file to import]: :_files -g *.py" \
+  '(-c+ --config=-)'{-c+,--config=-}'[specify location of config file to use]: :_files' \
+  '(-s+ --shell=-)'{-s+,--shell=-}'[specify a new shell, defaults to ''/bin/bash -l -c'']: :' \
+  '(--hide=-)--hide=-[comma-separated list of output levels to hide]: :->levels' \
+  '(--show=-)--show=-[comma-separated list of output levels to show]: :->levels' \
+  '*::: :->subcmds' && return 0
+
+if [[ CURRENT -ge 1 ]]; then
+    case $state in
+        noargs)
+             _message "nothing to complete";;
+        levels)
+            _describe -t commands "output levels" output_levels;;
+        *)
+            _targets;;
+    esac
+
+    return
+fi
diff --git a/plugins/fabric/fabric.plugin.zsh b/plugins/fabric/fabric.plugin.zsh
index d44e2d916..aca411329 100644
--- a/plugins/fabric/fabric.plugin.zsh
+++ b/plugins/fabric/fabric.plugin.zsh
@@ -1,8 +1 @@
-#compdef fab
-
-_fab_list() {
-    reply=(`fab --shortlist`)
-}
-compctl -K _fab_list fab
-
-# DECLARION: This plugin was created by kennethreitz. What I did is just making a portal from https://github.com/kennethreitz-archive/fabric-zsh-completion.
+# DECLARION: This plugin was created by vhbit. What I did is just making a portal from https://github.com/vhbit/fabric-zsh-autocomplete.

From 8e9cf45200391db787b3a25ae00f4352d7a11e8e Mon Sep 17 00:00:00 2001
From: Yohann Bianchi <sbooob@gmail.com>
Date: Sat, 19 Jan 2013 00:52:09 +0100
Subject: [PATCH 0133/1378] ADDED: Mercurial repository info

---
 themes/agnoster.zsh-theme | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c3107c06c..7ce5a77f8 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -83,6 +83,25 @@ prompt_git() {
   fi
 }
 
+prompt_hg() {
+	local rev status
+	if $(hg id >/dev/null 2>&1); then
+		if $(hg prompt >/dev/null 2>&1); then
+			rev=$(hg prompt {status})
+			if [[ $rev = "?" ]]; then
+				prompt_segment red white
+				rev='±'
+			elif [[ -n $rev ]]; then
+				prompt_segment yellow black
+				rev='±'
+			else
+				prompt_segment green black
+			fi
+		fi
+		echo -n $(hg prompt "⭠ {rev}@{branch}") $rev
+	fi
+}
+
 # Dir: current working directory
 prompt_dir() {
   prompt_segment blue black '%~'
@@ -109,6 +128,7 @@ build_prompt() {
   prompt_context
   prompt_dir
   prompt_git
+  prompt_hg
   prompt_end
 }
 

From 28b737416fe1eadd1a0e0bad460941651ac20e49 Mon Sep 17 00:00:00 2001
From: Yohann Bianchi <sbooob@gmail.com>
Date: Sun, 20 Jan 2013 13:10:31 +0100
Subject: [PATCH 0134/1378] ADDED: Mercurial prompt info support even if hg
 prompt extension is unavailable

---
 themes/agnoster.zsh-theme | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 7ce5a77f8..e2074b713 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -87,18 +87,35 @@ prompt_hg() {
 	local rev status
 	if $(hg id >/dev/null 2>&1); then
 		if $(hg prompt >/dev/null 2>&1); then
-			rev=$(hg prompt {status})
-			if [[ $rev = "?" ]]; then
+			st=$(hg prompt {status})
+			if [[ $st = "?" ]]; then
+				# if files are not added
 				prompt_segment red white
-				rev='±'
-			elif [[ -n $rev ]]; then
+				st='±'
+			elif [[ -n $st ]]; then
+				# if any modification
 				prompt_segment yellow black
-				rev='±'
+				st='±'
+			else
+				# if working copy is clean
+				prompt_segment green black
+			fi
+			echo -n $(hg prompt "⭠ {rev}@{branch}") $st
+		else
+			st=""
+			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
+			branch=$(hg id -b 2>/dev/null)
+			if `hg st | grep -Eq "^\?"`; then
+				prompt_segment red black
+				st='±'
+			elif `hg st | grep -Eq "^(M|A)"`; then
+				prompt_segment yellow black
+				st='±'
 			else
 				prompt_segment green black
 			fi
+			echo -n "⭠ $rev@$branch" $st
 		fi
-		echo -n $(hg prompt "⭠ {rev}@{branch}") $rev
 	fi
 }
 

From 4c91f6d13e32d7389cae299d96f6778451a45fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Serdar=20Dalg=C4=B1=C3=A7?= <sd@serdardalgic.org>
Date: Fri, 25 Jan 2013 12:58:55 +0200
Subject: [PATCH 0135/1378] Add autoenv plugin, which adopts using Kenneth
 Reitz's autoenv into oh-my-zsh.

---
 lib/directories.zsh                |  3 +++
 plugins/autoenv/autoenv.plugin.zsh | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 plugins/autoenv/autoenv.plugin.zsh

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 6c743e40e..93c6c176f 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -29,6 +29,9 @@ cd () {
     cd ../../../..
   elif [[ "x$*" == "x......" ]]; then
     cd ../../../../..
+  elif [ -d ~/.autoenv ]; then
+    source ~/.autoenv/activate.sh
+    autoenv_cd "$@"
   else
     builtin cd "$@"
   fi
diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
new file mode 100644
index 000000000..ca5666979
--- /dev/null
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -0,0 +1,18 @@
+# The use_env call below is a reusable command to activate/create a new Python
+# virtualenv, requiring only a single declarative line of code in your .env files.
+# It only performs an action if the requested virtualenv is not the current one.
+use_env() {
+    typeset venv
+    venv="$1"
+    if [[ "${VIRTUAL_ENV:t}" != "$venv" ]]; then
+        if workon | grep -q "$venv"; then
+            workon "$venv"
+        else
+            echo -n "Create virtualenv $venv now? (Yn) "
+            read answer
+            if [[ "$answer" == "Y" ]]; then
+                mkvirtualenv "$venv"
+            fi
+        fi
+    fi
+}

From 2e213b9b8f96722d4978a80ae53849fec437eb10 Mon Sep 17 00:00:00 2001
From: Yoav Weiss <yoav@yoav.ws>
Date: Sun, 27 Jan 2013 14:50:33 +0100
Subject: [PATCH 0136/1378] Faster dirty git status check (using git diff)

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 3e14695bd..d818c742d 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -13,7 +13,7 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi
-    if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then
+    if [[ -n $(git diff --ignore-submodules HEAD 2> /dev/null) ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From 8a463b6df7048c8507f95344c3dc5d7a1355c48d Mon Sep 17 00:00:00 2001
From: Alex <xzeroknightx@gmail.com>
Date: Wed, 30 Jan 2013 00:44:42 -0500
Subject: [PATCH 0137/1378] Better custom theme loading

oh-my-zsh.sh now also checks for $ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme when attempting to load a theme. This way custom themes can be a bit more organized in the 'custom' dir
---
 oh-my-zsh.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 689a79fef..2e1d3b477 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -73,6 +73,9 @@ else
     if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
     then
       source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
+    elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]
+    then
+      source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
     else
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"
     fi

From 171a76a3c45ac031262e4eb7eaa38cc020a59812 Mon Sep 17 00:00:00 2001
From: Yoav Weiss <yoav@yoav.ws>
Date: Wed, 30 Jan 2013 09:32:01 +0100
Subject: [PATCH 0138/1378] Closer to original status command, using SUBMODULE
 SYNTAX

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index d818c742d..ccc5d3128 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -13,7 +13,7 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi
-    if [[ -n $(git diff --ignore-submodules HEAD 2> /dev/null) ]]; then
+    if [[ -n $(git diff ${SUBMODULE_SYNTAX} 2> /dev/null) ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From 6d762fa053154a10befec1a42c963fff072ebece Mon Sep 17 00:00:00 2001
From: Florent Thoumie <flz@xbsd.org>
Date: Wed, 30 Jan 2013 05:16:26 -0800
Subject: [PATCH 0139/1378] Add new profiles plugin.

Depending on the machine you're logged into, you may want to use
specific configuration. Add 'profiles' to your list of plugin will
try to find a profile for the local machine and each (sub)domain
it belongs to.
---
 plugins/profiles/profiles.plugin.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 plugins/profiles/profiles.plugin.zsh

diff --git a/plugins/profiles/profiles.plugin.zsh b/plugins/profiles/profiles.plugin.zsh
new file mode 100644
index 000000000..8faae6b53
--- /dev/null
+++ b/plugins/profiles/profiles.plugin.zsh
@@ -0,0 +1,12 @@
+# You will probably want to list this plugin as the first in your .zshrc.
+
+# This will look for a custom profile for the local machine and each domain or
+# subdomain it belongs to. (e.g. com, example.com and foo.example.com)
+parts=(${(s:.:)$(hostname)})
+for i in {${#parts}..1}; do
+  profile=${(j:.:)${parts[$i,${#parts}]}}
+  file=$ZSH_CUSTOM/profiles/$profile
+  if [ -f $file ]; then
+    source $file
+  fi
+done

From 76e828691bedc345904716b04cfa746fd043e0e7 Mon Sep 17 00:00:00 2001
From: Adolfo Benedetti <adolfo.benedetti@gmail.com>
Date: Wed, 30 Jan 2013 18:58:58 +0100
Subject: [PATCH 0140/1378] updated adben theme: added offline content,
 subversion support, refactored prompt

---
 themes/adben.zsh-theme | 145 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 120 insertions(+), 25 deletions(-)

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index 9f777e847..b64714f32 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -1,26 +1,121 @@
 #!/usr/bin/env zsh
-local USER_HOST='%{$terminfo[bold]$fg[yellow]%}%n@%m%{$reset_color%}'
-local RETURN_CODE="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-local GIT_BRANCH='%{$terminfo[bold]$fg[red]%}$(git_prompt_info)%{$reset_color%}'
-local CURRENT_DIR='%{$terminfo[bold]$fg[green]%} %~%{$reset_color%}'
-local RUBY_RVM='%{$fg[gray]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
-local COMMAND_TIP='%{$terminfo[bold]$fg[blue]%}$(wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d' | sed 's/^/║/g')%{$reset_color%}'
-######### PROMPT #########
-PROMPT="%{$terminfo[bold]$fg[blue]%}╔═ %{$reset_color%}${USER_HOST} ${CURRENT_DIR} ${RUBY_RVM} ${GIT_BRANCH}
-${COMMAND_TIP}
-%{$terminfo[bold]$fg[blue]%}╚═ %{$reset_color%}%B%{$terminfo[bold]$fg[white]%}$%b%{$reset_color%} "
-RPS1='${RETURN_CODE}'
-RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
-######### PROMPT #########
-########## GIT ###########
-ZSH_THEME_GIT_PROMPT_PREFIX="‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%}›"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
-ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
-########## GIT ###########
+# #
+# # #README
+# #
+# # This theme provides two customizable header functionalities : 
+# # a) displaying a pseudo-random message from a database of quotations
+# # (https://en.wikipedia.org/wiki/Fortune_%28Unix%29)
+# # b) displaying randomly command line tips from The command line fu 
+# # (http://www.commandlinefu.com) community: in order to make use of this functionality
+# # you will need Internet connection. 
+# # This theme provides as well information for the current user's context, like;
+# # branch and status for the current version control system (git and svn currently
+# # supported) and time, presented to the user in a non invasive volatile way.
+# #
+# # #REQUIREMENTS
+# # This theme requires wget::
+# # -Homebrew-osx- brew install wget
+# # -Debian/Ubuntu- apt-get install wget
+# # and fortune ::
+# # -Homebrew-osx- brew install fortune
+# # -Debian/Ubuntu- apt-get install fortune
+# #
+# # optionally:
+# # -Oh-myzsh vcs plug-ins git and svn.
+# # -Solarized theme (https://github.com/altercation/solarized/)
+# # -OS X: iTerm 2 (http://www.iterm2.com/)
+# # -font Source code pro (https://github.com/adobe/source-code-pro)
+# # 
+# # Author: Adolfo Benedetti
+# # email: adolfo.benedetti@gmail.com
+# # License: Public Domain
+# # This theme's look and feel is based on the Aaron Toponce's zsh theme , more info: 
+# # http://pthree.org/2008/11/23/727/
+# # enjoy!
+########## COLOR ###########
+for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
+    eval PR_$COLOR='%{$fg[${(L)COLOR}]%}'
+    eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
+done
+PR_RESET="%{$reset_color%}"
+RED_START="${PR_RESET}${PR_GREY}<${PR_RESET}${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
+RED_END="${PR_RESET}${PR_BRIGHT_RED}>${PR_RESET}${PR_RED}>${PR_GREY}>${PR_RESET} "
+GREEN_END="${PR_RESET}${PR_BRIGHT_GREEN}>${PR_RESET}${PR_GREEN}>${PR_GREY}>${PR_RESET} "
+GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}"
+GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} "
+DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}"
+VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}"
+Vcs_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
+VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}"
+# ########## COLOR ###########
+# ########## SVN ###########
+ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹svn:"
+ZSH_THEME_SVN_PROMPT_SUFFIX=""
+ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
+ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
+# ########## SVN ###########
+# ########## GIT ###########
+ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹git:"
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
+ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
+ZSH_THEME_GIT_PROMPT_ADDED="${PR_RESET}${PR_YELLOW} ✚${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_RESET}${PR_YELLOW} ✹${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_DELETED="${PR_RESET}${PR_YELLOW} ✖${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_RENAMED="${PR_RESET}${PR_YELLOW} ➜${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_RESET}${PR_YELLOW} ═${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_RESET}${PR_YELLOW} ✭${PR_RESET}"
+# ########## GIT ###########
+function precmd {
+    #gets the fortune
+    ps1_fortune () {
+        #Choose from all databases, regardless of whether they are considered "offensive"
+        fortune -a
+    }
+    #obtains the tip 
+    ps1_command_tip () {
+        wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d'
+    }  
+    prompt_header () {
+        if [[ "true" == "$ENABLE_COMMAND_TIP" ]]; then
+            ps1_command_tip
+        else
+            ps1_fortune
+        fi 
+    }   
+    PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
+    # set a simple variable to show when in screen
+    if [[ -n "${WINDOW}" ]]; then
+        SCREEN=""
+    fi
+}
+
+# Context: user@directory or just directory
+prompt_context () {
+    local user=`whoami`
+    if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+        echo -n "${PR_RESET}${PR_RED}$user@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    else
+        echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    fi
+}
+
+set_prompt () {
+    # required for the prompt
+    setopt prompt_subst
+    autoload colors zsh/terminfo
+    if [[ "$terminfo[colors]" -gt 8 ]]; then
+        colors
+    fi 
+    
+    # ######### PROMPT #########
+    PROMPT='${PROMPT_HEAD}
+${RED_START}$(prompt_context)
+${GREEN_START_P1}'
+    RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}'
+    # Matching continuation prompt
+    PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
+    # ######### PROMPT #########
+}
+
+set_prompt

From ef8e3a67f293ab3d4dfc67da5af321de7c019ca4 Mon Sep 17 00:00:00 2001
From: Matt Guindin <matt@guindin.com>
Date: Wed, 30 Jan 2013 20:46:08 -0500
Subject: [PATCH 0141/1378] [agnoster] modifying theme to show dot for dirty
 files and plus for staged files in git repos

---
 themes/agnoster.zsh-theme | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c3107c06c..3ca5385be 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -71,7 +71,6 @@ prompt_context() {
 prompt_git() {
   local ref dirty
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-    ZSH_THEME_GIT_PROMPT_DIRTY='±'
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
     if [[ -n $dirty ]]; then
@@ -79,7 +78,19 @@ prompt_git() {
     else
       prompt_segment green black
     fi
-    echo -n "${ref/refs\/heads\//⭠ }$dirty"
+
+    setopt promptsubst
+    autoload -Uz vcs_info
+
+    zstyle ':vcs_info:*' enable git
+    zstyle ':vcs_info:*' get-revision true
+    zstyle ':vcs_info:*' check-for-changes true
+    zstyle ':vcs_info:*' stagedstr '✚'
+    zstyle ':vcs_info:git:*' unstagedstr '●'
+    zstyle ':vcs_info:*' formats ' %u%c'
+    zstyle ':vcs_info:*' actionformats '%u%c'
+    vcs_info
+    echo -n "${ref/refs\/heads\//⭠ }${vcs_info_msg_0_}"
   fi
 }
 

From fe4c2379c4ce9f4140fd16d2ea77138061e4a109 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Mon, 4 Feb 2013 22:21:34 +0100
Subject: [PATCH 0142/1378] use pushdminus

---
 lib/directories.zsh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index a787db9eb..4addc08fa 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -2,6 +2,7 @@
 setopt auto_name_dirs
 setopt auto_pushd
 setopt pushd_ignore_dups
+setopt pushdminus
 
 alias ..='cd ..'
 alias cd..='cd ..'
@@ -11,14 +12,14 @@ alias cd.....='cd ../../../..'
 alias cd/='cd /'
 
 alias 1='cd -'
-alias 2='cd +2'
-alias 3='cd +3'
-alias 4='cd +4'
-alias 5='cd +5'
-alias 6='cd +6'
-alias 7='cd +7'
-alias 8='cd +8'
-alias 9='cd +9'
+alias 2='cd -2'
+alias 3='cd -3'
+alias 4='cd -4'
+alias 5='cd -5'
+alias 6='cd -6'
+alias 7='cd -7'
+alias 8='cd -8'
+alias 9='cd -9'
 
 cd () {
   if   [[ "x$*" == "x..." ]]; then

From 631a8473e2f3f20e1414dff4e409fe07cbb41aea Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Tue, 5 Feb 2013 09:45:00 +0100
Subject: [PATCH 0143/1378] added pj.plugin

---
 plugins/pj/pj.plugin.zsh | 42 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 plugins/pj/pj.plugin.zsh

diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
new file mode 100644
index 000000000..ba3765b83
--- /dev/null
+++ b/plugins/pj/pj.plugin.zsh
@@ -0,0 +1,42 @@
+#!/bin/zsh
+
+#
+# Original idea by DefV (Jan De Poorter)
+# Source: https://gist.github.com/pjaspers/368394#comment-1016
+#
+# Usage:
+#  - Set `$PROJECT_PATHS` in your ~/.zshrc
+#    e.g.: PROJECT_PATHS=(~/src ~/work)
+#  - In ZSH you now can open a project directory with the command: `pj my-project`
+#    the plugin will locate the `my-project` directory in one of the $PROJECT_PATHS
+#    Also tab completion is supported.
+#  - `pjo my-project` will open the directory in $EDITOR
+# 
+
+function pj() {
+    cmd="cd"
+    file=$1
+
+    if [[ "open" == "$file" ]] then
+        file=$2
+        cmd=(${(s: :)EDITOR})
+    fi
+
+    for project in $PROJECT_PATHS; do
+        if [[ -d $project/$file ]] then
+            $cmd "$project/$file"
+            unset project # Unset project var
+            return
+        fi
+    done
+
+    echo "No such project $1"
+}
+
+alias pjo="pj open"
+
+function _pj () {
+    compadd `/bin/ls -l $PROJECT_PATHS 2>/dev/null | awk '{ print $9 }'`
+}
+
+compdef _pj pj

From a5a6f6bb6c95422964f9fe9b8e19d1a830202733 Mon Sep 17 00:00:00 2001
From: Eric Kelly <heroiceric@gmail.com>
Date: Thu, 7 Feb 2013 16:26:41 -0500
Subject: [PATCH 0144/1378] add alias for rspec to zeus plugin

---
 plugins/zeus/README.md       | 2 ++
 plugins/zeus/zeus.plugin.zsh | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md
index 4409943fe..d7c2aef80 100644
--- a/plugins/zeus/README.md
+++ b/plugins/zeus/README.md
@@ -25,6 +25,8 @@
 * `zcu` aliases `zeus cucumber`
 * `zucumber` aliases `zeus cucumber`
 
+* `zspec` aliases `zeus rspec`
+
 * `zt` aliases `zeus test`
 * `zest` aliases `zeus test`
 
diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index 2fc7e1ebf..1658b34d3 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -4,7 +4,7 @@
 
 # Always use bundler.
 # Rails depends on bundler, so we can be pretty sure, that there are no
-# problems with this command. For all the other aliases I provided an 
+# problems with this command. For all the other aliases I provided an
 # alternative, in case people have conflicts with other plugins (e.g. suse).
 alias zeus='bundle exec zeus'
 
@@ -40,6 +40,9 @@ alias zunner='zeus runner'
 alias zcu='zeus cucumber'
 alias zucumber='zeus cucumber'
 
+# Rspec
+alias zspec='zeus rspec'
+
 # Test
 alias zt='zeus test'
 alias zest='zeus test'

From dace87ae361722c0332c18e5470ca10f16720f7f Mon Sep 17 00:00:00 2001
From: "Jesse B. Hannah" <jesse@jbhannah.net>
Date: Fri, 8 Feb 2013 19:11:40 -0700
Subject: [PATCH 0145/1378] Fix rbenv gems helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes gem versions with words (beta, pre) in the version or with
multiple installed versions not being highlighted, and compatibility
with GNU sed (related to robbyrussell/oh-my-zsh#1579).
---
 plugins/rbenv/rbenv.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index d855c2445..fb9df4bdd 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -32,11 +32,11 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
 
     function gems {
       local rbenv_path=$(rbenv prefix)
-      gem list $@ | sed \
-        -Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-        -Ee "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
-        -Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-        -Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+      gem list $@ | sed -E \
+        -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+        -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
+        -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+        -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
     }
 
     function rbenv_prompt_info() {

From 3d81ecfb43d0da18a3b89b5aa12a78c1ad91f063 Mon Sep 17 00:00:00 2001
From: Ian MacLeod <ian@nevir.net>
Date: Fri, 8 Feb 2013 23:00:41 -0800
Subject: [PATCH 0146/1378] Support for Sublime Text 3, with fallback

---
 plugins/sublime/sublime.plugin.zsh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 1b2cbcdce..bfbc45a07 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,7 +1,12 @@
 # Sublime Text 2 Aliases
-#unamestr = 'uname'
 
-local _sublime_darwin_subl=/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl
+local _sublime_darwin_paths
+_sublime_darwin_paths=(
+	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+)
 
 if [[ $('uname') == 'Linux' ]]; then
 	if [ -f '/usr/bin/sublime_text' ]; then
@@ -9,13 +14,15 @@ if [[ $('uname') == 'Linux' ]]; then
 	else
 		st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
 	fi
-alias st=st_run
+	alias st=st_run
+
 elif  [[ $('uname') == 'Darwin' ]]; then
-	# Check if Sublime is installed in user's home application directory
-	if [[ -a $HOME/${_sublime_darwin_subl} ]]; then
-		alias st='$HOME/${_sublime_darwin_subl}'
-	else
-		alias st='${_sublime_darwin_subl}'
-	fi
+
+	for _sublime_path in $_sublime_darwin_paths; do
+		if [[ -a $_sublime_path ]]; then
+			alias st="'$_sublime_path'"
+		fi
+	done
 fi
+
 alias stt='st .'

From 06d5cb93ab043a244e98630fdd7b7378210c9b6f Mon Sep 17 00:00:00 2001
From: Gao Xiang <qasdfgtyuiop@gmail.com>
Date: Mon, 11 Feb 2013 11:33:24 +0800
Subject: [PATCH 0147/1378] new plugin: start fbterm automatically in /dev/tty*

---
 plugins/fbterm/fbterm.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/fbterm/fbterm.plugin.zsh

diff --git a/plugins/fbterm/fbterm.plugin.zsh b/plugins/fbterm/fbterm.plugin.zsh
new file mode 100644
index 000000000..4f0456016
--- /dev/null
+++ b/plugins/fbterm/fbterm.plugin.zsh
@@ -0,0 +1,6 @@
+# start fbterm automatically in /dev/tty*
+
+if [[ $(tty|grep -o '/dev/tty') = /dev/tty ]] ; then
+	fbterm
+	exit
+fi

From 11576dd40bfb78379724a9519081365bbd41d7a9 Mon Sep 17 00:00:00 2001
From: Yoav Weiss <yoav@yoav.ws>
Date: Wed, 13 Feb 2013 11:28:13 +0100
Subject: [PATCH 0148/1378] Fixed dirty check to include files added to index

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index ccc5d3128..fde30e2b9 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -13,7 +13,7 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi
-    if [[ -n $(git diff ${SUBMODULE_SYNTAX} 2> /dev/null) ]]; then
+    if [[ -n $(git diff ${SUBMODULE_SYNTAX} HEAD 2> /dev/null) ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From 9674a96b5bc296a767c2560757626bf2bc3a9ad3 Mon Sep 17 00:00:00 2001
From: Frank Louwers <frank@openminds.be>
Date: Wed, 13 Feb 2013 12:02:36 +0100
Subject: [PATCH 0149/1378] [pj-plugin] delete ugly ls -l | awk print $9 thing
 to use something not depending on date format + add support for projects with
 spaces in them

---
 plugins/pj/pj.plugin.zsh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
index ba3765b83..b98bfec34 100644
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
@@ -18,8 +18,11 @@ function pj() {
     file=$1
 
     if [[ "open" == "$file" ]] then
-        file=$2
+        shift
+        file=$*
         cmd=(${(s: :)EDITOR})
+    else
+        file=$*
     fi
 
     for project in $PROJECT_PATHS; do
@@ -36,7 +39,14 @@ function pj() {
 alias pjo="pj open"
 
 function _pj () {
-    compadd `/bin/ls -l $PROJECT_PATHS 2>/dev/null | awk '{ print $9 }'`
+    # might be possible to improve this using glob, without the basename trick
+    typeset -a projects
+    foreach i ($PROJECT_PATHS/*)
+    do
+        projects+=`basename $i`
+    done
+
+    _arguments '*:file:($projects)'
 }
 
 compdef _pj pj

From df67f2ee30dbad61117e1886b0a4de326cb6daf7 Mon Sep 17 00:00:00 2001
From: Frank Louwers <frank@openminds.be>
Date: Wed, 13 Feb 2013 13:39:47 +0100
Subject: [PATCH 0150/1378] [pj-plugin] avoid using basename. migth be (a lot?)
 faster

---
 plugins/pj/pj.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
index b98bfec34..dac561189 100644
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
@@ -43,7 +43,7 @@ function _pj () {
     typeset -a projects
     foreach i ($PROJECT_PATHS/*)
     do
-        projects+=`basename $i`
+        projects+=(${i##*/})
     done
 
     _arguments '*:file:($projects)'

From 9245a3086843c20ef1880f6d26720db73d5c724d Mon Sep 17 00:00:00 2001
From: Yoav Weiss <yoav@yoav.ws>
Date: Wed, 13 Feb 2013 17:14:43 +0100
Subject: [PATCH 0151/1378] Did a full circle and went back to # On branch
 master # Changes to be committed: #   (use "git reset HEAD <file>..." to
 unstage) # #	modified:   git.zsh #, ignoring untracked files, which seems
 to be the primary cause for slowness

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index fde30e2b9..ccd329665 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -13,7 +13,7 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi
-    if [[ -n $(git diff ${SUBMODULE_SYNTAX} HEAD 2> /dev/null) ]]; then
+    if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno  2> /dev/null) ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From ccdc5518f00ba3b4f35cb05a0daeb4ab4efd2268 Mon Sep 17 00:00:00 2001
From: Peter Bomars <pbomars@gmail.com>
Date: Thu, 14 Feb 2013 00:18:12 -0800
Subject: [PATCH 0152/1378] Update plugins/rvm/rvm.plugin.zsh

1) be gentle - first git pull request
2) added ruby 2.0.0 alias and function
---
 plugins/rvm/rvm.plugin.zsh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 1ab800b0f..5000a49b3 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -4,7 +4,8 @@ alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
 local ruby18='ruby-1.8.7-p334'
-local ruby19='ruby-1.9.3-p194'
+local ruby19='ruby-1.9.3-p385'
+local ruby20='ruby-2.0.0-rc2'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -28,6 +29,17 @@ function rb19 {
 _rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
 compdef _rb19 rb19
 
+function rb20 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby"
+	else
+		rvm use "$ruby20@$1"
+	fi
+}
+
+_rb20() {compadd `ls -1 $rvm_path/gems | grep "^$ruby20@" | sed -e "s/^$ruby20@//" | awk '{print $1}'`}
+compdef _rb20 rb20
+
 function rvm-update {
 	rvm get head
 	rvm reload # TODO: Reload rvm completion?

From fb3dc24ff4aac55c5cb0cd4e448b26f223a68957 Mon Sep 17 00:00:00 2001
From: Swanand Pagnis <swanand.pagnis@gmail.com>
Date: Thu, 14 Feb 2013 14:06:42 +0530
Subject: [PATCH 0153/1378] Support for opening tabs and windows in the same
 This fixed #1498 for me on Mountain Lion

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index c056989eb..e3828da14 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -8,7 +8,7 @@ function title {
   fi
   if [[ "$TERM" == screen* ]]; then
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
-  elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ $TERM == ansi ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
     print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
   fi

From 535fafde816b0c45521c5de2003ae9e0038cc424 Mon Sep 17 00:00:00 2001
From: Mirko Caserta <mirko.caserta@gmail.com>
Date: Fri, 15 Feb 2013 16:05:15 +0100
Subject: [PATCH 0154/1378] SBT and Scala plugins.

The SBT (Simple Build Tool: scala-sbt.org) plugin is an original
work of mine.
The Scala (scala-lang.org) plugin was taken from zsh-lovers.
---
 plugins/sbt/_sbt           |  55 ++++++++
 plugins/sbt/sbt.plugin.zsh |  23 ++++
 plugins/scala/_scala       | 249 +++++++++++++++++++++++++++++++++++++
 3 files changed, 327 insertions(+)
 create mode 100644 plugins/sbt/_sbt
 create mode 100644 plugins/sbt/sbt.plugin.zsh
 create mode 100644 plugins/scala/_scala

diff --git a/plugins/sbt/_sbt b/plugins/sbt/_sbt
new file mode 100644
index 000000000..91372aa72
--- /dev/null
+++ b/plugins/sbt/_sbt
@@ -0,0 +1,55 @@
+#compdef sbt
+#autoload
+
+local -a _sbt_commands
+_sbt_commands=(
+  'clean:delete files produced by the build'
+  'compile:compile sources'
+  'console:start the Scala REPL with project classes on the classpath'
+  'console-quick:start the Scala REPL with project deps on the classpath'
+  'console-project:start the Scala REPL w/sbt+build-def on the classpath'
+  'dist:generate distribution artifacts'
+  'dist\:clean:clean distribution artifacts'
+  'doc:generate API documentation'
+  'gen-idea:generate Intellij Idea project files'
+  'package:produce the main artifact, such as a binary jar'
+  'package-doc:produce a doc artifact, such as a jar containing API docs'
+  'package-src:produce a source artifact, such as a jar containing sources'
+  'publish:publish artifacts to a repository'
+  'publish-local:publish artifacts to the local repository'
+  'run:run a main class'
+  'run-main:run the main class selected by the first argument'
+  'test:execute all tests'
+  'test-only:execute the tests provided as arguments'
+  'test-quick:execute previously failed tests'
+  'update:resolve and optionally retrieve dependencies'
+)
+
+local expl
+
+_arguments \
+  '(-help)-h[prints an help message]' \
+  '(-h)-help[prints an help message]' \
+  '(-verbose)-v[this runner is chattier]' \
+  '(-v)-verbose[this runner is chattier]' \
+  '(-debug)-d[set sbt log level to debug]' \
+  '(-d)-debug[set sbt log level to debug]' \
+  '-no-colors[disable ANSI color codes]' \
+  '-sbt-create[start even if current dir contains no sbt project]' \
+  '-sbt-dir[path to global settings/plugins dir (default: ~/.sbt)]' \
+  '-sbt-boot[path to shared boot dir (default: ~/.sbt/boot)]' \
+  '-ivy[path to local Ivy repository (default: ~/.ivy2)]' \
+  '-mem[set memory options]' \
+  '-no-share[use all local caches; no sharing]' \
+  '-no-global[use global caches, but do not use global ~/.sbt dir]' \
+  '-jvm-debug[turn on JVM debugging, open at the given port]' \
+  '-batch[disable interactive mode]' \
+  '-sbt-version[use the specified version of sbt]' \
+  '-sbt-jar[use the specified jar as the sbt launcher]' \
+  '(-sbt-snapshot)-sbt-rc[use an RC version of sbt]' \
+  '(-sbt-rc)-sbt-snapshot[use a snapshot version of sbt]' \
+  '-java-home[alternate JAVA_HOME]' \
+  '*:: :->subcmds' && return 0
+
+_describe -t commands "sbt subcommand" _sbt_commands
+return
diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh
new file mode 100644
index 000000000..203c691f5
--- /dev/null
+++ b/plugins/sbt/sbt.plugin.zsh
@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------------------
+#          FILE:  sbt.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Mirko Caserta (mirko.caserta@gmail.com)
+#       VERSION:  1.0.2
+# ------------------------------------------------------------------------------
+ 
+# aliases - mnemonic: prefix is 'sb'
+alias sbc='sbt compile'
+alias sbco='sbt console'
+alias sbcq='sbt console-quick'
+alias sbcl='sbt clean'
+alias sbcp='sbt console-project'
+alias sbd='sbt doc'
+alias sbdc='sbt dist:clean'
+alias sbdi='sbt dist'
+alias sbgi='sbt gen-idea'
+alias sbp='sbt publish'
+alias sbpl='sbt publish-local'
+alias sbr='sbt run'
+alias sbrm='sbt run-main'
+alias sbu='sbt update'
+alias sbx='sbt test'
diff --git a/plugins/scala/_scala b/plugins/scala/_scala
new file mode 100644
index 000000000..c4ccb37d3
--- /dev/null
+++ b/plugins/scala/_scala
@@ -0,0 +1,249 @@
+#compdef scala scalac
+# ------------------------------------------------------------------------------
+# Copyright (c) 2012 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for scala and scalac (http://www.scala-lang.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Tony Sloane <inkytonik@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+typeset -A opt_args
+local context state line
+
+_scala_features () {
+   compadd "postfixOps" "reflectiveCalls" "implicitConversions" "higherKinds" \
+     "existentials" "experimental.macros" "_"
+}
+
+_scala_phases () {
+   compadd "parser" "namer" "packageobjects" "typer" "patmat" "superaccessors" \
+     "extmethods" "pickler" "refchecks" "selectiveanf" "selectivecps" "uncurry" \
+     "tailcalls" "specialize" "explicitouter" "erasure" "posterasure" "lazyvals" \
+     "lambdalift" "constructors" "flatten" "mixin" "cleanup" "icode" "inliner" \
+     "inlineExceptionHandlers" "closelim" "dce" "jvm" "terminal"
+}
+
+local -a shared_opts
+shared_opts=(
+  "-bootclasspath+[Override location of bootstrap class files]:bootstrap class directory:_files -/"
+  "-classpath+[Specify where to find user class files]:directory:_files -/"
+  "-D-[Pass -Dproperty=value directly to the runtime system]"
+  "-d+[Destination for generated classfiles]: directory or jar file:_files"
+  "-dependencyfile+[Set dependency tracking file]:dependency tracking file:_files"
+  "-deprecation[Emit warning and location for usages of deprecated APIs]"
+  "-encoding+[Specify character encoding used by source files]:encoding:"
+  "-explaintypes[Explain type errors in more detail]"
+  "-extdirs+[Override location of installed extensions]:extensions directory:_files -/"
+  "-g\:-[Set level of generated debugging info (default\: vars)]:debugging info level:(none source line vars notailcalls)"
+  "-help[Print a synopsis of standard options]"
+  "-J-[pass argument directly to Java runtime system]:JVM argument:"
+  "-javabootclasspath+[Override java boot classpath]:Java boot class path directory]:_files -/"
+  "-javaextdirs+[Override java extdirs classpath]:Java extdirs directory:_files -/"
+  "-language\:-[Enable one or more language features]:feature:_scala_features"
+  "-no-specialization[Ignore @specialize annotations]"
+  "-nobootcp[Do not use the boot classpath for the scala jars]"
+  "-nowarn[Generate no warnings]"
+  "-optimise[Generate faster bytecode by applying optimisations to the program]"
+  "-P\:-[Pass an option to a plugin (written plugin\:opt)]:plugin option:"
+  "-print[Print program with Scala-specific features removed]"
+  "-sourcepath+[Specify location(s) of source files]:source file directory:_files -/"
+  "-target\:-[Target platform for object files (default\: jvm-1.5)]:platform name:(jvm-1.5 msil)"
+  "-toolcp+[Add to the runner classpath]:directory:_files -/"
+  "-unchecked[Enable detailed unchecked (erasure) warnings]"
+  "-uniqid[Uniquely tag all identifiers in debugging output]"
+  "-usejavacp[Utilize the java.class.path in classpath resolution]"
+  "-verbose[Output messages about what the compiler is doing]"
+  "-version[Print product version and exit]"
+  "-X[Print a synopsis of advanced options]"
+  "-Y[Print a synopsis of private options]"
+)
+
+local -a X_opts
+X_opts=(
+  "-Xcheck-null[Warn upon selection of nullable reference]"
+  "-Xcheckinit[Wrap field accessors to throw an exception on uninitialized access]"
+  "-Xdisable-assertions[Generate no assertions or assumptions]"
+  "-Xelide-below+[Calls to @elidable methods are omitted if method priority is lower than integer argument]"
+  "-Xexperimental[Enable experimental extensions]"
+  "-Xfatal-warnings[Fail the compilation if there are any warnings]"
+  "-Xfull-lubs[Retains pre 2.10 behavior of less aggressive truncation of least upper bounds]"
+  "-Xfuture[Turn on future language features]"
+  "-Xgenerate-phase-graph+[Generate the phase graphs (outputs .dot files) to fileX.dot]:output file:_files"
+  "-Xlint[Enable recommended additional warnings]"
+  "-Xlog-free-terms[Print a message when reification creates a free term]"
+  "-Xlog-free-types[Print a message when reification resorts to generating a free type]"
+  "-Xlog-implicits[Show more detail on why some implicits are not applicable]"
+  "-Xlog-implicit-conversions[Print a message whenever an implicit conversion is inserted]"
+  "-Xlog-reflective-calls[Print a message when a reflective method call is generated]"
+  "-Xmacro-settings\:-[Custom settings for macros]:option"
+  "-Xmain-class+[Class for manifest's Main-Class entry (only useful with -d jar)]:path:"
+  "-Xmax-classfile-name+[Maximum filename length for generated classes]"
+  "-Xmigration[Warn about constructs whose behavior may have changed]"
+  "-Xno-forwarders[Do not generate static forwarders in mirror classes]"
+  "-Xno-patmat-analysis[Don't perform exhaustivity/unreachability analysis. Also, ignore @switch annotation]"
+  "-Xno-uescape[Disable handling of \u unicode escapes]"
+  "-Xnojline[Do not use JLine for editing]"
+  "-Xoldpatmat[Use the pre-2.10 pattern matcher. Otherwise, the 'virtualizing' pattern matcher is used in 2.10]"
+  "-Xprint\:-[Print out program after <phase>]:phase name:_scala_phases"
+  "-Xprint-icode\:-[Log internal icode to *.icode files after phase (default\: icode)]:phase name:_scala_phases"
+  "-Xprint-pos[Print tree positions, as offsets]"
+  "-Xprint-types[Print tree types (debugging option)]"
+  "-Xprompt[Display a prompt after each error (debugging option)]"
+  "-Xresident[Compiler stays resident: read source filenames from standard input]"
+  "-Xscript+[Treat the source file as a script and wrap it in a main method]:main object name"
+  "-Xshow-class+[Show internal representation of class]:class name"
+  "-Xshow-object+[Show internal representation of object]:object name"
+  "-Xshow-phases[Print a synopsis of compiler phases]"
+  "-Xsource-reader+[Specify a class name for a custom method of reading source files]:class name"
+  "-Xverify[Verify generic signatures in generated bytecode]"
+
+  "-Xassem-extdirs+[List of directories containing assemblies (requires -target:msil) (default\: lib)]:assembly directory:_files -/"
+  "-Xassem-name+[Name of the output assembly (requires -target:msil)]:assembly name:_files"
+  "-Xassem-path+[List of assemblies referenced by the program (requires -target:msil)]:assembly path:_files"
+  "-Xsourcedir+[Mirror source folder structure in output directory (requires -target:msil)]:source directory:_files -/"
+
+  "-Xplugin\:-[Load one or more plugins from file]:plugin file:_files"
+  "-Xpluginsdir+[Path to search compiler plugins]:plugin directory:_files -/"
+  "-Xplugin-list[Print a synopsis of loaded plugins]"
+  "-Xplugin-disable\:-[Disable the given plugin(s)]"
+  "-Xplugin-require\:-[Abort unless the given plugin(s) are available]"
+)
+
+local -a Y_opts
+Y_opts=(
+  "-Y[Print a synopsis of private options]"
+  "-Ybuild-manager-debug[Generate debug information for the Refined Build Manager compiler]"
+  "-Ybuilder-debug\:-[Compile using the specified build manager (default\: none)]:build manager:(none refined simple)"
+  "-Yclosure-elim[Perform closure elimination]"
+  "-Ycompact-trees[Use compact tree printer when displaying trees]"
+  "-Ydead-code[Perform dead code elimination]"
+  "-Ydependent-method-types[Allow dependent method types]"
+  "-Ydump-classes+[Dump the generated bytecode to .class files (useful for reflective compilation that utilizes in-memory classloaders)]:output directory:_files -/"
+  "-Yeta-expand-keeps-star[Eta-expand varargs methods to T* rather than Seq[T].  This is a temporary option to ease transition.]"
+  "-Ygen-javap+[Generate a parallel output directory of .javap files]:output directory:_files -/"
+  "-Yinfer-argument-types[Infer types for arguments of overriden methods]"
+  "-Yinline[Perform inlining when possible]"
+  "-Yinline-handlers[Perform exception handler inlining when possible]"
+  "-Yinline-warnings[Emit inlining warnings (normally surpressed due to high volume)]"
+  "-Yinvalidate+[Invalidate classpath entry before run]:classpath entry"
+  "-Ylinearizer\:-[Linearizer to use (default\: rpo)]:linearizer:(normal dfs rpo dump)"
+  "-Ylog-classpath[Output information about what classpath is being applied]"
+  "-Yno-adapted-args[Do not adapt an argument list (either by inserting unit or creating a tuple) to match the receiver]"
+  "-Ymacro-debug-lite[Trace essential macro-related activities]"
+  "-Ymacro-debug-verbose[Trace all macro-related activities: compilation, generation of synthetics, classloading, expansion, exceptions]"
+  "-Yno-completion[Disable tab-completion in the REPL]"
+  "-Yno-generic-signatures[Suppress generation of generic signatures for Java]"
+  "-Yno-imports[Compile without any implicit imports]"
+  "-Yno-predef[Compile without importing Predef]"
+  "-Yno-self-type-checks[Suppress check for self-type conformance among inherited members]"
+  "-Yno-squeeze[Disable creation of compact code in matching]"
+  "-Ynotnull[Enable (experimental and incomplete) scala.NotNull]"
+  "-Yoverride-objects[Allow member objects to be overridden]"
+  "-Yoverride-vars[Allow vars to be overridden]"
+  "-Ypmat-naive[Desugar matches as naively as possible]"
+  "-Ypresentation-delay+[Wait number of ms after typing before starting typechecking]"
+  "-Ypresentation-log+[Log presentation compiler events into file]:log file:_files"
+  "-Ypresentation-replay+[Replay presentation compiler events from file]:log file:_files"
+  "-Ypresentation-strict[Do not report type errors in sources with syntax errors]"
+  "-Ypresentation-verbose[Print information about presentation compiler tasks]"
+  "-Yprofile-class+[Specify name of profiler class]:profiler class name"
+  "-Yprofile-memory[Heap snapshot after compiler run (requires jgpagent on JVM -agentpath)]"
+  "-Yrangepos[Use range positions for syntax trees]"
+  "-Yrecursion+[Set recursion depth used when locking symbols]"
+  "-Yreify-copypaste[Dump the reified trees in copypasteable representation]"
+  "-Yrepl-sync[Do not use asynchronous code for REPL startup]"
+  "-Yresolve-term-conflict\:-[Resolve term conflicts (default\: error)]:resolution strategy:(package object error)"
+  "-Yself-in-annots[Include a \"self\" identifier inside of annotations]"
+  "-Yshow\:-[Show after <phase> (requires -Xshow-class or -Xshow-object)]:phase name:_scala_phases"
+  "-Yshow-syms[Print the AST symbol hierarchy after each phase]"
+  "-Yshow-symkinds[Print abbreviated symbol kinds next to symbol names]"
+  "-Yshow-trees[Print detailed ASTs (requires -Xprint\:phase)]"
+  "-Yshow-trees-compact[Print detailed ASTs in compact form (requires -Xprint\:)]"
+  "-Yshow-trees-stringified[Print stringifications along with detailed ASTs (requires -Xprint\:)]"
+  "-Ystatistics[Print compiler statistics]"
+  "-Ystruct-dispatch\:-[Structural method dispatch policy (default\: poly-cache)]:policy name:(no-cache mono-cache poly-cache invoke-dynamic)"
+
+  "-Ybrowse\:-[Browse the abstract syntax tree after <phase>]:phase name:_scala_phases"
+  "-Ycheck\:-[Check the tree at the end of <phase>]:phase name:_scala_phases"
+  "-Ylog\:-[Log operations during <phase>]:phase name:_scala_phases"
+  "-Yprofile\:-[Profile CPU usage of given phases (requires jgpagent on JVM -agentpath)]:phase name:_scala_phases"
+  "-Yskip\:-[Skip <phase>]:phase name:_scala_phases"
+  "-Ystop-after\:-[Stop after given phase <phase>]:phase name:_scala_phases"
+  "-Ystop-before\:-[Stop before given phase <phase>]:phase name:_scala_phases"
+
+  "-Ywarn-adapted-args[Warn if an argument list is modified to match the receiver]"
+  "-Ywarn-all[Enable all -Y warnings]"
+  "-Ywarn-dead-code[Warn when dead code is identified]"
+  "-Ywarn-inaccessible[Warn about inaccessible types in method signatures]"
+  "-Ywarn-nullary-override[Warn when non-nullary overrides nullary, e.g. def foo() over def foo]"
+  "-Ywarn-nullary-unit[Warn when nullary methods return Unit]"
+  "-Ywarn-numeric-widen[Warn when numerics are widened]"
+  "-Ywarn-value-discard[Warn when non-Unit expression results are unused]"
+
+  "-Ybuild-manager-debug[Generate debug information for the Refined Build Manager compiler]"
+  "-Ybuilder-debug\:-[Compile using the specified build manager (default\: none)]:manager:(none refined simple)"
+  "-Ycompletion-debug[Trace all tab completion activity]"
+  "-Ydebug[Increase the quantity of debugging output]"
+  "-Ydoc-debug[Trace all scaladoc activity]"
+  "-Yide-debug[Generate, validate and output trees using the interactive compiler]"
+  "-Yinfer-debug[Trace type inference and implicit search]"
+  "-Yissue-debug[Print stack traces when a context issues an error]"
+  "-Ypatmat-debug[Trace pattern matching translation]"
+  "-Ypmat-debug[Trace all pattern matcher activity]"
+  "-Ypos-debug[Trace position validation]"
+  "-Ypresentation-debug[Enable debugging output for the presentation compiler]"
+  "-Yreify-debug[Trace reification]"
+  "-Yrepl-debug[Trace all REPL activity]"
+  "-Ytyper-debug[Trace all type assignments]"
+)
+
+local -a scala_opts
+scala_opts=(
+  "-e+[execute <string> as if entered in the repl]:string" \
+  "-howtorun+[what to run (default\: guess)]:execution mode:(script object jar guess)" \
+  "-i+[preload <file> before starting the repl]:file to preload:_files" \
+  "-nc[no compilation daemon\: do not use the fsc offline compiler]" \
+  "-save[save the compiled script in a jar for future use]"
+)
+
+case $words[$CURRENT] in
+    -X*) _arguments $X_opts;;
+    -Y*) _arguments $Y_opts;;
+      *) case $service in
+           scala)  _arguments $scala_opts $shared_opts "*::filename:_files";;
+           scalac) _arguments $shared_opts "*::filename:_files";;
+         esac
+esac
+
+return 0

From 2264c51355542df082c72468eea2dfa5a8e54ada Mon Sep 17 00:00:00 2001
From: ripdog <mitchell@ferguson.geek.nz>
Date: Fri, 15 Feb 2013 16:57:36 +0000
Subject: [PATCH 0155/1378] Update plugins/extract/extract.plugin.zsh

Cause unrar to preserve directory structure. (Why is only unrar different?!)
---
 plugins/extract/extract.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 5c125e98b..23e86c593 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -53,7 +53,7 @@ function extract() {
       (*.lzma) unlzma "$1" ;;
       (*.Z) uncompress "$1" ;;
       (*.zip) unzip "$1" -d $extract_dir ;;
-      (*.rar) unrar e -ad "$1" ;;
+      (*.rar) unrar x -ad "$1" ;;
       (*.7z) 7za x "$1" ;;
       (*.deb)
         mkdir -p "$extract_dir/control"

From 3db22634a1dfe6797b2dafabce82b27f101c8e6b Mon Sep 17 00:00:00 2001
From: Thomas Minor <tminor@tminor-dt.nvidia.com>
Date: Tue, 22 Jan 2013 09:02:21 -0800
Subject: [PATCH 0156/1378] pipe git version check error to /dev/null (for when
 git doesn't exist)

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 3e14695bd..bcd6cc055 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -112,7 +112,7 @@ function git_compare_version() {
   local INPUT_GIT_VERSION=$1;
   local INSTALLED_GIT_VERSION
   INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION});
-  INSTALLED_GIT_VERSION=($(git --version));
+  INSTALLED_GIT_VERSION=($(git --version 2>/dev/null));
   INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
 
   for i in {1..3}; do

From 014ed1f0e5c85a10ab7538160e2d3421ab3dbf7e Mon Sep 17 00:00:00 2001
From: Heiko Reese <mail@heiko-reese.de>
Date: Thu, 21 Feb 2013 02:46:20 +0100
Subject: [PATCH 0157/1378] Disable ssh-agent support if another ssh-agent is
 already running.

---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 35 +++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 8cc71fd57..63c433413 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,26 +1,31 @@
-# Based on ssh-agent code
-
 local GPG_ENV=$HOME/.gnupg/gpg-agent.env
 
-function start_agent {
-  /usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV} > /dev/null
-  chmod 600 ${GPG_ENV}
-  . ${GPG_ENV} > /dev/null
+function start_agent_nossh {
+    eval $(/usr/bin/env gpg-agent --daemon --write-env-file ${GPG_ENV}) > /dev/null
+    export GPG_AGENT_INFO
 }
 
-# Source GPG agent settings, if applicable
+function start_agent_withssh {
+    eval $(/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV}) > /dev/null
+    export GPG_AGENT_INFO
+    export SSH_AUTH_SOCK
+    export SSH_AGENT_PID
+}
+
+# make sure all created files are u=rw only
+umask 177
+
+# source settings of old agent, if applicable
 if [ -f "${GPG_ENV}" ]; then
   . ${GPG_ENV} > /dev/null
-  ps -ef | grep ${SSH_AGENT_PID} | grep gpg-agent > /dev/null || {
-    start_agent;
-  }
-else
-  start_agent;
 fi
 
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
-export SSH_AGENT_PID
+# check for existing ssh-agent
+if ssh-add -l > /dev/null 2> /dev/null; then
+    start_agent_nossh;
+else
+    start_agent_withssh;
+fi
 
 GPG_TTY=$(tty)
 export GPG_TTY

From 174e09ca8dec0e2c393718505e9fc0cfc0996e21 Mon Sep 17 00:00:00 2001
From: Heiko Reese <mail@heiko-reese.de>
Date: Thu, 21 Feb 2013 03:40:32 +0100
Subject: [PATCH 0158/1378] Added --quiet to suppress message about gpg-agent
 already running.

---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 63c433413..109af44c8 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,20 +1,19 @@
 local GPG_ENV=$HOME/.gnupg/gpg-agent.env
 
 function start_agent_nossh {
-    eval $(/usr/bin/env gpg-agent --daemon --write-env-file ${GPG_ENV}) > /dev/null
+    eval $(/usr/bin/env gpg-agent --quiet --daemon --write-env-file ${GPG_ENV} 2> /dev/null)
+    chmod 600 ${GPG_ENV}
     export GPG_AGENT_INFO
 }
 
 function start_agent_withssh {
-    eval $(/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV}) > /dev/null
+    eval $(/usr/bin/env gpg-agent --quiet --daemon --enable-ssh-support --write-env-file ${GPG_ENV} 2> /dev/null)
+    chmod 600 ${GPG_ENV}
     export GPG_AGENT_INFO
     export SSH_AUTH_SOCK
     export SSH_AGENT_PID
 }
 
-# make sure all created files are u=rw only
-umask 177
-
 # source settings of old agent, if applicable
 if [ -f "${GPG_ENV}" ]; then
   . ${GPG_ENV} > /dev/null

From 8c74d80fd6cdc7e1b48e7eb321a3e3a22674c3be Mon Sep 17 00:00:00 2001
From: hacfi <philipp.wahala@gmail.com>
Date: Fri, 22 Feb 2013 17:07:15 +0100
Subject: [PATCH 0159/1378] Fix Symfony2 command completion 'permission denied'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

app/console by default (if you create a new Symfony project via composer create-project or by downloading it from symfony.com) is not executable. Therefore I get the following error:

sf2 _symfony2_get_command_list:1: permission denied: app/console
_symfony2_get_command_list:1: permission denied: app/console
_symfony2_get_command_list:1: permission denied: app/console

To make command completion work without changing app/console you just have to let php run it.
---
 plugins/symfony2/symfony2.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index cc9ffebc0..f425c14f7 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,7 +1,7 @@
 # Symfony2 basic command completion
 
 _symfony2_get_command_list () {
-	app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+	php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony2 () {

From b979400cff17248147d95f6271edb6f2d6e36c84 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 14:05:22 -0500
Subject: [PATCH 0160/1378] Starting tmux plugin with basic config variables.

---
 plugins/tmux/tmux.plugin.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 plugins/tmux/tmux.plugin.zsh

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
new file mode 100644
index 000000000..cc676cb92
--- /dev/null
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -0,0 +1,12 @@
+# Configuration variables
+# Automatically start tmux
+[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART = false
+# Automatically connect to a previous session if it exists
+[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT = true
+# Automatically close the terminal when tmux exits
+[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT = true
+# Set term to screen or screen-256color based on current terminal support
+[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT = true
+
+# Get the absolute path to the current directory
+local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"

From 26ee66f179be08fab59d41a0522ad51610125c6c Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 17:50:15 -0500
Subject: [PATCH 0161/1378] Adding main function and alias to tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 37 ++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index cc676cb92..a2f36c0be 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -1,12 +1,41 @@
 # Configuration variables
 # Automatically start tmux
-[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART = false
+[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
 # Automatically connect to a previous session if it exists
-[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT = true
+[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
 # Automatically close the terminal when tmux exits
-[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT = true
+[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
 # Set term to screen or screen-256color based on current terminal support
-[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT = true
+[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT=true
 
 # Get the absolute path to the current directory
 local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
+
+# Local variable to store the local config file to use, if any.
+local fixed_config=""
+
+# Set the correct local config file to use
+if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
+then
+	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
+	then
+		fixed_config=$zsh_tmux_plugin_path/tmux.extra.conf
+	else
+		fixed_config=$zsh_tmux_plugin_path/tmux.only.conf
+	fi
+fi
+
+# Override tmux with our function
+function zsh_tmux_plugin_start()
+{
+	if [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
+	then
+		\tmux attach || tmux -f $fixed_config new-session
+		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+	else
+		\tmux -f $fixed_config
+		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+	fi
+}
+
+alias tmux=zsh_tmux_plugin_start

From 3aef6793c2bf0c0afec1fdb97a3a56e7f8d065c6 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 18:05:58 -0500
Subject: [PATCH 0162/1378] Now checking for 256 color terminal in tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index a2f36c0be..f67c2b8b5 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -11,6 +11,14 @@
 # Get the absolute path to the current directory
 local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
 
+# Determine if the terminal supports 256 colors
+if [[ `tput colors` == "256" ]]
+then
+	export $ZSH_TMUX_TERM="screen-256"
+else
+	export $ZSH_TMUX_TERM="screen"
+fi
+
 # Local variable to store the local config file to use, if any.
 local fixed_config=""
 

From 778ae57772a02d11c393708c4c0644fbd1ffac35 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 18:07:25 -0500
Subject: [PATCH 0163/1378] Tmux plugin now just runs tmux if any extra args
 are given.

---
 plugins/tmux/tmux.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index f67c2b8b5..d8fdd9255 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -36,7 +36,12 @@ fi
 # Override tmux with our function
 function zsh_tmux_plugin_start()
 {
-	if [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
+	# We have other arguments, just run them
+	if [[ ! -n "$@" ]]
+	then
+		\tmux $@
+	# Try to connect to an existing session.
+	elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
 	then
 		\tmux attach || tmux -f $fixed_config new-session
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit

From 0cf871d51299a4f837e6dce4d4ae827b0c09f5bd Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 18:08:37 -0500
Subject: [PATCH 0164/1378] Adding comments to tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index d8fdd9255..48ffc1c27 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -27,8 +27,10 @@ if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
 then
 	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
 	then
+		#use this when they have a ~/.tmux.conf
 		fixed_config=$zsh_tmux_plugin_path/tmux.extra.conf
 	else
+		#use this when they don't have a ~/.tmux.conf
 		fixed_config=$zsh_tmux_plugin_path/tmux.only.conf
 	fi
 fi
@@ -45,6 +47,7 @@ function zsh_tmux_plugin_start()
 	then
 		\tmux attach || tmux -f $fixed_config new-session
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+	# Just try to fix the TERM variable.
 	else
 		\tmux -f $fixed_config
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit

From 45a4db33f81c5dbdcafa25cfe5a75490d55ec185 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 18:09:01 -0500
Subject: [PATCH 0165/1378] Enabling autostart of tmux in tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 48ffc1c27..8dd208399 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -55,3 +55,8 @@ function zsh_tmux_plugin_start()
 }
 
 alias tmux=zsh_tmux_plugin_start
+
+if [[ "$ZSH_TMUX_AUTOSTART" == "true" ]]
+then
+	zsh_tmux_plugin_start
+fi

From bf40d4e354ce33c0d9f42cc64372461bff14cde8 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 18:09:17 -0500
Subject: [PATCH 0166/1378] Adding helper tmux config files to tmux plugin.

---
 plugins/tmux/tmux.extra.conf | 2 ++
 plugins/tmux/tmux.only.conf  | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 plugins/tmux/tmux.extra.conf
 create mode 100644 plugins/tmux/tmux.only.conf

diff --git a/plugins/tmux/tmux.extra.conf b/plugins/tmux/tmux.extra.conf
new file mode 100644
index 000000000..beffd380c
--- /dev/null
+++ b/plugins/tmux/tmux.extra.conf
@@ -0,0 +1,2 @@
+set -g default-terminal $ZSH_TMUX_TERM
+source $HOME/.tmux.conf
diff --git a/plugins/tmux/tmux.only.conf b/plugins/tmux/tmux.only.conf
new file mode 100644
index 000000000..0734df3e1
--- /dev/null
+++ b/plugins/tmux/tmux.only.conf
@@ -0,0 +1 @@
+set -g default-terminal $ZSH_TMUX_TERM

From 7b15627851983e63a5756f0b3633938c44ed7a7d Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 21:47:11 -0500
Subject: [PATCH 0167/1378] Fixing typos, logic, and gremlins in tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 8dd208399..46c142b77 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -6,7 +6,7 @@
 # Automatically close the terminal when tmux exits
 [[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
 # Set term to screen or screen-256color based on current terminal support
-[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT=true
+[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
 
 # Get the absolute path to the current directory
 local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
@@ -14,49 +14,50 @@ local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
 # Determine if the terminal supports 256 colors
 if [[ `tput colors` == "256" ]]
 then
-	export $ZSH_TMUX_TERM="screen-256"
+	export ZSH_TMUX_TERM="screen-256color"
 else
-	export $ZSH_TMUX_TERM="screen"
+	export ZSH_TMUX_TERM="screen"
 fi
 
 # Local variable to store the local config file to use, if any.
 local fixed_config=""
 
-# Set the correct local config file to use
+# Set the correct local config file to use.
 if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
 then
 	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
 	then
 		#use this when they have a ~/.tmux.conf
-		fixed_config=$zsh_tmux_plugin_path/tmux.extra.conf
+		fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
 	else
 		#use this when they don't have a ~/.tmux.conf
-		fixed_config=$zsh_tmux_plugin_path/tmux.only.conf
+		fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
 	fi
 fi
 
-# Override tmux with our function
-function zsh_tmux_plugin_start()
+# Wrapper function for tmux.
+function zsh_tmux_plugin_run()
 {
 	# We have other arguments, just run them
-	if [[ ! -n "$@" ]]
+	if [[ -n "$@" ]]
 	then
 		\tmux $@
 	# Try to connect to an existing session.
 	elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
 	then
-		\tmux attach || tmux -f $fixed_config new-session
+		\tmux attach || \tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config`  new-session
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
-	# Just try to fix the TERM variable.
+	# Just run tmux, fixing the TERM variable if requested.
 	else
-		\tmux -f $fixed_config
+		\tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config`
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 	fi
 }
 
+# Alias tmux to our wrapper function.
 alias tmux=zsh_tmux_plugin_start
 
 if [[ "$ZSH_TMUX_AUTOSTART" == "true" ]]
 then
-	zsh_tmux_plugin_start
+	zsh_tmux_plugin_run
 fi

From 43c50f03e3c547ec51feef7ae3c99f734a66e6a6 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 21:52:26 -0500
Subject: [PATCH 0168/1378] Checking environment instead of local variable for
 fixing term in tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 46c142b77..9a52e6376 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -23,16 +23,13 @@ fi
 local fixed_config=""
 
 # Set the correct local config file to use.
-if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
+if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
 then
-	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
-	then
-		#use this when they have a ~/.tmux.conf
-		fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
-	else
-		#use this when they don't have a ~/.tmux.conf
-		fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
-	fi
+	#use this when they have a ~/.tmux.conf
+	fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
+else
+	#use this when they don't have a ~/.tmux.conf
+	fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
 fi
 
 # Wrapper function for tmux.
@@ -45,11 +42,11 @@ function zsh_tmux_plugin_run()
 	# Try to connect to an existing session.
 	elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
 	then
-		\tmux attach || \tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config`  new-session
+		\tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`  new-session
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 	# Just run tmux, fixing the TERM variable if requested.
 	else
-		\tmux `[[ -n "$fixed_config" ]] && echo '-f ' $fixed_config`
+		\tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`
 		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 	fi
 }

From f096644c751cb7fe566e82de531435a405d76be8 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 22:03:22 -0500
Subject: [PATCH 0169/1378] Checking if already in tmux before autostarting in
 tmux in tmux plugin.

---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 9a52e6376..8bdd92133 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -54,7 +54,7 @@ function zsh_tmux_plugin_run()
 # Alias tmux to our wrapper function.
 alias tmux=zsh_tmux_plugin_start
 
-if [[ "$ZSH_TMUX_AUTOSTART" == "true" ]]
+if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]
 then
 	zsh_tmux_plugin_run
 fi

From 691630a89586c86dfafa32974c5c6dbaa1356c07 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 22:18:36 -0500
Subject: [PATCH 0170/1378] Adding option to prevent autostarting tmux more
 than once in the same session.

---
 plugins/tmux/tmux.plugin.zsh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 8bdd92133..a7bf93dbd 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -1,6 +1,10 @@
 # Configuration variables
+#
 # Automatically start tmux
 [[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
+# Only autostart once. If set to false, tmux will attempt to
+# autostart every time your zsh configs are reloaded.
+[[ -n "$ZSH_TMUX_AUTOSTART_ONCE" ]] || ZSH_TMUX_AUTOSTART_ONCE=true
 # Automatically connect to a previous session if it exists
 [[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
 # Automatically close the terminal when tmux exits
@@ -8,6 +12,7 @@
 # Set term to screen or screen-256color based on current terminal support
 [[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
 
+
 # Get the absolute path to the current directory
 local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
 
@@ -54,7 +59,13 @@ function zsh_tmux_plugin_run()
 # Alias tmux to our wrapper function.
 alias tmux=zsh_tmux_plugin_start
 
+# Autostart if not already in tmux and enabled.
 if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]
 then
-	zsh_tmux_plugin_run
+	# Actually don't autostart if we already did and multiple autostarts are disabled.
+	if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]
+	then
+		export ZSH_TMUX_AUTOSTARTED=true
+		zsh_tmux_plugin_run
+	fi
 fi

From 56c46c4ed8339c66c671927c197eb4511b5a664c Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 22:55:18 -0500
Subject: [PATCH 0171/1378] Fixing typo in alias.

---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index a7bf93dbd..982f87356 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -57,7 +57,7 @@ function zsh_tmux_plugin_run()
 }
 
 # Alias tmux to our wrapper function.
-alias tmux=zsh_tmux_plugin_start
+alias tmux=zsh_tmux_plugin_run
 
 # Autostart if not already in tmux and enabled.
 if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]

From 86c9b32031dc28b4c6a641a4475e0e55c7ff32e5 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 22:57:37 -0500
Subject: [PATCH 0172/1378] Adding compdef to maintain tmux completions.

---
 plugins/tmux/tmux.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 982f87356..5c4076904 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -56,6 +56,9 @@ function zsh_tmux_plugin_run()
 	fi
 }
 
+# Use the completions for tmux for our function
+compdef _tmux zsh_tmux_plugin_run
+
 # Alias tmux to our wrapper function.
 alias tmux=zsh_tmux_plugin_run
 

From 4e8681c6e19f77a9b54ceee5934e3356e4ffb207 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 26 Feb 2013 23:35:45 -0500
Subject: [PATCH 0173/1378] Adding options to choose tmux TERM for 256 and
 non-256 color terminals.

This may be needed on systems that don't have the proper terminfo for
screen and/or screen-256color. Otherwise the defaults of screen and
screen-256color should be fine.
---
 plugins/tmux/tmux.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 5c4076904..be92fe096 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -11,6 +11,14 @@
 [[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
 # Set term to screen or screen-256color based on current terminal support
 [[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
+# The TERM to use for non-256 color terminals.
+# Tmux states this should be screen, but you may need to change it on
+# systems without the proper terminfo
+[[ -n "$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITHOUT_256COLOR="screen"
+# The TERM to use for 256 color terminals.
+# Tmux states this should be screen-256color, but you may need to change it on
+# systems without the proper terminfo
+[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
 
 
 # Get the absolute path to the current directory
@@ -19,9 +27,9 @@ local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
 # Determine if the terminal supports 256 colors
 if [[ `tput colors` == "256" ]]
 then
-	export ZSH_TMUX_TERM="screen-256color"
+	export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
 else
-	export ZSH_TMUX_TERM="screen"
+	export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 fi
 
 # Local variable to store the local config file to use, if any.

From f0a920df5a4a5e5260ef45daf27d42a15cd75217 Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Wed, 27 Feb 2013 10:21:19 -0500
Subject: [PATCH 0174/1378] Checking to make sure tmux is actually installed
 before running plugin.

If it is not found an error message is printed.
---
 plugins/tmux/tmux.plugin.zsh | 152 ++++++++++++++++++-----------------
 1 file changed, 79 insertions(+), 73 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index be92fe096..6f0d5902a 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -1,82 +1,88 @@
-# Configuration variables
-#
-# Automatically start tmux
-[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
-# Only autostart once. If set to false, tmux will attempt to
-# autostart every time your zsh configs are reloaded.
-[[ -n "$ZSH_TMUX_AUTOSTART_ONCE" ]] || ZSH_TMUX_AUTOSTART_ONCE=true
-# Automatically connect to a previous session if it exists
-[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
-# Automatically close the terminal when tmux exits
-[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
-# Set term to screen or screen-256color based on current terminal support
-[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
-# The TERM to use for non-256 color terminals.
-# Tmux states this should be screen, but you may need to change it on
-# systems without the proper terminfo
-[[ -n "$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITHOUT_256COLOR="screen"
-# The TERM to use for 256 color terminals.
-# Tmux states this should be screen-256color, but you may need to change it on
-# systems without the proper terminfo
-[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
-
-
-# Get the absolute path to the current directory
-local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
-
-# Determine if the terminal supports 256 colors
-if [[ `tput colors` == "256" ]]
-then
-	export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
-else
-	export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
-fi
-
-# Local variable to store the local config file to use, if any.
-local fixed_config=""
-
-# Set the correct local config file to use.
-if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
-then
-	#use this when they have a ~/.tmux.conf
-	fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
-else
-	#use this when they don't have a ~/.tmux.conf
-	fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
-fi
-
-# Wrapper function for tmux.
-function zsh_tmux_plugin_run()
-{
-	# We have other arguments, just run them
-	if [[ -n "$@" ]]
+# Only run if tmux is actually installed
+if which tmux &> /dev/null
 	then
-		\tmux $@
-	# Try to connect to an existing session.
-	elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
+	# Configuration variables
+	#
+	# Automatically start tmux
+	[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
+	# Only autostart once. If set to false, tmux will attempt to
+	# autostart every time your zsh configs are reloaded.
+	[[ -n "$ZSH_TMUX_AUTOSTART_ONCE" ]] || ZSH_TMUX_AUTOSTART_ONCE=true
+	# Automatically connect to a previous session if it exists
+	[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
+	# Automatically close the terminal when tmux exits
+	[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
+	# Set term to screen or screen-256color based on current terminal support
+	[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
+	# The TERM to use for non-256 color terminals.
+	# Tmux states this should be screen, but you may need to change it on
+	# systems without the proper terminfo
+	[[ -n "$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITHOUT_256COLOR="screen"
+	# The TERM to use for 256 color terminals.
+	# Tmux states this should be screen-256color, but you may need to change it on
+	# systems without the proper terminfo
+	[[ -n "$ZSH_TMUX_FIXTERM_WITH_256COLOR" ]] || ZSH_TMUX_FIXTERM_WITH_256COLOR="screen-256color"
+
+
+	# Get the absolute path to the current directory
+	local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
+
+	# Determine if the terminal supports 256 colors
+	if [[ `tput colors` == "256" ]]
 	then
-		\tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`  new-session
-		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
-	# Just run tmux, fixing the TERM variable if requested.
+		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
 	else
-		\tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`
-		[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 	fi
-}
 
-# Use the completions for tmux for our function
-compdef _tmux zsh_tmux_plugin_run
+	# Local variable to store the local config file to use, if any.
+	local fixed_config=""
 
-# Alias tmux to our wrapper function.
-alias tmux=zsh_tmux_plugin_run
-
-# Autostart if not already in tmux and enabled.
-if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]
-then
-	# Actually don't autostart if we already did and multiple autostarts are disabled.
-	if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]
+	# Set the correct local config file to use.
+	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
 	then
-		export ZSH_TMUX_AUTOSTARTED=true
-		zsh_tmux_plugin_run
+		#use this when they have a ~/.tmux.conf
+		fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
+	else
+		#use this when they don't have a ~/.tmux.conf
+		fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
 	fi
+
+	# Wrapper function for tmux.
+	function zsh_tmux_plugin_run()
+	{
+		# We have other arguments, just run them
+		if [[ -n "$@" ]]
+		then
+			\tmux $@
+		# Try to connect to an existing session.
+		elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
+		then
+			\tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`  new-session
+			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+		# Just run tmux, fixing the TERM variable if requested.
+		else
+			\tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`
+			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+		fi
+	}
+
+	# Use the completions for tmux for our function
+	compdef _tmux zsh_tmux_plugin_run
+
+	# Alias tmux to our wrapper function.
+	alias tmux=zsh_tmux_plugin_run
+
+	# Autostart if not already in tmux and enabled.
+	if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]
+	then
+		# Actually don't autostart if we already did and multiple autostarts are disabled.
+		if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]
+		then
+			export ZSH_TMUX_AUTOSTARTED=true
+			zsh_tmux_plugin_run
+		fi
+	fi
+else
+	print "zsh tmux plugin: tmux not found. Please install tmux before using this plugin."
 fi

From f4b12321a9e4d5e0fa208b48a4515156865a33bb Mon Sep 17 00:00:00 2001
From: Alexey Poimtsev <alec@alec-c4.com>
Date: Thu, 28 Feb 2013 00:26:03 +0400
Subject: [PATCH 0175/1378] Added rails4 plugin

---
 plugins/rails4/rails4.plugin.zsh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/rails4/rails4.plugin.zsh

diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
new file mode 100644
index 000000000..b6765365e
--- /dev/null
+++ b/plugins/rails4/rails4.plugin.zsh
@@ -0,0 +1,29 @@
+# Rails 4 aliases
+
+function _rails_command () {
+  if [ -e "script/server" ]; then
+    ruby script/$@
+  elif [ -e "script/rails" ]; then
+    ruby script/rails $@
+  else
+    ruby bin/rails $@  
+  fi
+}
+
+alias rc='_rails_command console'
+alias rd='_rails_command destroy'
+alias rdb='_rails_command dbconsole'
+alias rdbm='rake db:migrate db:test:clone'
+alias rg='_rails_command generate'
+alias rgm='_rails_command generate migration'
+alias rp='_rails_command plugin'
+alias ru='_rails_command runner'
+alias rs='_rails_command server'
+alias rsd='_rails_command server --debugger'
+alias devlog='tail -f log/development.log'
+alias rdm='rake db:migrate'
+alias rdr='rake db:rollback'
+alias rds='rake db:seed'
+alias rlc='rake log:clear'
+alias rn='rake notes'
+alias rr='rake routes'
\ No newline at end of file

From 4bb7b698cabd33bd53f89688e83cf836e4c3f50c Mon Sep 17 00:00:00 2001
From: Maxime Fabre <ehtnam6@gmail.com>
Date: Thu, 28 Feb 2013 11:50:39 +0100
Subject: [PATCH 0176/1378] Add alias for "composer dump-autoload"

---
 plugins/composer/composer.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index c9b762d07..a08c4633f 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -24,6 +24,7 @@ alias csu='composer self-update'
 alias cu='composer update'
 alias ci='composer install'
 alias ccp='composer create-project'
+alias cdu='composer dump-autoload'
 
 # install composer in the current directory
-alias cget='curl -s https://getcomposer.org/installer | php'
\ No newline at end of file
+alias cget='curl -s https://getcomposer.org/installer | php'

From 0744acd663216b8e1c0c75878c166d53684d75bc Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Thu, 28 Feb 2013 10:28:08 -0500
Subject: [PATCH 0177/1378] Update to latest per-directory-history

See [https://github.com/jimhester/per-directory-history]
---
 plugins/per-directory-history/README.md       |  56 +++++++
 .../per-directory-history.plugin.zsh          | 150 +-----------------
 .../per-directory-history.zsh                 | 149 +++++++++++++++++
 3 files changed, 206 insertions(+), 149 deletions(-)
 create mode 100644 plugins/per-directory-history/README.md
 mode change 100644 => 120000 plugins/per-directory-history/per-directory-history.plugin.zsh
 create mode 100644 plugins/per-directory-history/per-directory-history.zsh

diff --git a/plugins/per-directory-history/README.md b/plugins/per-directory-history/README.md
new file mode 100644
index 000000000..d8ff93dc0
--- /dev/null
+++ b/plugins/per-directory-history/README.md
@@ -0,0 +1,56 @@
+[Per-Directory-History][6]
+=========================
+
+Per directory history for zsh, as well as global history, and the
+ability to toggle between them with ^G.
+
+This is a implementation of per directory history for zsh, some 
+implementations of which exist in bash[1][],[2][].  It also implements 
+a per-directory-history-toggle-history function to change from using the 
+directory history to using the global history.  In both cases the history is 
+always saved to both the global history and the directory history, so the 
+toggle state will not effect the saved histories.  Being able to switch 
+between global and directory histories on the fly is a novel feature as far 
+as I am aware.
+
+This is a standalone repository for the script, however it is also included in
+[oh-my-zsh][4] as a plugin.
+
+----------------------------------------------------------------------------
+Usage
+----------------------------------------------------------------------------
+
+1.  Load this script into your interactive ZSH session:
+
+        % source zsh-per-directory-history.zsh
+
+2.  The default mode if per directory history, interact with your history as normal.
+
+3.  Press ^G (the Control and G keys simultaneously) to toggle between local
+    and global histories. 
+
+
+
+-------------------------------------------------------------------------------
+Configuration
+-------------------------------------------------------------------------------
+
+* HISTORY_BASE a global variable that defines the base directory in which the 
+  directory histories are stored
+* per-directory-history-toggle-history is the function to toggle the history
+
+-------------------------------------------------------------------------------
+History
+-------------------------------------------------------------------------------
+
+The idea/inspiration for a per directory history is from [Stewart MacArthur][1] 
+and [Dieter][2], the implementation idea is from [Bart Schaefer][3].  The 
+implementation is by [Jim Hester][5] in September 2012.
+
+[1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
+[2]: http://dieter.plaetinck.be/per_directory_bash
+[3]: http://www.zsh.org/mla/users/1997/msg00226.html
+[4]: https://github.com/robbyrussell/oh-my-zsh
+[5]: http://jimhester.com
+[6]: http://github.com/jimhester/per-directory-history
+
diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
deleted file mode 100644
index 61e8b5a62..000000000
--- a/plugins/per-directory-history/per-directory-history.plugin.zsh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/env zsh
-#
-# This is a implementation of per directory history for zsh, some 
-# implementations of which exist in bash[1,2].  It also implements 
-# a per-directory-history-toggle-history function to change from using the 
-# directory history to using the global history.  In both cases the history is 
-# always saved to both the global history and the directory history, so the 
-# toggle state will not effect the saved histories.  Being able to switch 
-# between global and directory histories on the fly is a novel feature as far 
-# as I am aware.
-#
-#-------------------------------------------------------------------------------
-# Configuration
-#-------------------------------------------------------------------------------
-#
-# HISTORY_BASE a global variable that defines the base directory in which the 
-# directory histories are stored
-#
-#-------------------------------------------------------------------------------
-# History
-#-------------------------------------------------------------------------------
-#
-# The idea/inspiration for a per directory history is from Stewart MacArthur[1] 
-# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh 
-# mailing list[3].  The implementation is by Jim Hester in September 2012.
-#
-# [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
-# [2]: http://dieter.plaetinck.be/per_directory_bash
-# [3]: http://www.zsh.org/mla/users/1997/msg00226.html
-#
-################################################################################
-#
-# Copyright (c) 2012 Jim Hester
-#
-# This software is provided 'as-is', without any express or implied warranty.  
-# In no event will the authors be held liable for any damages arising from the 
-# use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose, 
-# including commercial applications, and to alter it and redistribute it 
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not claim 
-# that you wrote the original software. If you use this software in a product, 
-# an acknowledgment in the product documentation would be appreciated but is 
-# not required.
-#
-# 2. Altered source versions must be plainly marked as such, and must not be 
-# misrepresented as being the original software.
-#
-# 3. This notice may not be removed or altered from any source distribution..
-#
-################################################################################
-
-#-------------------------------------------------------------------------------
-# configuration, the base under which the directory histories are stored
-#-------------------------------------------------------------------------------
-
-[[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
-
-#-------------------------------------------------------------------------------
-# toggle global/directory history used for searching - ctrl-G by default
-#-------------------------------------------------------------------------------
-
-function per-directory-history-toggle-history() {
-  if [[ $_per_directory_history_is_global == true ]]; then
-    _per-directory-history-set-directory-history
-    print "\nusing local history\n"
-  else
-    _per-directory-history-set-global-history
-    print "\nusing global history\n"
-  fi
-  zle .push-line
-  zle .accept-line
-}
-
-autoload per-directory-history-toggle-history
-zle -N per-directory-history-toggle-history
-bindkey '^G' per-directory-history-toggle-history
-
-#-------------------------------------------------------------------------------
-# implementation details
-#-------------------------------------------------------------------------------
-
-_per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
-
-function _per-directory-history-change-directory() {
-  _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
-  mkdir -p ${_per_directory_history_directory:h}
-  if [[ $_per_directory_history_is_global == false ]]; then
-    #save to the global history
-    fc -AI $HISTFILE
-    #save history to previous file
-    local prev="$HISTORY_BASE${OLDPWD:A}/history"
-    mkdir -p ${prev:h}
-    fc -AI $prev
-
-    #discard previous directory's history
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    
-    #read history in new file
-    if [[ -e $_per_directory_history_directory ]]; then
-      fc -R $_per_directory_history_directory
-    fi
-  fi
-}
-
-function _per-directory-history-addhistory() {
-  print -sr -- ${1%%$'\n'}
-  fc -p $_per_directory_history_directory
-}
-
-
-function _per-directory-history-set-directory-history() {
-  if [[ $_per_directory_history_is_global == true ]]; then
-    fc -AI $HISTFILE
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$_per_directory_history_directory" ]]; then
-      fc -R "$_per_directory_history_directory"
-    fi
-  fi
-  _per_directory_history_is_global=false
-}
-function _per-directory-history-set-global-history() {
-  if [[ $_per_directory_history_is_global == false ]]; then
-    fc -AI $_per_directory_history_directory
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$HISTFILE" ]]; then
-      fc -R "$HISTFILE"
-    fi
-  fi
-  _per_directory_history_is_global=true
-}
-
-
-#add functions to the exec list for chpwd and zshaddhistory
-chpwd_functions=(${chpwd_functions[@]} "_per-directory-history-change-directory")
-zshaddhistory_functions=(${zshaddhistory_functions[@]} "_per-directory-history-addhistory")
-
-#start in directory mode
-mkdir -p ${_per_directory_history_directory:h}
-_per_directory_history_is_global=true
-_per-directory-history-set-directory-history
diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
new file mode 120000
index 000000000..142d9541d
--- /dev/null
+++ b/plugins/per-directory-history/per-directory-history.plugin.zsh
@@ -0,0 +1 @@
+per-directory-history.zsh
\ No newline at end of file
diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
new file mode 100644
index 000000000..d50009080
--- /dev/null
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -0,0 +1,149 @@
+#!/usr/bin/env zsh
+#
+# This is a implementation of per directory history for zsh, some 
+# implementations of which exist in bash[1,2].  It also implements 
+# a per-directory-history-toggle-history function to change from using the 
+# directory history to using the global history.  In both cases the history is 
+# always saved to both the global history and the directory history, so the 
+# toggle state will not effect the saved histories.  Being able to switch 
+# between global and directory histories on the fly is a novel feature as far 
+# as I am aware.
+#
+#-------------------------------------------------------------------------------
+# Configuration
+#-------------------------------------------------------------------------------
+#
+# HISTORY_BASE a global variable that defines the base directory in which the 
+# directory histories are stored
+#
+#-------------------------------------------------------------------------------
+# History
+#-------------------------------------------------------------------------------
+#
+# The idea/inspiration for a per directory history is from Stewart MacArthur[1] 
+# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh 
+# mailing list[3].  The implementation is by Jim Hester in September 2012.
+#
+# [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
+# [2]: http://dieter.plaetinck.be/per_directory_bash
+# [3]: http://www.zsh.org/mla/users/1997/msg00226.html
+#
+################################################################################
+#
+# Copyright (c) 2012 Jim Hester
+#
+# This software is provided 'as-is', without any express or implied warranty.  
+# In no event will the authors be held liable for any damages arising from the 
+# use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose, 
+# including commercial applications, and to alter it and redistribute it 
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not claim 
+# that you wrote the original software. If you use this software in a product, 
+# an acknowledgment in the product documentation would be appreciated but is 
+# not required.
+#
+# 2. Altered source versions must be plainly marked as such, and must not be 
+# misrepresented as being the original software.
+#
+# 3. This notice may not be removed or altered from any source distribution..
+#
+################################################################################
+
+#-------------------------------------------------------------------------------
+# configuration, the base under which the directory histories are stored
+#-------------------------------------------------------------------------------
+
+[[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
+
+#-------------------------------------------------------------------------------
+# toggle global/directory history used for searching - ctrl-G by default
+#-------------------------------------------------------------------------------
+
+function per-directory-history-toggle-history() {
+  if [[ $_per_directory_history_is_global == true ]]; then
+    _per-directory-history-set-directory-history
+    print -n "\nusing local history"
+  else
+    _per-directory-history-set-global-history
+    print -n "\nusing global history"
+  fi
+  zle .push-line
+  zle .accept-line
+}
+
+autoload per-directory-history-toggle-history
+zle -N per-directory-history-toggle-history
+bindkey '^G' per-directory-history-toggle-history
+
+#-------------------------------------------------------------------------------
+# implementation details
+#-------------------------------------------------------------------------------
+
+_per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
+
+function _per-directory-history-change-directory() {
+  _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
+  mkdir -p ${_per_directory_history_directory:h}
+  if [[ $_per_directory_history_is_global == false ]]; then
+    #save to the global history
+    fc -AI $HISTFILE
+    #save history to previous file
+    local prev="$HISTORY_BASE${OLDPWD:A}/history"
+    mkdir -p ${prev:h}
+    fc -AI $prev
+
+    #discard previous directory's history
+    local original_histsize=$HISTSIZE
+    HISTSIZE=0
+    HISTSIZE=$original_histsize
+    
+    #read history in new file
+    if [[ -e $_per_directory_history_directory ]]; then
+      fc -R $_per_directory_history_directory
+    fi
+  fi
+}
+
+function _per-directory-history-addhistory() {
+  print -sr -- ${1%%$'\n'}
+  fc -a -p $_per_directory_history_directory
+}
+
+
+function _per-directory-history-set-directory-history() {
+  if [[ $_per_directory_history_is_global == true ]]; then
+    fc -AI $HISTFILE
+    local original_histsize=$HISTSIZE
+    HISTSIZE=0
+    HISTSIZE=$original_histsize
+    if [[ -e "$_per_directory_history_directory" ]]; then
+      fc -R "$_per_directory_history_directory"
+    fi
+  fi
+  _per_directory_history_is_global=false
+}
+function _per-directory-history-set-global-history() {
+  if [[ $_per_directory_history_is_global == false ]]; then
+    fc -AI $_per_directory_history_directory
+    local original_histsize=$HISTSIZE
+    HISTSIZE=0
+    HISTSIZE=$original_histsize
+    if [[ -e "$HISTFILE" ]]; then
+      fc -R "$HISTFILE"
+    fi
+  fi
+  _per_directory_history_is_global=true
+}
+
+
+#add functions to the exec list for chpwd and zshaddhistory
+chpwd_functions=(${chpwd_functions[@]} "_per-directory-history-change-directory")
+zshaddhistory_functions=(${zshaddhistory_functions[@]} "_per-directory-history-addhistory")
+
+#start in directory mode
+mkdir -p ${_per_directory_history_directory:h}
+_per_directory_history_is_global=true
+_per-directory-history-set-directory-history

From 20fe5e6a570fa5d9dfd246d020ecc2c18427405f Mon Sep 17 00:00:00 2001
From: RomainBelorgey <romain.belorgey@gmail.com>
Date: Fri, 1 Mar 2013 18:33:38 +0100
Subject: [PATCH 0178/1378] Update _capistrano

Add use of Capfile commands
---
 plugins/capistrano/_capistrano | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index cf6b50c7f..1002dad96 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -1,7 +1,7 @@
 #compdef cap
 #autoload
 
-if [ -f config/deploy.rb ]; then
+if [[ -f config/deploy.rb || -f Capfile ]]; then
   if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then
     echo "\nGenerating .cap_tasks~..." > /dev/stderr
     cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~

From fdd46d8815f9c3a314e13d2dbb57685fd78f4e7c Mon Sep 17 00:00:00 2001
From: Sean Jones <neuralsandwich@gmail.com>
Date: Sat, 2 Mar 2013 11:09:57 +0000
Subject: [PATCH 0179/1378] Updated battery plugin.  Displays charging time.

linux battery level now refreshes after every command
---
 plugins/battery/battery.plugin.zsh | 33 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 95f890632..cc9342c77 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -42,17 +42,27 @@ if [[ $(uname) == "Darwin" ]] ; then
       fi
       echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
     else
-      echo ""
+      echo "∞"
     fi
   }
 
 elif [[ $(uname) == "Linux"  ]] ; then
 
-  if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
-    function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
-    function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
-    function battery_pct_prompt() {
-      b=$(battery_pct_remaining)
+  function battery_pct_remaining() {
+    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
+      echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+    fi
+  }
+
+  function battery_time_remaining() {
+    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
+      echo $(acpi | cut -f3 -d ',')
+    fi
+  }
+
+  function battery_pct_prompt() {
+    b=$(battery_pct_remaining) 
+    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
       if [ $b -gt 50 ] ; then
         color='green'
       elif [ $b -gt 20 ] ; then
@@ -61,11 +71,8 @@ elif [[ $(uname) == "Linux"  ]] ; then
         color='red'
       fi
       echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
-    }
-  else
-    error_msg='no battery'
-    function battery_pct_remaining() { echo $error_msg }
-    function battery_time_remaining() { echo $error_msg }
-    function battery_pct_prompt() { echo '' }
-  fi
+    else
+      echo "∞"
+    fi
+  }
 fi

From c2d42f5a90f12ca925702ed4e8fc5563baf8397c Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Tue, 5 Mar 2013 22:50:27 +0100
Subject: [PATCH 0180/1378] added michelebologna theme

---
 themes/michelebologna.zsh-theme | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 themes/michelebologna.zsh-theme

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
new file mode 100644
index 000000000..002d46287
--- /dev/null
+++ b/themes/michelebologna.zsh-theme
@@ -0,0 +1,43 @@
+# reference colors
+GREEN="%{$fg_bold[green]%}"
+RED="%{$fg_bold[red]%}"
+CYAN="%{$fg_bold[cyan]%}"
+YELLOW="%{$fg_bold[yellow]%}"
+BLUE="%{$fg_bold[blue]%}"
+MAGENTA="%{$fg_bold[magenta]%}"
+WHITE="%{$fg_bold[white]%}"
+
+COLOR_ARRAY=($GREEN $RED $CYAN $YELLOW $BLUE $MAGENTA $WHITE)
+
+# color reset
+RESET_COLOR="%{$reset_color%}"
+
+# which color should be applied?
+USERNAME_NORMAL_COLOR=$WHITE
+USERNAME_ROOT_COLOR=$RED
+HOSTNAME_NORMAL_COLOR=$BLUE
+#for i in `hostname`; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
+HOSTNAME_ROOT_COLOR=$RED
+HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR)
+CURRENT_DIR_COLOR=$CYAN
+
+# zsh commands
+USERNAME_COMMAND="%n"
+HOSTNAME_COMMAND="%m"
+CURRENT_DIR="%~"
+
+# output: colors + commands
+USERNAME_OUTPUT="%(!..$USERNAME_NORMAL_COLOR$USERNAME_COMMAND$RESET_COLOR@)"
+HOSTNAME_OUTPUT="$HOSTNAME_COLOR$HOSTNAME_COMMAND$RESET_COLOR"
+CURRENT_DIR_OUTPUT="$CURRENT_DIR_COLOR$CURRENT_DIR"
+LAST_COMMAND_OUTPUT="%(?.%(!.$RED.$GREEN).$YELLOW)"
+
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY=")$RED*"
+ZSH_THEME_GIT_PROMPT_CLEAN=")"
+
+# wrap all together
+PROMPT='$USERNAME_OUTPUT$HOSTNAME_OUTPUT:$CURRENT_DIR_OUTPUT $LAST_COMMAND_OUTPUT%#$RESET_COLOR '
+RPROMPT='%1(j.fg: [%j].) $GREEN$(git_prompt_info)$RESET_COLOR [%@]'

From 0b6e7358850f7fd74556289b1e0c1634896ed66b Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Tue, 5 Mar 2013 23:01:00 +0100
Subject: [PATCH 0181/1378] added comment for auto-generated hostname color

---
 themes/michelebologna.zsh-theme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index 002d46287..ef4c6d740 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -16,6 +16,7 @@ RESET_COLOR="%{$reset_color%}"
 USERNAME_NORMAL_COLOR=$WHITE
 USERNAME_ROOT_COLOR=$RED
 HOSTNAME_NORMAL_COLOR=$BLUE
+# uncomment next line if you want auto-generated hostname color
 #for i in `hostname`; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
 HOSTNAME_ROOT_COLOR=$RED
 HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR)

From 49860bd61ff61d284f3b356bec0042cace98a686 Mon Sep 17 00:00:00 2001
From: ishtu <asymmetric.world@gmail.com>
Date: Sun, 10 Mar 2013 19:18:33 +0300
Subject: [PATCH 0182/1378] add function vncviwer

---
 plugins/osx/osx.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index f278d4f8d..51cd7c143 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -154,3 +154,6 @@ function trash() {
   IFS=$temp_ifs
 }
 
+function vncviewer() {
+  open vnc://$@
+}

From 9991401aaa88c294c37dc8aaaf955d7d08b04508 Mon Sep 17 00:00:00 2001
From: Deepu Sudhakar <deepu.sudhakar@gmail.com>
Date: Sun, 10 Mar 2013 14:36:39 -0500
Subject: [PATCH 0183/1378] Escape /Users/desudhak/.oh-my-zsh path (previously
 broke spaces in path)

---
 tools/upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index b2a1c06c4..a039d32f0 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,6 +1,6 @@
 current_path=`pwd`
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
-cd $ZSH
+cd "$ZSH"
 
 if git pull origin master
 then
@@ -16,4 +16,4 @@ else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
 fi
 
-cd "$current_path"
\ No newline at end of file
+cd "$current_path"

From 6dd286bba3fe36278ca6de45567c3842e2db7cc0 Mon Sep 17 00:00:00 2001
From: Vladimir Zakharov <zakharov.vv@gmail.com>
Date: Mon, 11 Mar 2013 14:24:12 +0400
Subject: [PATCH 0184/1378] Mercurial: add aliases for 'incoming' and
 'outgoing' commands

---
 plugins/mercurial/mercurial.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index a3a6ff8b6..820e1aee9 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -7,7 +7,9 @@ alias hgco='hg checkout'
 alias hgd='hg diff'
 alias hged='hg diffmerge'
 # pull and update
+alias hgi='hg incoming'
 alias hgl='hg pull -u'
+alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'
 # this is the 'git commit --amend' equivalent
@@ -17,4 +19,4 @@ function hg_current_branch() {
   if [ -d .hg ]; then
     echo hg:$(hg branch)
   fi
-}
\ No newline at end of file
+}

From 72ec24108a88d79a13cc3581f17b440418048a72 Mon Sep 17 00:00:00 2001
From: bertag <scott_bertagnole@byu.edu>
Date: Mon, 11 Mar 2013 13:41:32 -0600
Subject: [PATCH 0185/1378] Tweaked parse_git_dirty() in lib/git.zsh to support
 proper dirty/clean parsing against both git 1.6 and git 1.7+

---
 lib/git.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 3e14695bd..172bf4f7a 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -9,16 +9,19 @@ function git_prompt_info() {
 # Checks if working tree is dirty
 parse_git_dirty() {
   local SUBMODULE_SYNTAX=''
+  local GIT_STATUS=''
+  local CLEAN_MESSAGE='nothing to commit (working directory clean)'
   if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
-    fi
-    if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then
+    fi  
+    GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
+    if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
-    fi
-  fi
+    fi  
+  fi  
 }
 
 # get the difference between the local and remote branches

From a66bc75ad7d01d1a223cb60cb73810e0c79d2e4e Mon Sep 17 00:00:00 2001
From: "y.s" <y.s.inside@gmail.com>
Date: Tue, 12 Mar 2013 21:15:22 +0800
Subject: [PATCH 0186/1378] add: A new theme 'ys'.

---
 themes/ys.zsh-theme | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 themes/ys.zsh-theme

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
new file mode 100644
index 000000000..81f7e03fa
--- /dev/null
+++ b/themes/ys.zsh-theme
@@ -0,0 +1,22 @@
+# Clean, simple, compatible and meaningful.
+# Tested on Linux, Unix and Windows.
+# It is recommanded to use with a dark background and the font Inconsolata.
+# Colors: black, red, green, yellow, *blue, magenta, cyan, and white.
+#
+# Oct 2012 ys
+
+function box_name {
+    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+}
+
+local current_dir='${PWD/#$HOME/~}'
+local git_info='$(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
+
+PROMPT="
+# %{$fg[green]%}%n%{$reset_color%} %{$fg[white]%}at%{$reset_color%} %{$fg[cyan]%}$(box_name)%{$reset_color%} %{$fg[white]%}in%{$reset_color%} %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}${git_info} %{$fg[white]%}[%*]%{$reset_color%}
+%{$fg[red]%}$ %{$reset_color%}"

From 300f94cb0e1121e7796edbedcbc6d686e755be5b Mon Sep 17 00:00:00 2001
From: Spencer Rinehart <anubis@overthemonkey.com>
Date: Tue, 12 Mar 2013 13:11:18 -0400
Subject: [PATCH 0187/1378] Use [ -nt ] instead of stat -f%m to check cache
 files.

---
 plugins/ant/ant.plugin.zsh       | 16 +++-------------
 plugins/cake/cake.plugin.zsh     | 11 ++++-------
 plugins/gradle/gradle.plugin.zsh | 19 +++----------------
 plugins/phing/phing.plugin.zsh   |  9 +++------
 4 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index 691d4d2db..45f2b06eb 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -1,17 +1,7 @@
-stat -f%m . > /dev/null 2>&1
-if [ "$?" = 0 ]; then
-	stat_cmd=(stat -f%m)
-else
-	stat_cmd=(stat -L --format=%Y)
-fi
-
 _ant_does_target_list_need_generating () {
-  if [ ! -f .ant_targets ]; then return 0;
-  else
-    accurate=$($stat_cmd .ant_targets)
-    changed=$($stat_cmd build.xml)
-    return $(expr $accurate '>=' $changed)
-  fi
+  [ ! -f .ant_targets ] && return 0;
+  [ .ant_targets -nt build.xml ] && return 0;
+  return 1;
 }
 
 _ant () {
diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
index 1d0d196ee..44cc47470 100644
--- a/plugins/cake/cake.plugin.zsh
+++ b/plugins/cake/cake.plugin.zsh
@@ -14,12 +14,9 @@ _cake_does_target_list_need_generating () {
 		return 1;
 	fi
 
-	if [ ! -f ${_cake_task_cache_file} ]; then return 0;
-	else
-		accurate=$(stat -f%m $_cake_task_cache_file)
-		changed=$(stat -f%m Cakefile)
-		return $(expr $accurate '>=' $changed)
-	fi
+	[ ! -f ${_cake_task_cache_file} ] && return 0;
+	[ ${_cake_task_cache_file} -nt Cakefile ] && return 0;
+	return 1;
 }
 
 _cake () {
@@ -33,4 +30,4 @@ _cake () {
 	fi
 }
 
-compdef _cake cake
\ No newline at end of file
+compdef _cake cake
diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index fc4c78c50..9229512f7 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -54,27 +54,14 @@ function in_gradle() {
     fi
 }
 
-############################################################################
-# Define the stat_cmd command based on platform behavior
-##########################################################################
-stat -f%m . > /dev/null 2>&1
-if [ "$?" = 0 ]; then
-	stat_cmd=(stat -f%m)
-else
-	stat_cmd=(stat -L --format=%Y)
-fi
-
 ############################################################################## Examine the build.gradle file to see if its
 # timestamp has changed, and if so, regen
 # the .gradle_tasks cache file
 ############################################################################
 _gradle_does_task_list_need_generating () {
-  if [ ! -f .gradletasknamecache ]; then return 0;
-  else
-    accurate=$($stat_cmd .gradletasknamecache)
-    changed=$($stat_cmd build.gradle)
-    return $(expr $accurate '>=' $changed)
-  fi
+  [ ! -f .gradletasknamecache ] && return 0;
+  [ .gradletasknamecache -nt build.gradle ] && return 0;
+  return 1;
 }
 
 
diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/phing.plugin.zsh
index 8f4adca08..1abf0a954 100644
--- a/plugins/phing/phing.plugin.zsh
+++ b/plugins/phing/phing.plugin.zsh
@@ -1,10 +1,7 @@
 _phing_does_target_list_need_generating () {
-  if [ ! -f .phing_targets ]; then return 0;
-  else
-    accurate=$(stat -f%m .phing_targets)
-    changed=$(stat -f%m build.xml)
-    return $(expr $accurate '>=' $changed)
-  fi
+  [ ! -f .phing_targets ] && return 0;
+  [ .phing_targets -nt build.xml ] && return 0;
+  return 1;
 }
 
 _phing () {

From bdf4f5a347789069dda438e64467344b551fff00 Mon Sep 17 00:00:00 2001
From: Spencer Rinehart <anubis@overthemonkey.com>
Date: Tue, 12 Mar 2013 13:15:05 -0400
Subject: [PATCH 0188/1378] Allow ":" and "-" characters in phing tasks.

Tasks that included hyphens or colons were being excluded from
completion.  This improves the usage for this.
---
 plugins/phing/phing.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/phing.plugin.zsh
index 1abf0a954..795f1db85 100644
--- a/plugins/phing/phing.plugin.zsh
+++ b/plugins/phing/phing.plugin.zsh
@@ -7,7 +7,7 @@ _phing_does_target_list_need_generating () {
 _phing () {
   if [ -f build.xml ]; then
     if _phing_does_target_list_need_generating; then
-      phing -l |grep -v ":" |grep -v "^$"|grep -v "\-" > .phing_targets
+      phing -l |grep -v ":$" |grep -v "^-*$" > .phing_targets
     fi
     compadd `cat .phing_targets`
   fi

From 4bf174c38b2b8ff9b000accf63155d9756c63a02 Mon Sep 17 00:00:00 2001
From: hacfi <philipp.wahala@gmail.com>
Date: Wed, 13 Mar 2013 04:06:16 +0100
Subject: [PATCH 0189/1378] Autocomplete composer default methods if
 composer.json is not available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This plugin currently doesn't autocomplete composer commands if there is no composer.json in the current dir. However, the commands create-project, init, search, selfupdate and show are still useful without a composer.json!
---
 plugins/composer/composer.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index c9b762d07..639677ba6 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -13,6 +13,8 @@ _composer_get_command_list () {
 _composer () {
   if [ -f composer.json ]; then
     compadd `_composer_get_command_list`
+  else
+    compadd create-project init search selfupdate show
   fi
 }
 
@@ -26,4 +28,4 @@ alias ci='composer install'
 alias ccp='composer create-project'
 
 # install composer in the current directory
-alias cget='curl -s https://getcomposer.org/installer | php'
\ No newline at end of file
+alias cget='curl -s https://getcomposer.org/installer | php'

From 55c6fd5c38ad47c2dfa27e6e1a0913d2aa594172 Mon Sep 17 00:00:00 2001
From: "y.s" <y.s.inside@gmail.com>
Date: Wed, 13 Mar 2013 15:55:35 +0800
Subject: [PATCH 0190/1378] opt: Optimize the color scheme. Add some basic
 comments.

---
 themes/ys.zsh-theme | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 81f7e03fa..3d316390e 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -1,22 +1,34 @@
 # Clean, simple, compatible and meaningful.
-# Tested on Linux, Unix and Windows.
-# It is recommanded to use with a dark background and the font Inconsolata.
+# Tested on Linux, Unix and Windows under ANSI colors.
+# It is recommended to use with a dark background and the font Inconsolata.
 # Colors: black, red, green, yellow, *blue, magenta, cyan, and white.
-#
-# Oct 2012 ys
+# 
+# http://ysmood.org/wp/2013/03/my-ys-terminal-theme/
+# Mar 2013 ys
 
+# Machine name.
 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 
+# Directory info.
 local current_dir='${PWD/#$HOME/~}'
-local git_info='$(git_prompt_info)'
 
+# Git info.
+local git_info='$(git_prompt_info)'
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
 
+# Prompt format: \n # USER at MACHINE in DIRECTORY on git:BRANCH STATE [TIME] \n $ 
 PROMPT="
-# %{$fg[green]%}%n%{$reset_color%} %{$fg[white]%}at%{$reset_color%} %{$fg[cyan]%}$(box_name)%{$reset_color%} %{$fg[white]%}in%{$reset_color%} %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}${git_info} %{$fg[white]%}[%*]%{$reset_color%}
-%{$fg[red]%}$ %{$reset_color%}"
+%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
+%{$fg[cyan]%}%n \
+%{$fg[white]%}at \
+%{$fg[green]%}$(box_name) \
+%{$fg[white]%}in \
+%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
+${git_info} \
+%{$fg[white]%}[%*]
+%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From 7903f5185622b3ead5608f170b5457121bda413a Mon Sep 17 00:00:00 2001
From: Max Riveiro <kavu13@gmail.com>
Date: Wed, 13 Mar 2013 12:36:48 +0400
Subject: [PATCH 0191/1378] Fix git dirty status in dallas.zsh-theme

---
 themes/dallas.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
index e9b4f852a..c9e335521 100644
--- a/themes/dallas.zsh-theme
+++ b/themes/dallas.zsh-theme
@@ -14,7 +14,7 @@ fi
 DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
 # Grab the current filepath, use shortcuts: ~/Desktop
 # Append the current git branch, if in a git repository: ~aw@master
-DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
+DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)"
 # Grab the current username: dallas
 DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
 # Use a % for normal users and a # for privelaged (root) users.

From 6c6072c492064abf613fc1b89b4d635020631ef4 Mon Sep 17 00:00:00 2001
From: Ashley Snowdon <ashley.snowdon@gmail.com>
Date: Wed, 13 Mar 2013 11:21:43 +0000
Subject: [PATCH 0192/1378] Modified to use full parameter as newer versions of
 base64 uses lowercase D

---
 plugins/encode64/encode64.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/encode64/encode64.plugin.zsh b/plugins/encode64/encode64.plugin.zsh
index 3b59447c5..4dbd1b453 100644
--- a/plugins/encode64/encode64.plugin.zsh
+++ b/plugins/encode64/encode64.plugin.zsh
@@ -1,4 +1,4 @@
 encode64(){ echo -n $1 | base64 }
-decode64(){ echo -n $1 | base64 -D }
+decode64(){ echo -n $1 | base64 --decode }
 alias e64=encode64
 alias d64=decode64

From ac6f1a045c5511cda60167ab978cf127c370d955 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Wed, 13 Mar 2013 13:07:32 -0400
Subject: [PATCH 0193/1378] Update to latest per-directory-history

---
 .../per-directory-history.zsh                 | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index d50009080..bdee341bd 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -1,27 +1,27 @@
 #!/usr/bin/env zsh
 #
-# This is a implementation of per directory history for zsh, some 
-# implementations of which exist in bash[1,2].  It also implements 
-# a per-directory-history-toggle-history function to change from using the 
-# directory history to using the global history.  In both cases the history is 
-# always saved to both the global history and the directory history, so the 
-# toggle state will not effect the saved histories.  Being able to switch 
-# between global and directory histories on the fly is a novel feature as far 
+# This is a implementation of per directory history for zsh, some
+# implementations of which exist in bash[1,2].  It also implements
+# a per-directory-history-toggle-history function to change from using the
+# directory history to using the global history.  In both cases the history is
+# always saved to both the global history and the directory history, so the
+# toggle state will not effect the saved histories.  Being able to switch
+# between global and directory histories on the fly is a novel feature as far
 # as I am aware.
 #
 #-------------------------------------------------------------------------------
 # Configuration
 #-------------------------------------------------------------------------------
 #
-# HISTORY_BASE a global variable that defines the base directory in which the 
+# HISTORY_BASE a global variable that defines the base directory in which the
 # directory histories are stored
 #
 #-------------------------------------------------------------------------------
 # History
 #-------------------------------------------------------------------------------
 #
-# The idea/inspiration for a per directory history is from Stewart MacArthur[1] 
-# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh 
+# The idea/inspiration for a per directory history is from Stewart MacArthur[1]
+# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh
 # mailing list[3].  The implementation is by Jim Hester in September 2012.
 #
 # [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
@@ -32,20 +32,20 @@
 #
 # Copyright (c) 2012 Jim Hester
 #
-# This software is provided 'as-is', without any express or implied warranty.  
-# In no event will the authors be held liable for any damages arising from the 
+# This software is provided 'as-is', without any express or implied warranty. 
+# In no event will the authors be held liable for any damages arising from the
 # use of this software.
 #
-# Permission is granted to anyone to use this software for any purpose, 
-# including commercial applications, and to alter it and redistribute it 
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
 # freely, subject to the following restrictions:
 #
-# 1. The origin of this software must not be misrepresented; you must not claim 
-# that you wrote the original software. If you use this software in a product, 
-# an acknowledgment in the product documentation would be appreciated but is 
+# 1. The origin of this software must not be misrepresented; you must not claim
+# that you wrote the original software. If you use this software in a product,
+# an acknowledgment in the product documentation would be appreciated but is
 # not required.
 #
-# 2. Altered source versions must be plainly marked as such, and must not be 
+# 2. Altered source versions must be plainly marked as such, and must not be
 # misrepresented as being the original software.
 #
 # 3. This notice may not be removed or altered from any source distribution..
@@ -99,7 +99,7 @@ function _per-directory-history-change-directory() {
     local original_histsize=$HISTSIZE
     HISTSIZE=0
     HISTSIZE=$original_histsize
-    
+
     #read history in new file
     if [[ -e $_per_directory_history_directory ]]; then
       fc -R $_per_directory_history_directory
@@ -108,8 +108,8 @@ function _per-directory-history-change-directory() {
 }
 
 function _per-directory-history-addhistory() {
-  print -sr -- ${1%%$'\n'}
-  fc -a -p $_per_directory_history_directory
+  print -Sr -- ${1%%$'\n'}
+  fc -p $_per_directory_history_directory
 }
 
 

From 56e835426bc895a191540d4d640b7750a81ff23a Mon Sep 17 00:00:00 2001
From: Philip Stark <git@codechaos.ch>
Date: Thu, 14 Mar 2013 00:31:14 +0100
Subject: [PATCH 0194/1378] fix git_prompt_status() to not say the repository
 has untracked files all the time

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 3e14695bd..5cbd819f8 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -62,7 +62,7 @@ function git_prompt_long_sha() {
 git_prompt_status() {
   INDEX=$(git status --porcelain -b 2> /dev/null)
   STATUS=""
-  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^\?\? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then

From 1cfd813f796e4472575daf4b51cd816bacc833e0 Mon Sep 17 00:00:00 2001
From: rylwin <ryan@thewinograds.com>
Date: Wed, 13 Mar 2013 22:48:28 -0500
Subject: [PATCH 0195/1378] last-working-dir: Use >! to overwrite $cache_file

Use ">!" to overwrite $cache_file in case noclobber is set.
When noclobber is set, zsh will not allow the use of ">" to overwrite
the contents of a file. Instead, it displays a "file exists" error.
By using ">!" instead, we tell zsh to overwrite the file without
complaining.
---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index 190bc279d..4903616e3 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -9,7 +9,8 @@ local cache_file="$ZSH/cache/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {
-	echo "$PWD" > "$cache_file"
+        # Use >! in case noclobber is set to avoid "file exists" error
+	echo "$PWD" >! "$cache_file"
 }
 
 # Changes directory to the last working directory.

From 4c8bba57acb0f64edde89321d5d6cbc3a5226cac Mon Sep 17 00:00:00 2001
From: Ryan Winograd <ryan@thewinograds.com>
Date: Wed, 13 Mar 2013 22:51:12 -0500
Subject: [PATCH 0196/1378] Fix whitespace

That's what I get for using GitHub text editor and not checking tabs.
---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index 4903616e3..ccf0f5b22 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -9,7 +9,7 @@ local cache_file="$ZSH/cache/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {
-        # Use >! in case noclobber is set to avoid "file exists" error
+  # Use >! in case noclobber is set to avoid "file exists" error
 	echo "$PWD" >! "$cache_file"
 }
 

From 3826c7bf85b0005438c872fedc7aa1b4174e82c9 Mon Sep 17 00:00:00 2001
From: Flavius Aspra <flavius.as@gmail.com>
Date: Fri, 15 Mar 2013 22:07:47 +0100
Subject: [PATCH 0197/1378] allow setting a custom HISTFILE before oh-my-zsh is
 loaded

---
 lib/history.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 876936b87..655945166 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -1,5 +1,7 @@
 ## Command history configuration
-HISTFILE=$HOME/.zsh_history
+if [ -z $HISTFILE ]; then
+    HISTFILE=$HOME/.zsh_history
+fi
 HISTSIZE=10000
 SAVEHIST=10000
 

From 2a1c9ff340401ca63efd846ed626903d72771c25 Mon Sep 17 00:00:00 2001
From: Marcel Wolf <marcel.wolf@gmail.com>
Date: Sat, 16 Mar 2013 00:06:46 -0400
Subject: [PATCH 0198/1378] add ssh-agent option to set default lifetime of
 identities

By default, ssh-agent stores identities forever. It has an option to
set a maximum lifetime for identites (useful to expire passphrase protected
keys). Allow this option to be set using:

zstyle :omz:plugins:ssh-agent lifetime <time>
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index c4e92a1fe..7468749f8 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -6,11 +6,17 @@
 #
 #     zstyle :omz:plugins:ssh-agent agent-forwarding on
 #
-#   To load multiple identies use the identities style, For
+#   To load multiple identities use the identities style, For
 #   example:
 #
 #     zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github
 #
+#   To set the maximum lifetime of the identities, use the
+#   lifetime style. The lifetime may be specified in seconds
+#   or as described in sshd_config(5) (see TIME FORMATS)
+#   If left unspecified, the default lifetime is forever.
+#
+#     zstyle :omz:plugins:ssh-agent lifetime 4h
 #
 # CREDITS
 #
@@ -27,15 +33,18 @@ local _plugin__forwarding
 function _plugin__start_agent()
 {
   local -a identities
+  local lifetime
+  zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
   # start ssh-agent and setup environment
-  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
+  /usr/bin/env ssh-agent ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
   chmod 600 ${_plugin__ssh_env}
   . ${_plugin__ssh_env} > /dev/null
 
   # load identies
   zstyle -a :omz:plugins:ssh-agent identities identities 
-  echo starting...
+  echo starting ssh-agent...
+
   /usr/bin/ssh-add $HOME/.ssh/${^identities}
 }
 

From f7f487c42666adfe7b94ebed4714ed212ed22cb9 Mon Sep 17 00:00:00 2001
From: Ben Marshall-Corser <benmarshallcorser@gmail.com>
Date: Sun, 17 Mar 2013 23:00:12 +0000
Subject: [PATCH 0199/1378] Alias for commit and commit all with amend

For the lazy and forgetful. Don't worry, a bang is fine in an alias and completion.

:tada:
---
 plugins/git/git.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 154aa6db1..15f901f86 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -14,8 +14,12 @@ gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
 compdef _git gc=git-commit
+alias gc!='git commit -v --amend'
+compdef _git gc!=git-commit
 alias gca='git commit -v -a'
-compdef _git gca=git-commit
+compdef _git gc=git-commit
+alias gca!='git commit -v -a --amend'
+compdef _git gca!=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gcm='git checkout master'

From 0ed1adeaadfc03a5abb767df5ad76a1ddd2d7c69 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 20 Mar 2013 16:57:32 +0100
Subject: [PATCH 0200/1378] Use --no-rehash option for faster startup

---
 plugins/rbenv/rbenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index fb9df4bdd..78f76c3a3 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -17,7 +17,7 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
     FOUND_RBENV=1
     export RBENV_ROOT=$rbenvdir
     export PATH=${rbenvdir}/bin:$PATH
-    eval "$(rbenv init - zsh)"
+    eval "$(rbenv init --no-rehash - zsh)"
 
     alias rubies="rbenv versions"
     alias gemsets="rbenv gemset list"

From 7c50867d2e71c911b5684c1613e1c1524f099c02 Mon Sep 17 00:00:00 2001
From: Bobby DeSimone <bobbydesimone@gmail.com>
Date: Wed, 20 Mar 2013 13:32:03 -0400
Subject: [PATCH 0201/1378] Added golang completion support from golang.org

---
 plugins/golang/golang.plugin.zsh | 150 +++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 plugins/golang/golang.plugin.zsh

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
new file mode 100644
index 000000000..e60c4afe4
--- /dev/null
+++ b/plugins/golang/golang.plugin.zsh
@@ -0,0 +1,150 @@
+# From : http://golang.org/misc/zsh/go?m=text
+# gc
+prefixes=(5 6 8)
+for p in $prefixes; do
+    compctl -g "*.${p}" ${p}l
+    compctl -g "*.go" ${p}g
+done
+
+# standard go tools
+compctl -g "*.go" gofmt
+
+# gccgo
+compctl -g "*.go" gccgo
+
+# go tool
+__go_tool_complete() {
+  typeset -a commands build_flags
+  commands+=(
+    'build[compile packages and dependencies]'
+    'clean[remove object files]'
+    'doc[run godoc on package sources]'
+    'fix[run go tool fix on packages]'
+    'fmt[run gofmt on package sources]'
+    'get[download and install packages and dependencies]'
+    'help[display help]'
+    'install[compile and install packages and dependencies]'
+    'list[list packages]'
+    'run[compile and run Go program]'
+    'test[test packages]'
+    'tool[run specified go tool]'
+    'version[print Go version]'
+    'vet[run go tool vet on packages]'
+  )
+  if (( CURRENT == 2 )); then
+    # explain go commands
+    _values 'go tool commands' ${commands[@]}
+    return
+  fi
+  build_flags=(
+    '-a[force reinstallation of packages that are already up-to-date]'
+    '-n[print the commands but do not run them]'
+    "-p[number of parallel builds]:number"
+    '-x[print the commands]'
+    "-work[print temporary directory name and keep it]"
+    "-gcflags[flags for 5g/6g/8g]:flags"
+    "-ldflags[flags for 5l/6l/8l]:flags"
+    "-gccgoflags[flags for gccgo]:flags"
+  )
+  __go_list() {
+      local expl importpaths
+      declare -a importpaths
+      importpaths=($(go list ${words[$CURRENT]}... 2>/dev/null))
+      _wanted importpaths expl 'import paths' compadd "$@" - "${importpaths[@]}"
+  }
+  case ${words[2]} in
+  clean|doc)
+      _arguments -s -w : '*:importpaths:__go_list'
+      ;;
+  fix|fmt|list|vet)
+      _alternative ':importpaths:__go_list' ':files:_path_files -g "*.go"'
+      ;;
+  install)
+      _arguments -s -w : ${build_flags[@]} \
+        "-v[show package names]" \
+    '*:importpaths:__go_list'
+      ;;
+  get)
+      _arguments -s -w : \
+        ${build_flags[@]}
+      ;;
+  build)
+      _arguments -s -w : \
+        ${build_flags[@]} \
+        "-v[show package names]" \
+        "-o[output file]:file:_files" \
+        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
+      ;;
+  test)
+      _arguments -s -w : \
+        ${build_flags[@]} \
+        "-c[do not run, compile the test binary]" \
+        "-i[do not run, install dependencies]" \
+        "-v[print test output]" \
+        "-x[print the commands]" \
+        "-short[use short mode]" \
+        "-parallel[number of parallel tests]:number" \
+        "-cpu[values of GOMAXPROCS to use]:number list" \
+        "-run[run tests and examples matching regexp]:regexp" \
+        "-bench[run benchmarks matching regexp]:regexp" \
+        "-benchtime[run each benchmark during n seconds]:duration" \
+        "-timeout[kill test after that duration]:duration" \
+        "-cpuprofile[write CPU profile to file]:file:_files" \
+        "-memprofile[write heap profile to file]:file:_files" \
+        "-memprofilerate[set heap profiling rate]:number" \
+        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
+      ;;
+  help)
+      _values "${commands[@]}" \
+        'gopath[GOPATH environment variable]' \
+        'importpath[description of import paths]' \
+        'remote[remote import path syntax]' \
+        'testflag[description of testing flags]' \
+        'testfunc[description of testing functions]'
+      ;;
+  run)
+      _arguments -s -w : \
+          ${build_flags[@]} \
+          '*:file:_path_files -g "*.go"'
+      ;;
+  tool)
+      if (( CURRENT == 3 )); then
+          _values "go tool" $(go tool)
+          return
+      fi
+      case ${words[3]} in
+      [568]g)
+          _arguments -s -w : \
+              '-I[search for packages in DIR]:includes:_path_files -/' \
+              '-L[show full path in file:line prints]' \
+              '-S[print the assembly language]' \
+              '-V[print the compiler version]' \
+              '-e[no limit on number of errors printed]' \
+              '-h[panic on an error]' \
+              '-l[disable inlining]' \
+              '-m[print optimization decisions]' \
+              '-o[file specify output file]:file' \
+              '-p[assumed import path for this code]:importpath' \
+              '-u[disable package unsafe]' \
+              "*:file:_files -g '*.go'"
+          ;;
+      [568]l)
+          local O=${words[3]%l}
+          _arguments -s -w : \
+              '-o[file specify output file]:file' \
+              '-L[search for packages in DIR]:includes:_path_files -/' \
+              "*:file:_files -g '*.[ao$O]'"
+          ;;
+      dist)
+          _values "dist tool" banner bootstrap clean env install version
+          ;;
+      *)
+          # use files by default
+          _files
+          ;;
+      esac
+      ;;
+  esac
+}
+
+compdef __go_tool_complete go
\ No newline at end of file

From c1c77685edbe0fcbb494b8e2c73fca6637193297 Mon Sep 17 00:00:00 2001
From: Serg Lifinsky <serg.lifinsky@gmail.com>
Date: Mon, 25 Mar 2013 16:47:22 +0200
Subject: [PATCH 0202/1378] Fix grails plugin

Fix problem with "basename" command error "extra operand" (do not work with array)
---
 plugins/grails/grails.plugin.zsh | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
index cc6f9c53b..11777738c 100755
--- a/plugins/grails/grails.plugin.zsh
+++ b/plugins/grails/grails.plugin.zsh
@@ -24,17 +24,23 @@ _enumerateGrailsScripts() {
         return
     fi
     
-    # - Strip the path
-    # - Remove all scripts with a leading '_'
-    # - PackagePlugin_.groovy -> PackagePlugin
-    # - PackagePlugin         -> Package-Plugin
-    # - Package-Plugin        -> package-plugin
-    basename $files                             \
-        | sed -E  -e 's/^_?([^_]+)_?.groovy/\1/'\
-                  -e 's/([a-z])([A-Z])/\1-\2/g' \
-        | tr "[:upper:]" "[:lower:]"            \
-        | sort                                  \
-        | uniq
+    scripts=()
+    for file in $files
+    do
+        # - Strip the path
+        # - Remove all scripts with a leading '_'
+        # - PackagePlugin_.groovy -> PackagePlugin
+        # - PackagePlugin         -> Package-Plugin
+        # - Package-Plugin        -> package-plugin
+        command=$(basename $file                              \
+            | sed -E  -e 's/^_?([^_]+)_?.groovy/\1/'\
+                      -e 's/([a-z])([A-Z])/\1-\2/g' \
+            | tr "[:upper:]" "[:lower:]"            \
+            | sort                                  \
+            | uniq)
+        scripts+=($command)
+    done
+    echo $scripts
 }
  
 _grails() {

From 2916ef719444040528ffd1a56d91bdd1fb1b5aa5 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Mon, 25 Mar 2013 18:57:55 +0200
Subject: [PATCH 0203/1378] Use new style of rails command.

---
 plugins/rails3/rails3.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 237d0594b..5ebaf32e3 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -4,7 +4,11 @@ function _rails_command () {
   if [ -e "script/server" ]; then
     ruby script/$@
   else
-    ruby script/rails $@
+    if [ -e "bin/rails" ]; then
+      bin/rails $@
+    else
+      rails $@
+    fi
   fi
 }
 

From 5128669a76a744883ad51df7682577e6654418e1 Mon Sep 17 00:00:00 2001
From: Yohann Bianchi <sbooob@gmail.com>
Date: Tue, 26 Mar 2013 09:57:11 +0100
Subject: [PATCH 0204/1378] IMPROVED: untracked file status has priority over
 modified (ie: if you have both modified and untracked files, your prompt will
 be red indicating the presence of untracked files)

---
 themes/agnoster.zsh-theme | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index e2074b713..75e095776 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -87,12 +87,11 @@ prompt_hg() {
 	local rev status
 	if $(hg id >/dev/null 2>&1); then
 		if $(hg prompt >/dev/null 2>&1); then
-			st=$(hg prompt {status})
-			if [[ $st = "?" ]]; then
+			if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
 				# if files are not added
 				prompt_segment red white
 				st='±'
-			elif [[ -n $st ]]; then
+			elif [[ -n $(hg prompt "{status|modified}") ]]; then
 				# if any modification
 				prompt_segment yellow black
 				st='±'

From a91872df35d15f0544339ae9c61f87e761c19827 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@jmatthews.us>
Date: Tue, 26 Mar 2013 19:41:34 +0000
Subject: [PATCH 0205/1378] Prefixing tmux wrapper function with '_'.

---
 plugins/tmux/tmux.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 6f0d5902a..ea6b4d26c 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -49,7 +49,7 @@ if which tmux &> /dev/null
 	fi
 
 	# Wrapper function for tmux.
-	function zsh_tmux_plugin_run()
+	function _zsh_tmux_plugin_run()
 	{
 		# We have other arguments, just run them
 		if [[ -n "$@" ]]
@@ -68,10 +68,10 @@ if which tmux &> /dev/null
 	}
 
 	# Use the completions for tmux for our function
-	compdef _tmux zsh_tmux_plugin_run
+	compdef _tmux _zsh_tmux_plugin_run
 
 	# Alias tmux to our wrapper function.
-	alias tmux=zsh_tmux_plugin_run
+	alias tmux=_zsh_tmux_plugin_run
 
 	# Autostart if not already in tmux and enabled.
 	if [[ ! -n "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" ]]
@@ -80,7 +80,7 @@ if which tmux &> /dev/null
 		if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]
 		then
 			export ZSH_TMUX_AUTOSTARTED=true
-			zsh_tmux_plugin_run
+			_zsh_tmux_plugin_run
 		fi
 	fi
 else

From 19ae0b576c4fd0c0c4af1a5c491df867fdce39a4 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@jmatthews.us>
Date: Tue, 26 Mar 2013 19:42:05 +0000
Subject: [PATCH 0206/1378] Exporting path to fixed config as a global
 variable.

This is done to fix compatibility with antigen.
To keep with convention, the variable has been renamed to be in all caps.
---
 plugins/tmux/tmux.plugin.zsh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index ea6b4d26c..465f5b053 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -35,17 +35,14 @@ if which tmux &> /dev/null
 		export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 	fi
 
-	# Local variable to store the local config file to use, if any.
-	local fixed_config=""
-
 	# Set the correct local config file to use.
 	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
 	then
 		#use this when they have a ~/.tmux.conf
-		fixed_config="$zsh_tmux_plugin_path/tmux.extra.conf"
+		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"
 	else
 		#use this when they don't have a ~/.tmux.conf
-		fixed_config="$zsh_tmux_plugin_path/tmux.only.conf"
+		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.only.conf"
 	fi
 
 	# Wrapper function for tmux.
@@ -58,11 +55,11 @@ if which tmux &> /dev/null
 		# Try to connect to an existing session.
 		elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
 		then
-			\tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`  new-session
+			\tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`  new-session
 			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 		# Just run tmux, fixing the TERM variable if requested.
 		else
-			\tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$fixed_config`
+			\tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`
 			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 		fi
 	}

From 295bac03297b3909712cdf68b3cc388d5b6feb5e Mon Sep 17 00:00:00 2001
From: Vladimir Zakharov <zakharov.vv@gmail.com>
Date: Wed, 27 Mar 2013 10:16:46 +0400
Subject: [PATCH 0207/1378] Mercurial: add alias for pull with rebasing

---
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 820e1aee9..30e4be5b5 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -9,6 +9,7 @@ alias hged='hg diffmerge'
 # pull and update
 alias hgi='hg incoming'
 alias hgl='hg pull -u'
+alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'

From c89afd2f6a7221152648c7c0e32879dfc98cad5b Mon Sep 17 00:00:00 2001
From: "Simeon F. Willbanks" <sfw@simeonfosterwillbanks.com>
Date: Tue, 11 Dec 2012 11:17:32 -0800
Subject: [PATCH 0208/1378] Fixes #1485 zeus should not be bundled

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 plugins/zeus/zeus.plugin.zsh       | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 10c221acd..bc21da134 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma zeus)
+bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
 
 ## Functions
 
diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index 1658b34d3..eddfb4f94 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -2,12 +2,6 @@
 # Zeus preloads your Rails environment and forks that process whenever
 # needed. This effectively speeds up Rails' boot process to under 1 sec.
 
-# Always use bundler.
-# Rails depends on bundler, so we can be pretty sure, that there are no
-# problems with this command. For all the other aliases I provided an
-# alternative, in case people have conflicts with other plugins (e.g. suse).
-alias zeus='bundle exec zeus'
-
 # Init
 alias zi='zeus init'
 alias zinit='zeus init'

From fc67399843f26d4f7851fa0b7727183f138bdfa2 Mon Sep 17 00:00:00 2001
From: lesmyrmidons <lesmyrmidons@gmail.com>
Date: Fri, 29 Mar 2013 13:35:35 +0100
Subject: [PATCH 0209/1378] Simplification name aliases and adding new alias

---
 plugins/symfony2/symfony2.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index cc9ffebc0..10406c5c0 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -14,6 +14,8 @@ compdef _symfony2 app/console
 compdef _symfony2 sf
 
 #Alias
-alias sf2='php app/console'
-alias sf2clear='php app/console cache:clear'
+alias sfc='php app/console'
+alias sfcl='php app/console cache:clear'
+alias sfcroute='php app/console router:debug'
+alias sfcgb='php app/console generate:bundle'
 

From 55da480da17701531daf6874e17cabf460c9a75a Mon Sep 17 00:00:00 2001
From: lesmyrmidons <lesmyrmidons@gmail.com>
Date: Fri, 29 Mar 2013 16:39:18 +0100
Subject: [PATCH 0210/1378] modify alias sfc => sf

---
 plugins/symfony2/symfony2.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 10406c5c0..45d6165aa 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -14,8 +14,8 @@ compdef _symfony2 app/console
 compdef _symfony2 sf
 
 #Alias
-alias sfc='php app/console'
+alias sf='php app/console'
 alias sfcl='php app/console cache:clear'
-alias sfcroute='php app/console router:debug'
-alias sfcgb='php app/console generate:bundle'
+alias sfroute='php app/console router:debug'
+alias sfgb='php app/console generate:bundle'
 

From af8d8df36cee517c55449e6aaeaa2f60a94ac9f8 Mon Sep 17 00:00:00 2001
From: KokaKiwi <admin@kokaelkiwi.eu>
Date: Sat, 30 Mar 2013 16:00:40 +0100
Subject: [PATCH 0211/1378] Add colored man plugin.

---
 plugins/colored-man/colored-man.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 plugins/colored-man/colored-man.plugin.zsh

diff --git a/plugins/colored-man/colored-man.plugin.zsh b/plugins/colored-man/colored-man.plugin.zsh
new file mode 100644
index 000000000..56056284a
--- /dev/null
+++ b/plugins/colored-man/colored-man.plugin.zsh
@@ -0,0 +1,11 @@
+man() {
+      env \
+      	  LESS_TERMCAP_mb=$(printf "\e[1;31m") \
+	  LESS_TERMCAP_md=$(printf "\e[1;31m") \
+	  LESS_TERMCAP_me=$(printf "\e[0m") \
+	  LESS_TERMCAP_se=$(printf "\e[0m") \
+	  LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
+	  LESS_TERMCAP_ue=$(printf "\e[0m") \
+	  LESS_TERMCAP_us=$(printf "\e[1;32m") \
+	  			   man "$@"
+}

From 3ad05df020f4ad672d99a325304a1c962991fd64 Mon Sep 17 00:00:00 2001
From: KokaKiwi <admin@kokaelkiwi.eu>
Date: Sat, 30 Mar 2013 16:01:31 +0100
Subject: [PATCH 0212/1378] Add 'kiwi' theme

---
 themes/kiwi.zsh-theme | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 themes/kiwi.zsh-theme

diff --git a/themes/kiwi.zsh-theme b/themes/kiwi.zsh-theme
new file mode 100644
index 000000000..f93de2b75
--- /dev/null
+++ b/themes/kiwi.zsh-theme
@@ -0,0 +1,12 @@
+# 
+# Kiwi ZSH Theme
+# 
+
+PROMPT='%{$fg_bold[green]%}┌[%{$fg_bold[cyan]%}kiwish-4.2%{$fg_bold[green]%}]-(%{$fg_bold[white]%}%2~%{$fg_bold[green]%})-$(git_prompt_info)$(svn_prompt_info)$(battery_pct_prompt)
+└> % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="[%{$reset_color%}%{$fg[white]%}git:%{$fg_bold[white]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[green]%}]-"
+
+ZSH_THEME_SVN_PROMPT_PREFIX="[%{$reset_color%}%{$fg[white]%}svn:%{$fg_bold[white]%}/"
+ZSH_THEME_SVN_PROMPT_SUFFIX="%{$fg_bold[green]%}]-"

From 8d6b7573e77abf2fb114579806e6e749bef5eca5 Mon Sep 17 00:00:00 2001
From: Rostislav Raykov <z@zbrox.org>
Date: Sun, 31 Mar 2013 15:49:51 +0200
Subject: [PATCH 0213/1378] Powify autocomplete

---
 plugins/powify/_powify | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 plugins/powify/_powify

diff --git a/plugins/powify/_powify b/plugins/powify/_powify
new file mode 100644
index 000000000..d23c46513
--- /dev/null
+++ b/plugins/powify/_powify
@@ -0,0 +1,55 @@
+#compdef powify
+
+_powify_all_servers() {
+  all_servers=(`ls $HOME/.pow/`)
+}
+
+local -a all_servers
+
+local -a _1st_arguments
+_1st_arguments=(
+  'server:server specific commands'
+  'utils:manage powify'
+  'create:creates a pow app from the current directory (to change the name append name as an argument)'
+  'destroy:destroys the pow app linked to the current directory'
+  'restart:restarts the pow app linked to the current directory'
+  'always_restart:reload the pow app after each request'
+  'always_restart_off:do not reload the pow app after each request'
+  'rename:rename the current pow app to [NAME] or renmae [OLD] to [NEW]'
+  'environment:run the this pow app in a different environment (aliased `env`)'
+  'browse:opens and navigates the default browser to this app'
+  'logs:tail the application logs'
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "powify command" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  server)
+    _values \
+      'install[install pow server]' \
+      'reinstall[reinstall pow server]' \
+      'update[update pow server]' \
+      'uninstall[uninstall pow server]' \
+      'list[list all pow apps]' \
+      'start[start the pow server]' \
+      'stop[stop the pow server]' \
+      'restart[restart the pow server]' \
+      'host[adds all pow apps to /etc/hosts file]' \
+      'unhost[removes all pow apps from /etc/hosts file]' \
+      'status[print the current server status]' \
+      'config[print the current server configuration]' \
+      'logs[tails the pow server logs]' ;;
+  utils)
+    _values \
+      'install[install powify.dev server management tool]' \
+      'reinstall[reinstall powify.dev server management tool]' \
+      'uninstall[uninstall powify.dev server management tool]' ;;
+  destroy|restart|always_restart|always_restart_off|rename|browse|logs)
+    _powify_all_servers
+    _wanted all_servers expl 'all pow servers' compadd -a all_servers ;;
+esac

From b7608bf32de06a546ae509f872bba44a46e10f0a Mon Sep 17 00:00:00 2001
From: Adam Krebs <amk528@cs.nyu.edu>
Date: Mon, 1 Apr 2013 00:26:39 -0400
Subject: [PATCH 0214/1378] add bower autocompletion

---
 plugins/bower/_bower | 58 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 plugins/bower/_bower

diff --git a/plugins/bower/_bower b/plugins/bower/_bower
new file mode 100644
index 000000000..1b582a55e
--- /dev/null
+++ b/plugins/bower/_bower
@@ -0,0 +1,58 @@
+
+
+# Credits to npm's. Awesome completion utility.
+#
+# Bower completion script, based on npm completion script.
+
+###-begin-bower-completion-###
+#
+# Installation: bower completion >> ~/.bashrc  (or ~/.zshrc)
+# Or, maybe: bower completion > /usr/local/etc/bash_completion.d/npm
+#
+
+COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
+COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
+export COMP_WORDBREAKS
+
+if type complete &>/dev/null; then
+  _bower_completion () {
+    local si="$IFS"
+    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \
+                           COMP_LINE="$COMP_LINE" \
+                           COMP_POINT="$COMP_POINT" \
+                           bower completion -- "${COMP_WORDS[@]}" \
+                           2>/dev/null)) || return $?
+    IFS="$si"
+  }
+  complete -F _bower_completion bower
+elif type compdef &>/dev/null; then
+  _bower_completion() {
+    si=$IFS
+    compadd -- $(COMP_CWORD=$((CURRENT-1)) \
+                 COMP_LINE=$BUFFER \
+                 COMP_POINT=0 \
+                 bower completion -- "${words[@]}" \
+                 2>/dev/null)
+    IFS=$si
+  }
+  compdef _bower_completion bower
+elif type compctl &>/dev/null; then
+  _bower_completion () {
+    local cword line point words si
+    read -Ac words
+    read -cn cword
+    let cword-=1
+    read -l line
+    read -ln point
+    si="$IFS"
+    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
+                       COMP_LINE="$line" \
+                       COMP_POINT="$point" \
+                       bower completion -- "${words[@]}" \
+                       2>/dev/null)) || return $?
+    IFS="$si"
+  }
+  compctl -K _bower_completion bower
+fi
+###-end-bower-completion-###
+

From f9722174f72f3eb184159e7c77751472cb73384e Mon Sep 17 00:00:00 2001
From: Adam Krebs <amk528@cs.nyu.edu>
Date: Mon, 1 Apr 2013 00:30:35 -0400
Subject: [PATCH 0215/1378] fix some references from npm --> bower.

---
 plugins/bower/_bower | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 plugins/bower/_bower

diff --git a/plugins/bower/_bower b/plugins/bower/_bower
old mode 100644
new mode 100755
index 1b582a55e..ae0ca4a4e
--- a/plugins/bower/_bower
+++ b/plugins/bower/_bower
@@ -1,13 +1,13 @@
 
 
-# Credits to npm's. Awesome completion utility.
+# Credits to npm's awesome completion utility.
 #
 # Bower completion script, based on npm completion script.
 
 ###-begin-bower-completion-###
 #
 # Installation: bower completion >> ~/.bashrc  (or ~/.zshrc)
-# Or, maybe: bower completion > /usr/local/etc/bash_completion.d/npm
+# Or, maybe: bower completion > /usr/local/etc/bash_completion.d/bower
 #
 
 COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}

From 5c1c536015ea3e87acc19653faf537c0fb22b7ba Mon Sep 17 00:00:00 2001
From: Ben Hartshorne <ben@parse.com>
Date: Mon, 1 Apr 2013 13:34:59 -0700
Subject: [PATCH 0216/1378] allowing you to override knife paths

---
 plugins/knife/_knife | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index dec491257..ca6347957 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -170,11 +170,13 @@ _chef_environments_remote() {
 
 # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server
 _chef_cookbooks_local() {
- local knife_rb="$HOME/.chef/knife.rb"
- if [ -f ./.chef/knife.rb ]; then
-  knife_rb="./.chef/knife.rb"
- fi
- (for i in $( grep cookbook_path $knife_rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done)
+  
+  local knife_rb=${KNIFE_CONF_PATH:-${HOME}/.chef/knife.rb}
+  if [ -f ./.chef/knife.rb ]; then
+    knife_rb="./.chef/knife.rb"
+  fi
+  local cookbook_path=${KNIFE_COOKBOOK_PATH:-$(grep cookbook_path $knife_rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' )}
+  (for i in $cookbook_path; do ls $i; done)
 }
 
 # This function extracts the available cookbook versions on the chef server

From 520b0132e943252409457b550b39d8821663da7a Mon Sep 17 00:00:00 2001
From: Ben Hartshorne <ben@parse.com>
Date: Mon, 1 Apr 2013 13:44:53 -0700
Subject: [PATCH 0217/1378] adding docs about knife path config variables

---
 plugins/knife/_knife | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index ca6347957..9f5b406af 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -1,5 +1,10 @@
 #compdef knife
 
+# You can override the path to knife.rb and your cookbooks by setting
+# KNIFE_CONF_PATH=/path/to/my/.chef/knife.rb
+# KNIFE_COOKBOOK_PATH=/path/to/my/chef/cookbooks
+# Read around where these are used for more detail.
+
 # These flags should be available everywhere according to man knife
 knife_general_flags=( --help --server-url --key --config --editor --format --log_level --logfile --no-editor --user --print-after --version --yes )
 

From f358f614149e4f25b53abe140e0d0b8bc46928d6 Mon Sep 17 00:00:00 2001
From: Nicolas Jeker <n.jeker@gmx.net>
Date: Tue, 2 Apr 2013 12:33:06 +0300
Subject: [PATCH 0218/1378] use hostname instead of hostname -s

hostname -s is not available on every implementation of hostname, e.g. Cygwin uses hostname from coreutils which doesn't work.
---
 themes/ys.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 3d316390e..43c101c2a 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -8,7 +8,7 @@
 
 # Machine name.
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+    [ -f ~/.box-name ] && cat ~/.box-name || hostname
 }
 
 # Directory info.

From 48c0f6c2941941815bcccbed1b329f98b13c43c0 Mon Sep 17 00:00:00 2001
From: Justin Clayton <justin@claytons.net>
Date: Tue, 2 Apr 2013 18:18:01 -0700
Subject: [PATCH 0219/1378] Update _vagrant

updated to match new vagrant 1.1.x command list
---
 plugins/vagrant/_vagrant | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 9bed1e3c6..9af8cb036 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -8,18 +8,19 @@ _1st_arguments=(
     'box:Box commands'
     'destroy:Destroys the vagrant environment'
     'halt:Halts the currently running vagrant environment'
-    'help:[TASK] Describe available tasks or one specific task'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
     'package:Packages a vagrant environment for distribution'
+    'plugin:Plugin commands'
     'provision:Run the provisioner'
     'reload:Reload the vagrant environment'
     'resume:Resumes a suspend vagrant environment'
     'ssh:SSH into the currently running environment'
-    'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
+    'ssh-config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
     'status:Shows the status of the current Vagrant environment.'
     'suspend:Suspends the currently running vagrant environment'
     'up:Creates the vagrant environment'
-    'version:Prints the Vagrant version information'
+    '--help:[TASK] Describe available tasks or one specific task'
+    '--version:Prints the Vagrant version information'
 )
 
 local -a _box_arguments

From 8e368c1222a9ccd9203c6f19eba9db61bf4c27f8 Mon Sep 17 00:00:00 2001
From: Tima Maslyuchenko <insside@gmail.com>
Date: Wed, 3 Apr 2013 16:43:22 +0300
Subject: [PATCH 0220/1378] added hub autocomplete instructions

---
 plugins/github/github.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 598b059c1..66a10cfdb 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,5 +1,22 @@
 # Setup hub function for git, if it is available; http://github.com/defunkt/hub
 if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then
+    # Autoload _git completion functions
+    if declare -f _git > /dev/null; then
+      _git
+    fi
+    
+    if declare -f _git_commands > /dev/null; then
+        _hub_commands=(
+            'alias:show shell instructions for wrapping git'
+            'pull-request:open a pull request on GitHub'
+            'fork:fork origin repo on GitHub'
+            'create:create new repo on GitHub for the current project'
+            'browse:browse the project on GitHub'
+            'compare:open GitHub compare view'
+        )
+        # Extend the '_git_commands' function with hub commands
+        eval "$(declare -f _git_commands | sed -e 's/base_commands=(/base_commands=(${_hub_commands} /')"
+    fi
     # eval `hub alias -s zsh`
     function git(){
         if ! (( $+_has_working_hub  )); then

From e4fb94306a91ea6b893ba0dad34ba8eb17c07f0a Mon Sep 17 00:00:00 2001
From: Marko Bauhardt <marko.bauhardt@googlemail.com>
Date: Wed, 3 Apr 2013 20:20:57 +0200
Subject: [PATCH 0221/1378] ohmyzsh plugin of the z project:
 https://github.com/rupa/z

---
 plugins/z/Makefile     |   4 +
 plugins/z/README       | 135 ++++++++++++++++++++++++
 plugins/z/z.1          | 155 ++++++++++++++++++++++++++++
 plugins/z/z.plugin.zsh |   6 ++
 plugins/z/z.sh         | 228 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 528 insertions(+)
 create mode 100644 plugins/z/Makefile
 create mode 100644 plugins/z/README
 create mode 100644 plugins/z/z.1
 create mode 100644 plugins/z/z.plugin.zsh
 create mode 100644 plugins/z/z.sh

diff --git a/plugins/z/Makefile b/plugins/z/Makefile
new file mode 100644
index 000000000..dcf433d40
--- /dev/null
+++ b/plugins/z/Makefile
@@ -0,0 +1,4 @@
+readme:
+	@groff -man -Tascii z.1 | col -bx
+
+.PHONY: readme
diff --git a/plugins/z/README b/plugins/z/README
new file mode 100644
index 000000000..ec5abc6f5
--- /dev/null
+++ b/plugins/z/README
@@ -0,0 +1,135 @@
+Z(1)                             User Commands                            Z(1)
+
+
+
+NAME
+       z - jump around
+
+SYNOPSIS
+       z [-chlrt] [regex1 regex2 ... regexn]
+
+AVAILABILITY
+       bash, zsh
+
+DESCRIPTION
+       Tracks your most used directories, based on 'frecency'.
+
+       After  a  short  learning  phase, z will take you to the most 'frecent'
+       directory that matches ALL of the regexes given on the command line.
+
+OPTIONS
+       -c     restrict matches to subdirectories of the current directory.
+
+       -h     show a brief help message
+
+       -l     list only
+
+       -r     match by rank only
+
+       -t     match by recent access only
+
+EXAMPLES
+       z foo         cd to most frecent dir matching foo
+
+       z foo bar     cd to most frecent dir matching foo and bar
+
+       z -r foo      cd to highest ranked dir matching foo
+
+       z -t foo      cd to most recently accessed dir matching foo
+
+       z -l foo      list all dirs matching foo (by frecency)
+
+NOTES
+   Installation:
+       Put something like this in your $HOME/.bashrc or $HOME/.zshrc:
+
+              . /path/to/z.sh
+
+       cd around for a while to build up the db.
+
+       PROFIT!!
+
+       Optionally:
+              Set $_Z_CMD to change the command name (default z).
+              Set $_Z_DATA to change the datafile (default $HOME/.z).
+              Set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
+              Set $_Z_NO_PROMPT_COMMAND to handle PROMPT_COMMAND/precmd  your-
+              self.
+              Set $_Z_EXCLUDE_DIRS to an array of directories to exclude.
+              (These  settings  should  go  in .bashrc/.zshrc before the lines
+              added above.)
+              Install   the   provided   man   page   z.1    somewhere    like
+              /usr/local/man/man1.
+
+   Aging:
+       The rank of directories maintained by z undergoes aging based on a sim-
+       ple formula. The rank of each entry is incremented  every  time  it  is
+       accessed.  When  the  sum  of ranks is greater than 6000, all ranks are
+       multiplied by 0.99. Entries with a rank lower than 1 are forgotten.
+
+   Frecency:
+       Frecency is a portmantaeu of 'recent' and 'frequency'. It is a weighted
+       rank  that  depends on how often and how recently something occured. As
+       far as I know, Mozilla came up with the term.
+
+       To z, a directory that has low ranking but has been  accessed  recently
+       will  quickly  have  higher rank than a directory accessed frequently a
+       long time ago.
+
+       Frecency is determined at runtime.
+
+   Common:
+       When multiple directories match all queries, and they all have a common
+       prefix, z will cd to the shortest matching directory, without regard to
+       priority.  This has been in effect, if  undocumented,  for  quite  some
+       time, but should probably be configurable or reconsidered.
+
+   Tab Completion:
+       z  supports tab completion. After any number of arguments, press TAB to
+       complete on directories that match each argument. Due to limitations of
+       the  completion  implementations,  only  the last argument will be com-
+       pleted in the shell.
+
+       Internally, z decides you've requested a completion if the  last  argu-
+       ment  passed  is  an  absolute  path to an existing directory. This may
+       cause unexpected behavior if the last argument to z begins with /.
+
+ENVIRONMENT
+       A function _z() is defined.
+
+       The contents of the variable $_Z_CMD is aliased to _z 2>&1. If not set,
+       $_Z_CMD defaults to z.
+
+       The  environment  variable $_Z_DATA can be used to control the datafile
+       location. If it is not defined, the location defaults to $HOME/.z.
+
+       The environment variable $_Z_NO_RESOLVE_SYMLINKS can be set to  prevent
+       resolving  of  symlinks.  If  it  is  not  set,  symbolic links will be
+       resolved when added to the datafile.
+
+       In bash, z prepends a command to the PROMPT_COMMAND  environment  vari-
+       able  to  maintain its database. In zsh, z appends a function _z_precmd
+       to the precmd_functions array.
+
+       The environment variable $_Z_NO_PROMPT_COMMAND can be set if  you  want
+       to handle PROMPT_COMMAND or precmd yourself.
+
+       The  environment  variable  $_Z_EXCLUDE_DIRS  can be set to an array of
+       directories to exclude from tracking. $HOME is always excluded.  Direc-
+       tories must be full paths without trailing slashes.
+
+FILES
+       Data  is  stored  in  $HOME/.z.  This  can be overridden by setting the
+       $_Z_DATA environment variable. When initialized, z will raise an  error
+       if this path is a directory, and not function correctly.
+
+       A man page (z.1) is provided.
+
+SEE ALSO
+       regex(7), pushd, popd, autojump, cdargs
+
+       Please file bugs at https://github.com/rupa/z/
+
+
+
+z                                January 2013                             Z(1)
diff --git a/plugins/z/z.1 b/plugins/z/z.1
new file mode 100644
index 000000000..022a4b35d
--- /dev/null
+++ b/plugins/z/z.1
@@ -0,0 +1,155 @@
+.TH "Z" "1" "January 2013" "z" "User Commands"
+.SH
+NAME
+z \- jump around
+.SH
+SYNOPSIS
+z [\-chlrt] [regex1 regex2 ... regexn]
+.SH
+AVAILABILITY
+bash, zsh
+.SH
+DESCRIPTION
+Tracks your most used directories, based on 'frecency'.
+.P
+After a short learning phase, \fBz\fR will take you to the most 'frecent'
+directory that matches ALL of the regexes given on the command line.
+.SH
+OPTIONS
+.TP
+\fB\-c\fR
+restrict matches to subdirectories of the current directory.
+.TP
+\fB\-h\fR
+show a brief help message
+.TP
+\fB\-l\fR
+list only
+.TP
+\fB\-r\fR
+match by rank only
+.TP
+\fB\-t\fR
+match by recent access only
+.SH EXAMPLES
+.TP 14
+\fBz foo\fR
+cd to most frecent dir matching foo
+.TP 14
+\fBz foo bar\fR
+cd to most frecent dir matching foo and bar
+.TP 14
+\fBz -r foo\fR
+cd to highest ranked dir matching foo
+.TP 14
+\fBz -t foo\fR
+cd to most recently accessed dir matching foo
+.TP 14
+\fBz -l foo\fR
+list all dirs matching foo (by frecency)
+.SH
+NOTES
+.SS
+Installation:
+.P
+Put something like this in your \fB$HOME/.bashrc\fR or \fB$HOME/.zshrc\fR:
+.RS
+.P
+\fB. /path/to/z.sh\fR
+.RE
+.P
+\fBcd\fR around for a while to build up the db.
+.P
+PROFIT!!
+.P
+Optionally:
+.RS
+Set \fB$_Z_CMD\fR to change the command name (default \fBz\fR).
+.RE
+.RS
+Set \fB$_Z_DATA\fR to change the datafile (default \fB$HOME/.z\fR).
+.RE
+.RS
+Set \fB$_Z_NO_RESOLVE_SYMLINKS\fR to prevent symlink resolution.
+.RE
+.RS
+Set \fB$_Z_NO_PROMPT_COMMAND\fR to handle \fBPROMPT_COMMAND/precmd\fR yourself.
+.RE
+.RS
+Set \fB$_Z_EXCLUDE_DIRS\fR to an array of directories to exclude.
+.RE
+.RS
+(These settings should go in .bashrc/.zshrc before the lines added above.)
+.RE
+.RS
+Install the provided man page \fBz.1\fR somewhere like \fB/usr/local/man/man1\fR.
+.RE
+.SS
+Aging:
+The rank of directories maintained by \fBz\fR undergoes aging based on a simple
+formula. The rank of each entry is incremented every time it is accessed. When
+the sum of ranks is greater than 6000, all ranks are multiplied by 0.99. Entries
+with a rank lower than 1 are forgotten.
+.SS
+Frecency:
+Frecency is a portmantaeu of 'recent' and 'frequency'. It is a weighted rank
+that depends on how often and how recently something occured. As far as I
+know, Mozilla came up with the term.
+.P
+To \fBz\fR, a directory that has low ranking but has been accessed recently
+will quickly have higher rank than a directory accessed frequently a long time
+ago.
+.P
+Frecency is determined at runtime.
+.SS
+Common:
+When multiple directories match all queries, and they all have a common prefix,
+\fBz\fR will cd to the shortest matching directory, without regard to priority.
+This has been in effect, if undocumented, for quite some time, but should
+probably be configurable or reconsidered.
+.SS
+Tab Completion:
+\fBz\fR supports tab completion. After any number of arguments, press TAB to
+complete on directories that match each argument. Due to limitations of the
+completion implementations, only the last argument will be completed in the
+shell.
+.P
+Internally, \fBz\fR decides you've requested a completion if the last argument
+passed is an absolute path to an existing directory. This may cause unexpected
+behavior if the last argument to \fBz\fR begins with \fB/\fR.
+.SH
+ENVIRONMENT
+A function \fB_z()\fR is defined.
+.P
+The contents of the variable \fB$_Z_CMD\fR is aliased to \fB_z 2>&1\fR. If not
+set, \fB$_Z_CMD\fR defaults to \fBz\fR.
+.P
+The environment variable \fB$_Z_DATA\fR can be used to control the datafile
+location. If it is not defined, the location defaults to \fB$HOME/.z\fR.
+.P
+The environment variable \fB$_Z_NO_RESOLVE_SYMLINKS\fR can be set to prevent
+resolving of symlinks. If it is not set, symbolic links will be resolved when
+added to the datafile.
+.P
+In bash, \fBz\fR prepends a command to the \fBPROMPT_COMMAND\fR environment
+variable to maintain its database. In zsh, \fBz\fR appends a function
+\fB_z_precmd\fR to the \fBprecmd_functions\fR array.
+.P
+The environment variable \fB$_Z_NO_PROMPT_COMMAND\fR can be set if you want to
+handle \fBPROMPT_COMMAND\fR or \fBprecmd\fR yourself.
+.P
+The environment variable \fB$_Z_EXCLUDE_DIRS\fR can be set to an array of
+directories to exclude from tracking. \fB$HOME\fR is always excluded.
+Directories must be full paths without trailing slashes.
+.SH
+FILES
+Data is stored in \fB$HOME/.z\fR. This can be overridden by setting the
+\fB$_Z_DATA\fR environment variable. When initialized, \fBz\fR will raise an
+error if this path is a directory, and not function correctly.
+.P
+A man page (\fBz.1\fR) is provided.
+.SH
+SEE ALSO
+regex(7), pushd, popd, autojump, cdargs
+.P
+Please file bugs at https://github.com/rupa/z/
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/z.plugin.zsh
new file mode 100644
index 000000000..196b88b12
--- /dev/null
+++ b/plugins/z/z.plugin.zsh
@@ -0,0 +1,6 @@
+_load_z() {
+  source $1/z.sh
+}
+
+[[ -f $ZSH_CUSTOM/plugins/z/z.plugin.zsh ]] && _load_z $ZSH_CUSTOM/plugins/z
+[[ -f $ZSH/plugins/z/z.plugin.zsh ]] && _load_z $ZSH/plugins/z
diff --git a/plugins/z/z.sh b/plugins/z/z.sh
new file mode 100644
index 000000000..7e444ef46
--- /dev/null
+++ b/plugins/z/z.sh
@@ -0,0 +1,228 @@
+# Copyright (c) 2009 rupa deadwyler under the WTFPL license
+
+# maintains a jump-list of the directories you actually use
+#
+# INSTALL:
+#   * put something like this in your .bashrc/.zshrc:
+#     . /path/to/z.sh
+#   * cd around for a while to build up the db
+#   * PROFIT!!
+#   * optionally:
+#     set $_Z_CMD in .bashrc/.zshrc to change the command (default z).
+#     set $_Z_DATA in .bashrc/.zshrc to change the datafile (default ~/.z).
+#     set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
+#     set $_Z_NO_PROMPT_COMMAND if you're handling PROMPT_COMMAND yourself.
+#     set $_Z_EXCLUDE_DIRS to an array of directories to exclude.
+#
+# USE:
+#   * z foo     # cd to most frecent dir matching foo
+#   * z foo bar # cd to most frecent dir matching foo and bar
+#   * z -r foo  # cd to highest ranked dir matching foo
+#   * z -t foo  # cd to most recently accessed dir matching foo
+#   * z -l foo  # list matches instead of cd
+#   * z -c foo  # restrict matches to subdirs of $PWD
+
+case $- in
+ *i*) ;;
+   *) echo 'ERROR: z.sh is meant to be sourced, not directly executed.'
+esac
+
+[ -d "${_Z_DATA:-$HOME/.z}" ] && {
+    echo "ERROR: z.sh's datafile (${_Z_DATA:-$HOME/.z}) is a directory."
+}
+
+_z() {
+
+ local datafile="${_Z_DATA:-$HOME/.z}"
+
+ # bail out if we don't own ~/.z (we're another user but our ENV is still set)
+ [ -f "$datafile" -a ! -O "$datafile" ] && return
+
+ # add entries
+ if [ "$1" = "--add" ]; then
+  shift
+
+  # $HOME isn't worth matching
+  [ "$*" = "$HOME" ] && return
+
+  # don't track excluded dirs
+  local exclude
+  for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
+   [ "$*" = "$exclude" ] && return
+  done
+
+  # maintain the file
+  local tempfile
+  tempfile="$(mktemp "$datafile.XXXXXX")" || return
+  while read line; do
+   [ -d "${line%%\|*}" ] && echo $line
+  done < "$datafile" | awk -v path="$*" -v now="$(date +%s)" -F"|" '
+   BEGIN {
+    rank[path] = 1
+    time[path] = now
+   }
+   $2 >= 1 {
+    if( $1 == path ) {
+     rank[$1] = $2 + 1
+     time[$1] = now
+    } else {
+     rank[$1] = $2
+     time[$1] = $3
+    }
+    count += $2
+   }
+   END {
+    if( count > 6000 ) {
+     for( i in rank ) print i "|" 0.99*rank[i] "|" time[i] # aging
+    } else for( i in rank ) print i "|" rank[i] "|" time[i]
+   }
+  ' 2>/dev/null >| "$tempfile"
+  if [ $? -ne 0 -a -f "$datafile" ]; then
+   env rm -f "$tempfile"
+  else
+   env mv -f "$tempfile" "$datafile"
+  fi
+
+ # tab completion
+ elif [ "$1" = "--complete" ]; then
+  while read line; do
+   [ -d "${line%%\|*}" ] && echo $line
+  done < "$datafile" | awk -v q="$2" -F"|" '
+   BEGIN {
+    if( q == tolower(q) ) nocase = 1
+    split(substr(q,3),fnd," ")
+   }
+   {
+    if( nocase ) {
+     for( i in fnd ) tolower($1) !~ tolower(fnd[i]) && $1 = ""
+    } else {
+     for( i in fnd ) $1 !~ fnd[i] && $1 = ""
+    }
+    if( $1 ) print $1
+   }
+  ' 2>/dev/null
+
+ else
+  # list/go
+  while [ "$1" ]; do case "$1" in
+   --) while [ "$1" ]; do shift; local fnd="$fnd $1";done;;
+   -*) local opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
+        c) local fnd="^$PWD $fnd";;
+        h) echo "${_Z_CMD:-z} [-chlrt] args" >&2; return;;
+        l) local list=1;;
+        r) local typ="rank";;
+        t) local typ="recent";;
+       esac; opt=${opt:1}; done;;
+    *) local fnd="$fnd $1";;
+  esac; local last=$1; shift; done
+  [ "$fnd" -a "$fnd" != "^$PWD " ] || local list=1
+
+  # if we hit enter on a completion just go there
+  case "$last" in
+   # completions will always start with /
+   /*) [ -z "$list" -a -d "$last" ] && cd "$last" && return;;
+  esac
+
+  # no file yet
+  [ -f "$datafile" ] || return
+
+  local cd
+  cd="$(while read line; do
+   [ -d "${line%%\|*}" ] && echo $line
+  done < "$datafile" | awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
+   function frecent(rank, time) {
+    dx = t-time
+    if( dx < 3600 ) return rank*4
+    if( dx < 86400 ) return rank*2
+    if( dx < 604800 ) return rank/2
+    return rank/4
+   }
+   function output(files, toopen, override) {
+    if( list ) {
+     cmd = "sort -n >&2"
+     for( i in files ) if( files[i] ) printf "%-10s %s\n", files[i], i | cmd
+     if( override ) printf "%-10s %s\n", "common:", override > "/dev/stderr"
+    } else {
+     if( override ) toopen = override
+     print toopen
+    }
+   }
+   function common(matches) {
+    # shortest match
+    for( i in matches ) {
+     if( matches[i] && (!short || length(i) < length(short)) ) short = i
+    }
+    if( short == "/" ) return
+    # shortest match must be common to each match. escape special characters in
+    # a copy when testing, so we can return the original.
+    clean_short = short
+    gsub(/[\(\)\[\]\|]/, "\\\\&", clean_short)
+    for( i in matches ) if( matches[i] && i !~ clean_short ) return
+    return short
+   }
+   BEGIN { split(q, a, " "); oldf = noldf = -9999999999 }
+   {
+    if( typ == "rank" ) {
+     f = $2
+    } else if( typ == "recent" ) {
+     f = $3-t
+    } else f = frecent($2, $3)
+    wcase[$1] = nocase[$1] = f
+    for( i in a ) {
+     if( $1 !~ a[i] ) delete wcase[$1]
+     if( tolower($1) !~ tolower(a[i]) ) delete nocase[$1]
+    }
+    if( wcase[$1] && wcase[$1] > oldf ) {
+     cx = $1
+     oldf = wcase[$1]
+    } else if( nocase[$1] && nocase[$1] > noldf ) {
+     ncx = $1
+     noldf = nocase[$1]
+    }
+   }
+   END {
+    if( cx ) {
+     output(wcase, cx, common(wcase))
+    } else if( ncx ) output(nocase, ncx, common(nocase))
+   }
+  ')"
+  [ $? -gt 0 ] && return
+  [ "$cd" ] && cd "$cd"
+ fi
+}
+
+alias ${_Z_CMD:-z}='_z 2>&1'
+
+[ "$_Z_NO_RESOLVE_SYMLINKS" ] || _Z_RESOLVE_SYMLINKS="-P"
+
+if compctl &> /dev/null; then
+ [ "$_Z_NO_PROMPT_COMMAND" ] || {
+  # zsh populate directory list, avoid clobbering any other precmds
+  if [ "$_Z_NO_RESOLVE_SYMLINKS" ]; then
+    _z_precmd() {
+      _z --add "${PWD:a}"
+    }
+  else
+    _z_precmd() {
+      _z --add "${PWD:A}"
+    }
+  fi
+  precmd_functions+=(_z_precmd)
+ }
+ # zsh tab completion
+ _z_zsh_tab_completion() {
+  local compl
+  read -l compl
+  reply=(${(f)"$(_z --complete "$compl")"})
+ }
+ compctl -U -K _z_zsh_tab_completion _z
+elif complete &> /dev/null; then
+ # bash tab completion
+ complete -o filenames -C '_z --complete "$COMP_LINE"' ${_Z_CMD:-z}
+ [ "$_Z_NO_PROMPT_COMMAND" ] || {
+  # bash populate directory list. avoid clobbering other PROMPT_COMMANDs.
+  echo $PROMPT_COMMAND | grep -q "_z --add" || {
+   PROMPT_COMMAND='_z --add "$(pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null;'"$PROMPT_COMMAND"
+  }
+ }
+fi

From 889045068465c3aac25b212b80b07f3f1755d937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <choltje@us.ibm.com>
Date: Wed, 3 Apr 2013 20:41:05 -0400
Subject: [PATCH 0222/1378] This fixes checking for git untracked items

The grep expression was incorrect for normal grep. Adding
the `-E` option fixed the escaping of the question marks.
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 67075248e..98c00bd8a 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -62,7 +62,7 @@ function git_prompt_long_sha() {
 git_prompt_status() {
   INDEX=$(git status --porcelain -b 2> /dev/null)
   STATUS=""
-  if $(echo "$INDEX" | grep '^\?\? ' &> /dev/null); then
+  if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then

From 0707bfce5386eb7ad83e6ad8d0b09358916eeb64 Mon Sep 17 00:00:00 2001
From: Sergio Rafael Gianazza <sgianazza@gmail.com>
Date: Thu, 4 Apr 2013 16:18:48 -0300
Subject: [PATCH 0223/1378] New theme: Gianu Theme

I created a theme that I feel confortable with and want to share with
everyone.

The prompt format is: <user>@<host> <current_dir> (<git_status>)$
---
 themes/gianu.zsh-theme | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 themes/gianu.zsh-theme

diff --git a/themes/gianu.zsh-theme b/themes/gianu.zsh-theme
new file mode 100644
index 000000000..2eb4520ce
--- /dev/null
+++ b/themes/gianu.zsh-theme
@@ -0,0 +1,11 @@
+# Oh-my-Zsh prompt created by gianu
+#
+# github.com/gianu
+# sgianazza@gmail.com
+
+PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} %{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}]$ '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"

From c8423eb6d7149b9e73a94f4bf0c754771e27530a Mon Sep 17 00:00:00 2001
From: Sergio Rafael Gianazza <sgianazza@gmail.com>
Date: Thu, 4 Apr 2013 18:11:37 -0300
Subject: [PATCH 0224/1378] Removed colors from parenthesis.

---
 themes/gianu.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/gianu.zsh-theme b/themes/gianu.zsh-theme
index 2eb4520ce..c7fe40665 100644
--- a/themes/gianu.zsh-theme
+++ b/themes/gianu.zsh-theme
@@ -3,9 +3,9 @@
 # github.com/gianu
 # sgianazza@gmail.com
 
-PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} %{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}]$ '
+PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)%{$reset_color%}]$ '
 
-ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
+ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg_bold[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}"

From d55262b6a1ac614b35603885f0759015dc9f59dd Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Sun, 7 Apr 2013 20:58:55 +0800
Subject: [PATCH 0225/1378] Added $PATH to PATH in install shell

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 41f83e354..a2bd5665a 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -21,7 +21,7 @@ echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
-echo "export PATH=$PATH" >> ~/.zshrc
+echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
 
 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
 chsh -s `which zsh`

From 6271941a919858a05e9abec120db90ca0c131153 Mon Sep 17 00:00:00 2001
From: dsx <dsx@droidnest.org>
Date: Sun, 7 Apr 2013 09:12:30 -0400
Subject: [PATCH 0226/1378] Prevents echo of _sublime_darwin_paths contents

---
 plugins/sublime/sublime.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index bfbc45a07..7a5ada337 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,6 +1,6 @@
 # Sublime Text 2 Aliases
 
-local _sublime_darwin_paths
+local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
 	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"

From fc785de97b7ed1438b4d0e46d29079fb97a55338 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Sun, 7 Apr 2013 17:18:39 -0700
Subject: [PATCH 0227/1378] +safe-paste plugin

---
 plugins/safe-paste/safe-paste.plugin.zsh | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 plugins/safe-paste/safe-paste.plugin.zsh

diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
new file mode 100644
index 000000000..0aa97965f
--- /dev/null
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -0,0 +1,54 @@
+# Code from Mikael Magnusson: http://www.zsh.org/mla/users/2011/msg00367.html
+#
+# Requires xterm, urxvt, iTerm2 or any other terminal that supports bracketed
+# paste mode as documented: http://www.xfree86.org/current/ctlseqs.html
+
+# create a new keymap to use while pasting
+bindkey -N paste
+# make everything in this keymap call our custom widget
+bindkey -R -M paste "^@"-"\M-^?" paste-insert
+# these are the codes sent around the pasted text in bracketed
+# paste mode.
+# do the first one with both -M viins and -M vicmd in vi mode
+bindkey '^[[200~' _start_paste
+bindkey -M paste '^[[201~' _end_paste
+# insert newlines rather than carriage returns when pasting newlines
+bindkey -M paste -s '^M' '^J'
+
+zle -N _start_paste
+zle -N _end_paste
+zle -N zle-line-init _zle_line_init
+zle -N zle-line-finish _zle_line_finish
+zle -N paste-insert _paste_insert
+
+# switch the active keymap to paste mode
+function _start_paste() {
+  bindkey -A paste main
+}
+
+# go back to our normal keymap, and insert all the pasted text in the
+# command line. this has the nice effect of making the whole paste be
+# a single undo/redo event.
+function _end_paste() {
+#use bindkey -v here with vi mode probably. maybe you want to track
+#if you were in ins or cmd mode and restore the right one.
+  bindkey -e
+  LBUFFER+=$_paste_content
+  unset _paste_content
+}
+
+function _paste_insert() {
+  _paste_content+=$KEYS
+}
+
+function _zle_line_init() {
+  # Tell terminal to send escape codes around pastes.
+  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004h'
+}
+
+function _zle_line_finish() {
+  # Tell it to stop when we leave zle, so pasting in other programs
+  # doesn't get the ^[[200~ codes around the pasted text.
+  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004l'
+}
+

From b2421cc73fe4c531c5d8a699124a3ef62bb327bd Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 7 Apr 2013 19:26:40 -0700
Subject: [PATCH 0228/1378] 005d967dc4e879f304607a706ccd18886e630dc1

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 689a79fef..5b8e63e73 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,7 +1,7 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  /usr/bin/env ZSH=$ZSH zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh

From 9af229539467adf010c1f81c0ac4f03dc9bc9542 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 8 Apr 2013 09:38:15 +0200
Subject: [PATCH 0229/1378] Add emoji-clock plugin

which displays the current time with half hour accuracy as an emoji
symbol, for example in the shell prompt.
---
 plugins/emoji-clock/emoji-clock.plugin.zsh | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/emoji-clock/emoji-clock.plugin.zsh

diff --git a/plugins/emoji-clock/emoji-clock.plugin.zsh b/plugins/emoji-clock/emoji-clock.plugin.zsh
new file mode 100644
index 000000000..7351a02ec
--- /dev/null
+++ b/plugins/emoji-clock/emoji-clock.plugin.zsh
@@ -0,0 +1,29 @@
+# ------------------------------------------------------------------------------
+#          FILE: emoji-clock.plugin.zsh
+#   DESCRIPTION: The current time with half hour accuracy as an emoji symbol.
+#                Inspired by Andre Torrez' "Put A Burger In Your Shell"
+#                http://notes.torrez.org/2013/04/put-a-burger-in-your-shell.html
+#        AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
+#       VERSION: 1.0.0
+# -----------------------------------------------------------------------------
+
+function emoji-clock() {
+  hour=$(date '+%I')
+  minutes=$(date '+%M')
+  case $hour in
+    01) clock="🕐"; [ $minutes -ge 30 ] && clock="🕜";;
+    02) clock="🕑"; [ $minutes -ge 30 ] && clock="🕝";;
+    03) clock="🕒"; [ $minutes -ge 30 ] && clock="🕞";;
+    04) clock="🕓"; [ $minutes -ge 30 ] && clock="🕟";;
+    05) clock="🕔"; [ $minutes -ge 30 ] && clock="🕠";;
+    06) clock="🕕"; [ $minutes -ge 30 ] && clock="🕡";;
+    07) clock="🕖"; [ $minutes -ge 30 ] && clock="🕢";;
+    08) clock="🕗"; [ $minutes -ge 30 ] && clock="🕣";;
+    09) clock="🕘"; [ $minutes -ge 30 ] && clock="🕤";;
+    10) clock="🕙"; [ $minutes -ge 30 ] && clock="🕥";;
+    11) clock="🕚"; [ $minutes -ge 30 ] && clock="🕦";;
+    12) clock="🕛"; [ $minutes -ge 30 ] && clock="🕧";;
+     *) clock="⌛";;
+  esac
+  echo $clock
+}

From 58a6ed1eac57d3faf082070c21bc9770da90a044 Mon Sep 17 00:00:00 2001
From: Bercio <lorenzo233@gmail.com>
Date: Mon, 8 Apr 2013 18:45:45 +0800
Subject: [PATCH 0230/1378] "$PWD" = "PWD", >! doesn't work, echo is redundant.
 Fixed all.

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index ccf0f5b22..bc36c80db 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -9,8 +9,8 @@ local cache_file="$ZSH/cache/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {
-  # Use >! in case noclobber is set to avoid "file exists" error
-	echo "$PWD" >! "$cache_file"
+  # Use >| in case noclobber is set to avoid "file exists" error
+	pwd >| "$cache_file"
 }
 
 # Changes directory to the last working directory.

From 6b6208e1416b5eb5aa5a032139d4b61f8939386b Mon Sep 17 00:00:00 2001
From: Bercio <lorenzo233@gmail.com>
Date: Mon, 8 Apr 2013 19:02:48 +0800
Subject: [PATCH 0231/1378] >! doesn't work with no clobber, echo is redundant.
 Fixed all.

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index ccf0f5b22..bc36c80db 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -9,8 +9,8 @@ local cache_file="$ZSH/cache/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {
-  # Use >! in case noclobber is set to avoid "file exists" error
-	echo "$PWD" >! "$cache_file"
+  # Use >| in case noclobber is set to avoid "file exists" error
+	pwd >| "$cache_file"
 }
 
 # Changes directory to the last working directory.

From 9c6b88607e8f2898ba3bc83fdf5cce616c6aec83 Mon Sep 17 00:00:00 2001
From: Marko Bauhardt <marko.bauhardt@googlemail.com>
Date: Mon, 8 Apr 2013 22:11:22 +0200
Subject: [PATCH 0232/1378] a plugin (function) which copies the current
 directory into the clipboard

---
 plugins/copydir/copydir.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 plugins/copydir/copydir.plugin.zsh

diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
new file mode 100644
index 000000000..37bb5e086
--- /dev/null
+++ b/plugins/copydir/copydir.plugin.zsh
@@ -0,0 +1,3 @@
+function copydir {
+  pwd | tr -d "\r\n" | pbcopy
+}
\ No newline at end of file

From 0854b18cdfa6b29b08848a23e79c3f214c5e0f8d Mon Sep 17 00:00:00 2001
From: Marko Bauhardt <marko.bauhardt@googlemail.com>
Date: Mon, 8 Apr 2013 22:32:00 +0200
Subject: [PATCH 0233/1378] a plugin (function) which copies the content of a
 file into the clipboard

---
 plugins/copyfile/copyfile.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 plugins/copyfile/copyfile.plugin.zsh

diff --git a/plugins/copyfile/copyfile.plugin.zsh b/plugins/copyfile/copyfile.plugin.zsh
new file mode 100644
index 000000000..944a903c6
--- /dev/null
+++ b/plugins/copyfile/copyfile.plugin.zsh
@@ -0,0 +1,5 @@
+function copyfile {
+  [[ "$#" != 1 ]] && return 1
+  local file_to_copy=$1
+  cat $file_to_copy | pbcopy
+}

From 2bae7ef4f9972d4b3accf6bd614e38d9a2410a70 Mon Sep 17 00:00:00 2001
From: Marc Paradise <marc@opscode.com>
Date: Mon, 8 Apr 2013 17:07:06 -0400
Subject: [PATCH 0234/1378]  initial support for chef 11 integrated
 knife-essentials

* added new commands 'diff' and 'upload'
* Add basic file completion for file-centric commands 'diff' and
  'upload'
---
 plugins/knife/_knife | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index 9f5b406af..b44283f78 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -31,7 +31,7 @@ _knife() {
   
   case $state in
   knifecmd)
-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec environment index node recipe role search ssh status windows $cloudproviders
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload windows $cloudproviders
   ;;
   knifesubcmd)
     case $words[2] in
@@ -47,9 +47,12 @@ _knife() {
     cookbook)
       compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
     ;;
-  environment)
+    diff)
+      _arguments '*:file or directory:_files -g "*"'
+    ;;
+    environment)
       compadd -Q "$@" list create delete edit show "from file"
-      ;;
+    ;;
     node)
      compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
     ;;
@@ -59,6 +62,9 @@ _knife() {
     role)
       compadd -Q "$@" "bulk delete" create delete edit "from file" list show
     ;; 
+    upload)
+     _arguments '*:file or directory:_files -g "*"'
+    ;;
     windows)
       compadd "$@" bootstrap
     ;;

From c8db4f81fa4716ff627b63e4f7022d01c4b712d7 Mon Sep 17 00:00:00 2001
From: Vladimir Zakharov <zakharov.vv@gmail.com>
Date: Tue, 9 Apr 2013 14:11:51 +0400
Subject: [PATCH 0235/1378] Add alias for 'hg bookmarks'

---
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 30e4be5b5..9aa2d167a 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -3,6 +3,7 @@
 alias hgc='hg commit'
 alias hgb='hg branch'
 alias hgba='hg branches'
+alias hgbk='hg bookmarks'
 alias hgco='hg checkout'
 alias hgd='hg diff'
 alias hged='hg diffmerge'

From 32a42f27b62b62bd915ab632b0b36fa939d22c0e Mon Sep 17 00:00:00 2001
From: Gaurav Misra <keyvez@gmail.com>
Date: Tue, 9 Apr 2013 11:45:16 -0700
Subject: [PATCH 0236/1378] Escape spaces in folder name so script won't fail

If the current directory has spaces, the script fails to change paths and fails.
---
 tools/upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index b2a1c06c4..cd689ba1f 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,4 +1,5 @@
 current_path=`pwd`
+current_path=${current_path/ /\\ }
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd $ZSH
 
@@ -16,4 +17,4 @@ else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
 fi
 
-cd "$current_path"
\ No newline at end of file
+cd "$current_path"

From 872ef081d30f32fd7b38360bb0264452ebfd96eb Mon Sep 17 00:00:00 2001
From: Brian Galey <bkgaley@gmail.com>
Date: Tue, 9 Apr 2013 19:52:49 -0700
Subject: [PATCH 0237/1378] Add collectstatic to django command completions

---
 plugins/django/django.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 0bbd031fe..66e0d1539 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -20,6 +20,19 @@ _managepy-createcachetable(){
     $nul_args && ret=0
 }
 
+_managepy-collectstatic(){
+  _arguments -s : \
+    '--link=-[Create a symbolic link to each file instead of copying.]:' \
+    '--noinput=-[Do NOT prompt the user for input of any kind.]:' \
+    '--no-post-process=-[Do NOT post process collected files.]:' \
+    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]:' \
+    '--dry-run=-[Do everything except modify the filesystem.]:' \
+    '--clear=-[Clear the existing files using the storage before trying to copy or link the original file.]:' \
+    '--link=-[Create a symbolic link to each file instead of copying.]:' \
+    '--no-default-ignore=-[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]:' \
+    $nul_args && ret=0
+}
+
 _managepy-dbshell(){
   _arguments -s : \
     $nul_args && ret=0
@@ -163,6 +176,7 @@ _managepy-commands() {
   commands=(
     'adminindex:prints the admin-index template snippet for the given app name(s).'
     'createcachetable:creates the table needed to use the SQL cache backend.'
+    'collectstatic:Collect static files in a single location.'
     'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
     "diffsettings:displays differences between the current settings.py and Django's default settings."
     'dumpdata:Output the contents of the database as a fixture of the given format.'

From c3b20a65415dacb87f8ea5c94144d8ed12f95341 Mon Sep 17 00:00:00 2001
From: Brian Galey <bkgaley@gmail.com>
Date: Tue, 9 Apr 2013 19:54:50 -0700
Subject: [PATCH 0238/1378] Use completions with django-admin.py

---
 plugins/django/django.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 66e0d1539..9d898edca 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -234,4 +234,5 @@ _managepy() {
 
 compdef _managepy manage.py
 compdef _managepy django
+compdef _managepy django-admin.py
 compdef _managepy django-manage

From 0c9b4329efd79d33dd2c21bd960d5bd9b7627b7f Mon Sep 17 00:00:00 2001
From: George Miroshnykov <george.miroshnykov@gmail.com>
Date: Tue, 9 Apr 2013 17:41:48 +0300
Subject: [PATCH 0239/1378] Support for Sublime Text 3

---
 plugins/sublime/sublime.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index bfbc45a07..804410057 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -21,6 +21,7 @@ elif  [[ $('uname') == 'Darwin' ]]; then
 	for _sublime_path in $_sublime_darwin_paths; do
 		if [[ -a $_sublime_path ]]; then
 			alias st="'$_sublime_path'"
+			break
 		fi
 	done
 fi

From c50b9a24f1d80cf38f5f299ab02b5c9409faa7c8 Mon Sep 17 00:00:00 2001
From: bertabus <billy.rond@gmail.com>
Date: Thu, 11 Apr 2013 14:56:22 -0600
Subject: [PATCH 0240/1378] Added Vundle clean to remove bundles removed from
 vimrc

---
 plugins/vundle/vundle.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 005a58476..936c8d7d2 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -16,8 +16,12 @@ function vundle () {
   vim -c "execute \"BundleInstall\" | q | q"
 }
 
-
 function vundle-update () {
   vundle-init
   vim -c "execute \"BundleInstall!\" | q | q"
 }
+
+function vundle-clean () {
+  vundle-init
+  vim -c "execute \"BundleClean!\" | q | q"
+}

From 07738ea86330b7b77127fc6f18474b3da2c6ecec Mon Sep 17 00:00:00 2001
From: Oleg Kandaurov <okandaurov@at-consulting.ru>
Date: Fri, 12 Apr 2013 18:19:42 +0400
Subject: [PATCH 0241/1378] Add colorize plugin

---
 plugins/colorize/colorize.plugin.zsh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 plugins/colorize/colorize.plugin.zsh

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
new file mode 100644
index 000000000..0696607d9
--- /dev/null
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -0,0 +1,28 @@
+# Plugin for highligthing file content
+# Plugin highlights file content based on the filename extension.
+# If no highlighting method supported for given extension then it tries 
+# guess it by looking for file content.
+
+alias colorize='colorize_via_pygmentize'
+
+colorize_via_pygmentize() {
+    if [ ! -x $(which pygmentize) ]; then
+        echo package \'pygmentize\' is not installed!
+        exit -1
+    fi
+
+    if [ $# -eq 0 ]; then
+        pygmentize -g $@
+    fi
+
+    for FNAME in $@
+    do
+        filename=$(basename "$FNAME")
+        lexer=`pygmentize -N \"$filename\"`
+        if [ "Z$lexer" != "Ztext" ]; then
+            pygmentize -l $lexer "$FNAME"
+        else
+            pygmentize -g "$FNAME"
+        fi
+    done
+}
\ No newline at end of file

From 2d2aa641678f6cb691b67e40897c3fa185efadf8 Mon Sep 17 00:00:00 2001
From: Danyil Bohdan <danyil.bohdan@gmail.com>
Date: Fri, 12 Apr 2013 18:19:09 +0300
Subject: [PATCH 0242/1378] Implemented UTF-8 support in fishy.zsh-theme.

---
 themes/fishy.zsh-theme | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index e9f78a54e..8b24172a2 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -1,8 +1,13 @@
 # ZSH Theme emulating the Fish shell's default prompt.
 
 _fishy_collapsed_wd() {
-  echo $(pwd | perl -pe "s|^$HOME|~|g; s|/([^/])[^/]*(?=/)|/\$1|g")
-}
+  echo $(pwd | perl -pe "
+   BEGIN {
+      binmode STDIN,  ':encoding(UTF-8)';
+      binmode STDOUT, ':encoding(UTF-8)';
+   }; s|^$HOME|~|g; s|/([^/])[^/]*(?=/)|/\$1|g
+")
+} 
 
 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
 PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '

From 388ae92d4755dae0f2d205dbb40fb0bbd975c9b3 Mon Sep 17 00:00:00 2001
From: toctan <tianjin.sc@gmail.com>
Date: Sun, 14 Apr 2013 13:07:17 +0800
Subject: [PATCH 0243/1378] command-not-found support for Arch Linux

---
 plugins/command-not-found/command-not-found.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 567da1b45..f3d7ec2df 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -3,3 +3,7 @@
 # this is installed in Ubuntu
 
 [[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+
+# Arch Linux command-not-found support, you must have package pkgfile installed
+# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
+[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh

From 460cb3d0e0eb79f909a46ae3c1b9d1c19c55e0dd Mon Sep 17 00:00:00 2001
From: MatthR3D <matthr3d@gmail.com>
Date: Sun, 14 Apr 2013 13:08:03 +0200
Subject: [PATCH 0244/1378] Edit some yaourt aliases and add some

* yaupg now also updates AUR packages
* Add yalst alias : it lists the installed packages, even from AUR
* Add yaorph alias : it removes orphans using yaourt
---
 plugins/archlinux/archlinux.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index ae92a0b4c..bffe9657a 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -8,7 +8,7 @@ if [[ -x `which yaourt` ]]; then
   }
   alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff
   # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
-  alias yaupg='yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+  alias yaupg='yaourt -Syua'        # Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system.
   alias yasu='yaourt --sucre'      # Same as yaupg, but without confirmation
   alias yain='yaourt -S'           # Install specific package(s) from the repositories
   alias yains='yaourt -U'          # Install specific package not from the repositories but from a file
@@ -18,6 +18,8 @@ if [[ -x `which yaourt` ]]; then
   alias yareps='yaourt -Ss'        # Search for package(s) in the repositories
   alias yaloc='yaourt -Qi'         # Display information about a given package in the local database
   alias yalocs='yaourt -Qs'        # Search for package(s) in the local database
+  alias yalst='yaourt -Qe'         # List installed packages, even those installed from AUR (they're tagged as "local")
+  alias yaorph='yaourt -Qtd'       # Remove orphans using yaourt
   # Additional yaourt alias examples
   if [[ -x `which abs` ]]; then
     alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories

From ad3f59252beaf1a28e188dfc431a267875ca50b9 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Tue, 16 Apr 2013 10:22:28 +0300
Subject: [PATCH 0245/1378] Added global aliases to use RAILS_ENV.

---
 plugins/rails/rails.plugin.zsh   | 3 +++
 plugins/rails3/rails3.plugin.zsh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index cd232a6ae..76522e18d 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -9,6 +9,9 @@ alias rdbtp='rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'
+alias -g RET='RAILS_ENV=test'
+alias -g REP='RAILS_ENV=production'
+alias -g RED='RAILS_ENV=development'
 
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 237d0594b..a2697872a 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -21,3 +21,6 @@ alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
 alias rdm='rake db:migrate'
 alias rdr='rake db:rollback'
+alias -g RET='RAILS_ENV=test'
+alias -g REP='RAILS_ENV=production'
+alias -g RED='RAILS_ENV=development'

From 5dae44ac5965b36da1dfc20772059561d4973cda Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Tue, 16 Apr 2013 10:10:21 -0700
Subject: [PATCH 0246/1378] Return code instead of dollar sign

---
 themes/rkj-repos.zsh-theme | 2 +-
 themes/rkj.zsh-theme       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 318c315bb..46b8e83a0 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -24,6 +24,6 @@ function mygit() {
 
 # alternate prompt with git & hg
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
 
diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index 81b701e07..80122d5c6 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -3,6 +3,6 @@
 # entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b '
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B]%{\e[0m%}%b '
 
 

From 0b3d5608668880fd1f50f8c6a2099b4a5dd7871a Mon Sep 17 00:00:00 2001
From: Zoltan Debre <zdebre@gmail.com>
Date: Wed, 17 Apr 2013 15:07:11 +0200
Subject: [PATCH 0247/1378] Update rvm.plugin.zsh to the latest ruby versions

Ruby version numbers update:
1.8.7-p371
1.9.3-p392
2.0.0-p0
---
 plugins/rvm/rvm.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 5000a49b3..cdd0a7847 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -3,9 +3,9 @@ fpath=($rvm_path/scripts/zsh/Completion $fpath)
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
-local ruby18='ruby-1.8.7-p334'
-local ruby19='ruby-1.9.3-p385'
-local ruby20='ruby-2.0.0-rc2'
+local ruby18='ruby-1.8.7-p371'
+local ruby19='ruby-1.9.3-p392'
+local ruby20='ruby-2.0.0-p0'
 
 function rb18 {
 	if [ -z "$1" ]; then

From 7db2b20fc4982d0b523d5ac5c59d0351229bbc32 Mon Sep 17 00:00:00 2001
From: Stefan Tatschner <stefan.tatschner@gmail.com>
Date: Wed, 17 Apr 2013 15:07:53 +0200
Subject: [PATCH 0248/1378] Added git-flow-avh plugin.

git-flow-avh is a fork of gitflow, see: https://github.com/petervanderdoes/gitflow
---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh | 416 +++++++++++++++++++
 1 file changed, 416 insertions(+)
 create mode 100644 plugins/git-flow-avh/git-flow-avh.plugin.zsh

diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
new file mode 100644
index 000000000..d76f55ef6
--- /dev/null
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -0,0 +1,416 @@
+#!zsh
+#
+# Installation
+# ------------
+#
+# To achieve git-flow completion nirvana:
+#
+#  0. Update your zsh's git-completion module to the newest verion.
+#     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
+#
+#  1. Install this file. Either:
+#
+#     a. Place it in your .zshrc:
+#
+#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
+#        your .zshrc:
+#
+#            source ~/.git-flow-completion.zsh
+#
+#     c. Or, use this file as a oh-my-zsh plugin.
+#
+
+_git-flow ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'init:Initialize a new git repo with support for the branching model.'
+				'feature:Manage your feature branches.'
+				'config:Manage your configuration.'
+				'release:Manage your release branches.'
+				'hotfix:Manage your hotfix branches.'
+				'support:Manage your support branches.'
+				'version:Shows version information.'
+			)
+			_describe -t commands 'git flow' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(init)
+					_arguments \
+						-f'[Force setting of gitflow branches, even if already configured]'
+					;;
+
+					(version)
+					;;
+
+					(hotfix)
+						__git-flow-hotfix
+					;;
+
+					(release)
+						__git-flow-release
+					;;
+
+					(feature)
+						__git-flow-feature
+					;;
+					(config)
+					__git-flow-config
+					;;
+
+			esac
+		;;
+	esac
+}
+
+__git-flow-release ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new release branch.'
+				'finish:Finish a release branch.'
+				'list:List all your release branches. (Alias to `git flow release`)'
+				'publish:Publish release branch to remote.'
+				'track:Checkout remote release branch.'
+				'delet:Delete a release branch.'
+			)
+			_describe -t commands 'git flow release' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(delete)
+					_arguments \
+						-f'[Force deletion]' \
+						-r'[Delete remote branch]' \
+						':version:__git_flow_version_list'
+				;;
+
+				(publish)
+					_arguments \
+						':version:__git_flow_version_list'
+				;;
+
+				(track)
+					_arguments \
+						':version:__git_flow_version_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-hotfix ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new hotfix branch.'
+				'finish:Finish a hotfix branch.'
+				'delete:Delete a hotfix branch.'
+				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+			)
+			_describe -t commands 'git flow hotfix' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':hotfix:__git_flow_version_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				(delete)
+					_arguments \
+						-f'[Force deletion]' \
+						-r'[Delete remote branch]' \
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-feature ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new feature branch.'
+				'finish:Finish a feature branch.'
+				'delete:Delete a feature branch.'
+				'list:List all your feature branches. (Alias to `git flow feature`)'
+				'publish:Publish feature branch to remote.'
+				'track:Checkout remote feature branch.'
+				'diff:Show all changes.'
+				'rebase:Rebase from integration branch.'
+				'checkout:Checkout local feature branch.'
+				'pull:Pull changes from remote.'
+			)
+			_describe -t commands 'git flow feature' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':feature:__git_flow_feature_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-r'[Rebase instead of merge]'\
+						':feature:__git_flow_feature_list'
+				;;
+
+				(delete)
+					_arguments \
+						-f'[Force deletion]' \
+						-r'[Delete remote branch]' \
+						':feature:__git_flow_feature_list'
+				;;
+
+				(publish)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(track)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(diff)
+					_arguments \
+						':branch:__git_branch_names'\
+				;;
+
+				(rebase)
+					_arguments \
+						-i'[Do an interactive rebase]' \
+						':branch:__git_branch_names'
+				;;
+
+				(checkout)
+					_arguments \
+						':branch:__git_flow_feature_list'\
+				;;
+
+				(pull)
+					_arguments \
+						':remote:__git_remotes'\
+						':branch:__git_branch_names'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-config ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'list:List the configuration. (Alias to `git flow config`)'
+				'set:Set the configuration option'
+			)
+			_describe -t commands 'git flow config' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(set)
+					_arguments \
+						--local'[Use repository config file]' \
+						--global'[Use global config file]'\
+						--system'[Use system config file]'\
+						--file'[Use given config file]'\
+						':option:(master develop feature hotfix release support	versiontagprefix)'
+				;;
+
+				*)
+					_arguments \
+						--local'[Use repository config file]' \
+						--global'[Use global config file]'\
+						--system'[Use system config file]'\
+						--file'[Use given config file]'
+				;;
+			esac
+		;;
+	esac
+}
+__git_flow_version_list ()
+{
+	local expl
+	declare -a versions
+
+	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted versions expl 'version' compadd $versions
+}
+
+__git_flow_feature_list ()
+{
+	local expl
+	declare -a features
+
+	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+	local expl gitdir remotes
+
+	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+	__git_command_successful || return
+
+	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+	__git_command_successful || return
+
+	# TODO: Should combine the two instead of either or.
+	if (( $#remotes > 0 )); then
+		_wanted remotes expl remote compadd $* - $remotes
+	else
+		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+	fi
+}
+
+__git_flow_hotfix_list ()
+{
+	local expl
+	declare -a hotfixes
+
+	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_branch_names () {
+	local expl
+	declare -a branch_names
+
+	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+	__git_command_successful || return
+
+	_wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+	if (( ${#pipestatus:#0} > 0 )); then
+		_message 'not a git repository'
+		return 1
+	fi
+	return 0
+}
+
+zstyle ':completion:*:*:git:*' user-commands flow:'provide high-level repository operations'

From f2b915c56741c846e845b037e9fdeb7c3f063bc3 Mon Sep 17 00:00:00 2001
From: jaseg <s@jaseg.de>
Date: Wed, 17 Apr 2013 17:08:36 -0700
Subject: [PATCH 0249/1378] The safe-paste plugin now works with tmux, too

---
 plugins/safe-paste/safe-paste.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
index 0aa97965f..17c212c19 100644
--- a/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -43,12 +43,12 @@ function _paste_insert() {
 
 function _zle_line_init() {
   # Tell terminal to send escape codes around pastes.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004h'
+  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004h'
 }
 
 function _zle_line_finish() {
   # Tell it to stop when we leave zle, so pasting in other programs
   # doesn't get the ^[[200~ codes around the pasted text.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004l'
+  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004l'
 }
 

From 52dc3b99f9963576f50ba87a46953e92591e4d7d Mon Sep 17 00:00:00 2001
From: Chris Borgia <cborgia@gmail.com>
Date: Thu, 18 Apr 2013 16:27:02 -0400
Subject: [PATCH 0250/1378] Edited Grammar in template file

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 2ea9934af..30399abf3 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -17,7 +17,7 @@ ZSH_THEME="robbyrussell"
 # Comment this out to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# Uncomment to change how often before auto-updates occur? (in days)
 # export UPDATE_ZSH_DAYS=13
 
 # Uncomment following line if you want to disable colors in ls

From a08f626f1c37043cdf1e2632f283e537396a205b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Garami=20G=C3=A1bor?= <hron@hron.me>
Date: Sat, 20 Apr 2013 21:40:15 +0200
Subject: [PATCH 0251/1378] Adding undocumented clean command to completion

Clean command is undocumented (not included in
bundle help output), however that is very useful,
especially in RVM environment you can clean up
outdated gems in gemset.
---
 plugins/bundler/_bundler | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/bundler/_bundler b/plugins/bundler/_bundler
index 5d22cac9a..2ec3a5f9c 100644
--- a/plugins/bundler/_bundler
+++ b/plugins/bundler/_bundler
@@ -23,6 +23,7 @@ case $state in
 			"viz[Generate a visual representation of your dependencies]" \
 			"init[Generate a simple Gemfile, placed in the current directory]" \
 			"gem[Create a simple gem, suitable for development with bundler]" \
+			"clean[Cleans up unused gems in your bundler directory]" \
 			"help[Describe available tasks or one specific task]"
 		ret=0
 		;;
@@ -62,6 +63,14 @@ case $state in
 			exec)
 				_normal && ret=0
 				;;
+			clean)
+				_arguments \
+					'(--force)--force[forces clean even if --path is not set]' \
+					'(--dry-run)--dry-run[only print out changes, do not actually clean gems]' \
+					'(--no-color)--no-color[Disable colorization in output]' \
+					'(--verbose)--verbose[Enable verbose output mode]'
+				ret=0
+				;;
 			(open|show)
 				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
 				if [[ $_gems != "" ]]; then

From bc385531b0e71b90b800502117bbdc8d1531e4c2 Mon Sep 17 00:00:00 2001
From: Ron Shapiro <shapiro.rd@gmail.com>
Date: Sat, 20 Apr 2013 22:37:36 -0400
Subject: [PATCH 0252/1378] Separate the battery_pct_remaining data into it's
 own function so that it can be obtained even if the battery is connected.

---
 plugins/battery/battery.plugin.zsh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 95f890632..0c7c9421f 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -10,12 +10,16 @@
 
 if [[ $(uname) == "Darwin" ]] ; then
 
+  function battery_pct() {
+    typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
+    typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
+    integer i=$(((currentcapacity/maxcapacity) * 100))
+    echo $i
+  }
+  
   function battery_pct_remaining() {
     if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
-      typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
-      integer i=$(((currentcapacity/maxcapacity) * 100))
-      echo $i
+      battery_pct
     else
       echo "External Power"
     fi

From d615f6437408d66fa8aad031eb45942bf84fed86 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 21 Apr 2013 02:10:21 -0500
Subject: [PATCH 0253/1378] git: fix parse_git_dirty()

If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 lib/git.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/git.zsh b/lib/git.zsh
index 76fe9b142..353c42f3c 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -21,6 +21,8 @@ parse_git_dirty() {
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
     fi  
+  else
+    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi  
 }
 

From 72a8c08cc897520ea74ae49e811cd9e34501c520 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 21 Apr 2013 01:34:44 -0500
Subject: [PATCH 0254/1378] gitfast: synchronize with upstream

Up to version 1.8.2.1.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                |   9 +
 plugins/gitfast/git-completion.bash | 447 +++++++++++++++++++++++-----
 plugins/gitfast/git-prompt.sh       | 149 ++++++++--
 3 files changed, 503 insertions(+), 102 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 45775021f..cf8116d47 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -60,6 +60,15 @@ __gitcomp_nl ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
+__gitcomp_file ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+}
+
 _git ()
 {
 	local _ret=1
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index be800e09b..93eba4675 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -13,6 +13,7 @@
 #    *) .git/remotes file names
 #    *) git 'subcommands'
 #    *) tree paths within 'ref:path/to/file' expressions
+#    *) file paths within current working directory and index
 #    *) common --long-options
 #
 # To use these routines:
@@ -23,10 +24,6 @@
 #    3) Consider changing your PS1 to also show the current branch,
 #       see git-prompt.sh for details.
 
-if [[ -n ${ZSH_VERSION-} ]]; then
-	autoload -U +X bashcompinit && bashcompinit
-fi
-
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
 *)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
@@ -169,7 +166,6 @@ __git_reassemble_comp_words_by_ref()
 }
 
 if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
-if [[ -z ${ZSH_VERSION:+set} ]]; then
 _get_comp_words_by_ref ()
 {
 	local exclude cur_ words_ cword_
@@ -197,32 +193,6 @@ _get_comp_words_by_ref ()
 		shift
 	done
 }
-else
-_get_comp_words_by_ref ()
-{
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		cur)
-			cur=${COMP_WORDS[COMP_CWORD]}
-			;;
-		prev)
-			prev=${COMP_WORDS[COMP_CWORD-1]}
-			;;
-		words)
-			words=("${COMP_WORDS[@]}")
-			;;
-		cword)
-			cword=$COMP_CWORD
-			;;
-		-n)
-			# assume COMP_WORDBREAKS is already set sanely
-			shift
-			;;
-		esac
-		shift
-	done
-}
-fi
 fi
 
 # Generates completion reply with compgen, appending a space to possible
@@ -264,6 +234,124 @@ __gitcomp_nl ()
 	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
 }
 
+# Generates completion reply with compgen from newline-separated possible
+# completion filenames.
+# It accepts 1 to 3 arguments:
+# 1: List of possible completion filenames, separated by a single newline.
+# 2: A directory prefix to be added to each possible completion filename
+#    (optional).
+# 3: Generate possible completion matches for this word (optional).
+__gitcomp_file ()
+{
+	local IFS=$'\n'
+
+	# XXX does not work when the directory prefix contains a tilde,
+	# since tilde expansion is not applied.
+	# This means that COMPREPLY will be empty and Bash default
+	# completion will be used.
+	COMPREPLY=($(compgen -P "${2-}" -W "$1" -- "${3-$cur}"))
+
+	# Tell Bash that compspec generates filenames.
+	compopt -o filenames 2>/dev/null
+}
+
+__git_index_file_list_filter_compat ()
+{
+	local path
+
+	while read -r path; do
+		case "$path" in
+		?*/*) echo "${path%%/*}/" ;;
+		*) echo "$path" ;;
+		esac
+	done
+}
+
+__git_index_file_list_filter_bash ()
+{
+	local path
+
+	while read -r path; do
+		case "$path" in
+		?*/*)
+			# XXX if we append a slash to directory names when using
+			# `compopt -o filenames`, Bash will append another slash.
+			# This is pretty stupid, and this the reason why we have to
+			# define a compatible version for this function.
+			echo "${path%%/*}" ;;
+		*)
+			echo "$path" ;;
+		esac
+	done
+}
+
+# Process path list returned by "ls-files" and "diff-index --name-only"
+# commands, in order to list only file names relative to a specified
+# directory, and append a slash to directory names.
+__git_index_file_list_filter ()
+{
+	# Default to Bash >= 4.x
+	__git_index_file_list_filter_bash
+}
+
+# Execute git ls-files, returning paths relative to the directory
+# specified in the first argument, and using the options specified in
+# the second argument.
+__git_ls_files_helper ()
+{
+	(
+		test -n "${CDPATH+set}" && unset CDPATH
+		# NOTE: $2 is not quoted in order to support multiple options
+		cd "$1" && git ls-files --exclude-standard $2
+	) 2>/dev/null
+}
+
+
+# Execute git diff-index, returning paths relative to the directory
+# specified in the first argument, and using the tree object id
+# specified in the second argument.
+__git_diff_index_helper ()
+{
+	(
+		test -n "${CDPATH+set}" && unset CDPATH
+		cd "$1" && git diff-index --name-only --relative "$2"
+	) 2>/dev/null
+}
+
+# __git_index_files accepts 1 or 2 arguments:
+# 1: Options to pass to ls-files (required).
+#    Supported options are --cached, --modified, --deleted, --others,
+#    and --directory.
+# 2: A directory path (optional).
+#    If provided, only files within the specified directory are listed.
+#    Sub directories are never recursed.  Path must have a trailing
+#    slash.
+__git_index_files ()
+{
+	local dir="$(__gitdir)" root="${2-.}"
+
+	if [ -d "$dir" ]; then
+		__git_ls_files_helper "$root" "$1" | __git_index_file_list_filter |
+			sort | uniq
+	fi
+}
+
+# __git_diff_index_files accepts 1 or 2 arguments:
+# 1) The id of a tree object.
+# 2) A directory path (optional).
+#    If provided, only files within the specified directory are listed.
+#    Sub directories are never recursed.  Path must have a trailing
+#    slash.
+__git_diff_index_files ()
+{
+	local dir="$(__gitdir)" root="${2-.}"
+
+	if [ -d "$dir" ]; then
+		__git_diff_index_helper "$root" "$1" | __git_index_file_list_filter |
+			sort | uniq
+	fi
+}
+
 __git_heads ()
 {
 	local dir="$(__gitdir)"
@@ -321,7 +409,7 @@ __git_refs ()
 				if [[ "$ref" == "$cur"* ]]; then
 					echo "$ref"
 				fi
-			done | uniq -u
+			done | sort | uniq -u
 		fi
 		return
 	fi
@@ -428,7 +516,7 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
+		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" 2>/dev/null \
 				| sed '/^100... blob /{
 				           s,^.*	,,
 				           s,$, ,
@@ -461,6 +549,46 @@ __git_complete_revlist_file ()
 }
 
 
+# __git_complete_index_file requires 1 argument: the options to pass to
+# ls-file
+__git_complete_index_file ()
+{
+	local pfx cur_="$cur"
+
+	case "$cur_" in
+	?*/*)
+		pfx="${cur_%/*}"
+		cur_="${cur_##*/}"
+		pfx="${pfx}/"
+
+		__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
+		;;
+	*)
+		__gitcomp_file "$(__git_index_files "$1")" "" "$cur_"
+		;;
+	esac
+}
+
+# __git_complete_diff_index_file requires 1 argument: the id of a tree
+# object
+__git_complete_diff_index_file ()
+{
+	local pfx cur_="$cur"
+
+	case "$cur_" in
+	?*/*)
+		pfx="${cur_%/*}"
+		cur_="${cur_##*/}"
+		pfx="${pfx}/"
+
+		__gitcomp_file "$(__git_diff_index_files "$1" "$pfx")" "$pfx" "$cur_"
+		;;
+	*)
+		__gitcomp_file "$(__git_diff_index_files "$1")" "" "$cur_"
+		;;
+	esac
+}
+
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -562,10 +690,19 @@ __git_complete_strategy ()
 	return 1
 }
 
+__git_commands () {
+	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
+	then
+		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
+	else
+		git help -a|egrep '^  [a-zA-Z0-9]'
+	fi
+}
+
 __git_list_all_commands ()
 {
 	local i IFS=" "$'\n'
-	for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
+	for i in $(__git_commands)
 	do
 		case $i in
 		*--*)             : helper pattern;;
@@ -585,7 +722,7 @@ __git_list_porcelain_commands ()
 {
 	local i IFS=" "$'\n'
 	__git_compute_all_commands
-	for i in "help" $__git_all_commands
+	for i in $__git_all_commands
 	do
 		case $i in
 		*--*)             : helper pattern;;
@@ -594,6 +731,7 @@ __git_list_porcelain_commands ()
 		archimport)       : import;;
 		cat-file)         : plumbing;;
 		check-attr)       : plumbing;;
+		check-ignore)     : plumbing;;
 		check-ref-format) : plumbing;;
 		checkout-index)   : plumbing;;
 		commit-tree)      : plumbing;;
@@ -753,6 +891,43 @@ __git_has_doubledash ()
 	return 1
 }
 
+# Try to count non option arguments passed on the command line for the
+# specified git command.
+# When options are used, it is necessary to use the special -- option to
+# tell the implementation were non option arguments begin.
+# XXX this can not be improved, since options can appear everywhere, as
+# an example:
+#	git mv x -n y
+#
+# __git_count_arguments requires 1 argument: the git command executed.
+__git_count_arguments ()
+{
+	local word i c=0
+
+	# Skip "git" (first argument)
+	for ((i=1; i < ${#words[@]}; i++)); do
+		word="${words[i]}"
+
+		case "$word" in
+			--)
+				# Good; we can assume that the following are only non
+				# option arguments.
+				((c = 0))
+				;;
+			"$1")
+				# Skip the specified git command and discard git
+				# main options
+				((c = 0))
+				;;
+			?*)
+				((c++))
+				;;
+		esac
+	done
+
+	printf "%d" $c
+}
+
 __git_whitespacelist="nowarn warn error error-all fix"
 
 _git_am ()
@@ -801,8 +976,6 @@ _git_apply ()
 
 _git_add ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "
@@ -811,7 +984,9 @@ _git_add ()
 			"
 		return
 	esac
-	COMPREPLY=()
+
+	# XXX should we check for --update and --all options ?
+	__git_complete_index_file "--others --modified"
 }
 
 _git_archive ()
@@ -961,15 +1136,15 @@ _git_cherry_pick ()
 
 _git_clean ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "--dry-run --quiet"
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	# XXX should we check for -x option ?
+	__git_complete_index_file "--others"
 }
 
 _git_clone ()
@@ -989,6 +1164,8 @@ _git_clone ()
 			--upload-pack
 			--template=
 			--depth
+			--single-branch
+			--branch
 			"
 		return
 		;;
@@ -998,7 +1175,19 @@ _git_clone ()
 
 _git_commit ()
 {
-	__git_has_doubledash && return
+	case "$prev" in
+	-c|-C)
+		__gitcomp_nl "$(__git_refs)" "" "${cur}"
+		return
+		;;
+	esac
+
+	case "$prev" in
+	-c|-C)
+		__gitcomp_nl "$(__git_refs)" "" "${cur}"
+		return
+		;;
+	esac
 
 	case "$cur" in
 	--cleanup=*)
@@ -1027,7 +1216,13 @@ _git_commit ()
 			"
 		return
 	esac
-	COMPREPLY=()
+
+	if git rev-parse --verify --quiet HEAD >/dev/null; then
+		__git_complete_diff_index_file "HEAD"
+	else
+		# This is the first commit
+		__git_complete_index_file "--cached"
+	fi
 }
 
 _git_describe ()
@@ -1043,6 +1238,8 @@ _git_describe ()
 	__gitcomp_nl "$(__git_refs)"
 }
 
+__git_diff_algorithms="myers minimal patience histogram"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
@@ -1053,10 +1250,11 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--no-ext-diff
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
-			--patience
+			--patience --histogram --minimal
 			--raw
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
+			--diff-algorithm=
 "
 
 _git_diff ()
@@ -1064,6 +1262,10 @@ _git_diff ()
 	__git_has_doubledash && return
 
 	case "$cur" in
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1116,6 +1318,14 @@ _git_fetch ()
 	__git_complete_remote_or_refspec
 }
 
+__git_format_patch_options="
+	--stdout --attach --no-attach --thread --thread= --output-directory
+	--numbered --start-number --numbered-files --keep-subject --signoff
+	--signature --no-signature --in-reply-to= --cc= --full-index --binary
+	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
+	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
+"
+
 _git_format_patch ()
 {
 	case "$cur" in
@@ -1126,21 +1336,7 @@ _git_format_patch ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stdout --attach --no-attach --thread --thread=
-			--output-directory
-			--numbered --start-number
-			--numbered-files
-			--keep-subject
-			--signoff --signature --no-signature
-			--in-reply-to= --cc=
-			--full-index --binary
-			--not --all
-			--cover-letter
-			--no-prefix --src-prefix= --dst-prefix=
-			--inline --suffix= --ignore-if-in-upstream
-			--subject-prefix=
-			"
+		__gitcomp "$__git_format_patch_options"
 		return
 		;;
 	esac
@@ -1251,8 +1447,6 @@ _git_init ()
 
 _git_ls_files ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "--cached --deleted --modified --others --ignored
@@ -1265,7 +1459,10 @@ _git_ls_files ()
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	# XXX ignore options like --modified and always suggest all cached
+	# files.
+	__git_complete_index_file "--cached"
 }
 
 _git_ls_remote ()
@@ -1397,7 +1594,14 @@ _git_mv ()
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	if [ $(__git_count_arguments "mv") -gt 0 ]; then
+		# We need to show both cached and untracked files (including
+		# empty directories) since this may not be the last argument.
+		__git_complete_index_file "--cached --others --directory"
+	else
+		__git_complete_index_file "--cached"
+	fi
 }
 
 _git_name_rev ()
@@ -1554,6 +1758,12 @@ _git_send_email ()
 		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
 		return
 		;;
+	--thread=*)
+		__gitcomp "
+			deep shallow
+			" "" "${cur##--thread=}"
+		return
+		;;
 	--*)
 		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
 			--compose --confirm= --dry-run --envelope-sender
@@ -1563,11 +1773,12 @@ _git_send_email ()
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
-			--validate --no-validate"
+			--validate --no-validate
+			$__git_format_patch_options"
 		return
 		;;
 	esac
-	COMPREPLY=()
+	__git_complete_revlist
 }
 
 _git_stage ()
@@ -1581,7 +1792,7 @@ __git_config_get_set_variables ()
 	while [ $c -gt 1 ]; do
 		word="${words[c]}"
 		case "$word" in
-		--global|--system|--file=*)
+		--system|--global|--local|--file=*)
 			config_file="$word"
 			break
 			;;
@@ -1687,7 +1898,7 @@ _git_config ()
 	case "$cur" in
 	--*)
 		__gitcomp "
-			--global --system --file=
+			--system --global --local --file=
 			--list --replace-all
 			--get --get-all --get-regexp
 			--add --unset --unset-all
@@ -1860,6 +2071,7 @@ _git_config ()
 		diff.suppressBlankEmpty
 		diff.tool
 		diff.wordRegex
+		diff.algorithm
 		difftool.
 		difftool.prompt
 		fetch.recurseSubmodules
@@ -2096,15 +2308,14 @@ _git_revert ()
 
 _git_rm ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	__git_complete_index_file "--cached"
 }
 
 _git_shortlog ()
@@ -2134,6 +2345,10 @@ _git_show ()
 			" "" "${cur#*=}"
 		return
 		;;
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
 	--*)
 		__gitcomp "--pretty= --format= --abbrev-commit --oneline
 			$__git_diff_common_options
@@ -2429,20 +2644,88 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
+if [[ -n ${ZSH_VERSION-} ]]; then
+	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
+
+	autoload -U +X compinit && compinit
+
+	__gitcomp ()
+	{
+		emulate -L zsh
+
+		local cur_="${3-$cur}"
+
+		case "$cur_" in
+		--*=)
+			;;
+		*)
+			local c IFS=$' \t\n'
+			local -a array
+			for c in ${=1}; do
+				c="$c${4-}"
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				array[$#array+1]="$c"
+			done
+			compset -P '*[=:]'
+			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+			;;
+		esac
+	}
+
+	__gitcomp_nl ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	}
+
+	__gitcomp_file ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	}
+
+	__git_zsh_helper ()
+	{
+		emulate -L ksh
+		local cur cword prev
+		cur=${words[CURRENT-1]}
+		prev=${words[CURRENT-2]}
+		let cword=CURRENT-1
+		__${service}_main
+	}
+
+	_git ()
+	{
+		emulate -L zsh
+		local _ret=1
+		__git_zsh_helper
+		let _ret && _default -S '' && _ret=0
+		return _ret
+	}
+
+	compdef _git git gitk
+	return
+elif [[ -n ${BASH_VERSION-} ]]; then
+	if ((${BASH_VERSINFO[0]} < 4)); then
+		# compopt is not supported
+		__git_index_file_list_filter ()
+		{
+			__git_index_file_list_filter_compat
+		}
+	fi
+fi
+
 __git_func_wrap ()
 {
-	if [[ -n ${ZSH_VERSION-} ]]; then
-		emulate -L bash
-		setopt KSH_TYPESET
-
-		# workaround zsh's bug that leaves 'words' as a special
-		# variable in versions < 4.3.12
-		typeset -h words
-
-		# workaround zsh's bug that quotes spaces in the COMPREPLY
-		# array if IFS doesn't contain spaces.
-		typeset -h IFS
-	fi
 	local cur words cword prev
 	_get_comp_words_by_ref -n =: cur words cword prev
 	$1
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index afd76e86e..65f8368f1 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -10,9 +10,22 @@
 #    1) Copy this file to somewhere (e.g. ~/.git-prompt.sh).
 #    2) Add the following line to your .bashrc/.zshrc:
 #        source ~/.git-prompt.sh
-#    3) Change your PS1 to also show the current branch:
-#         Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
-#         ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#    3a) Change your PS1 to call __git_ps1 as
+#        command-substitution:
+#        Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
+#        ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#        the optional argument will be used as format string.
+#    3b) Alternatively, if you are using bash, __git_ps1 can be
+#        used for PROMPT_COMMAND with two parameters, <pre> and
+#        <post>, which are strings you would put in $PS1 before
+#        and after the status string generated by the git-prompt
+#        machinery.  e.g.
+#           PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
+#        will show username, at-sign, host, colon, cwd, then
+#        various status string, followed by dollar and SP, as
+#        your prompt.
+#        Optionally, you can supply a third argument with a printf
+#        format string to finetune the output of the branch status
 #
 # The argument to __git_ps1 will be displayed only if you are currently
 # in a git repository.  The %s token will be the name of the current
@@ -30,7 +43,10 @@
 #
 # If you would like to see if there're untracked files, then you can set
 # GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked
-# files, then a '%' will be shown next to the branch name.
+# files, then a '%' will be shown next to the branch name.  You can
+# configure this per-repository with the bash.showUntrackedFiles
+# variable, which defaults to true once GIT_PS1_SHOWUNTRACKEDFILES is
+# enabled.
 #
 # If you would like to see the difference between HEAD and its upstream,
 # set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
@@ -49,6 +65,19 @@
 # find one, or @{upstream} otherwise.  Once you have set
 # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
 # setting the bash.showUpstream config variable.
+#
+# If you would like to see more information about the identity of
+# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
+# to one of these values:
+#
+#     contains      relative to newer annotated tag (v1.6.3.2~35)
+#     branch        relative to newer tag or branch (master~4)
+#     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
+#     default       exactly matching tag
+#
+# If you would like a colored hint about the current dirty state, set
+# GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
+# the colored output of "git status -sb".
 
 # __gitdir accepts 0 or 1 arguments (i.e., location)
 # returns location of .git repo
@@ -195,11 +224,43 @@ __git_ps1_show_upstream ()
 
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
-# returns text to add to bash PS1 prompt (includes branch name)
+# when called from PS1 using command substitution
+# in this mode it prints text to add to bash PS1 prompt (includes branch name)
+#
+# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)
+# in that case it _sets_ PS1. The arguments are parts of a PS1 string.
+# when two arguments are given, the first is prepended and the second appended
+# to the state string when assigned to PS1.
+# The optional third parameter will be used as printf format string to further
+# customize the output of the git-status string.
+# In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
 __git_ps1 ()
 {
+	local pcmode=no
+	local detached=no
+	local ps1pc_start='\u@\h:\w '
+	local ps1pc_end='\$ '
+	local printf_format=' (%s)'
+
+	case "$#" in
+		2|3)	pcmode=yes
+			ps1pc_start="$1"
+			ps1pc_end="$2"
+			printf_format="${3:-$printf_format}"
+		;;
+		0|1)	printf_format="${1:-$printf_format}"
+		;;
+		*)	return
+		;;
+	esac
+
 	local g="$(__gitdir)"
-	if [ -n "$g" ]; then
+	if [ -z "$g" ]; then
+		if [ $pcmode = yes ]; then
+			#In PC mode PS1 always needs to be set
+			PS1="$ps1pc_start$ps1pc_end"
+		fi
+	else
 		local r=""
 		local b=""
 		if [ -f "$g/rebase-merge/interactive" ]; then
@@ -226,7 +287,7 @@ __git_ps1 ()
 			fi
 
 			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
-
+				detached=yes
 				b="$(
 				case "${GIT_PS1_DESCRIBE_STYLE-}" in
 				(contains)
@@ -259,24 +320,25 @@ __git_ps1 ()
 				b="GIT_DIR!"
 			fi
 		elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
-			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
-				if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
-					git diff --no-ext-diff --quiet --exit-code || w="*"
-					if git rev-parse --quiet --verify HEAD >/dev/null; then
-						git diff-index --cached --quiet HEAD -- || i="+"
-					else
-						i="#"
-					fi
+			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
+			   [ "$(git config --bool bash.showDirtyState)" != "false" ]
+			then
+				git diff --no-ext-diff --quiet --exit-code || w="*"
+				if git rev-parse --quiet --verify HEAD >/dev/null; then
+					git diff-index --cached --quiet HEAD -- || i="+"
+				else
+					i="#"
 				fi
 			fi
 			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
 				git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
 			fi
 
-			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
-				if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-					u="%%"
-				fi
+			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
+			   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
+			   [ -n "$(git ls-files --others --exclude-standard)" ]
+			then
+				u="%%"
 			fi
 
 			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
@@ -285,6 +347,53 @@ __git_ps1 ()
 		fi
 
 		local f="$w$i$s$u"
-		printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
+		if [ $pcmode = yes ]; then
+			local gitstring=
+			if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+				local c_red='\e[31m'
+				local c_green='\e[32m'
+				local c_lblue='\e[1;34m'
+				local c_clear='\e[0m'
+				local bad_color=$c_red
+				local ok_color=$c_green
+				local branch_color="$c_clear"
+				local flags_color="$c_lblue"
+				local branchstring="$c${b##refs/heads/}"
+
+				if [ $detached = no ]; then
+					branch_color="$ok_color"
+				else
+					branch_color="$bad_color"
+				fi
+
+				# Setting gitstring directly with \[ and \] around colors
+				# is necessary to prevent wrapping issues!
+				gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
+
+				if [ -n "$w$i$s$u$r$p" ]; then
+					gitstring="$gitstring "
+				fi
+				if [ "$w" = "*" ]; then
+					gitstring="$gitstring\[$bad_color\]$w"
+				fi
+				if [ -n "$i" ]; then
+					gitstring="$gitstring\[$ok_color\]$i"
+				fi
+				if [ -n "$s" ]; then
+					gitstring="$gitstring\[$flags_color\]$s"
+				fi
+				if [ -n "$u" ]; then
+					gitstring="$gitstring\[$bad_color\]$u"
+				fi
+				gitstring="$gitstring\[$c_clear\]$r$p"
+			else
+				gitstring="$c${b##refs/heads/}${f:+ $f}$r$p"
+			fi
+			gitstring=$(printf -- "$printf_format" "$gitstring")
+			PS1="$ps1pc_start$gitstring$ps1pc_end"
+		else
+			# NO color option unless in PROMPT_COMMAND mode
+			printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p"
+		fi
 	fi
 }

From c944f8b465e6c28f9a42ac6d71c90ddf9a5b5742 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 29 Nov 2012 15:54:17 +0100
Subject: [PATCH 0255/1378] gitfast: fix prompt

Certain themes need the 'clean' mark, and some people like to have the
'dirty' one, just like the original git_promp_info().

We probably shouldn't be modifying that function, there's no other clean
way to achieve our own status information, so let's try to emulate the
original as much as possible.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/gitfast.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index 7e50cf721..dba1b1315 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -3,5 +3,6 @@ source $dir/../git/git.plugin.zsh
 source $dir/git-prompt.sh
 
 function git_prompt_info() {
-  __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
+  dirty="$(parse_git_dirty)"
+  __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${dirty//\%/%%}${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
 }

From e41714d72c6c5629efe632b1052b590f5f8905c5 Mon Sep 17 00:00:00 2001
From: Jeremy Attali <jeremy.attali@gmail.com>
Date: Mon, 22 Apr 2013 10:59:08 +0200
Subject: [PATCH 0256/1378] Added option to allow untracked files as non dirty

In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
---
 lib/git.zsh                  | 6 +++++-
 templates/zshrc.zsh-template | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 76fe9b142..5f8453112 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -15,7 +15,11 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi  
-    GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
+    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
+        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
+    else
+        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
+    fi
     if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 2ea9934af..58f193550 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,6 +29,11 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want red dots to be displayed while waiting for completion
 # COMPLETION_WAITING_DOTS="true"
 
+# Uncomment following line if you want to disable marking untracked files under
+# VCS as dirty. This makes repository status check for large repositories much,
+# much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 785b1c6337e1da6b2356e71b72ef6b4c93460e90 Mon Sep 17 00:00:00 2001
From: Dustin Hemmerling <dhemmerling@adacado.com>
Date: Mon, 22 Apr 2013 16:01:09 -0700
Subject: [PATCH 0257/1378] mvn plugin was missing "redeploy" completion for
 tomcat.

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index c2d8e7ed7..799f6fc8c 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -114,7 +114,7 @@ function listMavenCompletions {
         # jboss
         jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
         # tomcat
-        tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:undeploy
+        tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
         # tomcat6
         tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
         # tomcat7

From 680302c9f6ce71f69afaf7d020ed400cec2e5d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Sj=C3=B6sten?= <tobias.sjosten@gmail.com>
Date: Tue, 23 Apr 2013 09:35:27 +0300
Subject: [PATCH 0258/1378] Added 'jekyll' to list of bundled commands

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index bc21da134..a288cffcd 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate cap capify cucumber foreman guard jekyll middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
 
 ## Functions
 

From d537193f262d277158f01bd319bfe76d154b751d Mon Sep 17 00:00:00 2001
From: Tobias Preuss <tobias.preuss@googlemail.com>
Date: Tue, 23 Apr 2013 10:41:58 +0200
Subject: [PATCH 0259/1378] Add auto-completion for zeus.

---
 plugins/zeus/_zeus | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 plugins/zeus/_zeus

diff --git a/plugins/zeus/_zeus b/plugins/zeus/_zeus
new file mode 100644
index 000000000..5a13bd9ec
--- /dev/null
+++ b/plugins/zeus/_zeus
@@ -0,0 +1,34 @@
+#compdef zeus
+#autoload
+
+# in order to make this work, you will need to have the gem zeus installed
+
+# zeus zsh completion, based on adb completion
+
+local -a _1st_arguments
+_1st_arguments=(
+'console:Lets you interact with your Rails application from the command line. (alias = c)'
+'cucumber:Runs cucumber.'
+'dbconsole:Figures out which database you are using and drops you into whichever command line interface.'
+'destroy:Figures out what generate did, and undoes it. (alias = d)'
+'generate:Uses templates to create a whole lot of things. (alias = g)'
+'rake:Execute rake tasks.'
+'runner:Runs Ruby code in the context of Rails non-interactively. (alias = r)'
+'server:Launches a small web server named WEBrick which comes bundled with Ruby. (alias = s)'
+'start:Preloads the zeus environment'
+'test:Runs RSpec tests. (alias = rspec, testrb)'
+'version:Shows the version number.'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+	'*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+	_describe -t commands "zeus subcommand" _1st_arguments
+	return
+fi
+
+_files

From 8cd1b21b931c0f7a310fc32c43dd3288203ecd40 Mon Sep 17 00:00:00 2001
From: Alexey Poimtsev <alec@alec-c4.com>
Date: Wed, 24 Apr 2013 01:40:09 +0400
Subject: [PATCH 0260/1378] Update rails4.plugin.zsh

added alias for rake db:create
---
 plugins/rails4/rails4.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
index b6765365e..fce827ee3 100644
--- a/plugins/rails4/rails4.plugin.zsh
+++ b/plugins/rails4/rails4.plugin.zsh
@@ -22,8 +22,9 @@ alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
 alias rdm='rake db:migrate'
+alias rdc='rake db:create'
 alias rdr='rake db:rollback'
 alias rds='rake db:seed'
 alias rlc='rake log:clear'
 alias rn='rake notes'
-alias rr='rake routes'
\ No newline at end of file
+alias rr='rake routes'

From d4d8939410edf3b81e6cd6a63b39744262691185 Mon Sep 17 00:00:00 2001
From: JamesFerguson <jim@The-Ocean.local>
Date: Wed, 24 Apr 2013 09:11:52 +1000
Subject: [PATCH 0261/1378] Only trim remote names; be git-flow friendly

 - don't remove everything before the last /
 - do remove <remote_name>/
 - allows flow style feature/foobar branch names
---
 plugins/git-remote-branch/git-remote-branch.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git-remote-branch/git-remote-branch.plugin.zsh b/plugins/git-remote-branch/git-remote-branch.plugin.zsh
index ff98cbf87..6c5ab8f70 100644
--- a/plugins/git-remote-branch/git-remote-branch.plugin.zsh
+++ b/plugins/git-remote-branch/git-remote-branch.plugin.zsh
@@ -6,7 +6,8 @@ _git_remote_branch() {
       compadd create publish rename delete track
     elif (( CURRENT == 3 )); then
       # second arg: remote branch name
-      compadd `git branch -r | grep -v HEAD | sed "s/.*\///" | sed "s/ //g"`
+      remotes=`git remote | tr '\n' '|' | sed "s/\|$//g"`
+      compadd `git branch -r | grep -v HEAD | sed "s/$remotes\///" | sed "s/ //g"`
     elif (( CURRENT == 4 )); then
       # third arg: remote name
       compadd `git remote`

From dd6247057ea9b8e238aea5e16446dee089f11f3e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 23 Apr 2013 20:52:18 -0700
Subject: [PATCH 0262/1378] Updating the README file

---
 README.textile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.textile b/README.textile
index 0a4545bac..46e69691e 100644
--- a/README.textile
+++ b/README.textile
@@ -1,5 +1,4 @@
-A handful of functions, auto-complete helpers, and stuff that makes you shout...
-
+oh-my-zsh is an open source, community-driven framework for managing your ZSH configuration. It comes bundled with a ton of helpful functions, helpers, plugins, themes, and few things that make you shout...
 
 bq. "OH MY ZSHELL!"
 
@@ -76,9 +75,7 @@ h3. (Don't) Send us your theme! (for now)
 
 -I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.-
 
-We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there. 
-
-
+We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there.
 
 h2. Contributors
 

From bf9645224b529be0e03655b4cef9c32f66c76015 Mon Sep 17 00:00:00 2001
From: Philipp Tessenow <philipp@tessenow.org>
Date: Wed, 24 Apr 2013 08:33:02 +0200
Subject: [PATCH 0263/1378] extend mercurial plugin to be more like git/svn

implement in_hg(), hg_get_branch_name(), hg_prompt_info(), and hg_dirty() for the mercurial plugin
named functions similar to subversion plugin, to give theme maintainers an easier life
---
 plugins/mercurial/mercurial.plugin.zsh | 38 ++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 9aa2d167a..83dd578b3 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -17,8 +17,40 @@ alias hgs='hg status'
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 
-function hg_current_branch() {
-  if [ -d .hg ]; then
-    echo hg:$(hg branch)
+function in_hg() {
+  if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then
+    echo 1
   fi
 }
+
+function hg_get_branch_name() {
+  if [ $(in_hg) ]; then
+    echo $(hg branch)
+  fi
+}
+
+function hg_prompt_info {
+  if [ $(in_hg) ]; then
+    _DISPLAY=$(hg_get_branch_name)
+    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_PROMPT_BASE_COLOR"
+    unset _DISPLAY
+  fi
+}
+
+function hg_dirty_choose {
+  if [ $(in_hg) ]; then
+    hg status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
+    if [ $pipestatus[-1] -eq 0 ]; then
+      # Grep exits with 0 when "One or more lines were selected", return "dirty".
+      echo $1
+    else
+      # Otherwise, no lines were found, or an error occurred. Return clean.
+      echo $2
+    fi
+  fi
+}
+
+function hg_dirty {
+  hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN
+}

From cf9b0119fa909f6e507759986b8e887ef771012f Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Wed, 24 Apr 2013 06:50:48 -0700
Subject: [PATCH 0264/1378] Fixed missing retcode function

---
 themes/rkj-repos.zsh-theme | 2 ++
 themes/rkj.zsh-theme       | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 46b8e83a0..4ab3bc757 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -22,6 +22,8 @@ function mygit() {
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
+function retcode() {}
+
 # alternate prompt with git & hg
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index 80122d5c6..fe06161c8 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -2,7 +2,8 @@
 # on two lines for easier vgrepping
 # entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 
+function retcode() {}
+
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B]%{\e[0m%}%b '
 
-

From 2f7479b5cb58ebd006f4a7a023a86cad0da2ce0d Mon Sep 17 00:00:00 2001
From: Joni Chandra <joniliciously@gmail.com>
Date: Fri, 26 Apr 2013 11:31:02 +0700
Subject: [PATCH 0265/1378] Update the wrong variable used in rb20 function.
 Fixes #1762

Signed-off-by: Joni Chandra <joniliciously@gmail.com>
---
 plugins/rvm/rvm.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index cdd0a7847..68485a577 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -31,7 +31,7 @@ compdef _rb19 rb19
 
 function rb20 {
 	if [ -z "$1" ]; then
-		rvm use "$ruby"
+		rvm use "$ruby20"
 	else
 		rvm use "$ruby20@$1"
 	fi

From f77a545a4bfe07e0fd097a21ad8c1e80ff3d65f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20M-B?= <essembeh@gmail.com>
Date: Sun, 28 Apr 2013 16:34:36 +0200
Subject: [PATCH 0266/1378] Uncomment l alias

---
 lib/aliases.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 2b58c4faa..9b3709172 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -17,7 +17,7 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-#alias l='ls -la'
+alias l='ls -la'
 alias ll='ls -l'
 alias la='ls -lA'
 alias sl=ls # often screw this up

From 17a092b0ffa1ecf4ef9f727054a414e26f9e1edd Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 29 Apr 2013 03:19:31 -0400
Subject: [PATCH 0267/1378] Change sublime text path select priority on mac.

User changed symbolic link for sublime binary is now top priority,
since this allows users to actually specify which version of sublime
they want to use. Sublime text 2 binary has higher priority over
sublime text (3) binary, since sublime text 2 is considered more
stable.
---
 plugins/sublime/sublime.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index e74695de0..82faf87c9 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -2,10 +2,11 @@
 
 local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
-	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"/usr/local/bin/subl"
 	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 	"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 )
 
 if [[ $('uname') == 'Linux' ]]; then

From 39b46f526c83a5d4704bd25eff03c7678230ec78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mueller@cel.kit.edu>
Date: Mon, 29 Apr 2013 09:51:21 +0200
Subject: [PATCH 0268/1378] eliminated unnecessary cd and failing substitution

Changing the working directory in a sub-subshell
does not change the working directory of the executing
shell.

The substitution was broken for me on _all_ my machines,
so I started looking into the business.
---
 tools/upgrade.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 0aeebdebf..3624a88e5 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,8 +1,5 @@
-current_path=`pwd`
-current_path=${current_path/ /\\ }
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd "$ZSH"
-
 if git pull origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
@@ -17,4 +14,3 @@ else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
 fi
 
-cd "$current_path"

From ae1973de443525daeb87df9973ae83c6c9210cfe Mon Sep 17 00:00:00 2001
From: Ron Shapiro <shapiro.rd@gmail.com>
Date: Mon, 29 Apr 2013 10:18:32 -0400
Subject: [PATCH 0269/1378] plugged_in function

---
 plugins/battery/battery.plugin.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 0c7c9421f..785386a12 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -16,12 +16,16 @@ if [[ $(uname) == "Darwin" ]] ; then
     integer i=$(((currentcapacity/maxcapacity) * 100))
     echo $i
   }
+
+  function plugged_in() {
+    [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ]
+  }
   
   function battery_pct_remaining() {
-    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      battery_pct
-    else
+    if plugged_in ; then
       echo "External Power"
+    else
+      battery_pct
     fi
   }
 

From f28e16a15856baf92163dba8ac6eec1e02cf6c1f Mon Sep 17 00:00:00 2001
From: Lindolfo 'Lorn' Rodrigues <lorn@lornlab.org>
Date: Tue, 30 Apr 2013 01:51:09 -0300
Subject: [PATCH 0270/1378] Cache for fasd --init

Using cache technique for faster fasd --init as shown at:
 https://github.com/clvv/fasdi#install
---
 plugins/fasd/fasd.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index d42584f1a..8ad43fc23 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -1,5 +1,10 @@
 if [ $commands[fasd] ]; then # check if fasd is installed
-  eval "$(fasd --init auto)"
+  fasd_cache="$HOME/.fasd-init-cache"
+  if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
+    fasd --init auto >| "$fasd_cache"
+  fi
+  source "$fasd_cache"
+  unset fasd_cache
   alias v='f -e vim'
   alias o='a -e open'
 fi

From cf3a03d45e6b4eb642238bbd7b6aeca1fd1bc868 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Sun, 5 May 2013 16:35:40 +0800
Subject: [PATCH 0271/1378] rm alias gcm='git checkout master' and add alias
 gcm='git commit -m'

---
 plugins/git/git.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..5277abc99 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -22,9 +22,10 @@ alias gca='git commit -v -a'
 compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
+alias gcm='git commit -m'
+compdef _git gcm=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
-alias gcm='git checkout master'
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'

From b36c42b76d5bb06e1a19b534177ad4980bc3b025 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Wed, 8 May 2013 17:03:07 +0800
Subject: [PATCH 0272/1378] rename gcm to gcmsg and stand for 'git commit -m'

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5277abc99..bcbd0897c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -22,7 +22,7 @@ alias gca='git commit -v -a'
 compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
-alias gcm='git commit -m'
+alias gcmsg='git commit -m'
 compdef _git gcm=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout

From 29e696d902b4cf665e237969aa333a5e176a59f5 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Wed, 8 May 2013 17:03:07 +0800
Subject: [PATCH 0273/1378] rename gcm to gcmsg and stand for 'git commit -m'
 #1790

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5277abc99..bcbd0897c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -22,7 +22,7 @@ alias gca='git commit -v -a'
 compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
-alias gcm='git commit -m'
+alias gcmsg='git commit -m'
 compdef _git gcm=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout

From 22dce9e71594d1cf191cd41cef845a34621826f8 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Thu, 9 May 2013 12:57:32 +0800
Subject: [PATCH 0274/1378] add git alias 'gcmsg' and stand for 'git commit -m'

---
 plugins/git/git.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bcbd0897c..b30c4b99a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -23,9 +23,10 @@ compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
 alias gcmsg='git commit -m'
-compdef _git gcm=git-commit
+compdef _git gcmsg=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
+alias gcm='git checkout master'
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'

From 6de78ad2ba8688532b116de8322d7aaecbbcebbe Mon Sep 17 00:00:00 2001
From: bebugz <bebugz@gmail.com>
Date: Thu, 9 May 2013 13:12:11 +0400
Subject: [PATCH 0275/1378] gentoo linux support

---
 plugins/autojump/autojump.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 3894ccd2f..f856f2f01 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -3,6 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
     . /etc/profile.d/autojump.zsh
+  elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation
+    . /etc/profile.d/autojump.sh
   elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
     . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports

From a9111488e4945a29b8afa9a4eab12ee2e6fc9a0e Mon Sep 17 00:00:00 2001
From: yleo77 <ylep77@gmail.com>
Date: Fri, 17 May 2013 17:48:06 +0800
Subject: [PATCH 0276/1378] add search by filename and file content feature

---
 .gitignore                            |  5 ++---
 custom/plugins/sfffe/sfffe.plugin.zsh | 28 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 custom/plugins/sfffe/sfffe.plugin.zsh

diff --git a/.gitignore b/.gitignore
index 51a5ee6c3..5db11ce5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*
-!custom/example
-!custom/example.zsh
+custom/example
+custom/example.zsh
 *.swp
 !custom/example.zshcache
 cache/
diff --git a/custom/plugins/sfffe/sfffe.plugin.zsh b/custom/plugins/sfffe/sfffe.plugin.zsh
new file mode 100644
index 000000000..a0f034908
--- /dev/null
+++ b/custom/plugins/sfffe/sfffe.plugin.zsh
@@ -0,0 +1,28 @@
+# ------------------------------------------------------------------------------
+#          FILE:  sfffe.plugin.zsh
+#   DESCRIPTION:  search file for FE
+#        AUTHOR:  yleo77 (ylep77@gmail.com)
+#       VERSION:  0.1
+#       REQUIRE:  ack
+# ------------------------------------------------------------------------------
+
+if [ ! -x $(which ack) ]; then
+    echo  \'ack\' is not installed!
+    exit -1
+fi
+
+ajs() {
+    ack "$@" --type js
+}
+
+acss() {
+    ack "$@" --type css
+}
+
+fjs() {
+    find ./ -name "$@*" -type f | grep '\.js'
+}
+
+fcss() {
+    find ./ -name "$@*" -type f | grep '\.css'
+}

From d2fe03d7549558745f999865ea0e348cb44e818f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <choltje@us.ibm.com>
Date: Fri, 17 May 2013 11:17:33 -0400
Subject: [PATCH 0277/1378] Create the zcompdump based on version and host

This will prevent lots of subtle problems that happen when
people upgrade ZSH or use NFS mounted home directories.

The ZSH_COMPDUMP variable can also be used to implement `zcompile`
and other fun features in the future.
---
 oh-my-zsh.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 93c10e3d2..15c1dce44 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -38,10 +38,20 @@ for plugin ($plugins); do
   fi
 done
 
+# Figure out the SHORT hostname
+if [ -n "$commands[scutil]" ]; then
+  # OS X
+  SHORT_HOST=$(scutil --get ComputerName)
+else
+  SHORT_HOST=${HOST/.*/}
+fi
+
+# Save the location of the current completion dump file.
+ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+
 # Load and run compinit
 autoload -U compinit
-compinit -i
-
+compinit -i -d "${ZSH_COMPDUMP}"
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do

From 4ff861ee115fdba24033f945dcf3cacea3120074 Mon Sep 17 00:00:00 2001
From: Christopher Roach <vthakr@gmail.com>
Date: Sun, 19 May 2013 12:55:10 -0700
Subject: [PATCH 0278/1378] Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY
 option.

---
 lib/git.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 96598cf5f..c4b5b5d62 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -15,12 +15,12 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi
-    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
-        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
-    else
+    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
         GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
+    else
+        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
     fi
-    if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno  2> /dev/null) ]]; then
+    if [[ -n $GIT_STATUS ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From 25313814775c08c64dc541fbadceb38c669c541a Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Mon, 20 May 2013 22:18:07 -0700
Subject: [PATCH 0279/1378] Add web-search plugin.

This plugin adds google, bing and yahoo commands to launch the default
web browser to do web search:

e.g.

    google oh-my-zsh
    bing what is zsh
---
 plugins/web-search/web-search.plugin.zsh | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 plugins/web-search/web-search.plugin.zsh

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
new file mode 100644
index 000000000..6b6de2b15
--- /dev/null
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -0,0 +1,43 @@
+# web_search from terminal
+
+function web_search() {
+
+  # get the open command
+  local open_cmd
+  if [[ $(uname -s) == 'Darwin' ]]; then
+    open_cmd='open'
+  else
+    open_cmd='xdg-open'
+  fi
+
+  # check whether the search engine is supported
+  if [[ ! $1 =~ '(google|bing|yahoo)' ]];
+  then
+    echo "Search engine $1 not supported."
+    return 1
+  fi
+
+  local url="http://www.$1.com"
+
+  # no keyword provided, simply open the search engine homepage
+  if [[ $# -le 1 ]]; then
+    $open_cmd "$url"
+    return
+  fi
+
+  url="${url}/search?q="
+  shift   # shift out $1
+
+  while [[ $# -gt 0 ]]; do
+    url="${url}$1+"
+    shift
+  done
+
+  url="${url%?}" # remove the last '+'
+
+  $open_cmd "$url"
+}
+
+alias bing='web_search bing'
+alias google='web_search google'
+alias yahoo='web_search yahoo'

From 69116fa806f5a7405d33cc1f7c66d4c26ad4253b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20M=2E=20Bravo?= <german.mb@gmail.com>
Date: Tue, 21 May 2013 14:20:28 -0400
Subject: [PATCH 0280/1378] Fixed recursion. Git not needed for it to work.

Avoid infinite `cd` loops under certain conditions. Try getting `.venv` from the current directory (not necessarily always using git)
---
 .../virtualenvwrapper.plugin.zsh              | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 0ed2565b4..35de50874 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -8,26 +8,36 @@ if [[ -f "$wrapsource" ]]; then
     # directory name of the project. Virtual environment name can be overridden
     # by placing a .venv file in the project root with a virtualenv name in it
     function workon_cwd {
-        # Check that this is a Git repo
-        PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
-        if (( $? == 0 )); then
+        if [ ! $WORKON_CWD ]; then
+            WORKON_CWD=1
+            # Check if this is a Git repo
+            PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
+            if (( $? != 0 )); then
+                PROJECT_ROOT="."
+            fi
             # Check for virtualenv name override
-            ENV_NAME=`basename "$PROJECT_ROOT"`
             if [[ -f "$PROJECT_ROOT/.venv" ]]; then
                 ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+            elif [[ "$PROJECT_ROOT" != "." ]]; then
+                ENV_NAME=`basename "$PROJECT_ROOT"`
+            else
+                ENV_NAME=""
             fi
-            # Activate the environment only if it is not already active
-            if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
-                if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
-                    workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+            if [[ "$ENV_NAME" != "" ]]; then
+                # Activate the environment only if it is not already active
+                if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+                    if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+                        workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+                    fi
                 fi
+            elif [ $CD_VIRTUAL_ENV ]; then
+                # We've just left the repo, deactivate the environment
+                # Note: this only happens if the virtualenv was activated automatically
+                deactivate && unset CD_VIRTUAL_ENV
             fi
-        elif [ $CD_VIRTUAL_ENV ]; then
-            # We've just left the repo, deactivate the environment
-            # Note: this only happens if the virtualenv was activated automatically
-            deactivate && unset CD_VIRTUAL_ENV
+            unset PROJECT_ROOT
+            unset WORKON_CWD
         fi
-        unset PROJECT_ROOT
     }
 
     # New cd function that does the virtualenv magic

From 00848cd8b7347e9b793a2ac6170498e6592dde56 Mon Sep 17 00:00:00 2001
From: yleo77 <ylep77@gmail.com>
Date: Wed, 22 May 2013 17:00:08 +0800
Subject: [PATCH 0281/1378] add gf alias for git flow

---
 plugins/git-flow/git-flow.plugin.zsh | 3 +++
 plugins/git/git.plugin.zsh           | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index ab9c0c848..58c31d756 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -20,6 +20,9 @@
 #     c. Or, use this file as a oh-my-zsh plugin.
 #
 
+#Alias
+alias gf='git flow'
+
 _git-flow ()
 {
 	local curcontext="$curcontext" state line
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..af0189fdc 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -63,7 +63,10 @@ compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gf='git ls-files | grep'
+
+#remove the gf alias
+#alias gf='git ls-files | grep'
+
 alias gpoat='git push origin --all && git push origin --tags'
 
 # Will cd into the top of the current repository

From bd38c50241647a1d0b0e2ca49fb1d6b9a2b88806 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Lemieux <marc@marcantoinelemieux.com>
Date: Mon, 27 May 2013 09:23:14 -0400
Subject: [PATCH 0282/1378] fix the open command in linux using xdg-open

---
 plugins/jira/jira.plugin.zsh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index b91f93c95..bea726a54 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -11,6 +11,13 @@
 # Usage: jira           # opens a new issue
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {
+  local open_cmd
+  if [[ $(uname -s) == 'Darwin' ]]; then
+    open_cmd='open'
+  else
+    open_cmd='xdg-open'
+  fi
+
   if [ -f .jira-url ]; then
     jira_url=$(cat .jira-url)
   elif [ -f ~/.jira-url ]; then
@@ -28,9 +35,9 @@ open_jira_issue () {
   else
     echo "Opening issue #$1"
     if [[ "x$JIRA_RAPID_BOARD" = "yes" ]]; then
-      `open $jira_url/issues/$1`
+      $open_cmd  "$jira_url/issues/$1"
     else
-      `open $jira_url/browse/$1`
+      $open_cmd  "$jira_url/browse/$1"
     fi
   fi
 }

From 6f8e8c58a05a3ff9d48ade08544e3a4d5cc4185d Mon Sep 17 00:00:00 2001
From: Ayush Samantroy <ayush@ayush.org>
Date: Sat, 1 Jun 2013 18:02:38 +0530
Subject: [PATCH 0283/1378] Added alias for git clean

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..c81a72ff4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -62,6 +62,7 @@ alias gm='git merge'
 compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
+alias gclean='git reset --hard && git clean -dfx'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gf='git ls-files | grep'
 alias gpoat='git push origin --all && git push origin --tags'

From 4b945a856c7d43891b645e99a91eb9d38b62b64a Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 5 Jun 2013 15:12:56 +0200
Subject: [PATCH 0284/1378] New plugin for git-repo
 (https://code.google.com/p/git-repo/)

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/repo/README.md       |   7 +
 plugins/repo/_repo           | 272 +++++++++++++++++++++++++++++++++++
 plugins/repo/repo.plugin.zsh |   2 +
 3 files changed, 281 insertions(+)
 create mode 100644 plugins/repo/README.md
 create mode 100644 plugins/repo/_repo
 create mode 100644 plugins/repo/repo.plugin.zsh

diff --git a/plugins/repo/README.md b/plugins/repo/README.md
new file mode 100644
index 000000000..0b77e6d48
--- /dev/null
+++ b/plugins/repo/README.md
@@ -0,0 +1,7 @@
+## repo
+**Maintainer:** [Stibbons](https://github.com/Stibbons)
+
+This plugin mainly add support automatic completion for the repo command line tool:
+http://code.google.com/p/git-repo/
+
+* `r` aliases `repo`
diff --git a/plugins/repo/_repo b/plugins/repo/_repo
new file mode 100644
index 000000000..59e39c954
--- /dev/null
+++ b/plugins/repo/_repo
@@ -0,0 +1,272 @@
+#compdef repo
+
+
+__git_apply_whitespace_strategies ()
+{
+  declare -a strategies
+
+  strategies=(
+    'nowarn:turn off the trailing-whitespace warning'
+    'warn:output trailing-whitespace warning, but apply patch'
+    'fix:output trailing-whitespace warning and strip trailing whitespace'
+    'error:output trailing-whitespace warning and refuse to apply patch'
+    'error-all:same as "error", but output warnings for all files')
+
+  _describe -t strategies 'trailing-whitespace resolution strategy' strategies $*
+}
+
+
+_repo()
+{
+  local context state state_descr line curcontext="$curcontext"
+  typeset -A opt_args
+
+  local ret=1
+
+  _arguments -C \
+    '(- 1 *)--help[show usage]'\
+    '1:command:->command'\
+    '*::args:->args' && ret=0
+
+  case $state in
+    (command)
+      repo list  2> /dev/null > /dev/null
+      if [[ $? == 0 ]]; then
+        local commands;
+        commands=(
+          'abandon:Permanently abandon a development branch'
+          'branch:View current topic branches'
+          'branches:View current topic branches'
+          'checkout:Checkout a branch for development'
+          'cherry-pick:Cherry-pick a change.'
+          'diff:Show changes between commit and working tree'
+          'download:Download and checkout a change'
+          'forall:execute command on several project'
+          'grep:Print lines matching a pattern'
+          'help:Display detailed help on a command'
+          'init:Initialize repo in the current directory'
+          'list:List projects and their associated directories'
+          'manifest:Manifest inspection utility'
+          'overview:Display overview of unmerged project branches'
+          'prune:Prune (delete) already merged topics'
+          'rebase:Rebase local branches on upstream branch'
+          'selfupdate:Update repo to the latest version'
+          'smartsync:Update working tree to the latest known good revision'
+          'stage:Stage file(s) for commit'
+          'start:Start a new branch for development'
+          'status:Show the working tree status'
+          'sync:Update working tree to the latest revision'
+          'upload:Upload changes for code review'
+          'version:Display the version of repo'
+        )
+        _describe -t commands 'command' commands && ret=0
+      else
+        local commands;
+        commands=(
+          'init:Install repo in the current working directory'
+          'help:Display detailed help on a command'
+        )
+        _describe -t commands 'command' commands && ret=0
+      fi
+      ;;
+    (args)
+      case $words[1] in
+        (branch | branches)
+          # TODO : list available projects and add them in list to feed compadd with
+          _arguments  : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     ': :__repo_projects' \
+                      && ret=0
+         ;;
+        (abandon)
+          # TODO : list available projects and add them in list to feed compadd with
+          _arguments  : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     ':branch name:__repo_branch' \
+                     ': :__repo_projects'\
+                      && ret=0
+          ;;
+        (checkout)
+          # TODO : list available projects and add them in list to feed compadd with
+          _arguments  : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     ':branch name:__repo_branch' \
+                     ': :__repo_projects'\
+                     && ret=0
+          ;;
+        (init)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-q --quiet)"{-q,--quiet}"[be quiet]" \
+                     "(-u --manifest-url)"{-u,--manifest-url=}"[manifest repository location]":url:__repo_url_prompt \
+                     "(-b --manifest-branch)"{-b,--manifest-branch=}"[manifest branch or revision]":branch:__repo_branch\
+                     "(-m --manifest-name)"{-m,--manifest-name=}"[initial manifest file]":manifest_name:__repo_manifest_name\
+                     "(--mirror)--mirror[mirror the forrest]"\
+                     "(--reference)--reference=[location of mirror directory]":dir:_dirs\
+                     "(--depth)--depth=[create a shallow clone with given depth; see git clone]":depth:__repo_depth_prompt\
+                     "(-g --group=)"{-g,--group=}"[restrict manifest projects to ones with a specified group]":group:_group\
+                     "(-p --platform=)"{-p,--platform=}"[restrict manifest projects to ones with a specified platform group(auto|all|none|linux|darwin|...)]":platform:"(auto all none linux darwin)"\
+                     "(--repo-url)--repo-url=[repo repository location]":url:__repo_url_prompt\
+                     "(--repo-branch)--repo-branch[repo branch or revision]":branch_or_rev:__repo__repo_branch_or_rev\
+                     "(--no-repo-verify)--no-repo-verify[do not verify repo source code]"\
+                     "(--config-name)--config-name[Always prompt for name/e-mail]"\
+                     && ret=0
+          ;;
+        (start)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(--all)--all=[begin branch in all projects]"\
+                    ':branch name:__repo_new__repo_branch_name' \
+                    ':projects:__repo_projects_or_all' \
+                    && ret=0
+          ;;
+        (rebase)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-i --interactive)"{-i,--interactive}"[interactive rebase (single project only)]: :__repo_projects" \
+                     "(-f --force-rebase)"{-f,--force-rebase}"[Pass --force-rebase to git rebase]" \
+                     "(--no-ff)--no-ff=[Pass --no-ff to git rebase]"\
+                     "(-q --quiet)"{-q,--quiet}"[Pass --quiet to git rebase]" \
+                     "(--autosquash)--no-ff[Pass --autosquash to git rebase]"\
+                     "(--whitespace=)--whitespace=[Pass --whitespace to git rebase]: :__git_apply_whitespace_strategies"\
+                     "(--auto-stash)--auto-stash[Stash local modifications before starting]"\
+                     && ret=0
+          ;;
+        (checkout)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                    ':branch name:__git_branch_names' \
+                    ':projects:__repo_projects' \
+                    && ret=0
+          ;;
+        (list)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                    && ret=0
+          ;;
+        (status)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-j --jobs)"{-j,--jobs}"[number of projects to check simultaneously]" \
+                    ':projects:__repo_projects' \
+                    && ret=0
+          ;;
+        (sync)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(--no-force-broken)--no-force-broken[stop sync if a project fails to sync (probably because of permissions)]" \
+                     "(-l --local-only)"{-l,--local-only}"[only update working tree, don't fetch]" \
+                     "(-n --network-only)"{-n,--network-branch}"[fetch only, don't update working tree]" \
+                     "(-d --detach)"{-d,--detach}"[detach projects back to manifest revision]" \
+                     "(-c --current-branch)"{-c,--current-branch}"[fetch only current branch from server]" \
+                     "(-q --quiet)"{-q,--quiet}"[be more quiet]" \
+                     "(-j --jobs=)"{-j,--jobs=}"[projects to fetch simultaneously (default 1) (limited to 5)]:projects to fetch simultaneously (default 1) (limited to 5)" \
+                     "(-m --manifest-name=)"{-m,--manifest-name=}"[temporary manifest to use for this sync]:manifest xml file:_files -g *.xml" \
+                     "(--no-clone-bundle)--no-clone-bundle[disable use of /clone.bundle on HTTP/HTTPS]" \
+                     "(-s --smart-sync)"{-s,--smart-sync=}"[smart sync using manifest from a known tag]:tag:" \
+                     '(--no-repo-verify)--no-repo-verify[do not verify repo source code]' \
+                     ': :__repo_projects' \
+                     && ret=0
+          ;;
+        (upload)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-t)-t[Send local branch name to Gerrit Code Review]" \
+                     "(--re= --reviewers=)"{--re=,--reviewers=}"[Request reviews from these people]:Request reviews from these people:" \
+                     "(--cc=)--cc=[Also send email to these email addresses.]:email addresses:_email_addresses" \
+                     "(--br=)--br=[Branch to upload.]:branch:__repo_branch" \
+                     "(--cbr --current-branch)"{--cbr,--current-branch}"[Upload current git branch]" \
+                     "(-d --draft)"{-d,--draft}"[If specified, upload as a draft.]" \
+                     "(--verify --no-verify)--no-verify[Do not run the upload hook.]" \
+                     '(--verify --no-verify)--verify[Run the upload hook without prompting]' \
+                     ': :__repo_projects' \
+                     && ret=0
+          ;;
+        (forall)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-v --verbose)"{-v,--verbose}"[Show command error messages]" \
+                     '(-p)-p[Show project headers before output]' \
+                     ': :__repo_projects_mandatory' \
+                     "(-c --command -h --help -v --verbose -p)"{-c,--command}"[Command (and arguments) to execute]" \
+                     && ret=0
+          ;;
+        *)
+          ret=0
+      esac
+      ;;
+  esac
+
+  return $ret
+}
+
+__repo_reviewers()
+{
+ # _message -e url 'reviewers'
+}
+
+__repo_url_prompt()
+{
+  _message -e url 'url'
+}
+
+__repo_manifest_name()
+{
+  _message -e manifest_name 'manifest name'
+}
+
+_group()
+{
+  _message -e group 'group'
+}
+
+__repo_branch()
+{
+  #_message -e branch 'Repo branch'
+  branches=($(repo branches| cut -c4- | grep '|' | cut -d' ' -f1))
+  _describe -t branches 'Select repo branch' branches
+}
+
+__repo__repo_branch_or_rev()
+{
+  _message -e branch_or_rev 'repo branch or revision'
+}
+
+__repo_depth_prompt()
+{
+  _message -e depth 'depth'
+}
+
+__repo_projects()
+{
+  _message -e depth 'Optional option : <projects>...'
+  projects=($(repo list | cut -d' ' -f1))
+  _describe -t projects 'Select projects (keep empty for selecting all projects)' projects
+}
+
+__repo_projects_mandatory()
+{
+  projects=($(repo list | cut -d' ' -f1))
+  #_describe -t projects 'Select projects to apply commands' projects
+  _values -s ' ' "Select projects to apply commands" $projects
+}
+
+__repo_new__repo_branch_name()
+{
+  branches=($(repo branches| cut -c4- | grep '|' | cut -d' ' -f1))
+  _describe "" branches
+  _message -e "branch name" 'Enter new branch name or select an existing repo branch'
+}
+
+__repo_projects_or_all()
+{
+  #_message -e depth '[--all | <project>...]'
+
+  projects=(--all $(repo list | cut -d' ' -f1))
+  _describe -t projects 'Select projects or --all' projects
+  _describe -t --all 'All projects'
+}
+
+_repo "$@"
+return $?
+
diff --git a/plugins/repo/repo.plugin.zsh b/plugins/repo/repo.plugin.zsh
new file mode 100644
index 000000000..9cc336959
--- /dev/null
+++ b/plugins/repo/repo.plugin.zsh
@@ -0,0 +1,2 @@
+# Aliases
+alias r='repo'

From 46f0d8dba95aae400e4d9fc825691d0119cf7189 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 5 Jun 2013 15:16:51 +0200
Subject: [PATCH 0285/1378] Improvement in the git plugin

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/git/README.md      |  4 +++
 plugins/git/_git-branch    | 62 ++++++++++++++++++++++++++++++++
 plugins/git/_git-remote    | 74 ++++++++++++++++++++++++++++++++++++++
 plugins/git/git.plugin.zsh | 13 +++++++
 4 files changed, 153 insertions(+)
 create mode 100644 plugins/git/README.md
 create mode 100644 plugins/git/_git-branch
 create mode 100644 plugins/git/_git-remote

diff --git a/plugins/git/README.md b/plugins/git/README.md
new file mode 100644
index 000000000..8462dda1c
--- /dev/null
+++ b/plugins/git/README.md
@@ -0,0 +1,4 @@
+## git
+**Maintainer:** [Stibbons](https://github.com/Stibbons)
+
+This plugin adds several git aliases and increase the completion function provided by zsh
diff --git a/plugins/git/_git-branch b/plugins/git/_git-branch
new file mode 100644
index 000000000..86d03bc30
--- /dev/null
+++ b/plugins/git/_git-branch
@@ -0,0 +1,62 @@
+#compdef git-branch
+
+_git-branch () 
+{
+  declare l c m d
+
+  l='--color --no-color -r -a --all -v --verbose --abbrev --no-abbrev'
+  c='-l -f --force -t --track --no-track --set-upstream --contains --merged --no-merged'
+  m='-m -M'
+  d='-d -D'
+
+  declare -a dependent_creation_args
+  if (( words[(I)-r] == 0 )); then
+    dependent_creation_args=(
+      "($l $m $d): :__git_branch_names"
+      "::start-point:__git_revisions")
+  fi
+
+  declare -a dependent_deletion_args
+  if (( words[(I)-d] || words[(I)-D] )); then
+    dependent_creation_args=
+    dependent_deletion_args=(
+      '-r[delete only remote-tracking branches]')
+    if (( words[(I)-r] )); then
+      dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_remote_branch_names'
+    else
+      dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_branch_names'
+    fi
+  fi
+
+  declare -a dependent_modification_args
+  if (( words[(I)-m] || words[(I)-M] )); then
+    dependent_creation_args=
+    dependent_modification_args=(
+      ':old or new branch name:__git_branch_names'
+      '::new branch name:__git_branch_names')
+  fi
+
+  _arguments -w -S -s \
+    "($c $m $d --no-color :)--color=-[turn on branch coloring]:: :__git_color_whens" \
+    "($c $m $d : --color)--no-color[turn off branch coloring]" \
+    "($c $m      -a --all)-r[list or delete only remote-tracking branches]" \
+    "($c $m $d : -r)"{-a,--all}"[list both remote-tracking branches and local branches]" \
+    "($c $m $d : -v --verbose)"{-v,--verbose}'[show SHA1 and commit subject line for each head]' \
+    "($c $m $d :)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length" \
+    "($c $m $d :)--no-abbrev[do not abbreviate sha1s]" \
+    "($l $m $d)-l[create the branch's reflog]" \
+    "($l $m $d -f --force)"{-f,--force}"[force the creation of a new branch]" \
+    "($l $m $d -t --track)"{-t,--track}"[set up configuration so that pull merges from the start point]" \
+    "($l $m $d)--no-track[override the branch.autosetupmerge configuration variable]" \
+    "($l $m $d)--set-upstream[set up configuration so that pull merges]" \
+    "($l $m $d)--contains=[only list branches which contain the specified commit]: :__git_committishs" \
+    "($l $m $d)--merged=[only list branches which are fully contained by HEAD]: :__git_committishs" \
+    "($l $m $d)--no-merged=[do not list branches which are fully contained by HEAD]: :__git_committishs" \
+    $dependent_creation_args \
+    "($l $c $d -M)-m[rename a branch and the corresponding reflog]" \
+    "($l $c $d -m)-M[rename a branch even if the new branch-name already exists]" \
+    $dependent_modification_args \
+    "($l $c $m -D)-d[delete a fully merged branch]" \
+    "($l $c $m -d)-D[delete a branch]" \
+    $dependent_deletion_args
+}
diff --git a/plugins/git/_git-remote b/plugins/git/_git-remote
new file mode 100644
index 000000000..4ba62a357
--- /dev/null
+++ b/plugins/git/_git-remote
@@ -0,0 +1,74 @@
+#compdef git-remote
+
+# NOTE: --track is undocumented.
+# TODO: --track, -t, --master, and -m should take remote branches, I guess.
+# NOTE: --master is undocumented.
+# NOTE: --fetch is undocumented.
+_git-remote () {
+  local curcontext=$curcontext state line
+  declare -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options' && ret=0
+
+  case $state in
+    (command)
+      declare -a commands
+
+      commands=(
+        'add:add a new remote'
+        'show:show information about a given remote'
+        'prune:delete all stale tracking branches for a given remote'
+        'update:fetch updates for a set of remotes'
+        'rm:remove a remote from .git/config and all associated tracking branches'
+        'rename:rename a remote from .git/config and update all associated tracking branches'
+        'set-head:sets or deletes the default branch'
+        'set-branches:changes the list of branches tracked by the named remote.'
+        'set-url:changes URL remote points to.'
+        )
+
+      _describe -t commands 'sub-command' commands && ret=0
+      ;;
+    (options)
+      case $line[1] in
+        (add)
+          _arguments \
+            '*'{--track,-t}'[track given branch instead of default glob refspec]:branch:__git_branch_names' \
+            '(--master -m)'{--master,-m}'[set the remote'\''s HEAD to point to given master branch]:branch:__git_branch_names' \
+            '(--fetch -f)'{--fetch,-f}'[run git-fetch on the new remote after it has been created]' \
+            ':branch name:__git_remotes' \
+            ':url:_urls' && ret=0
+          ;;
+        (show)
+          _arguments \
+            '-n[do not contact the remote for a list of branches]' \
+            ':remote:__git_remotes' && ret=0
+          ;;
+        (prune)
+          _arguments \
+            '(--dry-run -n)'{-n,--dry-run}'[do not actually prune, only list what would be done]' \
+            ':remote:__git_remotes' && ret=0
+          ;;
+        (update)
+          __git_remote-groups && ret=0
+          ;;
+        (rm)
+          __git_remotes && ret=0
+          ;;
+        (rename)
+          __git_remotes && ret=0
+          ;;
+        (set-url)
+          _arguments \
+            '*--push[manipulate push URLs]' \
+            '(--add)--add[add URL]' \
+            '(--delete)--delete[delete URLs]' \
+            ':branch name:__git_remotes' \
+            ':url:_urls' && ret=0
+          ;;
+          
+      esac
+      ;;
+  esac
+}
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..cf897239c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -37,6 +37,12 @@ alias grset='git remote set-url'
 compdef _git grset=git-remote
 alias grup='git remote update'
 compdef _git grset=git-remote
+alias grbi='git rebase -i'
+compdef _git grbi=git-rebase
+alias grbc='git rebase --continue'
+compdef _git grbc=git-rebase
+alias grba='git rebase --abort'
+compdef _git grba=git-rebase
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
@@ -65,6 +71,13 @@ alias grhh='git reset HEAD --hard'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gf='git ls-files | grep'
 alias gpoat='git push origin --all && git push origin --tags'
+alias gmt='git mergetool --no-prompt'
+compdef _git gm=git-mergetool
+
+alias gg='git gui citool'
+alias gga='git gui citool --amend'
+alias gk='gitk --all --branches'
+alias gss='git stash show --text'
 
 # Will cd into the top of the current repository
 # or submodule.

From 82666e25e31451527520ab49a819e4135ed8a34c Mon Sep 17 00:00:00 2001
From: Trev <trev311@gmail.com>
Date: Wed, 5 Jun 2013 13:22:33 -0400
Subject: [PATCH 0286/1378] A cabal plugin based on the lein plugin

---
 plugins/cabal/cabal.plugin.zsh | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 plugins/cabal/cabal.plugin.zsh

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
new file mode 100644
index 000000000..8d3c64587
--- /dev/null
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -0,0 +1,36 @@
+function _cabal_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "bench:Run the benchmark, if any (configure with UserHooks)"
+          "build:Make this package ready for installation"
+          "check:Check the package for common mistakes"
+          "clean:Clean up after a build"
+          "copy:Copy teh files into the install locations"
+          "configure:Prepare to build the package"
+          "fetch:Downloads packages for later installation"
+          "haddock:Generate HAddock HTML documentation"
+          "help:Help about commands"
+          "hscolour:Generate HsColour colourised code, in HTML format"
+          "info:Display detailed information about a particular package"
+          "init:Interactively create a .cabal file"
+          "install:Installs a list of packages"
+          "list:List packages matching a search string"
+          "register:Register this package with the compiler"
+          "report:Upload build reports to a remote server"
+          "sdist:Generate a source distribution file (.tar.gz)"
+          "test:Run the test suite, if any (configure with UserHooks)"
+          "unpack:Unpacks packages for user inspection"
+          "update:Updates list of known packages"
+          "upload:Uploads source packages to Hackage"
+        )
+        _describe -t subcommands 'cabal subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+compdef _cabal_commands cabal

From 0118e182894b1756ce292936b6a1ff64582879b4 Mon Sep 17 00:00:00 2001
From: Michael LaCorte <mlacorte@oddz.com>
Date: Wed, 5 Jun 2013 12:37:02 -0700
Subject: [PATCH 0287/1378] Fixed color on git prompt for superjarin theme

---
 themes/superjarin.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
index 86955a560..2920d17a2 100644
--- a/themes/superjarin.zsh-theme
+++ b/themes/superjarin.zsh-theme
@@ -11,13 +11,13 @@ fi
 # Append the current git branch, if in a git repository
 JARIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[white]%}"
 
 # Do nothing if the branch is clean (no changes).
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}>"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%}>"
 
 # Add a yellow ✗ if the branch is dirty
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}> %{$fg[yellow]%}✗"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}> %{$fg[yellow]%}✗"
 
 # Put it all together!
 PROMPT="$JARIN_CURRENT_RUBY_ $JARIN_CURRENT_LOCA_ "

From 8300f62e92bd63a1b221889f98318e9c5b441e0b Mon Sep 17 00:00:00 2001
From: Lucas Uyezu <lucas.uyezu@gmail.com>
Date: Thu, 6 Jun 2013 00:40:02 -0300
Subject: [PATCH 0288/1378] Adding testlog and prodlog.

---
 plugins/rails/rails.plugin.zsh   | 2 ++
 plugins/rails3/rails3.plugin.zsh | 2 ++
 plugins/rails4/rails4.plugin.zsh | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 0139d22c3..dd8b174b2 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -10,6 +10,8 @@ alias migrate='rake db:migrate && rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'
+alias testlog='tail -f log/test.log'
+alias prodlog='tail -f log/production.log'
 alias -g RET='RAILS_ENV=test'
 alias -g REP='RAILS_ENV=production'
 alias -g RED='RAILS_ENV=development'
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index a2697872a..2555fab67 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -19,6 +19,8 @@ alias ru='_rails_command runner'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
+alias testlog='tail -f log/test.log'
+alias prodlog='tail -f log/production.log'
 alias rdm='rake db:migrate'
 alias rdr='rake db:rollback'
 alias -g RET='RAILS_ENV=test'
diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
index fce827ee3..cb6cf816d 100644
--- a/plugins/rails4/rails4.plugin.zsh
+++ b/plugins/rails4/rails4.plugin.zsh
@@ -21,6 +21,8 @@ alias ru='_rails_command runner'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
+alias testlog='tail -f log/test.log'
+alias prodlog='tail -f log/production.log'
 alias rdm='rake db:migrate'
 alias rdc='rake db:create'
 alias rdr='rake db:rollback'

From 6b832b93588567cb00b9a9e8170a5ebf539dea51 Mon Sep 17 00:00:00 2001
From: yleo77 <ylep77@gmail.com>
Date: Thu, 6 Jun 2013 12:39:14 +0800
Subject: [PATCH 0289/1378] add some alias for git flow

---
 plugins/git-flow/git-flow.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 58c31d756..b9ea06844 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -22,6 +22,9 @@
 
 #Alias
 alias gf='git flow'
+alias gcd='git checkout develop'
+alias gch='git checkout hotfix'
+alias gcr='git checkout release'
 
 _git-flow ()
 {

From b1f41f6fa5fbfb9317704fa1416a8d081b4e2310 Mon Sep 17 00:00:00 2001
From: Matthew Robben <mattr@terrarium.io>
Date: Thu, 6 Jun 2013 02:18:25 -0300
Subject: [PATCH 0290/1378] Update README.textile

Add upgrade command to docs. I canceled the prompt once and went hunting for this so I could upgrade.
---
 README.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.textile b/README.textile
index 5f8067499..1916d9f4e 100644
--- a/README.textile
+++ b/README.textile
@@ -72,6 +72,8 @@ To disable updates entirely, put this in your ~/.zshrc
 
 @DISABLE_AUTO_UPDATE=true@
 
+To upgrade directly from the command line, just run @upgrade_oh_my_zsh@
+
 h3. Uninstalling
 
 If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).

From 97849bd9b65300a839f3c340e9dbb30b494d9898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20D=C3=A9trez?= <gdetrez@crans.org>
Date: Thu, 6 Jun 2013 13:06:29 +0200
Subject: [PATCH 0291/1378] Update the character used in powerline

The code points have been updated in 53fbfe1, see
- https://github.com/Lokaltog/powerline/commit/53fbfe15fead8cc7598bcb4ee9714a221ab7e446
- https://github.com/Lokaltog/powerline/issues/4
---
 themes/agnoster.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index a9de8c84e..e65293858 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -26,7 +26,7 @@
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 
 CURRENT_BG='NONE'
-SEGMENT_SEPARATOR='⮀'
+SEGMENT_SEPARATOR=''
 
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//⭠ }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
   fi
 }
 
@@ -110,7 +110,7 @@ prompt_hg() {
 				# if working copy is clean
 				prompt_segment green black
 			fi
-			echo -n $(hg prompt "⭠ {rev}@{branch}") $st
+			echo -n $(hg prompt " {rev}@{branch}") $st
 		else
 			st=""
 			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
@@ -124,7 +124,7 @@ prompt_hg() {
 			else
 				prompt_segment green black
 			fi
-			echo -n "⭠ $rev@$branch" $st
+			echo -n " $rev@$branch" $st
 		fi
 	fi
 }

From 1e86e65e3a424145bda6096f7770c448f0286dce Mon Sep 17 00:00:00 2001
From: Charles Johnson <charles@opscode.com>
Date: Thu, 6 Jun 2013 13:34:36 -0600
Subject: [PATCH 0292/1378] Update bundler.plugin.zsh

Added berks, foodcritic, kitchen, and knife commands to bundler plugin.
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 9446aafab..58476206c 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -7,7 +7,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard jekyll middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork thin thor unicorn unicorn_rails puma)
 
 ## Functions
 

From ec177659df38865c77c930c3f6223069e0cdab78 Mon Sep 17 00:00:00 2001
From: Charles Johnson <charles@opscode.com>
Date: Thu, 6 Jun 2013 14:37:39 -0600
Subject: [PATCH 0293/1378] Update bundler.plugin.zsh

Added strainer & tailor to commands in bundler plugin.
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 58476206c..c01241409 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -7,7 +7,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor thin thor unicorn unicorn_rails puma)
 
 ## Functions
 

From c5aaa11ceee00142e0f385f157b90910d692705f Mon Sep 17 00:00:00 2001
From: Chris Krycho <github@chriskrycho.com>
Date: Fri, 7 Jun 2013 18:36:07 -0300
Subject: [PATCH 0294/1378] Add count for incoming and outgoing changesets.

---
 plugins/mercurial/mercurial.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 9aa2d167a..2d1a0ac0d 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -1,4 +1,3 @@
-
 # Mercurial
 alias hgc='hg commit'
 alias hgb='hg branch'
@@ -9,9 +8,11 @@ alias hgd='hg diff'
 alias hged='hg diffmerge'
 # pull and update
 alias hgi='hg incoming'
+alias hgic='hg incoming | grep "changeset" | wc -l'
 alias hgl='hg pull -u'
 alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
+alias hgoc='hg outgoing | grep 'changeset' | wc -l'
 alias hgp='hg push'
 alias hgs='hg status'
 # this is the 'git commit --amend' equivalent

From e73dd2cdf895879a3584eca3a475f33f72f48da8 Mon Sep 17 00:00:00 2001
From: Andrew Grangaard <Andrew.Grangaard@demandmedia.com>
Date: Sat, 8 Jun 2013 11:25:52 -0700
Subject: [PATCH 0295/1378] virtualenvwrapper plugin cleanup

* removes cd override by using chpwd_functions
* removes subshell call to which by using $+commands array and
  c param expansion to find in PATH
* zsh love!
---
 .../virtualenvwrapper.plugin.zsh              | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 35de50874..670c287bd 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,10 +1,9 @@
-wrapsource=`which virtualenvwrapper_lazy.sh`
-
-if [[ -f "$wrapsource" ]]; then
-  source $wrapsource
+virtualenvwrapper='virtualenvwrapper_lazy.sh'
+if (( $+commands[$virtualenvwrapper] )); then
+  source ${${virtualenvwrapper}:c}
 
   if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-    # Automatically activate Git projects' virtual environments based on the
+    # Automatically activate Git projects's virtual environments based on the
     # directory name of the project. Virtual environment name can be overridden
     # by placing a .venv file in the project root with a virtualenv name in it
     function workon_cwd {
@@ -40,11 +39,17 @@ if [[ -f "$wrapsource" ]]; then
         fi
     }
 
-    # New cd function that does the virtualenv magic
-    function cd {
-        builtin cd "$@" && workon_cwd
-    }
+    # Append workon_cwd to the chpwd_functions array, so it will be called on cd
+    # http://zsh.sourceforge.net/Doc/Release/Functions.html
+    # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
+    if (( ${+chpwd_functions} )); then
+        if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
+            set -A chpwd_functions $chpwd_functions workon_cwd
+        fi
+    else
+        set -A chpwd_functions workon_cwd
+    fi
   fi
 else
-  print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper_lazy.sh. Please install with \`pip install virtualenvwrapper\`."
+  print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`."
 fi

From 894e1caa0a7fb2e02aa139d23d0b05d62c6d8932 Mon Sep 17 00:00:00 2001
From: Andrew Grangaard <Andrew.Grangaard@demandmedia.com>
Date: Sat, 8 Jun 2013 10:02:32 -0700
Subject: [PATCH 0296/1378] virtualenv cleanup: replaces subshell with prompt
 expansion.

* :t parameter expansion returns the last portion of the path,
  equivalent to basename. I <3 zsh.
* adds comments for the VIRTUAL_ENV_DISABLE_PROMPT,
  used by virtual_env activate

See also:
  http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
---
 plugins/virtualenv/virtualenv.plugin.zsh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index e8458389f..8e06450b1 100644
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -1,9 +1,8 @@
 function virtualenv_prompt_info(){
-  local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path ]]; then
-    local virtualenv_name=`basename $virtualenv_path`
-    printf "%s[%s] " "%{${fg[yellow]}%}" $virtualenv_name
+  if [[ -n $VIRTUAL_ENV ]]; then
+    printf "%s[%s] " "%{${fg[yellow]}%}" ${${VIRTUAL_ENV}:t}
   fi
 }
 
+# disables prompt mangling in virtual_env/bin/activate
 export VIRTUAL_ENV_DISABLE_PROMPT=1

From e4884da5a09b121a43121c79449e4cfae7a5c9d0 Mon Sep 17 00:00:00 2001
From: San Martin Morote Eduardo <posva13@gmail.com>
Date: Sun, 9 Jun 2013 11:01:20 +0200
Subject: [PATCH 0297/1378] Random quotes from the internet

---
 plugins/rand-quote/rand-quote.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/rand-quote/rand-quote.plugin.zsh

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
new file mode 100644
index 000000000..b85abc81c
--- /dev/null
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -0,0 +1,17 @@
+Get a random quote fron the sitehttp://www.quotationspage.com/random.php3
+# Created by Eduardo San Martin Morote aka Posva
+# http://posva.github.io
+# Sun Jun 09 10:59:36 CEST 2013 
+# Don't remove this header, thank you
+# Usage: quote
+
+if [[ -x `which curl` ]]; then
+    function quote()
+    {
+        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php3" | grep -m 1 "dt ")
+        TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
+        W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
+        echo "\e[0;33m${W}\e[0;30m: \e[0;35m“${TXT}”\e[m"
+    }
+    #quote
+fi

From 60aa92bae3a589af93d8a52443f01609b81cd4ab Mon Sep 17 00:00:00 2001
From: San Martin Morote Eduardo <posva13@gmail.com>
Date: Sun, 9 Jun 2013 11:04:39 +0200
Subject: [PATCH 0298/1378] Messed up the comment somehow...

---
 plugins/rand-quote/rand-quote.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index b85abc81c..5544ca565 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -1,4 +1,4 @@
-Get a random quote fron the sitehttp://www.quotationspage.com/random.php3
+# Get a random quote fron the site http://www.quotationspage.com/random.php3
 # Created by Eduardo San Martin Morote aka Posva
 # http://posva.github.io
 # Sun Jun 09 10:59:36 CEST 2013 

From d6945e2daad2b980da8cd6af9b1d1ea4f874ec95 Mon Sep 17 00:00:00 2001
From: Michiel Missotten <michiel@lil-web.fr>
Date: Tue, 11 Jun 2013 11:23:02 +0200
Subject: [PATCH 0299/1378] Adding a rebase option to git alias.

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..6f2f59df3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -95,6 +95,8 @@ function current_repository() {
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
+alias ggpur='git pull --rebase origin $(current_branch)'
+compdef ggpur=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

From 3f44f51e9ca1b196e4c3caa439558996abdac273 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 11 Jun 2013 14:50:32 +0200
Subject: [PATCH 0300/1378] source ~/.profile for upgrading (to source the
 proxy configuration)

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 tools/check_for_upgrade.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 581f03a07..14d294328 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -20,6 +20,8 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
+[ ~/.profile ] && source ~/.profile
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update

From b832ec92086df4648e270b3d44a10fe058ffd8f4 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 11 Jun 2013 14:58:25 +0200
Subject: [PATCH 0301/1378] New plugin 'common-aliases' for optional cutting
 edge zsh aliases

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 .../common-aliases/common-aliases.plugin.zsh  | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 plugins/common-aliases/common-aliases.plugin.zsh

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
new file mode 100644
index 000000000..4ac8178b6
--- /dev/null
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -0,0 +1,94 @@
+# Advanced Aliases.
+# Use with caution
+#
+
+# ls, the common ones I use a lot shortened for rapid fire usage
+alias ls='ls --color' #I like color
+alias l='ls -lFh'     #size,show type,human readable
+alias la='ls -lAFh'   #long list,show almost all,show type,human readable
+alias lr='ls -tRFh'   #sorted by date,recursive,show type,human readable
+alias lt='ls -ltFh'   #long list,sorted by date,show type,human readable
+alias ll='ls -l'      #long list
+alias ldot='ls -ld .*'
+alias lS='ls -1FSsh'
+alias lart='ls -1Fcart'
+alias lrt='ls -1Fcrt'
+
+alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file
+
+alias grep='grep --color'
+alias sgrep='grep -R -n -H -C 5'
+
+alias t='tail -f'
+
+# because typing 'cd' is A LOT of work!!
+alias ..='cd ../'
+alias ...='cd ../../'
+alias ....='cd ../../../'
+alias .....='cd ../../../../'
+
+# Command line head / tail shortcuts
+alias -g H='| head'
+alias -g T='| tail'
+alias -g G='| grep'
+alias -g L="| less"
+alias -g M="| most"
+alias -g LL="2>&1 | less"
+alias -g CA="2>&1 | cat -A"
+alias -g NE="2> /dev/null"
+alias -g NUL="> /dev/null 2>&1"
+alias -g P="2>&1| pygmentize -l pytb"
+
+alias dud='du --max-depth=1 -h'
+alias duf='du -sh *'
+alias fd='find . -type d -name'
+alias ff='find . -type f -name'
+
+alias h='history'
+alias hgrep="fc -El 0 | grep"
+alias help='man'
+alias j='jobs'
+alias p='ps -f'
+alias sortnr='sort -n -r'
+alias unexport='unset'
+
+alias whereami=display_info
+
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+# zsh is able to auto-do some kungfoo
+# depends on the SUFFIX :)
+if [ ${ZSH_VERSION//\./} -ge 420 ]; then
+  # open browser on urls
+  _browser_fts=(htm html de org net com at cx nl se dk dk php)
+  for ft in $_browser_fts ; do alias -s $ft=$BROWSER ; done
+
+  _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
+  for ft in $_editor_fts ; do alias -s $ft=$EDITOR ; done
+
+  _image_fts=(jpg jpeg png gif mng tiff tif xpm)
+  for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
+
+  _media_fts=(avi mpg mpeg ogm mp3 wav ogg ape rm mov mkv)
+  for ft in $_media_fts ; do alias -s $ft=mplayer ; done
+
+  #read documents
+  alias -s pdf=acroread
+  alias -s ps=gv
+  alias -s dvi=xdvi
+  alias -s chm=xchm
+  alias -s djvu=djview
+
+  #list whats inside packed file
+  alias -s zip="unzip -l"
+  alias -s rar="unrar l"
+  alias -s tar="tar tf"
+  alias -s tar.gz="echo "
+  alias -s ace="unace l"
+fi
+
+# Make zsh know about hosts already accessed by SSH
+zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
+

From ab7604e5c2a4e07e656b3e4edf0d3e45407665e5 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren.kret@gmail.com>
Date: Tue, 11 Jun 2013 11:37:35 -0700
Subject: [PATCH 0302/1378] Escape both % and $ in the command line

Fixes issue #1884
---
 lib/termsupport.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e3828da14..80319e1a8 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,9 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  title "$CMD" "%100>...>${2:gs/%/%%}%<<"
+  local LINE="${2:gs/$/\\$}"
+  LINE="${LINE:gs/%/%%}"
+  title "$CMD" "%100>...>$LINE%<<"
 }
 
 autoload -U add-zsh-hook

From dbcaafd03b084b94ebef9b04e91b3f04ad05d374 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 12 Jun 2013 11:54:08 +0200
Subject: [PATCH 0303/1378] Better super-grep

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 4ac8178b6..75899ca2c 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -17,7 +17,7 @@ alias lrt='ls -1Fcrt'
 alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file
 
 alias grep='grep --color'
-alias sgrep='grep -R -n -H -C 5'
+alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
 
 alias t='tail -f'
 

From 9703eba66e2a45ee28cd895a852853fd34ea4ff0 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Wed, 12 Jun 2013 20:04:08 +0300
Subject: [PATCH 0304/1378] Fixed slow behavior when using GitHub wrappers

---
 lib/git.zsh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index c4b5b5d62..df0fcedbb 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,7 +1,7 @@
 # get the name of the branch we are on
 function git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
@@ -11,14 +11,14 @@ parse_git_dirty() {
   local SUBMODULE_SYNTAX=''
   local GIT_STATUS=''
   local CLEAN_MESSAGE='nothing to commit (working directory clean)'
-  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
-        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
+        GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
     else
-        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
+        GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
     fi
     if [[ -n $GIT_STATUS ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
@@ -32,10 +32,10 @@ parse_git_dirty() {
 
 # get the difference between the local and remote branches
 git_remote_status() {
-    remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
+    remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
     if [[ -n ${remote} ]] ; then
-        ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
-        behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
+        ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
+        behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
 
         if [ $ahead -eq 0 ] && [ $behind -gt 0 ]
         then
@@ -52,24 +52,24 @@ git_remote_status() {
 
 # Checks if there are commits ahead from remote
 function git_prompt_ahead() {
-  if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+  if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
     echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
 }
 
 # Formats prompt string for current git commit short SHA
 function git_prompt_short_sha() {
-  SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
+  SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
 # Formats prompt string for current git commit long SHA
 function git_prompt_long_sha() {
-  SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
+  SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
 # Get the status of the working tree
 git_prompt_status() {
-  INDEX=$(git status --porcelain -b 2> /dev/null)
+  INDEX=$(command git status --porcelain -b 2> /dev/null)
   STATUS=""
   if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
@@ -96,7 +96,7 @@ git_prompt_status() {
   elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
-  if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
+  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
@@ -121,7 +121,7 @@ function git_compare_version() {
   local INPUT_GIT_VERSION=$1;
   local INSTALLED_GIT_VERSION
   INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION});
-  INSTALLED_GIT_VERSION=($(git --version 2>/dev/null));
+  INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null));
   INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
 
   for i in {1..3}; do

From bab1800ded30331b289550b1de8d60bb64f5512f Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Wed, 12 Jun 2013 12:22:47 -0500
Subject: [PATCH 0305/1378] Correctly detect Rapid Board

* Add "x" in front of the value we check against...
* Use true instead of yes (more consistent with the rest of ohmyzsh)

The fact that no one seems to have raised this as an issue leads me to believe it's not used that much...
---
 plugins/jira/jira.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index bea726a54..9aa192c1e 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -3,7 +3,7 @@
 #         .jira-url in the current directory takes precedence
 #
 # If you use Rapid Board, set:
-#JIRA_RAPID_BOARD="yes"
+#JIRA_RAPID_BOARD="true"
 # in you .zshrc
 #
 # Setup: cd to/my/project
@@ -34,7 +34,7 @@ open_jira_issue () {
     `open $jira_url/secure/CreateIssue!default.jspa`
   else
     echo "Opening issue #$1"
-    if [[ "x$JIRA_RAPID_BOARD" = "yes" ]]; then
+    if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
       $open_cmd  "$jira_url/issues/$1"
     else
       $open_cmd  "$jira_url/browse/$1"

From b074886ae66ed73957858608b21401767e3c66c0 Mon Sep 17 00:00:00 2001
From: Christoph Jerolimov <jerolimov@gmail.com>
Date: Fri, 14 Jun 2013 01:36:37 +0300
Subject: [PATCH 0306/1378] Do not clear tab when calling it with an argument.

---
 plugins/osx/osx.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 51cd7c143..dd785f911 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -6,7 +6,7 @@
 # ------------------------------------------------------------------------------
 
 function tab() {
-  local command="cd \\\"$PWD\\\""
+  local command="cd \\\"$PWD\\\"; clear; "
   (( $# > 0 )) && command="${command}; $*"
 
   the_app=$(
@@ -34,7 +34,7 @@ EOF
           launch session "Default Session"
           set current_session to current session
           tell current_session
-            write text "${command}; clear;"
+            write text "${command}"
           end tell
         end tell
       end tell

From f8e3f293e0ae4e5890f83d9233e2829e64a04df9 Mon Sep 17 00:00:00 2001
From: Jeremy Tennant <registrations@jeremytennant.com>
Date: Sun, 16 Jun 2013 14:04:02 +1000
Subject: [PATCH 0307/1378] Add new plugin for homebrew installed version of
 postgres

---
 plugins/postgres/postgres.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/postgres/postgres.plugin.zsh

diff --git a/plugins/postgres/postgres.plugin.zsh b/plugins/postgres/postgres.plugin.zsh
new file mode 100644
index 000000000..cdd142e92
--- /dev/null
+++ b/plugins/postgres/postgres.plugin.zsh
@@ -0,0 +1,6 @@
+# Aliases to stop, start and restart Postgres
+# Paths noted below are for Postgress installed via Homebrew on OSX
+
+alias startpost='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
+alias stoppost='pg_ctl -D /usr/local/var/postgres stop -s -m fast'
+alias restartpost='stoppost && sleep 1 && startpost'
\ No newline at end of file

From 4eace8753be4793f109c997bede7f0985692bb0a Mon Sep 17 00:00:00 2001
From: Code Whale <hoiwai930@gmail.com>
Date: Sun, 16 Jun 2013 13:25:29 +0800
Subject: [PATCH 0308/1378] debian plugin: ignore alias in sudo/aptitude check

---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 55b90e379..b51d0cd37 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -6,14 +6,14 @@
 
 # Use aptitude if installed, or apt-get if not.
 # You can just set apt_pref='apt-get' to override it.
-if [[ -e $( which aptitude 2>&1 ) ]]; then
+if [[ -e $( which -p aptitude 2>&1 ) ]]; then
     apt_pref='aptitude'
 else
     apt_pref='apt-get'
 fi
 
 # Use sudo by default if it's installed
-if [[ -e $( which sudo 2>&1 ) ]]; then
+if [[ -e $( which -p sudo 2>&1 ) ]]; then
     use_sudo=1
 fi
 

From decf9cdb3143fde3d2e608c008e61ba9838c0deb Mon Sep 17 00:00:00 2001
From: Gunther Konig <gunther.s.konig@gmail.com>
Date: Fri, 21 Jun 2013 12:21:25 +0300
Subject: [PATCH 0309/1378] autocomplete required packages as second argumet

---
 plugins/composer/composer.plugin.zsh | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 2d1557541..37dd282e4 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -10,14 +10,36 @@ _composer_get_command_list () {
 	composer --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
+_composer_get_required_list () {
+    composer show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
+}
+
 _composer () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+  _arguments \
+    '1: :->command'\
+    '*: :->args'
   if [ -f composer.json ]; then
-    compadd `_composer_get_command_list`
+    case $state in
+      command)
+        compadd `_composer_get_command_list`
+        ;;
+      *)
+        compadd `_composer_get_required_list`
+        ;;
+    esac
   else
     compadd create-project init search selfupdate show
   fi
 }
 
+_composer_required () {
+  if [ -f composer.json ]; then
+    compadd `_composer_get_required_list`
+  fi
+}
+
 compdef _composer composer
 
 # Aliases

From 85c43f8a894b7aa521a68d096e39587855d2d35f Mon Sep 17 00:00:00 2001
From: Gunther Konig <gunther.s.konig@gmail.com>
Date: Fri, 21 Jun 2013 12:38:17 +0300
Subject: [PATCH 0310/1378] remove unused function

---
 plugins/composer/composer.plugin.zsh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 37dd282e4..9975aaca4 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -34,12 +34,6 @@ _composer () {
   fi
 }
 
-_composer_required () {
-  if [ -f composer.json ]; then
-    compadd `_composer_get_required_list`
-  fi
-}
-
 compdef _composer composer
 
 # Aliases

From bc65443734ec96ddc8da61c022d630fa8303765a Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew.schwartzmeyer@gmail.com>
Date: Sat, 22 Jun 2013 15:58:45 -0700
Subject: [PATCH 0311/1378] Adding support for iTerm2 tmux integration via
 option '-CC'

---
 plugins/tmux/tmux.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 465f5b053..5bd946f08 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -14,6 +14,8 @@ if which tmux &> /dev/null
 	[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
 	# Set term to screen or screen-256color based on current terminal support
 	[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
+	# Set '-CC' option for iTerm2 tmux integration
+	[[ -n "$$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false
 	# The TERM to use for non-256 color terminals.
 	# Tmux states this should be screen, but you may need to change it on
 	# systems without the proper terminfo
@@ -55,11 +57,11 @@ if which tmux &> /dev/null
 		# Try to connect to an existing session.
 		elif [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
 		then
-			\tmux attach || \tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`  new-session
+			\tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` attach || \tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG` new-session
 			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 		# Just run tmux, fixing the TERM variable if requested.
 		else
-			\tmux `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`
+			\tmux `[[ "$ZSH_TMUX_ITERM2" == "true" ]] && echo '-CC '` `[[ "$ZSH_TMUX_FIXTERM" == "true" ]] && echo '-f '$_ZSH_TMUX_FIXED_CONFIG`
 			[[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
 		fi
 	}

From 55f7990607ae413ae9f1edacf94f9c6369456983 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew.schwartzmeyer@gmail.com>
Date: Sat, 22 Jun 2013 17:43:42 -0700
Subject: [PATCH 0312/1378] Not loading home tmux confs when iTerm2 tmux
 integration is enabled

---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 5bd946f08..049ceb30f 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -38,7 +38,7 @@ if which tmux &> /dev/null
 	fi
 
 	# Set the correct local config file to use.
-	if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
+    if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -f $HOME/.tmux.conf ]] || -h $HOME/.tmux.conf ]] ))
 	then
 		#use this when they have a ~/.tmux.conf
 		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"

From 711e96b1a277b1d5b9771c2eec19fa34f796839b Mon Sep 17 00:00:00 2001
From: Olaf Conradi <olaf@conradi.org>
Date: Sun, 23 Jun 2013 11:34:03 +0200
Subject: [PATCH 0313/1378] Prevent starting multiple gpg-agents

Don't just overwrite the environment. First check for a running agent (an
x-session might have one running). If no agent is found, source the
environment and check again using those settings. If again no agent is
found, start a new instance.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 109af44c8..b82711872 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -14,16 +14,24 @@ function start_agent_withssh {
     export SSH_AGENT_PID
 }
 
-# source settings of old agent, if applicable
-if [ -f "${GPG_ENV}" ]; then
-  . ${GPG_ENV} > /dev/null
-fi
+# check if another agent is running
+if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
+    # source settings of old agent, if applicable
+    if [ -f "${GPG_ENV}" ]; then
+        . ${GPG_ENV} > /dev/null
+    fi
 
-# check for existing ssh-agent
-if ssh-add -l > /dev/null 2> /dev/null; then
-    start_agent_nossh;
-else
-    start_agent_withssh;
+    # check again if another agent is running using the newly sources settings
+    if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
+        # check for existing ssh-agent
+        if ssh-add -l > /dev/null 2> /dev/null; then
+            # ssh-agent running, start gpg-agent without ssh support
+            start_agent_nossh;
+        else
+            # otherwise start gpg-agent with ssh support
+            start_agent_withssh;
+        fi
+    fi
 fi
 
 GPG_TTY=$(tty)

From 64fc125eba09f48f17184cde4403267c1cb16999 Mon Sep 17 00:00:00 2001
From: Olaf Conradi <olaf@conradi.org>
Date: Sun, 23 Jun 2013 12:25:35 +0200
Subject: [PATCH 0314/1378] Typo

---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index b82711872..4071334cb 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -21,7 +21,7 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
         . ${GPG_ENV} > /dev/null
     fi
 
-    # check again if another agent is running using the newly sources settings
+    # check again if another agent is running using the newly sourced settings
     if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
         # check for existing ssh-agent
         if ssh-add -l > /dev/null 2> /dev/null; then

From 87a1d8a02df5413b4e718eb0fb486535f0aae8e3 Mon Sep 17 00:00:00 2001
From: UncleBill <billbill290@gmail.com>
Date: Tue, 25 Jun 2013 12:08:02 +0800
Subject: [PATCH 0315/1378] git-pull add --rebase option

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 3624a88e5..e04fc672f 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,6 +1,6 @@
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd "$ZSH"
-if git pull origin master
+if git pull --rebase origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
   printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '

From ebfc9042ed2121c1d330a6767736fbf7bff2e369 Mon Sep 17 00:00:00 2001
From: Gong Hao <gonghao@ghsky.com>
Date: Tue, 25 Jun 2013 12:26:42 +0800
Subject: [PATCH 0316/1378] add virtualenv prompt support for agnoster theme

---
 themes/agnoster.zsh-theme | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index e65293858..c7a59ad0d 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -134,6 +134,14 @@ prompt_dir() {
   prompt_segment blue black '%~'
 }
 
+# Virtualenv: current working virtualenv
+prompt_virtualenv() {
+  local virtualenv_path="$VIRTUAL_ENV"
+  if [[ -n $virtualenv_path ]]; then
+    prompt_segment blue black "(`basename $virtualenv_path`)"
+  fi
+}
+
 # Status:
 # - was there an error
 # - am I root
@@ -152,6 +160,7 @@ prompt_status() {
 build_prompt() {
   RETVAL=$?
   prompt_status
+  prompt_virtualenv
   prompt_context
   prompt_dir
   prompt_git

From a18fa835503acb44ac656c5bb592873e66bd40f1 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@gmail.com>
Date: Tue, 25 Jun 2013 21:12:01 +0800
Subject: [PATCH 0317/1378] Add celery completion

---
 plugins/celery/_celery | 129 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 plugins/celery/_celery

diff --git a/plugins/celery/_celery b/plugins/celery/_celery
new file mode 100644
index 000000000..63af9fad5
--- /dev/null
+++ b/plugins/celery/_celery
@@ -0,0 +1,129 @@
+#compdef celery
+#autoload
+
+#celery zsh  completion
+
+_celery () {
+local -a _1st_arguments ifargs dopts controlargs
+
+typeset -A opt_args
+
+_1st_arguments=('worker' 'events' 'beat' 'shell' 'multi' 'amqp' 'status' 'inspect' \
+                'control' 'purge' 'list' 'migrate' 'call' 'result' 'report')
+ifargs=('--app=' '--broker=' '--loader=' '--config=' '--version')
+dopts=('--detach' '--umask=' '--gid=' '--uid=' '--pidfile=' '--logfile=' '--loglevel=')
+controlargs=('--timeout' '--destination')
+_arguments \
+        '(-A --app=)'{-A,--app}'[app instance to use (e.g. module.attr_name):APP]' \
+        '(-b --broker=)'{-b,--broker}'[url to broker.  default is "amqp://guest@localhost//":BROKER]' \
+        '(--loader)--loader[name of custom loader class to use.:LOADER]' \
+        '(--config)--config[Name of the configuration module:CONFIG]' \
+        '(--workdir)--workdir[Optional directory to change to after detaching.:WORKING_DIRECTORY]' \
+        '(-q --quiet)'{-q,--quiet}'[Don"t show as much output.]' \
+        '(-C --no-color)'{-C,--no-color}'[Don"t display colors.]' \
+        '(--version)--version[show program"s version number and exit]' \
+        '(- : *)'{-h,--help}'[show this help message and exit]' \
+        '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "celery subcommand" _1st_arguments
+    return
+fi
+
+case "$words[1]" in
+    worker)
+    _arguments \
+    '(-C --concurrency=)'{-C,--concurrency=}'[Number of child processes processing the queue. The default is the number of CPUs.]' \
+    '(--pool)--pool=:::(processes eventlet gevent threads solo)' \
+    '(--purge --discard)'{--discard,--purge}'[Purges all waiting tasks before the daemon is started.]' \
+    '(-f --logfile=)'{-f,--logfile=}'[Path to log file. If no logfile is specified, stderr is used.]' \
+    '(--loglevel=)--loglevel=:::(critical error warning info debug)' \
+    '(-N --hostname=)'{-N,--hostname=}'[Set custom hostname, e.g. "foo.example.com".]' \
+    '(-B --beat)'{-B,--beat}'[Also run the celerybeat periodic task scheduler.]' \
+    '(-s --schedule=)'{-s,--schedule=}'[Path to the schedule database if running with the -B option. Defaults to celerybeat-schedule.]' \
+    '(-S --statedb=)'{-S,--statedb=}'[Path to the state database.Default: None]' \
+    '(-E --events)'{-E,--events}'[Send events that can be captured by monitors like celeryev, celerymon, and others.]' \
+    '(--time-limit=)--time-limit=[nables a hard time limit (in seconds int/float) for tasks]' \
+    '(--soft-time-limit=)--soft-time-limit=[Enables a soft time limit (in seconds int/float) for tasks]' \
+    '(--maxtasksperchild=)--maxtasksperchild=[Maximum number of tasks a pool worker can execute before it"s terminated and replaced by a new worker.]' \
+    '(-Q --queues=)'{-Q,--queues=}'[List of queues to enable for this worker, separated by comma. By default all configured queues are enabled.]' \
+    '(-I --include=)'{-I,--include=}'[Comma separated list of additional modules to import.]' \
+    '(--pidfile=)--pidfile=[Optional file used to store the process pid.]' \
+    '(--autoscale=)--autoscale=[Enable autoscaling by providing max_concurrency, min_concurrency.]' \
+    '(--autoreload)--autoreload[Enable autoreloading.]' \
+    '(--no-execv)--no-execv[Don"t do execv after multiprocessing child fork.]'
+    compadd -a ifargs
+    ;;
+    inspect)
+    _values -s \
+    'active[dump active tasks (being processed)]' \
+    'active_queues[dump queues being consumed from]' \
+    'ping[ping worker(s)]' \
+    'registered[dump of registered tasks]' \
+    'report[get bugreport info]' \
+    'reserved[dump reserved tasks (waiting to be processed)]' \
+    'revoked[dump of revoked task ids]' \
+    'scheduled[dump scheduled tasks (eta/countdown/retry)]' \
+    'stats[dump worker statistics]'
+    compadd -a controlargs ifargs
+    ;;
+    control)
+    _values -s \
+    'add_consumer[tell worker(s) to start consuming a queue]' \
+    'autoscale[change autoscale settings]' \
+    'cancel_consumer[tell worker(s) to stop consuming a queue]' \
+    'disable_events[tell worker(s) to disable events]' \
+    'enable_events[tell worker(s) to enable events]' \
+    'pool_grow[start more pool processes]' \
+    'pool_shrink[use less pool processes]' \
+    'rate_limit[tell worker(s) to modify the rate limit for a task type]' \
+    'time_limit[tell worker(s) to modify the time limit for a task type.]'
+    compadd -a controlargs ifargs
+    ;;
+    multi)
+    _values -s \
+    '--nosplash[Don"t display program info.]' \
+    '--verbose[Show more output.]' \
+    '--no-color[Don"t display colors.]' \
+    '--quiet[Don"t show as much output.]' \
+    'start' 'restart' 'stopwait' 'stop' 'show' \
+    'names' 'expand' 'get' 'kill'
+    compadd -a ifargs
+    ;;
+    amqp)
+    _values -s \
+    'queue.declare' 'queue.purge' 'exchange.delete' 'basic.publish' \
+    'exchange.declare' 'queue.delete' 'queue.bind' 'basic.get'
+    ;;
+    list)
+    _values -s, 'bindings'
+    ;;
+    shell)
+    _values -s \
+    '--ipython[force iPython.]' \
+    '--bpython[force bpython.]' \
+    '--python[force default Python shell.]' \
+    '--without-tasks[don"t add tasks to locals.]' \
+    '--eventlet[use eventlet.]' \
+    '--gevent[use gevent.]'
+    compadd -a ifargs
+    ;;
+    beat)
+    _arguments \
+    '(-s --schedule=)'{-s,--schedule=}'[Path to the schedule database. Defaults to celerybeat-schedule.]' \
+    '(-S --scheduler=)'{-S,--scheduler=}'[Scheduler class to use. Default is celery.beat.PersistentScheduler.]' \
+    '(--max-interval)--max-interval[]'
+    compadd -a dopts fargs
+    ;;
+    events)
+    _arguments \
+    '(-d --dump)'{-d,--dump}'[Dump events to stdout.]' \
+    '(-c --camera=)'{-c,--camera=}'[Take snapshots of events using this camera.]' \
+    '(-F --frequency=)'{-F,--frequency=}'[Camera: Shutter frequency.  Default is every 1.0 seconds.]' \
+    '(-r --maxrate=)'{-r,--maxrate=}'[Camera: Optional shutter rate limit (e.g. 10/m).]'
+    compadd -a dopts fargs
+    ;;
+    *)
+        ;;
+    esac
+}

From f25e2d2856281698914f21f7d22f84ae7e421f39 Mon Sep 17 00:00:00 2001
From: Chris Krycho <github@chriskrycho.com>
Date: Tue, 25 Jun 2013 15:52:26 -0300
Subject: [PATCH 0318/1378] Add more capable hg incoming and outgoing count
 handling

The original hgic and hgoc aliases worked well for the default path, but attempting to call them with a different path failed. I created functions to handle them instead.
---
 plugins/mercurial/mercurial.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index de036e44d..c18aa726c 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -8,11 +8,9 @@ alias hgd='hg diff'
 alias hged='hg diffmerge'
 # pull and update
 alias hgi='hg incoming'
-alias hgic='hg incoming | grep "changeset" | wc -l'
 alias hgl='hg pull -u'
 alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
-alias hgoc='hg outgoing | grep 'changeset' | wc -l'
 alias hgp='hg push'
 alias hgs='hg status'
 # this is the 'git commit --amend' equivalent
@@ -55,3 +53,11 @@ function hg_dirty_choose {
 function hg_dirty {
   hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN
 }
+
+function hgic() {
+    hg incoming "$@" | grep "changeset" | wc -l
+}
+
+function hgoc() {
+    hg outgoing "$@" | grep "changeset" | wc -l
+}

From 10bd036dfe466d82f90f10edaa83dc67a90b8571 Mon Sep 17 00:00:00 2001
From: Tobias Preuss <tobias.preuss@googlemail.com>
Date: Fri, 26 Apr 2013 11:02:18 +0200
Subject: [PATCH 0319/1378] Add autocompletion for Rails3.

+ Originally published by Christopher Chow.
+ Source:
https://github.com/robbyrussell/oh-my-zsh/blob/30620d463850c17f86e7a56fbf6a8b5e793a4e07/plugins/rails3/_rails3
  Commit: 30620d463850c17f86e7a56fbf6a8b5e793a4e07
---
 plugins/rails3/_rails3 | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 plugins/rails3/_rails3

diff --git a/plugins/rails3/_rails3 b/plugins/rails3/_rails3
new file mode 100644
index 000000000..97915e68b
--- /dev/null
+++ b/plugins/rails3/_rails3
@@ -0,0 +1,56 @@
+#compdef rails
+#autoload
+
+# rails 3 zsh completion, based on homebrew completion
+# Extracted from https://github.com/robbyrussell/oh-my-zsh/blob/30620d463850c17f86e7a56fbf6a8b5e793a4e07/plugins/rails3/_rails3
+# Published by Christopher Chow
+
+local -a _1st_arguments
+_1st_arguments=(
+    'generate:Generate new code (short-cut alias: "g")'
+    'console:Start the Rails console (short-cut alias: "c")'
+    'server:Start the Rails server (short-cut alias: "s")'
+    'dbconsole:Start a console for the database specified in config/database.yml (short-cut alias: "db")'
+    'new:Create a new Rails application. "rails new my_app" creates a new application called MyApp in "./my_app"'
+    'application:Generate the Rails application code'
+    'destroy:Undo code generated with "generate"'
+    'benchmarker:See how fast a piece of code runs'
+    'profiler:Get profile information from a piece of code'
+    'plugin:Install a plugin'
+)
+
+_rails_generate_arguments() {
+    generate_arguments=(
+        controller
+        generator
+        helper
+        integration_test
+        mailer
+        migration
+        model
+        observer
+        performance_test
+        plugin
+        resource
+        scaffold
+        scaffold_controller
+        session_migration
+        stylesheets
+    )
+}
+
+_arguments \
+    '(--version)--version[show version]' \
+    '(--help)--help[show help]' \
+    '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "rails subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  generate)
+    _rails_generate_arguments
+    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
+esac

From c51ef9dce6a600976aa3d0a3d733bb99c477959b Mon Sep 17 00:00:00 2001
From: Okura Masafumi <masafumi.o1988@gmail.com>
Date: Thu, 27 Jun 2013 22:28:14 +0900
Subject: [PATCH 0320/1378] Change duplicated alias name

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 851fdf24b..2ecc74eb6 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -78,7 +78,7 @@ compdef _git gm=git-mergetool
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 alias gk='gitk --all --branches'
-alias gss='git stash show --text'
+alias gsts='git stash show --text'
 
 # Will cd into the top of the current repository
 # or submodule.

From 644728bd225c70068e32501c81a95713d04b8ff1 Mon Sep 17 00:00:00 2001
From: Brandon Black <brandonmblack@gmail.com>
Date: Thu, 27 Jun 2013 11:38:04 -0700
Subject: [PATCH 0321/1378] rvm plugin: update to ruby version helpers and
 rvm-update

* the current patch levels hard-coded here are pretty dated. I updated the ruby version helpers to use loose ruby version matchers so they don't continually need to be updated with every new patch level release.

* `rvm get head` actually performs an `rvm reload` in the post install. there's no need to do again here in rvm-update so I've removed that.
---
 plugins/rvm/rvm.plugin.zsh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index cdd0a7847..e6ad6450d 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -3,9 +3,9 @@ fpath=($rvm_path/scripts/zsh/Completion $fpath)
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
-local ruby18='ruby-1.8.7-p371'
-local ruby19='ruby-1.9.3-p392'
-local ruby20='ruby-2.0.0-p0'
+local ruby18='ruby-1.8.7'
+local ruby19='ruby-1.9.3'
+local ruby20='ruby-2.0.0'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -42,7 +42,6 @@ compdef _rb20 rb20
 
 function rvm-update {
 	rvm get head
-	rvm reload # TODO: Reload rvm completion?
 }
 
 # TODO: Make this usable w/o rvm.

From 012afe238159d87701fde176309d8a1a5cf8ea41 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Fri, 28 Jun 2013 11:47:03 +0800
Subject: [PATCH 0322/1378] The current version of bower is completely
 unavailable, plugin depth modification

---
 plugins/bower/bower.plugin.zsh | 91 +++++++++++++++++++++++++---------
 1 file changed, 67 insertions(+), 24 deletions(-)

diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
index ed9c04840..68a67a3cc 100644
--- a/plugins/bower/bower.plugin.zsh
+++ b/plugins/bower/bower.plugin.zsh
@@ -2,37 +2,80 @@ alias bi="bower install"
 alias bl="bower list"
 alias bs="bower search"
 
-bower_package_list=''
-
+_bower_installed_packages () {
+    bower_package_list=$(bower ls --no-color 2>/dev/null| awk 'NR>3{print p}{p=$0}'| cut -d ' ' -f 2|sed 's/#.*//')
+}
 _bower ()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
+    local -a _1st_arguments _no_color _dopts _save_dev _force_lastest _production
+    local expl
+    typeset -A opt_args
 
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
+    _no_color=('--no-color[Do not print colors (available in all commands)]')
 
-	case $state in
-		(command)
+    _dopts=(
+        '(--save)--save[Save installed packages into the project"s bower.json dependencies]'
+        '(--force)--force[Force fetching remote resources even if a local copy exists on disk]'
+    )
 
-			local -a subcommands
-			subcommands=(${=$(bower help | grep help | sed -e 's/,//g')})
-			_describe -t commands 'bower' subcommands
-		;;
+    _save_dev=('(--save-dev)--save-dev[Save installed packages into the project"s bower.json devDependencies]')
 
-		(options)
-			case $line[1] in
+    _force_lastest=('(--force-latest)--force-latest[Force latest version on conflict]')
+
+    _production=('(--production)--production[Do not install project devDependencies]')
+
+    _1st_arguments=(
+    'cache-clean:Clean the Bower cache, or the specified package caches' \
+    'help:Display help information about Bower' \
+    'info:Version info and description of a particular package' \
+    'init:Interactively create a bower.json file' \
+    'install:Install a package locally' \
+    'link:Symlink a package folder' \
+    'lookup:Look up a package URL by name' \
+    'register:Register a package' \
+    'search:Search for a package by name' \
+    'uninstall:Remove a package' \
+    'update:Update a package' \
+    {ls,list}:'[List all installed packages]'
+    )
+    _arguments \
+    $_no_color \
+    '*:: :->subcmds' && return 0
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands "bower subcommand" _1st_arguments
+        return
+    fi
+
+    case "$words[1]" in
+        install)
+        _arguments \
+        $_dopts \
+        $_save_dev \
+        $_force_lastest \
+        $_no_color \
+        $_production
+        ;;
+        update)
+        _arguments \
+        $_dopts \
+        $_no_color \
+        $_force_lastest
+        _bower_installed_packages
+        compadd "$@" $(echo $bower_package_list)
+        ;;
+        uninstall)
+        _arguments \
+        $_no_color \
+        $_dopts
+        _bower_installed_packages
+        compadd "$@" $(echo $bower_package_list)
+        ;;
+        *)
+        $_no_color \
+        ;;
+    esac
 
-				(install)
-				    if [ -z "$bower_package_list" ];then
-                    bower_package_list=$(bower search | awk 'NR > 2' | cut -d '-' -f 2 | cut -d ' ' -f 2 | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g")
-                fi
-				    compadd "$@" $(echo $bower_package_list)
-                ;;
-			esac
-		;;
-	esac
 }
 
 compdef _bower bower

From 4fe4db51285af30f1195a817dadcf5d8b3b93e79 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Fri, 28 Jun 2013 15:08:26 +0800
Subject: [PATCH 0323/1378] Update coffee completion

---
 plugins/coffee/_coffee | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/coffee/_coffee b/plugins/coffee/_coffee
index 5c8eb9a08..10b6b8164 100644
--- a/plugins/coffee/_coffee
+++ b/plugins/coffee/_coffee
@@ -35,27 +35,37 @@
 # -------
 #
 #  * Mario Fernandez (https://github.com/sirech)
+#  * Dong Weiming (https://github.com/dongweiming)
 #
 # ------------------------------------------------------------------------------
 
-local curcontext="$curcontext" state line ret=1
+local curcontext="$curcontext" state line ret=1 version opts first second third
 typeset -A opt_args
+version=(${(f)"$(_call_program version $words[1] --version)"})
+version=${${(z)${version[1]}}[3]}
+first=$(echo $version|cut -d '.' -f 1)
+second=$(echo $version|cut -d '.' -f 2)
+third=$(echo $version|cut -d '.' -f 3)
+if (( $first < 2 )) &&  (( $second < 7 )) && (( $third < 3 ));then
+  opts+=('(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]'
+         '(-r --require)'{-r,--require}'[require a library before executing your script]:library')
+fi
+
 
 _arguments -C \
   '(- *)'{-h,--help}'[display this help message]' \
   '(- *)'{-v,--version}'[display the version number]' \
+  $opts \
   '(-b --bare)'{-b,--bare}'[compile without a top-level function wrapper]' \
   '(-e --eval)'{-e,--eval}'[pass a string from the command line as input]:Inline Script' \
   '(-i --interactive)'{-i,--interactive}'[run an interactive CoffeeScript REPL]' \
   '(-j --join)'{-j,--join}'[concatenate the source CoffeeScript before compiling]:Destination JS file:_files -g "*.js"' \
-  '(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]' \
   '(--nodejs)--nodejs[pass options directly to the "node" binary]' \
   '(-c --compile)'{-c,--compile}'[compile to JavaScript and save as .js files]' \
   '(-o --output)'{-o,--output}'[set the output directory for compiled JavaScript]:Output Directory:_files -/' \
   '(-n -t -p)'{-n,--nodes}'[print out the parse tree that the parser produces]' \
   '(-n -t -p)'{-p,--print}'[print out the compiled JavaScript]' \
   '(-n -t -p)'{-t,--tokens}'[print out the tokens that the lexer/rewriter produce]' \
-  '(-r --require)'{-r,--require}'[require a library before executing your script]:library' \
   '(-s --stdio)'{-s,--stdio}'[listen for and compile scripts over stdio]' \
   '(-w --watch)'{-w,--watch}'[watch scripts for changes and rerun commands]' \
   '*:script or directory:_files' && ret=0

From 15509ce0472a431867cc2ff21ca5ef0a1c1e855f Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Sun, 30 Jun 2013 17:29:02 +0800
Subject: [PATCH 0324/1378] Update gem completion

---
 plugins/gem/_gem | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 83cba40d1..279181e70 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -4,11 +4,13 @@
 # gem zsh completion, based on homebrew completion
 
 _gem_installed() {
-  installed_gems=(`gem list --local --no-versions`)
+  installed_gems=(${(f)"$(gem list --local --no-versions)"})
 }
 
 local -a _1st_arguments
+
 _1st_arguments=(
+  'build:Build a gem from a gemspec'
   'cert:Manage RubyGems certificates and signing settings'
   'check:Check installed gems'
   'cleanup:Clean up old versions of installed gems in the local repository'
@@ -37,6 +39,7 @@ _1st_arguments=(
   'unpack:Unpack an installed gem to the current directory'
   'update:Update the named gems (or all installed gems) in the local repository'
   'which:Find the location of a library file you can require'
+  'yank:Remove a specific gem version release from RubyGems.org'
 )
 
 local expl

From d4a9467f89115c1e60b51d8c068ec4e5e1c5b195 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Sun, 30 Jun 2013 18:08:48 +0800
Subject: [PATCH 0325/1378] Modify determine the oh-my-zsh installed in
 non-default path of the installed

---
 tools/install.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index a2bd5665a..5af038fd9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,6 +1,11 @@
-if [ -d ~/.oh-my-zsh ]
+ZSH=`/usr/bin/env|grep 'ZSH='|cut -d '=' -f 2`
+if [ -d "$ZSH" ]
 then
-  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install"
+  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
+  exit
+elif [ -d ~/.oh-my-zsh ]
+then
+  echo "\033[0;33mYou already have One Oh My Zsh Directory.\033[0m You'll need to remove  ~/.oh-my-zsh if you want to clone"
   exit
 fi
 

From 77cf8696053d5256b4deb7cddc79c31d26158451 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Sun, 30 Jun 2013 20:46:10 +0800
Subject: [PATCH 0326/1378] Add option for show in the command execution time
 stamp in the history

---
 lib/aliases.zsh              | 14 ++++++++++++--
 templates/zshrc.zsh-template |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 9b3709172..b279bf855 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -13,8 +13,18 @@ alias please='sudo'
 #alias g='grep -in'
 
 # Show history
-alias history='fc -l 1'
-
+if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
+then
+    alias history='fc -fl 1'
+elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ]
+then
+    alias history='fc -El 1'
+elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ]
+then
+    alias history='fc -il 1'
+else
+    alias history='fc -l 1'
+fi
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index d4dded73a..3135df882 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -37,6 +37,11 @@ ZSH_THEME="robbyrussell"
 # much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
+# Uncomment following line if you want to  shown in the command execution time stamp 
+# in the history command output. The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|
+# yyyy-mm-dd
+# HIST_STAMPS="mm/dd/yyyy"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From c164f2aab693f4b32c209cb34784818fba434b2d Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@gmail.com>
Date: Tue, 2 Jul 2013 00:22:25 +0800
Subject: [PATCH 0327/1378] Add shell built method

---
 plugins/urltools/urltools.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
index 4ddfff8ce..22327334d 100644
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -14,6 +14,9 @@ if [[ $(whence node) != "" && ( "x$URLTOOLS_METHOD" = "x"  || "x$URLTOOLS_METHOD
 elif [[ $(whence python) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then
     alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
     alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"'
+elif [[ $(whence xxd) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xshell" ) ]]; then
+    function urlencode() {echo $@ | tr -d "\n" | xxd -plain | sed "s/\(..\)/%\1/g"}
+    function urldecode() {printf $(echo -n $@ | sed 's/\\/\\\\/g;s/\(%\)\([0-9a-fA-F][0-9a-fA-F]\)/\\x\2/g')"\n"}
 elif [[ $(whence ruby) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xruby" ) ]]; then
     alias urlencode='ruby -r cgi -e "puts CGI.escape(ARGV[0])"'
     alias urldecode='ruby -r cgi -e "puts CGI.unescape(ARGV[0])"'
@@ -33,4 +36,4 @@ elif [[ $(whence perl) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHO
     fi
 fi
 
-unset URLTOOLS_METHOD
\ No newline at end of file
+unset URLTOOLS_METHOD

From 9cec52c4495cc3e439b637ffd9dcdf7cea54a288 Mon Sep 17 00:00:00 2001
From: Matei Trusca <matei.trusca@sellerengine.com>
Date: Tue, 2 Jul 2013 11:29:25 +0300
Subject: [PATCH 0328/1378] fixed typo in tmux plugin

---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 049ceb30f..3ecc2ac69 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -15,7 +15,7 @@ if which tmux &> /dev/null
 	# Set term to screen or screen-256color based on current terminal support
 	[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_FIXTERM=true
 	# Set '-CC' option for iTerm2 tmux integration
-	[[ -n "$$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false
+	[[ -n "$ZSH_TMUX_ITERM2" ]] || ZSH_TMUX_ITERM2=false
 	# The TERM to use for non-256 color terminals.
 	# Tmux states this should be screen, but you may need to change it on
 	# systems without the proper terminfo

From 44a26df8fdd85c3eeb774a6913b9102106228ebb Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Wed, 3 Jul 2013 11:57:31 +0800
Subject: [PATCH 0329/1378] Add version option

---
 plugins/supervisor/_supervisord | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/supervisor/_supervisord b/plugins/supervisor/_supervisord
index 34d27805d..e0cb670e1 100644
--- a/plugins/supervisor/_supervisord
+++ b/plugins/supervisor/_supervisord
@@ -7,6 +7,7 @@ _arguments \
     {--configuration,-c}"[configuration file]:FILENAME:_files" \
     {--nodaemon,-n}"[run in the foreground (same as 'nodaemon true' in config file)]" \
     {--help,-h}"[print this usage message and exit]:" \
+    {--version,-v}"[print supervisord version number and exit]:" \
     {--user,-u}"[run supervisord as this user]:USER:_users" \
     {--umask,-m}"[use this umask for daemon subprocess (default is 022)]" \
     {--directory,-d}"[directory to chdir to when daemonized]" \

From 426f5f483925f5bd9d3f78fa03d6f7d9818bb288 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@gmail.com>
Date: Wed, 3 Jul 2013 22:29:42 +0800
Subject: [PATCH 0330/1378] Update powify for displayed parameter is not
 enough, and when there is no directory error

---
 plugins/powify/_powify | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/powify/_powify b/plugins/powify/_powify
index d23c46513..9507f400e 100644
--- a/plugins/powify/_powify
+++ b/plugins/powify/_powify
@@ -1,7 +1,7 @@
 #compdef powify
 
 _powify_all_servers() {
-  all_servers=(`ls $HOME/.pow/`)
+  all_servers=(`ls $HOME/.pow/ 2>/dev/null`)
 }
 
 local -a all_servers
@@ -30,7 +30,7 @@ fi
 
 case "$words[1]" in
   server)
-    _values \
+    _values , \
       'install[install pow server]' \
       'reinstall[reinstall pow server]' \
       'update[update pow server]' \
@@ -45,7 +45,7 @@ case "$words[1]" in
       'config[print the current server configuration]' \
       'logs[tails the pow server logs]' ;;
   utils)
-    _values \
+    _values , \
       'install[install powify.dev server management tool]' \
       'reinstall[reinstall powify.dev server management tool]' \
       'uninstall[uninstall powify.dev server management tool]' ;;

From 744f3654e2bfb4806381ca4f0a5dfcfa5b1c3b83 Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Thu, 4 Jul 2013 19:18:52 +0800
Subject: [PATCH 0331/1378] Add sudo plugin

---
 plugins/sudo/sudo.zsh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 plugins/sudo/sudo.zsh

diff --git a/plugins/sudo/sudo.zsh b/plugins/sudo/sudo.zsh
new file mode 100644
index 000000000..d12e06853
--- /dev/null
+++ b/plugins/sudo/sudo.zsh
@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# sudo will be inserted before the command
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Dongweiming <ciici123@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+sudo-command-line() {
+[[ -z $BUFFER ]] && zle up-history
+[[ $BUFFER != sudo\ * ]] && BUFFER="sudo $BUFFER"
+zle end-of-line 
+}
+zle -N sudo-command-line
+# Defined shortcut keys: [Esc] [Esc]
+bindkey "\e\e" sudo-command-line

From c26facb582eed3b63642665864258862aa49392b Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@mekanics.ch>
Date: Fri, 5 Jul 2013 00:58:05 +0200
Subject: [PATCH 0332/1378] first few lines for the autocompletion of cocoapods

---
 plugins/pod/_pod | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 plugins/pod/_pod

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
new file mode 100644
index 000000000..2c183635d
--- /dev/null
+++ b/plugins/pod/_pod
@@ -0,0 +1,82 @@
+#compdef pod
+
+# -----------------------------------------------------------------------------
+#          FILE:  pod.plugin.zsh
+#   DESCRIPTION:  Cocoapods autocomplete plugin for Oh-My-Zsh
+#        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
+#        GITHUB:  https://github.com/mekanics
+#       VERSION:  0.0.1
+# -----------------------------------------------------------------------------
+
+_pod_all_repos() {
+    repos=(`ls ~/.cocoapods`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+    'help:Show help for the given command.'
+    'install:Install project dependencies'
+    'ipc:Inter-process communication'
+    'lib:Develop pods'
+    'list:List pods'
+    'outdated:Show outdated project dependencies'
+    'podfile-info:Shows information on installed Pods'
+    'push:Push new specifications to a spec-repo'
+    'repo:Manage spec-repositories'
+    'search:Searches for pods'
+    'setup:Setup the CocoaPods environment'
+    'spec:Manage pod specs'
+    'update:Update outdated project dependencies'
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "pod command" _1st_arguments
+  return
+fi
+
+local -a _command_args
+case "$words[1]" in
+    install)
+    _command_args=(
+        '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn` intact after downloading]' \
+        '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
+        '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
+    )
+    ;;
+    update)
+    _command_args=(
+        '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn intact after downloading]' \
+        '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
+        '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
+    )
+    ;;
+    outdated)
+    _command_args=(
+        '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
+    )
+    ;;
+    search)
+    _command_args=(
+        '(--full)--full[Search by name, summary, and description]' \
+        '(--stats)--stats[Show additional stats (like GitHub watchers and forks)]' \
+        '(--ios)--ios[Restricts the search to Pods supported on iOS]' \
+        '(--osx)--osx[Restricts the search to Pods supported on OS X]'
+    )
+    ;;
+    update)
+    _command_args=(
+        '(--update)--update[Run `pod repo update before listing]'
+    )
+    ;;
+esac
+
+_arguments \
+    $_command_args \
+    '(--silent)--silent[Show nothing]' \
+    '(--version)--version[Show the version of CocoaPods]' \
+    '(--no-color)--no-color[Show output without color]' \
+    '(--verbose)--verbose[Show more debugging information]' \
+    '(--help)--help[Show help banner of specified command]' \
+    &&  return 0
\ No newline at end of file

From cf5ca2f4f3e6d98a4d4d4938be0e421645722fb2 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Fri, 5 Jul 2013 11:07:29 +0200
Subject: [PATCH 0333/1378] commands and subcommands

---
 plugins/pod/_pod | 219 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 168 insertions(+), 51 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 2c183635d..ce8882d42 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -1,16 +1,29 @@
 #compdef pod
+#autoload
 
 # -----------------------------------------------------------------------------
 #          FILE:  pod.plugin.zsh
 #   DESCRIPTION:  Cocoapods autocomplete plugin for Oh-My-Zsh
+#                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
+#       TWITTER:  @jolyAlexandre
 #       VERSION:  0.0.1
+#       LICENSE:  MIT
 # -----------------------------------------------------------------------------
 
-_pod_all_repos() {
-    repos=(`ls ~/.cocoapods`)
-}
+#------------------
+# TODO:
+#   - Parameters for
+#       - install
+#       - update
+#       - outdated
+#       - search
+#       - list
+#       - push
+#       - podfile-info
+#       - setup
+#------------------
 
 local -a _1st_arguments
 _1st_arguments=(
@@ -29,54 +42,158 @@ _1st_arguments=(
     'update:Update outdated project dependencies'
 )
 
-_arguments '*:: :->command'
+local -a _repo_arguments
+_repo_arguments=(
+    'add:Add a spec repo'
+    'lint:Validates all specs in a repo'
+    'update:Update a spec repo'
+)
 
-if (( CURRENT == 1 )); then
-  _describe -t commands "pod command" _1st_arguments
-  return
-fi
+local -a _spec_arguments
+_spec_arguments=(
+    'cat:Prints a spec file'
+    'create:Create spec file stub'
+    'edit:Edit a spec file'
+    'lint:Validates a spec file'
+    'which:Prints the path of the given spec'
+)
 
-local -a _command_args
-case "$words[1]" in
-    install)
-    _command_args=(
-        '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn` intact after downloading]' \
-        '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
-        '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
-    )
-    ;;
-    update)
-    _command_args=(
-        '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn intact after downloading]' \
-        '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
-        '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
-    )
-    ;;
-    outdated)
-    _command_args=(
-        '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
-    )
-    ;;
-    search)
-    _command_args=(
-        '(--full)--full[Search by name, summary, and description]' \
-        '(--stats)--stats[Show additional stats (like GitHub watchers and forks)]' \
-        '(--ios)--ios[Restricts the search to Pods supported on iOS]' \
-        '(--osx)--osx[Restricts the search to Pods supported on OS X]'
-    )
-    ;;
-    update)
-    _command_args=(
-        '(--update)--update[Run `pod repo update before listing]'
-    )
-    ;;
+local -a _ipc_arguments
+_ipc_arguments=(
+    'list:Lists the specifications know to CocoaPods'
+    'podfile:Converts a Podfile to YAML'
+    'repl:The repl listens to commands on standard input'
+    'spec:Converts a podspec to YAML'
+    'update-search-index:Updates the search index'
+)
+
+local -a _list_arguments
+_list_arguments=(
+    'new:Lists pods introduced in the master spec-repo since the last check'
+)
+
+__first_command_list ()
+{
+    local expl
+    declare -a tasks
+
+    tasks=(install ipc lib list outdated podfile-info push repo search setup spec update)
+
+    _wanted tasks expl 'help' compadd $tasks
+}
+
+__repo_list() {
+    _wanted application expl 'command' compadd $(command ls -1 ~/.cocoapods 2>/dev/null | sed -e 's/ /\\ /g')
+}
+
+__pod-repo() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+       (command)
+           _describe -t commands "gem subcommand" _repo_arguments
+           return
+       ;;
+
+       (options)
+           case $line[1] in
+               (update|lint)
+                   _arguments ':feature:__repo_list'
+               ;;
+           esac
+       ;;
+    esac
+}
+
+__pod-spec() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "gem subcommand" _spec_arguments
+            return
+        ;;
+
+        (options)
+            #todo
+            return
+        ;;
+    esac
+}
+
+__pod-ipc() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "gem subcommand" _ipc_arguments
+            return
+        ;;
+
+        (options)
+            #todo
+            return
+        ;;
+    esac
+}
+
+
+
+local expl
+#local -a boxes installed_boxes
+
+local curcontext="$curcontext" state line
+typeset -A opt_args
+
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+case $state in
+  (command)
+      _describe -t commands "gem subcommand" _1st_arguments
+      return
+  ;;
+
+  (options)
+    case $line[1] in
+        (help)
+            _arguments ':feature:__first_command_list'
+        ;;
+
+        (repo)
+            __pod-repo
+        ;;
+
+        (spec)
+            __pod-spec
+        ;;
+
+        (ipc)
+            __pod-ipc
+        ;;
+
+        (list)
+            __pod-list
+        ;;
+
+        (install|lib|outdated|podfile-info|push|search|setup|update)
+            #_arguments ':feature:__repo_list'
+    esac
+  ;;
 esac
-
-_arguments \
-    $_command_args \
-    '(--silent)--silent[Show nothing]' \
-    '(--version)--version[Show the version of CocoaPods]' \
-    '(--no-color)--no-color[Show output without color]' \
-    '(--verbose)--verbose[Show more debugging information]' \
-    '(--help)--help[Show help banner of specified command]' \
-    &&  return 0
\ No newline at end of file

From 1d636fe8ab4a7258eddbe120d462cdda3d8adbaf Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Fri, 5 Jul 2013 11:17:33 +0200
Subject: [PATCH 0334/1378] pod-list

pod-lib removed. whyever I described it...
---
 plugins/pod/_pod | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index ce8882d42..1decb8872 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -30,7 +30,6 @@ _1st_arguments=(
     'help:Show help for the given command.'
     'install:Install project dependencies'
     'ipc:Inter-process communication'
-    'lib:Develop pods'
     'list:List pods'
     'outdated:Show outdated project dependencies'
     'podfile-info:Shows information on installed Pods'
@@ -77,7 +76,7 @@ __first_command_list ()
     local expl
     declare -a tasks
 
-    tasks=(install ipc lib list outdated podfile-info push repo search setup spec update)
+    tasks=(install ipc list outdated podfile-info push repo search setup spec update)
 
     _wanted tasks expl 'help' compadd $tasks
 }
@@ -152,6 +151,27 @@ __pod-ipc() {
     esac
 }
 
+__pod-list() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "gem subcommand" _list_arguments
+            return
+        ;;
+
+        (options)
+            #todo
+            return
+        ;;
+    esac
+}
+
 
 
 local expl
@@ -192,7 +212,7 @@ case $state in
             __pod-list
         ;;
 
-        (install|lib|outdated|podfile-info|push|search|setup|update)
+        (install|outdated|podfile-info|push|search|setup|update)
             #_arguments ':feature:__repo_list'
     esac
   ;;

From c48822b3a3a3f25922c184d1804fc11aea2b6432 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Fri, 5 Jul 2013 11:28:00 +0200
Subject: [PATCH 0335/1378] show repos on pod push

---
 plugins/pod/_pod | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 1decb8872..78644745b 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -196,6 +196,10 @@ case $state in
             _arguments ':feature:__first_command_list'
         ;;
 
+        (push)
+            _arguments ':feature:__repo_list'
+        ;;
+
         (repo)
             __pod-repo
         ;;
@@ -212,7 +216,7 @@ case $state in
             __pod-list
         ;;
 
-        (install|outdated|podfile-info|push|search|setup|update)
+        (install|outdated|podfile-info|search|setup|update)
             #_arguments ':feature:__repo_list'
     esac
   ;;

From 4d6b59f041f2d5eb9b61608a0ff33160faf48afa Mon Sep 17 00:00:00 2001
From: dongweiming <ciici123@hotmail.com>
Date: Fri, 5 Jul 2013 19:27:43 +0800
Subject: [PATCH 0336/1378] Add a plugin for systemadmin ops and developer

---
 plugins/systemadmin/systemadmin.zsh | 159 ++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 plugins/systemadmin/systemadmin.zsh

diff --git a/plugins/systemadmin/systemadmin.zsh b/plugins/systemadmin/systemadmin.zsh
new file mode 100644
index 000000000..f5e44c66f
--- /dev/null
+++ b/plugins/systemadmin/systemadmin.zsh
@@ -0,0 +1,159 @@
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# This is one for the system administrator, operation and maintenance.
+# Some of which come from http://justinlilly.com/dotfiles/zsh.html
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Dongweiming <ciici123@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+function retval() {
+    if [[ -z $1 ]];then
+        echo '.'
+    else
+        echo $1
+    fi
+}
+
+function retlog() {
+    if [[ -z $1 ]];then
+        echo '/var/log/nginx/access.log'
+    else
+        echo $1
+    fi
+}
+
+alias ping='ping -c 5'
+alias clr='clear;echo "Currently logged in on $(tty), as $(whoami) in directory $(pwd)."'
+alias path='echo -e ${PATH//:/\\n}'
+alias mkdir='mkdir -pv'
+# get top process eating memory
+alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
+alias psmem10='ps -e -orss=,args= | sort -b -k1,1n| head -10'
+# get top process eating cpu if not work try excute : export LC_ALL='C'
+alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr'
+alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1 -nr | head -10'
+# top10 of the history
+alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
+
+# directory LS
+dls () {
+    ls -l | grep "^d" | awk '{ print $9 }' | tr -d "/"
+}
+psgrep() {
+    ps aux | grep "$(retval $1)" | grep -v grep
+}
+# Kills any process that matches a regexp passed to it
+killit() {
+    ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
+}
+
+# list contents of directories in a tree-like format
+if [ -z "\${which tree}" ]; then
+  tree () {
+      find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+  }
+fi
+
+# Sort connection state
+sortcons() {
+    netstat -nat |awk '{print $6}'|sort|uniq -c|sort -rn
+}
+
+# View all 80 Port Connections
+con80() {
+    netstat -nat|grep -i ":80"|wc -l
+}
+
+# On the connected IP sorted by the number of connections
+sortconip() {
+    netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
+}
+
+# top20 of Find the number of requests on 80 port
+req20() {
+    netstat -anlp|grep 80|grep tcp|awk '{print $5}'|awk -F: '{print $1}'|sort|uniq -c|sort -nr|head -n20
+}
+
+# top20 of Using tcpdump port 80 access to view
+http20() {
+    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
+}
+
+# top20 of Find time_wait connection
+timewait20() {
+    netstat -n|grep TIME_WAIT|awk '{print $5}'|sort|uniq -c|sort -rn|head -n20
+}
+
+# top20 of Find SYN connection
+syn20() {
+    netstat -an | grep SYN | awk '{print $5}' | awk -F: '{print $1}' | sort | uniq -c | sort -nr|head -n20
+}
+
+# Printing process according to the port number
+port_pro() {
+    netstat -ntlp | grep "$(retval $1)" | awk '{print $7}' | cut -d/ -f1
+}
+
+# top10 of gain access to the ip address
+accessip10() {
+    awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
+}
+
+# top20 of Most Visited file or page
+visitpage20() {
+    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
+}
+
+# top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
+consume100() {
+    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    # if django website or other webiste make by no suffix language
+    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+}
+
+# Website traffic statistics (G)
+webtraffic() {
+    awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
+}
+
+# Statistical connections 404
+c404() {
+    awk '($9 ~/404/)' "$(retlog)" | awk '{print $9,$7}' | sort
+}
+
+# Statistical http status.
+httpstatus() {
+    awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
+}
+
+# Delete 0 byte file
+d0() {
+    find "$(retval $1)" -type f -size 0 -exec rm -rf {} \;
+}
+
+# gather external ip address
+geteip() {
+    curl http://ifconfig.me
+}
+
+# determine local IP address
+getip() {
+    ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
+}
+
+# Clear zombie processes
+clrz() {
+    ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
+}
+
+# Second concurrent
+conssec() {
+    awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)"|sort -k 2 -nr|head -n10
+}

From 2defe0b5c54b08fc599005197761edf162600c78 Mon Sep 17 00:00:00 2001
From: Vincent <emesix@xs4all.nl>
Date: Mon, 8 Jul 2013 01:17:33 +0200
Subject: [PATCH 0337/1378] Update jonathan.zsh-theme

Made it work with UTF-8 Console.
Thanks goes to http://blog.ganneff.de/blog/2013/03/zsh-config---and-prompt.html
---
 themes/jonathan.zsh-theme | 59 ++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 9f0f30271..bca92970c 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -71,17 +71,30 @@ setprompt () {
 
     ###
     # See if we can use extended characters to look nicer.
+    # UTF-8 Fixed
 
-    typeset -A altchar
-    set -A altchar ${(s..)terminfo[acsc]}
-    PR_SET_CHARSET="%{$terminfo[enacs]%}"
-    PR_SHIFT_IN="%{$terminfo[smacs]%}"
-    PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
-    PR_HBAR=${altchar[q]:--}
-    PR_ULCORNER=${altchar[l]:--}
-    PR_LLCORNER=${altchar[m]:--}
-    PR_LRCORNER=${altchar[j]:--}
-    PR_URCORNER=${altchar[k]:--}
+    if [[ $(locale charmap) == "UTF-8" ]]; then
+	PR_SET_CHARSET=""
+	PR_SHIFT_IN=""
+	PR_SHIFT_OUT=""
+	PR_HBAR="─"
+        PR_ULCORNER="┌"
+        PR_LLCORNER="└"
+        PR_LRCORNER="┘"
+        PR_URCORNER="┐"
+    else
+        typeset -A altchar
+        set -A altchar ${(s..)terminfo[acsc]}
+        # Some stuff to help us draw nice lines
+        PR_SET_CHARSET="%{$terminfo[enacs]%}"
+        PR_SHIFT_IN="%{$terminfo[smacs]%}"
+        PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
+        PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
+        PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
+        PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
+        PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
+        PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
+     fi
 
 
     ###
@@ -113,31 +126,31 @@ setprompt () {
     # Finally, the prompt.
 
     PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
-$PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\
 $PR_GREEN%$PR_PWDLEN<...<%~%<<\
-$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\
 $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
-$PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
+$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\
 
-$PR_CYAN$PR_SHIFT_IN$PR_LLCORNER$PR_BLUE$PR_HBAR$PR_SHIFT_OUT(\
+$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
 $PR_YELLOW%D{%H:%M:%S}\
-$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_SHIFT_IN$PR_HBAR\
-$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
+$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\
+$PR_HBAR\
 >$PR_NO_COLOUR '
 
     # display exitcode on the right when >0
     return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
-    RPROMPT=' $return_code$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_BLUE$PR_HBAR$PR_SHIFT_OUT\
-($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_SHIFT_OUT$PR_NO_COLOUR'
+    RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\
+($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR'
 
-    PS2='$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
-$PR_BLUE$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT(\
-$PR_LIGHT_GREEN%_$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
-$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT$PR_NO_COLOUR '
+    PS2='$PR_CYAN$PR_HBAR\
+$PR_BLUE$PR_HBAR(\
+$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\
+$PR_CYAN$PR_HBAR$PR_NO_COLOUR '
 }
 
 setprompt
 
 autoload -U add-zsh-hook
 add-zsh-hook precmd  theme_precmd
-add-zsh-hook preexec theme_preexec
\ No newline at end of file
+add-zsh-hook preexec theme_preexec

From 0892bce00b73fdf75d70e554b1fd64ae0fd5e61a Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 9 Jul 2013 14:41:41 +0200
Subject: [PATCH 0338/1378] supplemented with options

---
 plugins/pod/_pod | 239 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 197 insertions(+), 42 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 78644745b..bb4f782b3 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -12,19 +12,6 @@
 #       LICENSE:  MIT
 # -----------------------------------------------------------------------------
 
-#------------------
-# TODO:
-#   - Parameters for
-#       - install
-#       - update
-#       - outdated
-#       - search
-#       - list
-#       - push
-#       - podfile-info
-#       - setup
-#------------------
-
 local -a _1st_arguments
 _1st_arguments=(
     'help:Show help for the given command.'
@@ -71,6 +58,92 @@ _list_arguments=(
     'new:Lists pods introduced in the master spec-repo since the last check'
 )
 
+local -a _inherited_options
+_inherited_options=(
+    '(--silent)--silent[Show nothing]' \
+    '(--version)--version[Show the version of CocoaPods]' \
+    '(--no-color)--no-color[Show output without color]' \
+    '(--verbose)--verbose[Show more debugging information]' \
+    '(--help)--help[Show help banner of specified command]'
+)
+
+local -a _install_options
+_install_options=(
+    '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn` intact after downloading]' \
+    '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
+    '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]'
+)
+
+local -a _update_options
+_update_options=(
+    '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn intact after downloading]' \
+    '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
+    '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
+)
+
+local -a _outdated_options
+_outdated_options=(
+    '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]'
+)
+
+local -a _search_options
+_search_options=(
+    '(--full)--full[Search by name, summary, and description]' \
+    '(--stats)--stats[Show additional stats (like GitHub watchers and forks)]' \
+    '(--ios)--ios[Restricts the search to Pods supported on iOS]' \
+    '(--osx)--osx[Restricts the search to Pods supported on OS X]'
+)
+
+local -a _list_options
+_list_options=(
+    '(--update)--update[Run `pod repo update` before listing]'
+)
+
+local -a _podfile_info_options
+_podfile_info_options=(
+    '(--all)--all[Show information about all Pods with dependencies that are used in a project]' \
+    '(--md)--md[Output information in Markdown format]'
+)
+
+local -a _push_options
+_push_options=(
+    '(--allow-warnings)--allow-warnings[Allows pushing even if there are warnings]' \
+    '(--local-only)--local-only[Does not perform the step of pushing REPO to its remote]'
+)
+
+local -a _repo_lint_options
+_repo_lint_options=(
+    '(--only-errors)--only-errors[Lint presents only the errors]'
+)
+
+local -a _setup_options
+_setup_options=(
+    '(--push)--push[Use this option to enable push access once granted]'
+)
+
+local -a _spec_lint_options
+_spec_lint_options=(
+    '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \
+    '(--only-errors)--only-errors[Lint validates even if warnings are present]' \
+    '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]'
+)
+
+local -a _spec_cat_options
+_spec_cat_options=(
+    '(--show-all)--show-all[Pick from all versions of the given podspec]'
+)
+
+local -a _spec_which_options
+_spec_which_options=(
+    '(--show-all)--show-all[Print all versions of the given podspec]'
+)
+
+local -a _spec_edit_options
+_spec_edit_options=(
+    '(--show-all)--show-all[Pick which spec to edit from all available versions of the given podspec]'
+)
+
+
 __first_command_list ()
 {
     local expl
@@ -82,7 +155,7 @@ __first_command_list ()
 }
 
 __repo_list() {
-    _wanted application expl 'command' compadd $(command ls -1 ~/.cocoapods 2>/dev/null | sed -e 's/ /\\ /g')
+    _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods 2>/dev/null | sed -e 's/ /\\ /g')
 }
 
 __pod-repo() {
@@ -93,19 +166,32 @@ __pod-repo() {
         ':command:->command' \
         '*::options:->options'
 
-   case $state in
-       (command)
-           _describe -t commands "gem subcommand" _repo_arguments
-           return
-       ;;
+    case $state in
+        (command)
+            _describe -t commands "pod repo" _repo_arguments
+            return
+        ;;
 
-       (options)
-           case $line[1] in
-               (update|lint)
-                   _arguments ':feature:__repo_list'
-               ;;
-           esac
-       ;;
+        (options)
+            case $line[1] in
+                (lint)
+                    _arguments \
+                        $_inherited_options \
+                        $_repo_lint_options \
+                        ':feature:__repo_list'
+                ;;
+
+                (update)
+                    _arguments \
+                        $_inherited_options \
+                        ':feature:__repo_list'
+                ;;
+
+                (add)
+                    _arguments \
+                        $_inherited_options
+            esac
+        ;;
     esac
 }
 
@@ -119,12 +205,41 @@ __pod-spec() {
 
    case $state in
         (command)
-            _describe -t commands "gem subcommand" _spec_arguments
+            _describe -t commands "pod spec" _spec_arguments
             return
         ;;
 
         (options)
-            #todo
+            case $line[1] in
+                (create)
+                    _arguments \
+                        $_inherited_options
+                ;;
+
+                (lint)
+                    _arguments \
+                        $_inherited_options \
+                        $_spec_lint_options
+                ;;
+
+                (cat)
+                    _arguments \
+                        $_inherited_options \
+                        $_spec_cat_options
+                ;;
+
+                (which)
+                    _arguments \
+                        $_inherited_options \
+                        $_spec_which_options
+                ;;
+
+                (edit)
+                    _arguments \
+                        $_inherited_options \
+                        $_spec_edit_options
+                ;;
+            esac
             return
         ;;
     esac
@@ -140,12 +255,13 @@ __pod-ipc() {
 
    case $state in
         (command)
-            _describe -t commands "gem subcommand" _ipc_arguments
+            _describe -t commands "pod ipc" _ipc_arguments
             return
         ;;
 
         (options)
-            #todo
+            _arguments -C \
+                $_inherited_options
             return
         ;;
     esac
@@ -156,48 +272,53 @@ __pod-list() {
     typeset -A opt_args
 
     _arguments -C \
+        $_inherited_options \
+        $_list_options \
         ':command:->command' \
         '*::options:->options'
 
    case $state in
         (command)
-            _describe -t commands "gem subcommand" _list_arguments
+            _describe -t commands "pod list" _list_arguments
             return
         ;;
 
         (options)
-            #todo
+            _arguments -C \
+                $_inherited_options \
+                $_list_options
             return
         ;;
     esac
 }
 
-
-
-local expl
-#local -a boxes installed_boxes
-
 local curcontext="$curcontext" state line
 typeset -A opt_args
 
 _arguments -C \
+    $_inherited_options \
     ':command:->command' \
     '*::options:->options'
 
 case $state in
   (command)
-      _describe -t commands "gem subcommand" _1st_arguments
+      _describe -t commands "pod" _1st_arguments
       return
   ;;
 
   (options)
     case $line[1] in
         (help)
-            _arguments ':feature:__first_command_list'
+            _arguments \
+                $_inherited_options \
+                ':help:__first_command_list'
         ;;
 
         (push)
-            _arguments ':feature:__repo_list'
+            _arguments \
+                $_inherited_options \
+                $_push_options \
+                ':repo:__repo_list'
         ;;
 
         (repo)
@@ -216,8 +337,42 @@ case $state in
             __pod-list
         ;;
 
-        (install|outdated|podfile-info|search|setup|update)
-            #_arguments ':feature:__repo_list'
+        (install)
+            _arguments \
+                $_inherited_options \
+                $_install_options
+        ;;
+
+        (update)
+            _arguments \
+                $_inherited_options \
+                $_update_options
+        ;;
+
+        (outdated)
+            _arguments \
+                $_inherited_options \
+                $_outdated_options
+        ;;
+
+        (search)
+            _arguments \
+                $_inherited_options \
+                $_search_options
+        ;;
+
+        (podfile-info)
+            _arguments \
+                $_inherited_options \
+                $_podfile_info_options
+        ;;
+
+        (setup)
+            _arguments \
+                $_inherited_options \
+                $_setup_options
+        ;;
+
     esac
   ;;
 esac

From 45314ee5b7ad2d7daafe940b801ddacd151d7017 Mon Sep 17 00:00:00 2001
From: mekanics <alexandre.joly@mekanics.ch>
Date: Wed, 10 Jul 2013 00:14:08 +0200
Subject: [PATCH 0339/1378] correct filename in the comments

---
 plugins/pod/_pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index bb4f782b3..c1eb86b5e 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -2,7 +2,7 @@
 #autoload
 
 # -----------------------------------------------------------------------------
-#          FILE:  pod.plugin.zsh
+#          FILE:  _pod
 #   DESCRIPTION:  Cocoapods autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)

From 05d8fdf3d54af3243e5891d13969a766bd9570a1 Mon Sep 17 00:00:00 2001
From: Brent Theisen <brent@bantamlabs.com>
Date: Tue, 9 Jul 2013 23:15:43 -0500
Subject: [PATCH 0340/1378] Copy and paste of two functions from Ubuntu 13.04's
 version of /usr/share/zsh/functions/Completion/Unix/_git that were referenced
 in 46f0d8d. Fixes #1952.

---
 plugins/git/_git-branch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/plugins/git/_git-branch b/plugins/git/_git-branch
index 86d03bc30..6b9c1a483 100644
--- a/plugins/git/_git-branch
+++ b/plugins/git/_git-branch
@@ -60,3 +60,24 @@ _git-branch ()
     "($l $c $m -d)-D[delete a branch]" \
     $dependent_deletion_args
 }
+
+(( $+functions[__git_ignore_line] )) ||
+__git_ignore_line () {
+  declare -a ignored
+  ignored=()
+  ((CURRENT > 1)) &&
+    ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+  ((CURRENT < $#line)) &&
+    ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+  $* -F ignored
+}
+
+(( $+functions[__git_ignore_line_inside_arguments] )) ||
+__git_ignore_line_inside_arguments () {
+  declare -a compadd_opts
+
+  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
+
+  __git_ignore_line $* $compadd_opts
+}
+

From 3d204883a69355b95248b72e8c2078718fb07802 Mon Sep 17 00:00:00 2001
From: Sukant Hajra <rrudbskr5g@snkmail.com>
Date: Thu, 11 Jul 2013 01:36:50 -0500
Subject: [PATCH 0341/1378] fix gpg-agent "running already" check

The GPG_ENV file is sourced before doing the gpg-connect-agent check,
but this file (unlike the SSH_ENV file) doesn't export GPG_AGENT_INFO,
so the check always fails.  This results in new gpg-agents continuously
being spawned.

All this commit does is put in the single export to fix the problem.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 4071334cb..b6992479d 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -19,6 +19,7 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
     # source settings of old agent, if applicable
     if [ -f "${GPG_ENV}" ]; then
         . ${GPG_ENV} > /dev/null
+        export GPG_AGENT_INFO
     fi
 
     # check again if another agent is running using the newly sourced settings

From 57a2327ddff8ed88492dd32cc57ccd5fd5c6e9ac Mon Sep 17 00:00:00 2001
From: Tehmasp Chaudhri <tehmasp@gmail.com>
Date: Fri, 12 Jul 2013 12:03:44 -0600
Subject: [PATCH 0342/1378] Added a 'git diff --cached' alias -> 'gdc'

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2ecc74eb6..3522703ef 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -5,6 +5,8 @@ alias gst='git status'
 compdef _git gst=git-status
 alias gd='git diff'
 compdef _git gd=git-diff
+alias gdc='git diff --cached'
+compdef _git gdc=git-diff
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git pull --rebase'

From 849c80b02ddb52a3f28edaca875e154a9daacd01 Mon Sep 17 00:00:00 2001
From: fff <milel.f@gmail.com>
Date: Mon, 15 Jul 2013 09:25:18 +0800
Subject: [PATCH 0343/1378] fixed typo in tmux plugin

---
 plugins/tmux/tmux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 3ecc2ac69..96fab80a6 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -38,7 +38,7 @@ if which tmux &> /dev/null
 	fi
 
 	# Set the correct local config file to use.
-    if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -f $HOME/.tmux.conf ]] || -h $HOME/.tmux.conf ]] ))
+    if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
 	then
 		#use this when they have a ~/.tmux.conf
 		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"

From ba7fe6df62236dfa03a360a8707ebd0c0b1a645a Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@mekanics.ch>
Date: Mon, 15 Jul 2013 14:37:31 +0200
Subject: [PATCH 0344/1378] show file liste on 'pod push [REPO]' and tab, 'pod
 spec lint' and 'pod podfile-info'

---
 plugins/pod/_pod | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index c1eb86b5e..563fa5e66 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -102,13 +102,15 @@ _list_options=(
 local -a _podfile_info_options
 _podfile_info_options=(
     '(--all)--all[Show information about all Pods with dependencies that are used in a project]' \
-    '(--md)--md[Output information in Markdown format]'
+    '(--md)--md[Output information in Markdown format]' \
+    '*:script or directory:_files'
 )
 
 local -a _push_options
 _push_options=(
     '(--allow-warnings)--allow-warnings[Allows pushing even if there are warnings]' \
-    '(--local-only)--local-only[Does not perform the step of pushing REPO to its remote]'
+    '(--local-only)--local-only[Does not perform the step of pushing REPO to its remote]' \
+    '*:script or directory:_files'
 )
 
 local -a _repo_lint_options
@@ -125,7 +127,8 @@ local -a _spec_lint_options
 _spec_lint_options=(
     '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \
     '(--only-errors)--only-errors[Lint validates even if warnings are present]' \
-    '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]'
+    '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]' \
+    '*:script or directory:_files'
 )
 
 local -a _spec_cat_options

From cf8d76094c2e0032ebe5cc1d579e393521ed3b86 Mon Sep 17 00:00:00 2001
From: Sukant Hajra <rrudbskr5g@snkmail.com>
Date: Mon, 15 Jul 2013 08:51:08 -0500
Subject: [PATCH 0345/1378] PLUGIN: gpg-agent: export SSH_* environment
 variables too

If using the gpg-agent with --enable-ssh-support, the SSH_AUTH_SOCK and
SSH_AGENT_PID environment variables need to be exported once sourced
from GPG_ENV.  Otherwise, we get no benefit from the persisting these
values to GPG_ENV; subsequent openned terminals don't see the existent
gpg-agent as a process for an SSH daemon.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index b6992479d..3e6a34f42 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -20,6 +20,8 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
     if [ -f "${GPG_ENV}" ]; then
         . ${GPG_ENV} > /dev/null
         export GPG_AGENT_INFO
+        export SSH_AUTH_SOCK
+        export SSH_AGENT_PID
     fi
 
     # check again if another agent is running using the newly sourced settings

From 6041e4938cc559b908d83b5664166cc1fd02f31e Mon Sep 17 00:00:00 2001
From: yleo77 <ylep77@gmail.com>
Date: Tue, 16 Jul 2013 16:54:54 +0800
Subject: [PATCH 0346/1378] set default value `--max-count=10`

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3bdf0c30f..9087a14ea 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -52,9 +52,9 @@ compdef gcount=git
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
-alias glg='git log --stat --max-count=5'
+alias glg='git log --stat --max-count=10'
 compdef _git glg=git-log
-alias glgg='git log --graph --max-count=5'
+alias glgg='git log --graph --max-count=10'
 compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
 compdef _git glgga=git-log

From 5c529b5daac6e22cb8a267dcd7796c8400c63679 Mon Sep 17 00:00:00 2001
From: Armin Widegreen <armin.widegreen@gmail.com>
Date: Tue, 16 Jul 2013 17:10:47 +0200
Subject: [PATCH 0347/1378] Fix ssh-agent plugin identities comment for using
 multiple identities.

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 7468749f8..3b0042a7d 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -9,7 +9,7 @@
 #   To load multiple identities use the identities style, For
 #   example:
 #
-#     zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github
+#     zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
 #
 #   To set the maximum lifetime of the identities, use the
 #   lifetime style. The lifetime may be specified in seconds

From 00ccee1f33c90c8900e8c2efe4dca9bf5db040f9 Mon Sep 17 00:00:00 2001
From: Trae Robrock <trobrock@gmail.com>
Date: Tue, 16 Jul 2013 16:57:08 -0700
Subject: [PATCH 0348/1378] Add knife_ssh command to make connecting to servers
 managed with chef easier

---
 plugins/knife_ssh/knife_ssh.plugin.zsh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/knife_ssh/knife_ssh.plugin.zsh

diff --git a/plugins/knife_ssh/knife_ssh.plugin.zsh b/plugins/knife_ssh/knife_ssh.plugin.zsh
new file mode 100644
index 000000000..ea3361c49
--- /dev/null
+++ b/plugins/knife_ssh/knife_ssh.plugin.zsh
@@ -0,0 +1,18 @@
+function knife_ssh() {
+  grep -q $1 ~/.knife_comp~ || rm -f ~/.knife_comp~;
+  ssh $(knife node show $1 | awk '/IP:/{print $2}')
+}
+
+_knife_ssh() {
+  if hash knife 2>/dev/null; then
+    if [[ ! -f ~/.knife_comp~ ]]; then
+      echo "\nGenerating ~/.knife_comp~..." >/dev/stderr
+      knife node list > ~/.knife_comp~
+    fi
+    compadd `cat ~/.knife_comp~`
+  else
+    echo "Could not find knife" > /dev/stderr;
+  fi
+}
+
+compdef _knife_ssh knife_ssh

From 9a9e6e929964cbb25c5ce656a995e31ab9636762 Mon Sep 17 00:00:00 2001
From: Trae Robrock <trobrock@gmail.com>
Date: Tue, 16 Jul 2013 17:01:58 -0700
Subject: [PATCH 0349/1378] No cat, and hide errors for missing cache file

---
 plugins/knife_ssh/knife_ssh.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/knife_ssh/knife_ssh.plugin.zsh b/plugins/knife_ssh/knife_ssh.plugin.zsh
index ea3361c49..7fdd42a1e 100644
--- a/plugins/knife_ssh/knife_ssh.plugin.zsh
+++ b/plugins/knife_ssh/knife_ssh.plugin.zsh
@@ -1,5 +1,5 @@
 function knife_ssh() {
-  grep -q $1 ~/.knife_comp~ || rm -f ~/.knife_comp~;
+  grep -q $1 ~/.knife_comp~ 2> /dev/null || rm -f ~/.knife_comp~;
   ssh $(knife node show $1 | awk '/IP:/{print $2}')
 }
 
@@ -9,7 +9,7 @@ _knife_ssh() {
       echo "\nGenerating ~/.knife_comp~..." >/dev/stderr
       knife node list > ~/.knife_comp~
     fi
-    compadd `cat ~/.knife_comp~`
+    compadd $(<~/.knife_comp~)
   else
     echo "Could not find knife" > /dev/stderr;
   fi

From cbbdc0dfeb579474e320a6acf46077bac8c78c28 Mon Sep 17 00:00:00 2001
From: Andrey Janzen <andrey@janzen.su>
Date: Sat, 20 Jul 2013 10:12:06 +0700
Subject: [PATCH 0350/1378] Added 'reinstall' command to brew completion

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index e43ba2900..3ead022dc 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -28,6 +28,7 @@ _1st_arguments=(
   'missing:check all installed formuale for missing dependencies.'
   'outdated:list formulas for which a newer version is available'
   'prune:remove dead links'
+  'reinstall:reinstall a formula'
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
   'server:start a local web app that lets you browse formulae (requires Sinatra)'

From 4b8e10958467899765e0e4fedb80d31f8e0adb8d Mon Sep 17 00:00:00 2001
From: John Warwick <jwarwick@gmail.com>
Date: Fri, 19 Jul 2013 23:19:11 -0400
Subject: [PATCH 0351/1378] Added autocompletion support for Elixir mix command

---
 plugins/mix/_mix | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 plugins/mix/_mix

diff --git a/plugins/mix/_mix b/plugins/mix/_mix
new file mode 100644
index 000000000..602f5ffa0
--- /dev/null
+++ b/plugins/mix/_mix
@@ -0,0 +1,63 @@
+#compdef mix 
+#autoload
+
+# Elixir mix zsh completion
+
+local -a _1st_arguments
+_1st_arguments=(
+    'archive:Archive this project into a .ez file'
+    'clean:Clean generated application files'
+    'compile:Compile source files'
+    'deps:List dependencies and their status'
+    "deps.clean:Remove dependencies' files"
+    'deps.compile:Compile dependencies'
+    'deps.get:Get all out of date dependencies'
+    'deps.unlock:Unlock the given dependencies'
+    'deps.update:Update dependencies'
+    'do:Executes the commands separated by comma'
+    'escriptize:Generates an escript for the project'
+    'help:Print help information for tasks'
+    'local:List local tasks'
+    'local.install:Install a task or an archive locally'
+    'local.rebar:Install rebar locally'
+    'local.uninstall:Uninstall local tasks or archives'
+    'new:Creates a new Elixir project'
+    'run:Run the given file or expression'
+    "test:Run a project's tests"
+    '--help:Describe available tasks'
+    '--version:Prints the Elixir version information'
+)
+
+__task_list ()
+{
+    local expl
+    declare -a tasks
+
+    tasks=(archive clean compile deps deps.clean deps.compile deps.get deps.unlock deps.update do escriptize help local local.install local.rebar local.uninstall new run test)
+
+    _wanted tasks expl 'help' compadd $tasks
+}
+
+local expl
+
+local curcontext="$curcontext" state line
+typeset -A opt_args
+
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+case $state in
+  (command)
+      _describe -t commands "mix subcommand" _1st_arguments
+      return
+  ;;
+
+  (options)
+    case $line[1] in
+      (help)
+         _arguments ':feature:__task_list' 
+    esac
+  ;;
+esac
+

From d0e312fc13d8f2a1a6bb9a02ca4acf1bcdc0bbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Macias?= <jerome.macias@gmail.com>
Date: Mon, 22 Jul 2013 15:51:16 +0200
Subject: [PATCH 0352/1378] Fix symfony command completion 'permission denied'

---
 plugins/symfony/symfony.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony/symfony.plugin.zsh b/plugins/symfony/symfony.plugin.zsh
index 9de767548..f070e9e47 100644
--- a/plugins/symfony/symfony.plugin.zsh
+++ b/plugins/symfony/symfony.plugin.zsh
@@ -1,7 +1,7 @@
 # symfony basic command completion
 
 _symfony_get_command_list () {
-    ./symfony | sed "1,/Available tasks/d" | awk 'BEGIN { cat=null; } /^[A-Za-z]+$/ { cat = $1; } /^  :[a-z]+/ { print cat $1; }'
+    php symfony | sed "1,/Available tasks/d" | awk 'BEGIN { cat=null; } /^[A-Za-z]+$/ { cat = $1; } /^  :[a-z]+/ { print cat $1; }'
 }
 
 _symfony () {

From b456541cc392e79ce7b8b30f0cba98f2796ed9a4 Mon Sep 17 00:00:00 2001
From: Andrey Janzen <andrey@janzen.su>
Date: Tue, 23 Jul 2013 15:52:44 +0700
Subject: [PATCH 0353/1378] In capistrano completion show also tasks without
 description

---
 plugins/capistrano/_capistrano | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index 1002dad96..3cadf3d54 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -4,7 +4,7 @@
 if [[ -f config/deploy.rb || -f Capfile ]]; then
   if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then
     echo "\nGenerating .cap_tasks~..." > /dev/stderr
-    cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
+    cap -v --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
   fi
   compadd `cat .cap_tasks~`
 fi

From 107d196f94ee800907abcb3c2de8df1f73b2b31e Mon Sep 17 00:00:00 2001
From: Kenneth Geerts <Kenneth.Geerts@up-nxt.com>
Date: Tue, 23 Jul 2013 15:51:35 +0200
Subject: [PATCH 0354/1378] Updated gem plugin zsh completion (gem 2.0.3).

---
 plugins/gem/_gem | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 83cba40d1..975cec602 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -9,8 +9,9 @@ _gem_installed() {
 
 local -a _1st_arguments
 _1st_arguments=(
+  'build:Build a gem from a gemspec'
   'cert:Manage RubyGems certificates and signing settings'
-  'check:Check installed gems'
+  'check:Check a gem repository for added or missing files'
   'cleanup:Clean up old versions of installed gems in the local repository'
   'contents:Display the contents of the installed gems'
   'dependency:Show the dependencies of an installed gem'
@@ -21,7 +22,7 @@ _1st_arguments=(
   'install:Install a gem into the local repository'
   'list:Display gems whose name starts with STRING'
   'lock:Generate a lockdown list of gems'
-  'mirror:Mirror a gem repository'
+  'mirror:Mirror all gem files (requires rubygems-mirror)'
   'outdated:Display all gems that need updates'
   'owner:Manage gem owners on RubyGems.org.'
   'pristine:Restores installed gems to pristine condition from files located in the gem cache'
@@ -35,8 +36,9 @@ _1st_arguments=(
   'stale:List gems along with access times'
   'uninstall:Uninstall gems from the local repository'
   'unpack:Unpack an installed gem to the current directory'
-  'update:Update the named gems (or all installed gems) in the local repository'
+  'update:Update installed gems to the latest version'
   'which:Find the location of a library file you can require'
+  'yank:Remove a specific gem version release from RubyGems.org'
 )
 
 local expl

From c8dbadd3da204bbe3c15c870818aeb34800e26a2 Mon Sep 17 00:00:00 2001
From: Andrey Janzen <andrey@janzen.su>
Date: Tue, 23 Jul 2013 21:32:55 +0700
Subject: [PATCH 0355/1378] Added completion for second argument for 'brew
 reinstall'

---
 plugins/brew/_brew | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index 3ead022dc..bf0a286c1 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -76,7 +76,7 @@ case "$words[1]" in
   install|home|homepage|log|info|abv|uses|cat|deps|edit|options|versions)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  remove|rm|uninstall|unlink|cleanup|link|ln)
+  reinstall|remove|rm|uninstall|unlink|cleanup|link|ln)
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
 esac

From 7fb17127c7ef2ff11240af5c42430ae3ae1c0369 Mon Sep 17 00:00:00 2001
From: Dmitri Akatov <akatov@gmail.com>
Date: Wed, 24 Jul 2013 14:30:12 -0700
Subject: [PATCH 0356/1378] carton completion plugin

---
 plugins/carton/carton.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/carton/carton.plugin.zsh

diff --git a/plugins/carton/carton.plugin.zsh b/plugins/carton/carton.plugin.zsh
new file mode 100644
index 000000000..23868b09c
--- /dev/null
+++ b/plugins/carton/carton.plugin.zsh
@@ -0,0 +1,6 @@
+if which carton &> /dev/null
+then
+  source $(dirname $(which carton))/../etc/carton_completion.zsh
+else
+  print "zsh carton plugin: carton not found"
+fi

From 25913cf14402dbf71a95c56cae69008bcec71b69 Mon Sep 17 00:00:00 2001
From: stibinator <stib@pureandapplied.com.au>
Date: Fri, 26 Jul 2013 11:49:40 +1000
Subject: [PATCH 0357/1378] added duckduckgo to web-search

---
 plugins/web-search/web-search.plugin.zsh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 6b6de2b15..ebd133a0a 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -11,7 +11,7 @@ function web_search() {
   fi
 
   # check whether the search engine is supported
-  if [[ ! $1 =~ '(google|bing|yahoo)' ]];
+  if [[ ! $1 =~ '(google|bing|yahoo|duckduckgo)' ]];
   then
     echo "Search engine $1 not supported."
     return 1
@@ -24,8 +24,12 @@ function web_search() {
     $open_cmd "$url"
     return
   fi
-
-  url="${url}/search?q="
+  if [[ $1 == 'duckduckgo' ]]; then
+  #slightly different search syntax for DDG
+    url="${url}/?q="
+  else
+    url="${url}/search?q="
+  fi
   shift   # shift out $1
 
   while [[ $# -gt 0 ]]; do
@@ -34,10 +38,19 @@ function web_search() {
   done
 
   url="${url%?}" # remove the last '+'
-
+  
   $open_cmd "$url"
 }
 
+
 alias bing='web_search bing'
 alias google='web_search google'
 alias yahoo='web_search yahoo'
+alias duck='web_search duckduckgo'
+#add your own !bang searches here
+alias wiki='web_search duckduckgo \!w'
+alias news='web_search duckduckgo \!n'
+alias youtube='web_search duckduckgo \!yt'
+alias map='web_search duckduckgo \!m'
+alias image='web_search duckduckgo \!i'
+alias ducky='web_search duckduckgo \!'
\ No newline at end of file

From 0456664463374f4872200ffc057c741433eba4f6 Mon Sep 17 00:00:00 2001
From: stibinator <stib@pureandapplied.com.au>
Date: Fri, 26 Jul 2013 11:53:53 +1000
Subject: [PATCH 0358/1378] added duckduckgo to web-search

---
 plugins/web-search/web-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index ebd133a0a..d06585ae5 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -53,4 +53,4 @@ alias news='web_search duckduckgo \!n'
 alias youtube='web_search duckduckgo \!yt'
 alias map='web_search duckduckgo \!m'
 alias image='web_search duckduckgo \!i'
-alias ducky='web_search duckduckgo \!'
\ No newline at end of file
+alias ducky='web_search duckduckgo \!'

From 55c90b1d6cbda581f9ccd41ea1c8da15da98d5ee Mon Sep 17 00:00:00 2001
From: Dmitri Akatov <akatov@gmail.com>
Date: Fri, 26 Jul 2013 20:00:45 -0700
Subject: [PATCH 0359/1378] grunt completion courtesy of @yonchu:
 https://github.com/yonchu/grunt-zsh-completion

---
 plugins/grunt/grunt.plugin.zsh | 253 +++++++++++++++++++++++++++++++++
 1 file changed, 253 insertions(+)
 create mode 100644 plugins/grunt/grunt.plugin.zsh

diff --git a/plugins/grunt/grunt.plugin.zsh b/plugins/grunt/grunt.plugin.zsh
new file mode 100644
index 000000000..48f6cb5a2
--- /dev/null
+++ b/plugins/grunt/grunt.plugin.zsh
@@ -0,0 +1,253 @@
+#compdef grunt
+# -----------------------------------------------------------------------------
+#  _grunt
+#
+#  Completion script for grunt.
+#   - https://github.com/gruntjs/grunt
+#   - https://github.com/gruntjs/grunt-cli
+#
+# -----------------------------------------------------------------------------
+#
+#  Version     : 0.1.0
+#  Author      : Yonchu <yuyuchu3333@gmail.com>
+#  License     : MIT License
+#  Repository  : https://github.com/yonchu/grunt-zsh-completion
+#  Last Change : 22 Jul 2013.
+#
+#  Copyright (c) 2013 Yonchu.
+#
+# -----------------------------------------------------------------------------
+# USAGE
+# -----
+#
+# Enable caching:
+#
+#   If you want to use the cache, set the followings in your .zshrc:
+#
+#     zstyle ':completion:*' use-cache yes
+#
+#
+# Settings:
+#
+#  - Show grunt file path:
+#      zstyle ':completion::complete:grunt::options:' show_grunt_path yes
+#
+#  - Cache expiration days (default: 7):
+#      zstyle ':completion::complete:grunt::options:' expire 1
+#
+#  - Not update options cache if target gruntfile is changed.
+#      zstyle ':completion::complete:grunt::options:' no_update_options yes
+#
+#  Note that if you change the zstyle settings,
+#  you should delete the cache file and restart zsh.
+#
+#    $ rm ~/.zcompcache/grunt
+#    $ exec zsh
+#
+# -----------------------------------------------------------------------------
+
+function _grunt() {
+    local curcontext="$curcontext" update_policy state
+    local show_grunt_path update_msg gruntfile opts tasks
+
+    # Setup cache-policy.
+    zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+    if [[ -z $update_policy ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy __grunt_caching_policy
+    fi
+
+    # Check show_path option.
+    zstyle -b ":completion:${curcontext}:options:" show_grunt_path show_grunt_path
+
+    # Get current gruntfile.
+    gruntfile=$(__grunt_get_gruntfile)
+
+    # Initialize opts and tasks.
+    opts=()
+    tasks=()
+
+    # Add help options.
+    opts+=('(- 1 *)'{-h,--help}'[Display this help text.]')
+
+    ## Complete without gruntfile.
+    if [[ ! -f $gruntfile ]]; then
+        _arguments "${opts[@]}"
+        return
+    fi
+
+    ## Complete with gruntfile.
+    # Retrieve cache.
+    if ! __grunt_update_cache "$gruntfile"; then
+        update_msg=' (cache updated)'
+    fi
+
+    # Make optioins completion.
+    if [[ ${#__grunt_opts} -gt 0 ]]; then
+        opts+=("${__grunt_opts[@]}")
+    fi
+
+    # Complete arguments.
+    _arguments \
+        "${opts[@]}" \
+        '*: :->tasks' \
+        && return
+
+    case $state in
+        tasks)
+            if [[ $show_grunt_path == 'yes' ]]; then
+                update_msg="$update_msg: ${${gruntfile/#$HOME/~}%/}"
+            fi
+            # Make tasks completion.
+            if [[ ${#__grunt_tasks} -gt 0 ]]; then
+                tasks+=("${__grunt_tasks[@]}")
+                _describe -t grunt-task "$verbose grunt task$update_msg" tasks || return 1
+            fi
+        ;;
+    esac
+
+    return 0
+}
+
+# Cache policy:
+#   The cache file name: grunt
+#   The cache variable name: __grunt_version __grunt_gruntfile __grunt_opts __grunt_tasks
+function __grunt_update_cache() {
+    # TODO
+    local version='0.1.0'
+    local is_updating=0
+    local gruntfile="$1"
+    local grunt_info no_update_options cache_path
+
+    # Check no_update_options option.
+    zstyle -b ":completion:${curcontext}:options:" no_update_options no_update_options
+
+
+    if ! ( ((  $+__grunt_gruntfile )) \
+        && (( $+__grunt_opts )) \
+        && (( $+__grunt_tasks )) ) \
+        && ! _retrieve_cache 'grunt'; then
+        is_updating=1
+    fi
+
+    if [[ $gruntfile != $__grunt_gruntfile ]]; then
+        # Except for --help options.
+        __grunt_gruntfile=$gruntfile
+        if [[ $no_update_options == 'yes' ]]; then
+            if [[ $PREFIX == ${PREFIX#-} ]]; then
+                # Not options completions.
+                is_updating=1
+            elif [[ ${#__grunt_opts} -lt 2 ]]; then
+                is_updating=1
+            else
+                unset __grunt_gruntfile
+            fi
+        else
+            is_updating=1
+        fi
+    else
+        if [[ $PREFIX != ${PREFIX#-} && ${#__grunt_opts} -gt 1 ]]; then
+            unset __grunt_gruntfile
+        fi
+    fi
+
+    if _cache_invalid 'grunt'; then
+        is_updating=1
+    fi
+
+    # Check _grunt version.
+    if [[ $__grunt_version != $version ]]; then
+        is_updating=1
+    fi
+
+    if [[ $is_updating -ne 0 ]]; then
+        # Update caceh.
+        __grunt_version=$version
+        __grunt_gruntfile=$gruntfile
+        is_updating=1
+        grunt_info=$(grunt --help --no-color --gruntfile "$__grunt_gruntfile" 2>/dev/null)
+        __grunt_opts=(${(f)"$(__grunt_get_opts "$grunt_info")"})
+        __grunt_tasks=(${(f)"$(__grunt_get_tasks "$grunt_info")"})
+        _store_cache 'grunt' __grunt_version __grunt_gruntfile __grunt_opts __grunt_tasks
+    fi
+    return $is_updating
+}
+
+function __grunt_get_tasks() {
+    echo -E "$1" \
+        | grep 'Available tasks' -A 100 \
+        | grep '^ ' \
+        | sed -e 's/^[[:blank:]]*//' -e 's/[[:blank:]]*$//' \
+        | sed -e 's/  /:/'
+}
+
+function __grunt_get_opts() {
+    local opt_hunk opt_sep opt_num line opt
+    opt_hunk=$(echo -E "$1" \
+        | grep 'Options$' -A 100 \
+        | sed '1 d' \
+        | sed -e 's/[[:blank:]]*$//' \
+    )
+
+    opt_sep=()
+    opt_hunk=(${(f)opt_hunk})
+    opt_num=0
+    for line in "$opt_hunk[@]"; do
+        opt=$(echo -E "$line" | sed -e 's/^[[:blank:]]*//')
+        if [[ $line == $opt ]]; then
+            break
+        fi
+        if [[ $opt != ${opt#-} ]]; then
+            # Start with -
+            (( opt_num++ ))
+            opt=$(echo -E "$opt" | sed 's/^\(\(--[^ ]*\)\(, \(-[^ ]*\)\)*\)  */\2\\t\4\\\t/')
+        fi
+        opt_sep[$opt_num]=("${opt_sep[$opt_num]}${opt}")
+    done
+
+    for line in "$opt_sep[@]"; do
+        opt=(${(s:\t:)line})
+        if [[ ${opt[1]} == '--help' ]]; then
+            continue
+        fi
+        if [[ ${#opt} -eq 2 ]]; then
+            echo -E "(${opt[1]})${opt[1]}[${opt[2]}]"
+        else
+            echo -E "(${opt[1]},${opt[2]})${opt[1]}[${opt[3]}]"
+            echo -E "(${opt[1]},${opt[2]})${opt[2]}[${opt[3]}]"
+        fi
+    done
+}
+
+function __grunt_get_gruntfile() {
+    local gruntfile
+    local curpath="$PWD"
+    while [ "$curpath" ]; do
+        for gruntfile in "$curpath/"{G,g}runtfile.{js,coffee}; do
+            if [[ -e "$gruntfile" ]]; then
+                echo "$gruntfile"
+                return
+            fi
+        done
+        curpath=${curpath%/*}
+    done
+    return 1
+}
+
+function __grunt_caching_policy() {
+    # Returns status zero if the completions cache needs rebuilding.
+
+    # Rebuild if .agignore more recent than cache.
+    if [[ -f $__grunt_gruntfile && $__grunt_gruntfile -nt $1 ]]; then
+        # Invalid cache because gruntfile is old.
+        return 0
+    fi
+
+    local -a oldp
+    local expire
+    zstyle -s ":completion:${curcontext}:options:" expire expire || expire=7
+    # Rebuild if cache is more than $expire days.
+    oldp=( "$1"(Nm+$expire) )
+    (( $#oldp ))
+}
+
+compdef _grunt grunt

From 5bad3f890de691194b77cfc33846e2102e21ea93 Mon Sep 17 00:00:00 2001
From: Steven De Coeyer <steven@banteng.be>
Date: Mon, 5 Aug 2013 21:15:28 +0200
Subject: [PATCH 0360/1378] Updates Zhann theme

---
 themes/zhann.zsh-theme | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 5c49fe79b..5c0854730 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -1,15 +1,25 @@
-PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+autoload -U colors && colors
 
-if [ -e ~/.rvm/bin/rvm-prompt ]; then
-  RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
-else
-  if which rbenv &> /dev/null; then
-    RPROMPT='%{$reset_color%} %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//") %{$reset_color%}'
-  fi
-fi
+autoload -Uz vcs_info
 
+zstyle ':vcs_info:*' stagedstr '%F{green}●'
+zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:*' enable git svn
+theme_precmd () {
+    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
+    } else {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+    }
+
+    vcs_info
+}
+
+setopt prompt_subst
+PROMPT='%B%F{blue}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}% '
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd  theme_precmd
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From 1af012d4991a36bfb0e2def3e67f5a0e56fc49e4 Mon Sep 17 00:00:00 2001
From: Dmitri Akatov <akatov@gmail.com>
Date: Tue, 6 Aug 2013 13:28:52 -0700
Subject: [PATCH 0361/1378] carton was renamed to cask

---
 plugins/carton/carton.plugin.zsh | 6 ------
 plugins/cask/cask.plugin.zsh     | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 plugins/carton/carton.plugin.zsh
 create mode 100644 plugins/cask/cask.plugin.zsh

diff --git a/plugins/carton/carton.plugin.zsh b/plugins/carton/carton.plugin.zsh
deleted file mode 100644
index 23868b09c..000000000
--- a/plugins/carton/carton.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-if which carton &> /dev/null
-then
-  source $(dirname $(which carton))/../etc/carton_completion.zsh
-else
-  print "zsh carton plugin: carton not found"
-fi
diff --git a/plugins/cask/cask.plugin.zsh b/plugins/cask/cask.plugin.zsh
new file mode 100644
index 000000000..c55862924
--- /dev/null
+++ b/plugins/cask/cask.plugin.zsh
@@ -0,0 +1,5 @@
+if which cask &> /dev/null; then
+  source $(dirname $(which cask))/../etc/cask_completion.zsh
+else
+  print "zsh cask plugin: cask not found"
+fi

From 619ecb5f4fcec9ceb3769f4697fcbb2cbe3f2a7a Mon Sep 17 00:00:00 2001
From: Ahmed Azaan <azaan@outlook.com>
Date: Wed, 7 Aug 2013 21:19:21 +0530
Subject: [PATCH 0362/1378] add docker autocomplete plugin

---
 plugins/docker/README.md |   0
 plugins/docker/_docker   | 290 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 290 insertions(+)
 create mode 100644 plugins/docker/README.md
 create mode 100644 plugins/docker/_docker

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/docker/_docker b/plugins/docker/_docker
new file mode 100644
index 000000000..e8d2885c9
--- /dev/null
+++ b/plugins/docker/_docker
@@ -0,0 +1,290 @@
+#compdef docker
+
+# Docker autocompletion for oh-my-zsh
+# Requires: Docker installed
+# Author : Azaan (@aeonazaan)
+
+
+# ----- Helper functions
+# Output a selectable list of all running docker containers
+__docker_containers() {
+    declare -a cont_cmd
+    cont_cmd=($(docker ps | awk 'NR>1{print $1":[CON("$1")"$2"("$3")]"}'))
+    _describe 'containers' cont_cmd
+}
+
+# output a selectable list of all docker images
+__docker_images() {
+    declare -a img_cmd
+    img_cmd=($(docker images | awk 'NR>1{print $1}'))
+    _describe 'images' img_cmd
+}
+
+# ----- Commands
+# Seperate function for each command, makes extension easier later
+# ---------------------------
+__attach() {
+    __docker_containers
+}
+
+__build() {
+    _arguments \
+        '-q=false[Suppress verbose build output]' \
+        '-t="[fuck to be applied to the resulting image in case of success]' \
+        ' *:files:_files'
+}
+
+__commit() {
+    _arguments \
+        '-author="[Author]' \
+        '-m="[Commit message]' \
+        '-run="[Config automatically applied when the image is run.\n]'
+    __docker_containers
+}
+
+__diff() {
+    __docker_containers
+}
+
+__export() {
+   __docker_containers
+}
+
+
+__history() {
+    __docker_images
+}
+
+__images() {
+    _arguments \
+        '-a[show all images]' \
+        '-notrunc[dont truncate output]' \
+        '-q[only show numeric IDs]' \
+        '-viz[output graph in graphviz format'
+    __docker_images
+}
+
+__import() {
+    _arguments '*:files:_files'
+}
+
+__info() {
+    # no arguments
+}
+
+__insert() {
+    __docker_images
+    _arguments '*:files:_files'
+}
+
+__inspect() {
+    __docker_images
+    __docker_containers
+}
+
+__kill() {
+    __docker_containers
+}
+
+__login() {
+    _arguments \
+        '-e="[email]' \
+        '-p="[password]' \
+        '-u="[username]' \
+}
+
+__logs() {
+    __docker_containers
+}
+
+__port() {
+    __docker_containers
+}
+
+__top() {
+    __docker_containers
+}
+
+__ps() {
+    _arguments \
+        '-a[Show all containers. Only running containers are shown by default.]' \
+        '-beforeId="[Show only container created before Id, include non-running ones.]' \
+        '-l[Show only the latest created container, include non-running ones.]' \
+        '-n=[Show n last created containers, include non-running ones.]' \
+        '-notrurrrrnc[Dont truncate output]' \
+        '-q[Only display numeric IDs]' \
+        '-s[Display sizes]' \
+        '-sinceId="[Show only containers created since Id, include non-running ones.]'
+}
+
+__pull() {
+    _arguments '-t="[Download tagged image in repository]'
+}
+
+__push() {
+
+}
+
+__restart() {
+    _arguments '-t=[number of seconds to try to stop before killing]'
+    __docker_containers
+}
+
+__rm() {
+    _arguments '-v[Remove the volumes associated to the container]'
+    __docker_containers
+}
+
+__rmi() {
+    __docker_images
+}
+
+__run() {
+    _arguments \
+        '-a=[Attach to stdin, stdout or stderr.]' \
+        '-c=[CPU shares (relative weight)]' \
+        '-d[Detached mode: leave the container running in the background]' \
+        '-dns=[Set custom dns servers]' \
+        '-e=[Set environment variables]' \
+        '-entrypoint="[Overwrite the default entrypoint of the image]' \
+        '-h="[Container host name]' \
+        '-i[Keep stdin open even if not attached]' \
+        '-m=[Memory limit (in bytes)]' \
+        '-p=[Expose a containers port to the host (use docker port to see the actual mapping)]' \
+        '-t[Allocate a pseudo-tty]' \
+        '-u="[Username or UID]' \
+        '-v=[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
+        '-volumes-from="[Mount volumes from the specified container]'
+    __docker_images
+}
+
+__search() {
+    arguments '-notrunc[Dont truncate output]'
+}
+
+__start() {
+    __docker_container
+}
+
+__stop() {
+    __arguments '-t=[number of seconds to try to stop before killing]'
+    __docker_containers
+}
+
+__tag() {
+    __arguments '-f[Force]'
+    __docker_images
+}
+
+__version() {
+
+}
+
+__wait() {
+    __docker_container
+}
+
+# end commands ---------
+# ----------------------
+
+local -a _1st_arguments
+_1st_arguments=(
+    "attach":"Attach to a running container"
+    "build":"Build a container from a Dockerfile"
+    "commit":"Create a new image from a container's changes"
+    "diff":"Inspect changes on a container's filesystem"
+    "export":"Stream the contents of a container as a tar archive"
+    "history":"Show the history of an image"
+    "images":"List images"
+    "import":"Create a new filesystem image from the contents of a tarball"
+    "info":"Display system-wide information"
+    "insert":"Insert a file in an image"
+    "inspect":"Return low-level information on a container"
+    "kill":"Kill a running container"
+    "login":"Register or Login to the docker registry server"
+    "logs":"Fetch the logs of a container"
+    "port":"Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"
+    "top":"Lookup the running processes of a container"
+    "ps":"List containers"
+    "pull":"Pull an image or a repository from the docker registry server"
+    "push":"Push an image or a repository to the docker registry server"
+    "restart":"Restart a running container"
+    "rm":"Remove one or more containers"
+    "rmi":"Remove one or more images"
+    "run":"Run a command in a new container"
+    "search":"Search for an image in the docker index"
+    "start":"Start a stopped container"
+    "stop":"Stop a running container"
+    "tag":"Tag an image into a repository"
+    "version":"Show the docker version information"
+    "wait":"Block until a container stops, then print its exit code"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "docker command" _1st_arguments
+    return
+fi
+
+local -a _command_args
+case "$words[1]" in
+    attach)
+       __docker_containers ;;
+    build)
+        __build ;;
+    commit)
+        __commit ;;
+    diff)
+        __diff ;;
+    export)
+        __export ;;
+    history)
+        __history ;;
+    images)
+        __images ;;
+    import)
+        __import ;;
+    info)
+        __info ;;
+    insert)
+        __insert ;;
+    inspect)
+        __inspect ;;
+    kill)
+        __kill ;;
+    login)
+        __login ;;
+    logs)
+        __logs ;;
+    port)
+        __port ;;
+    top)
+        __top ;;
+    ps)
+        __ps ;;
+    pull)
+        __pull ;;
+    push)
+        __push ;;
+    restart)
+        __restart ;;
+    rm)
+        __rm ;;
+    rmi)
+        __rmi ;;
+    run)
+        __run ;;
+    search)
+        __search ;;
+    start)
+        __start ;;
+    stop)
+        __stop ;;
+    tag)
+        __tag ;;
+    version)
+        __version ;;
+    wait)
+        __wait ;;
+esac

From 0a62f6636d6fc749b13a45b3d032f3616f2c828d Mon Sep 17 00:00:00 2001
From: Ahmed Aeon Axan <azaan@outlook.com>
Date: Wed, 7 Aug 2013 21:29:53 +0530
Subject: [PATCH 0363/1378] Update README.md

---
 plugins/docker/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index e69de29bb..231a6dcf5 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -0,0 +1,19 @@
+## Docker autocomplete plugin
+
+- Adds autocomplete options for all docker commands.
+- Will also show containerIDs and Image names where applicable
+
+####Shows help for all commands
+![General Help](http://i.imgur.com/tUBO9jh.png "Help for all commands")
+
+
+####Shows your downloaded images where applicable
+![Images](http://i.imgur.com/R8ZsWO1.png "Images")
+
+
+####Shows your running containers where applicable
+![Containers](http://i.imgur.com/WQtbheg.png "Containers")
+
+
+
+Maintainer : Ahmed Azaan ([@aeonazaan](https://twitter.com/aeonazaan))

From 2d1a07a3f72353a59ed9ecda88969093406699f7 Mon Sep 17 00:00:00 2001
From: Ahmed Azaan <azaan@outlook.com>
Date: Wed, 7 Aug 2013 22:11:49 +0530
Subject: [PATCH 0364/1378] fixed minor errors

---
 plugins/docker/_docker | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index e8d2885c9..f13f876cf 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -31,7 +31,7 @@ __build() {
     _arguments \
         '-q=false[Suppress verbose build output]' \
         '-t="[fuck to be applied to the resulting image in case of success]' \
-        ' *:files:_files'
+        '*:files:_files'
 }
 
 __commit() {
@@ -60,7 +60,7 @@ __images() {
         '-a[show all images]' \
         '-notrunc[dont truncate output]' \
         '-q[only show numeric IDs]' \
-        '-viz[output graph in graphviz format'
+        '-viz[output graph in graphviz format]'
     __docker_images
 }
 
@@ -159,20 +159,20 @@ __run() {
 }
 
 __search() {
-    arguments '-notrunc[Dont truncate output]'
+    _arguments '-notrunc[Dont truncate output]'
 }
 
 __start() {
-    __docker_container
+    __docker_containers
 }
 
 __stop() {
-    __arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments '-t=[number of seconds to try to stop before killing]'
     __docker_containers
 }
 
 __tag() {
-    __arguments '-f[Force]'
+    _arguments '-f[Force]'
     __docker_images
 }
 
@@ -181,7 +181,7 @@ __version() {
 }
 
 __wait() {
-    __docker_container
+    __docker_containers
 }
 
 # end commands ---------

From 2c56345917624bd94bfc05fe7bdbb2051421d5e7 Mon Sep 17 00:00:00 2001
From: Kasper Kronborg Isager <kasperisager@gmail.com>
Date: Sat, 10 Aug 2013 19:19:30 -0400
Subject: [PATCH 0365/1378] Add Pure theme

---
 themes/pure.zsh-theme | 128 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 themes/pure.zsh-theme

diff --git a/themes/pure.zsh-theme b/themes/pure.zsh-theme
new file mode 100644
index 000000000..d7ed624e4
--- /dev/null
+++ b/themes/pure.zsh-theme
@@ -0,0 +1,128 @@
+#!/usr/bin/env zsh
+
+# ------------------------------------------------------------------------------
+#
+# Pure - A minimal and beautiful theme for oh-my-zsh
+#
+# Based on the custom Zsh-prompt of the same name by Sindre Sorhus. A huge
+# thanks goes out to him for designing the fantastic Pure prompt in the first
+# place! I'd also like to thank Julien Nicoulaud for his "nicoulaj" theme from
+# which I've borrowed both some ideas and some actual code. You can find out
+# more about both of these fantastic two people here:
+#
+# Sindre Sorhus
+#   Github:   https://github.com/sindresorhus
+#   Twitter:  https://twitter.com/sindresorhus
+#
+# Julien Nicoulaud
+#   Github:   https://github.com/nicoulaj
+#   Twitter:  https://twitter.com/nicoulaj
+#
+# License
+#
+# Copyright (c) 2013 Kasper Kronborg Isager
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ------------------------------------------------------------------------------
+
+# Set required options
+#
+setopt prompt_subst
+
+# Load required modules
+#
+autoload -Uz vcs_info
+
+# Set vcs_info parameters
+#
+zstyle ':vcs_info:*' enable hg bzr git
+zstyle ':vcs_info:*:*' unstagedstr '!'
+zstyle ':vcs_info:*:*' stagedstr '+'
+zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%%u%c"
+zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%u%c (%a)"
+zstyle ':vcs_info:*:*' nvcsformats "%~" "" ""
+
+# Fastest possible way to check if repo is dirty
+#
+git_dirty() {
+    # Check if we're in a git repo
+    command git rev-parse --is-inside-work-tree &>/dev/null || return
+    # Check if it's dirty
+    command git diff --quiet --ignore-submodules HEAD &>/dev/null; [ $? -eq 1 ] && echo "*"
+}
+
+# Display information about the current repository
+#
+repo_information() {
+    echo "%F{blue}${vcs_info_msg_0_%%/.} %F{8}$vcs_info_msg_1_`git_dirty` $vcs_info_msg_2_%f"
+}
+
+# Displays the exec time of the last command if set threshold was exceeded
+#
+cmd_exec_time() {
+    local stop=`date +%s`
+    local start=${cmd_timestamp:-$stop}
+    let local elapsed=$stop-$start
+    [ $elapsed -gt 5 ] && echo ${elapsed}s
+}
+
+# Get the intial timestamp for cmd_exec_time
+#
+preexec() {
+    cmd_timestamp=`date +%s`
+}
+
+# Output additional information about paths, repos and exec time
+#
+precmd() {
+    vcs_info # Get version control info before we start outputting stuff
+    print -P "\n$(repo_information) %F{yellow}$(cmd_exec_time)%f"
+}
+
+# Define prompts
+#
+PROMPT="%(?.%F{magenta}.%F{red})❯%f " # Display a red prompt char on failure
+RPROMPT="%F{8}${SSH_TTY:+%n@%m}%f"    # Display username if connected via SSH
+
+# ------------------------------------------------------------------------------
+#
+# List of vcs_info format strings:
+#
+# %b => current branch
+# %a => current action (rebase/merge)
+# %s => current version control system
+# %r => name of the root directory of the repository
+# %S => current path relative to the repository root directory
+# %m => in case of Git, show information about stashes
+# %u => show unstaged changes in the repository
+# %c => show staged changes in the repository
+#
+# List of prompt format strings:
+#
+# prompt:
+# %F => color dict
+# %f => reset color
+# %~ => current path
+# %* => time
+# %n => username
+# %m => shortname host
+# %(?..) => prompt conditional - %(condition.true.false)
+#
+# ------------------------------------------------------------------------------

From b9474c411b84c3a7985143060393619b459b0162 Mon Sep 17 00:00:00 2001
From: stibinator <stib@pureandapplied.com.au>
Date: Wed, 14 Aug 2013 14:04:06 +1000
Subject: [PATCH 0366/1378] changed duck to ddg for alias

---
 plugins/web-search/web-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index d06585ae5..8eedb90ee 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -46,7 +46,7 @@ function web_search() {
 alias bing='web_search bing'
 alias google='web_search google'
 alias yahoo='web_search yahoo'
-alias duck='web_search duckduckgo'
+alias ddg='web_search duckduckgo'
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
 alias news='web_search duckduckgo \!n'

From e4d0b2b385113aa7fb89efe14c5d022fb646f261 Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Wed, 14 Aug 2013 23:19:16 -0400
Subject: [PATCH 0367/1378] Improve pip plugin options support

* -r, --record now looks for a local file instead of trying to cache
  the entire package index
* add --editable because it's useful
* add --single-version-externally-managed because it is too long
* add --record and --root because they're required by
  --single-version-externally-managed
---
 plugins/pip/_pip | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index df53ba5ce..fb8765c7e 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -6,8 +6,8 @@
 _pip_all() {
   # we cache the list of packages (originally from the macports plugin)
   if (( ! $+piplist )); then
-    echo -n " (caching package index...)"
-	piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
+      echo -n " (caching package index...)"
+      piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
   fi
 }
 
@@ -62,8 +62,13 @@ case "$words[1]" in
       '(--no-install)--no-install[only download packages]' \
       '(--no-download)--no-download[only install downloaded packages]' \
       '(--install-option)--install-option[extra arguments to be supplied to the setup.py]' \
+      '(--single-version-externally-managed)--single-version-externally-managed[do not download/install dependencies. requires --record or --root]'\
+      '(--root)--root[treat this path as a fake chroot, installing into it. implies --single-version-externally-managed]'\
+      '(--record)--record[file to record all installed files to.]'\
+      '(-r --requirement)'{-r,--requirement}'[requirements file]: :_files'\
+      '(-e --editable)'{-e,--editable}'[path of or url to source to link to instead of installing.]: :_files -/'\
       '1: :->packages' &&  return 0
-     
+
       if [[ "$state" == packages ]]; then
         _pip_all
         _wanted piplist expl 'packages' compadd -a piplist

From e368bf1d4aea6ac08ae46d60308e0492e9ab3b85 Mon Sep 17 00:00:00 2001
From: Jeroen Janssens <jeroen.janssens@visualrevenue.com>
Date: Thu, 15 Aug 2013 10:32:01 -0400
Subject: [PATCH 0368/1378] Add jump plugin, which allows you to easily jump
 around the file system

---
 plugins/jump/jump.plugin.zsh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/jump/jump.plugin.zsh

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
new file mode 100644
index 000000000..b792f544c
--- /dev/null
+++ b/plugins/jump/jump.plugin.zsh
@@ -0,0 +1,21 @@
+# Easily jump around the file system by manually adding marks
+# marks are stored as symbolic links in the directory $MARKPATH (default $HOME/.marks)
+#
+# jump FOO: jump to a mark named FOO
+# mark FOO: create a mark named FOO
+# unmark FOO: delete a mark
+# marks: lists all marks
+#
+export MARKPATH=$HOME/.marks
+function jump { 
+	cd -P $MARKPATH/$1 2>/dev/null || echo "No such mark: $1"
+}
+function mark { 
+	mkdir -p $MARKPATH; ln -s $(pwd) $MARKPATH/$1
+}
+function unmark { 
+	rm -i $MARKPATH/$1 
+}
+function marks {
+	ls -l $MARKPATH | sed 's/  / /g' | cut -d' ' -f9- | sed 's/ -/\t-/g' && echo
+}

From 73c22c146c57afe5c9ce341cff876abf00571463 Mon Sep 17 00:00:00 2001
From: Jeroen Janssens <jeroen.janssens@visualrevenue.com>
Date: Sun, 18 Aug 2013 14:16:26 -0400
Subject: [PATCH 0369/1378] Add tab completion for jump plugin

---
 plugins/jump/jump.plugin.zsh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index b792f544c..349d3e01f 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -8,14 +8,21 @@
 #
 export MARKPATH=$HOME/.marks
 function jump { 
-	cd -P $MARKPATH/$1 2>/dev/null || echo "No such mark: $1"
+	cd -P "$MARKPATH/$1" 2>/dev/null || echo "No such mark: $1"
 }
 function mark { 
-	mkdir -p $MARKPATH; ln -s $(pwd) $MARKPATH/$1
+	mkdir -p "$MARKPATH"; ln -s "$(pwd)" $MARKPATH/$1
 }
 function unmark { 
-	rm -i $MARKPATH/$1 
+	rm -i "$MARKPATH/$1"
 }
 function marks {
-	ls -l $MARKPATH | sed 's/  / /g' | cut -d' ' -f9- | sed 's/ -/\t-/g' && echo
+	ls -l "$MARKPATH" | sed 's/  / /g' | cut -d' ' -f9- | sed 's/ -/\t-/g' && echo
 }
+
+function _completemarks {
+  reply=($(ls $MARKPATH))
+}
+
+compctl -K _completemarks jump
+compctl -K _completemarks unmark

From f11934e00c711a09876e1cf776d04c231339ff18 Mon Sep 17 00:00:00 2001
From: Aaron Mills <aaron.mills@returnpath.com>
Date: Mon, 19 Aug 2013 16:28:09 -0600
Subject: [PATCH 0370/1378] Add support for mosh (remote-shell) tab completion.

---
 plugins/mosh/mosh.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 plugins/mosh/mosh.plugin.zsh

diff --git a/plugins/mosh/mosh.plugin.zsh b/plugins/mosh/mosh.plugin.zsh
new file mode 100644
index 000000000..ea36b7ee9
--- /dev/null
+++ b/plugins/mosh/mosh.plugin.zsh
@@ -0,0 +1,2 @@
+# Allow SSH tab completion for mosh hostnames
+compdef mosh=ssh

From 9ebdbec58979b077e4790387b5927c74ce7184ef Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 23 Aug 2013 21:58:29 -0500
Subject: [PATCH 0371/1378] gitfast: update to upstream v1.8.4

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                | 163 +++++++++++--
 plugins/gitfast/git-completion.bash | 301 ++++++++---------------
 plugins/gitfast/git-prompt.sh       | 362 ++++++++++++++++------------
 3 files changed, 449 insertions(+), 377 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index cf8116d47..fac5e711e 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -2,18 +2,19 @@
 
 # zsh completion wrapper for git
 #
-# You need git's bash completion script installed somewhere, by default on the
-# same directory as this script.
+# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# If your script is on ~/.git-completion.sh instead, you can configure it on
-# your ~/.zshrc:
+# You need git's bash completion script installed somewhere, by default it
+# would be the location bash-completion uses.
+#
+# If your script is somewhere else, you can configure it on your ~/.zshrc:
 #
 #  zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
 #
-# The recommended way to install this script is to copy to
-# '~/.zsh/completion/_git', and then add the following to your ~/.zshrc file:
+# The recommended way to install this script is to copy to '~/.zsh/_git', and
+# then add the following to your ~/.zshrc file:
 #
-#  fpath=(~/.zsh/completion $fpath)
+#  fpath=(~/.zsh $fpath)
 
 complete ()
 {
@@ -21,8 +22,23 @@ complete ()
 	return 0
 }
 
+zstyle -T ':completion:*:*:git:*' tag-order && \
+	zstyle ':completion:*:*:git:*' tag-order 'common-commands'
+
 zstyle -s ":completion:*:*:git:*" script script
-test -z "$script" && script="$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+if [ -z "$script" ]; then
+	local -a locations
+	local e
+	locations=(
+		'/etc/bash_completion.d/git' # fedora, old debian
+		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
+		'/usr/share/bash-completion/git' # gentoo
+		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
+		)
+	for e in $locations; do
+		test -f $e && script="$e" && break
+	done
+fi
 ZSH_VERSION='' . "$script"
 
 __gitcomp ()
@@ -69,18 +85,131 @@ __gitcomp_file ()
 	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
 }
 
+__git_zsh_bash_func ()
+{
+	emulate -L ksh
+
+	local command=$1
+
+	local completion_func="_git_${command//-/_}"
+	declare -f $completion_func >/dev/null && $completion_func && return
+
+	local expansion=$(__git_aliased_command "$command")
+	if [ -n "$expansion" ]; then
+		completion_func="_git_${expansion//-/_}"
+		declare -f $completion_func >/dev/null && $completion_func
+	fi
+}
+
+__git_zsh_cmd_common ()
+{
+	local -a list
+	list=(
+	add:'add file contents to the index'
+	bisect:'find by binary search the change that introduced a bug'
+	branch:'list, create, or delete branches'
+	checkout:'checkout a branch or paths to the working tree'
+	clone:'clone a repository into a new directory'
+	commit:'record changes to the repository'
+	diff:'show changes between commits, commit and working tree, etc'
+	fetch:'download objects and refs from another repository'
+	grep:'print lines matching a pattern'
+	init:'create an empty Git repository or reinitialize an existing one'
+	log:'show commit logs'
+	merge:'join two or more development histories together'
+	mv:'move or rename a file, a directory, or a symlink'
+	pull:'fetch from and merge with another repository or a local branch'
+	push:'update remote refs along with associated objects'
+	rebase:'forward-port local commits to the updated upstream head'
+	reset:'reset current HEAD to the specified state'
+	rm:'remove files from the working tree and from the index'
+	show:'show various types of objects'
+	status:'show the working tree status'
+	tag:'create, list, delete or verify a tag object signed with GPG')
+	_describe -t common-commands 'common commands' list && _ret=0
+}
+
+__git_zsh_cmd_alias ()
+{
+	local -a list
+	list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
+	_describe -t alias-commands 'aliases' list $* && _ret=0
+}
+
+__git_zsh_cmd_all ()
+{
+	local -a list
+	emulate ksh -c __git_compute_all_commands
+	list=( ${=__git_all_commands} )
+	_describe -t all-commands 'all commands' list && _ret=0
+}
+
+__git_zsh_main ()
+{
+	local curcontext="$curcontext" state state_descr line
+	typeset -A opt_args
+	local -a orig_words
+
+	orig_words=( ${words[@]} )
+
+	_arguments -C \
+		'(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
+		'(-p --paginate)--no-pager[do not pipe git output into a pager]' \
+		'--git-dir=-[set the path to the repository]: :_directories' \
+		'--bare[treat the repository as a bare repository]' \
+		'(- :)--version[prints the git suite version]' \
+		'--exec-path=-[path to where your core git programs are installed]:: :_directories' \
+		'--html-path[print the path where git''s HTML documentation is installed]' \
+		'--info-path[print the path where the Info files are installed]' \
+		'--man-path[print the manpath (see `man(1)`) for the man pages]' \
+		'--work-tree=-[set the path to the working tree]: :_directories' \
+		'--namespace=-[set the git namespace]' \
+		'--no-replace-objects[do not use replacement refs to replace git objects]' \
+		'(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+		'(-): :->command' \
+		'(-)*:: :->arg' && return
+
+	case $state in
+	(command)
+		_alternative \
+                         'alias-commands:alias:__git_zsh_cmd_alias' \
+                         'common-commands:common:__git_zsh_cmd_common' \
+                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		;;
+	(arg)
+		local command="${words[1]}" __git_dir
+
+		if (( $+opt_args[--bare] )); then
+			__git_dir='.'
+		else
+			__git_dir=${opt_args[--git-dir]}
+		fi
+
+		(( $+opt_args[--help] )) && command='help'
+
+		words=( ${orig_words[@]} )
+
+		__git_zsh_bash_func $command
+		;;
+	esac
+}
+
 _git ()
 {
 	local _ret=1
-	() {
-		emulate -L ksh
-		local cur cword prev
-		cur=${words[CURRENT-1]}
-		prev=${words[CURRENT-2]}
-		let cword=CURRENT-1
-		__${service}_main
-	}
-	let _ret && _default -S '' && _ret=0
+	local cur cword prev
+
+	cur=${words[CURRENT]}
+	prev=${words[CURRENT-1]}
+	let cword=CURRENT-1
+
+	if (( $+functions[__${service}_zsh_main] )); then
+		__${service}_zsh_main
+	else
+		emulate ksh -c __${service}_main
+	fi
+
+	let _ret && _default && _ret=0
 	return _ret
 }
 
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 93eba4675..5da920ecd 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -33,8 +33,6 @@ esac
 # returns location of .git repo
 __gitdir ()
 {
-	# Note: this function is duplicated in git-prompt.sh
-	# When updating it, make sure you update the other one to match.
 	if [ -z "${1-}" ]; then
 		if [ -n "${__git_dir-}" ]; then
 			echo "$__git_dir"
@@ -53,19 +51,6 @@ __gitdir ()
 	fi
 }
 
-__gitcomp_1 ()
-{
-	local c IFS=$' \t\n'
-	for c in $1; do
-		c="$c$2"
-		case $c in
-		--*=*|*.) ;;
-		*) c="$c " ;;
-		esac
-		printf '%s\n' "$c"
-	done
-}
-
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -195,8 +180,18 @@ _get_comp_words_by_ref ()
 }
 fi
 
-# Generates completion reply with compgen, appending a space to possible
-# completion words, if necessary.
+__gitcompadd ()
+{
+	local i=0
+	for x in $1; do
+		if [[ "$x" == "$3"* ]]; then
+			COMPREPLY[i++]="$2$x$4"
+		fi
+	done
+}
+
+# Generates completion reply, appending a space to possible completion words,
+# if necessary.
 # It accepts 1 to 4 arguments:
 # 1: List of possible completion words.
 # 2: A prefix to be added to each possible completion word (optional).
@@ -208,19 +203,25 @@ __gitcomp ()
 
 	case "$cur_" in
 	--*=)
-		COMPREPLY=()
 		;;
 	*)
-		local IFS=$'\n'
-		COMPREPLY=($(compgen -P "${2-}" \
-			-W "$(__gitcomp_1 "${1-}" "${4-}")" \
-			-- "$cur_"))
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
 		;;
 	esac
 }
 
-# Generates completion reply with compgen from newline-separated possible
-# completion words by appending a space to all of them.
+# Generates completion reply from newline-separated possible completion words
+# by appending a space to all of them.
 # It accepts 1 to 4 arguments:
 # 1: List of possible completion words, separated by a single newline.
 # 2: A prefix to be added to each possible completion word (optional).
@@ -231,7 +232,7 @@ __gitcomp ()
 __gitcomp_nl ()
 {
 	local IFS=$'\n'
-	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
+	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
 }
 
 # Generates completion reply with compgen from newline-separated possible
@@ -249,106 +250,50 @@ __gitcomp_file ()
 	# since tilde expansion is not applied.
 	# This means that COMPREPLY will be empty and Bash default
 	# completion will be used.
-	COMPREPLY=($(compgen -P "${2-}" -W "$1" -- "${3-$cur}"))
+	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
 
-	# Tell Bash that compspec generates filenames.
-	compopt -o filenames 2>/dev/null
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ > /dev/null
 }
 
-__git_index_file_list_filter_compat ()
-{
-	local path
-
-	while read -r path; do
-		case "$path" in
-		?*/*) echo "${path%%/*}/" ;;
-		*) echo "$path" ;;
-		esac
-	done
-}
-
-__git_index_file_list_filter_bash ()
-{
-	local path
-
-	while read -r path; do
-		case "$path" in
-		?*/*)
-			# XXX if we append a slash to directory names when using
-			# `compopt -o filenames`, Bash will append another slash.
-			# This is pretty stupid, and this the reason why we have to
-			# define a compatible version for this function.
-			echo "${path%%/*}" ;;
-		*)
-			echo "$path" ;;
-		esac
-	done
-}
-
-# Process path list returned by "ls-files" and "diff-index --name-only"
-# commands, in order to list only file names relative to a specified
-# directory, and append a slash to directory names.
-__git_index_file_list_filter ()
-{
-	# Default to Bash >= 4.x
-	__git_index_file_list_filter_bash
-}
-
-# Execute git ls-files, returning paths relative to the directory
-# specified in the first argument, and using the options specified in
-# the second argument.
+# Execute 'git ls-files', unless the --committable option is specified, in
+# which case it runs 'git diff-index' to find out the files that can be
+# committed.  It return paths relative to the directory specified in the first
+# argument, and using the options specified in the second argument.
 __git_ls_files_helper ()
 {
 	(
 		test -n "${CDPATH+set}" && unset CDPATH
-		# NOTE: $2 is not quoted in order to support multiple options
-		cd "$1" && git ls-files --exclude-standard $2
+		cd "$1"
+		if [ "$2" == "--committable" ]; then
+			git diff-index --name-only --relative HEAD
+		else
+			# NOTE: $2 is not quoted in order to support multiple options
+			git ls-files --exclude-standard $2
+		fi
 	) 2>/dev/null
 }
 
 
-# Execute git diff-index, returning paths relative to the directory
-# specified in the first argument, and using the tree object id
-# specified in the second argument.
-__git_diff_index_helper ()
-{
-	(
-		test -n "${CDPATH+set}" && unset CDPATH
-		cd "$1" && git diff-index --name-only --relative "$2"
-	) 2>/dev/null
-}
-
 # __git_index_files accepts 1 or 2 arguments:
 # 1: Options to pass to ls-files (required).
-#    Supported options are --cached, --modified, --deleted, --others,
-#    and --directory.
 # 2: A directory path (optional).
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
 __git_index_files ()
 {
-	local dir="$(__gitdir)" root="${2-.}"
+	local dir="$(__gitdir)" root="${2-.}" file
 
 	if [ -d "$dir" ]; then
-		__git_ls_files_helper "$root" "$1" | __git_index_file_list_filter |
-			sort | uniq
-	fi
-}
-
-# __git_diff_index_files accepts 1 or 2 arguments:
-# 1) The id of a tree object.
-# 2) A directory path (optional).
-#    If provided, only files within the specified directory are listed.
-#    Sub directories are never recursed.  Path must have a trailing
-#    slash.
-__git_diff_index_files ()
-{
-	local dir="$(__gitdir)" root="${2-.}"
-
-	if [ -d "$dir" ]; then
-		__git_diff_index_helper "$root" "$1" | __git_index_file_list_filter |
-			sort | uniq
+		__git_ls_files_helper "$root" "$1" |
+		while read -r file; do
+			case "$file" in
+			?*/*) echo "${file%%/*}" ;;
+			*) echo "$file" ;;
+			esac
+		done | sort | uniq
 	fi
 }
 
@@ -424,14 +369,8 @@ __git_refs ()
 		done
 		;;
 	*)
-		git ls-remote "$dir" HEAD ORIG_HEAD 'refs/tags/*' 'refs/heads/*' 'refs/remotes/*' 2>/dev/null | \
-		while read -r hash i; do
-			case "$i" in
-			*^{}) ;;
-			refs/*) echo "${i#refs/*/}" ;;
-			*) echo "$i" ;;
-			esac
-		done
+		echo "HEAD"
+		git for-each-ref --format="%(refname:short)" -- "refs/remotes/$dir/" | sed -e "s#^$dir/##"
 		;;
 	esac
 }
@@ -549,44 +488,23 @@ __git_complete_revlist_file ()
 }
 
 
-# __git_complete_index_file requires 1 argument: the options to pass to
-# ls-file
+# __git_complete_index_file requires 1 argument:
+# 1: the options to pass to ls-file
+#
+# The exception is --committable, which finds the files appropriate commit.
 __git_complete_index_file ()
 {
-	local pfx cur_="$cur"
+	local pfx="" cur_="$cur"
 
 	case "$cur_" in
 	?*/*)
 		pfx="${cur_%/*}"
 		cur_="${cur_##*/}"
 		pfx="${pfx}/"
-
-		__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
-		;;
-	*)
-		__gitcomp_file "$(__git_index_files "$1")" "" "$cur_"
 		;;
 	esac
-}
 
-# __git_complete_diff_index_file requires 1 argument: the id of a tree
-# object
-__git_complete_diff_index_file ()
-{
-	local pfx cur_="$cur"
-
-	case "$cur_" in
-	?*/*)
-		pfx="${cur_%/*}"
-		cur_="${cur_##*/}"
-		pfx="${pfx}/"
-
-		__gitcomp_file "$(__git_diff_index_files "$1" "$pfx")" "$pfx" "$cur_"
-		;;
-	*)
-		__gitcomp_file "$(__git_diff_index_files "$1")" "" "$cur_"
-		;;
-	esac
+	__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
 }
 
 __git_complete_file ()
@@ -614,7 +532,6 @@ __git_complete_remote_or_refspec ()
 			case "$cmd" in
 			push) no_complete_refspec=1 ;;
 			fetch)
-				COMPREPLY=()
 				return
 				;;
 			*) ;;
@@ -630,7 +547,6 @@ __git_complete_remote_or_refspec ()
 		return
 	fi
 	if [ $no_complete_refspec = 1 ]; then
-		COMPREPLY=()
 		return
 	fi
 	[ "$remote" = "." ] && remote=
@@ -732,6 +648,7 @@ __git_list_porcelain_commands ()
 		cat-file)         : plumbing;;
 		check-attr)       : plumbing;;
 		check-ignore)     : plumbing;;
+		check-mailmap)    : plumbing;;
 		check-ref-format) : plumbing;;
 		checkout-index)   : plumbing;;
 		commit-tree)      : plumbing;;
@@ -951,7 +868,6 @@ _git_am ()
 			"
 		return
 	esac
-	COMPREPLY=()
 }
 
 _git_apply ()
@@ -971,7 +887,6 @@ _git_apply ()
 			"
 		return
 	esac
-	COMPREPLY=()
 }
 
 _git_add ()
@@ -1031,7 +946,6 @@ _git_bisect ()
 		__gitcomp_nl "$(__git_refs)"
 		;;
 	*)
-		COMPREPLY=()
 		;;
 	esac
 }
@@ -1124,9 +1038,14 @@ _git_cherry ()
 
 _git_cherry_pick ()
 {
+	local dir="$(__gitdir)"
+	if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
+		__gitcomp "--continue --quit --abort"
+		return
+	fi
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit"
+		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
 		;;
 	*)
 		__gitcomp_nl "$(__git_refs)"
@@ -1170,7 +1089,6 @@ _git_clone ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_commit ()
@@ -1182,13 +1100,6 @@ _git_commit ()
 		;;
 	esac
 
-	case "$prev" in
-	-c|-C)
-		__gitcomp_nl "$(__git_refs)" "" "${cur}"
-		return
-		;;
-	esac
-
 	case "$cur" in
 	--cleanup=*)
 		__gitcomp "default strip verbatim whitespace
@@ -1218,7 +1129,7 @@ _git_commit ()
 	esac
 
 	if git rev-parse --verify --quiet HEAD >/dev/null; then
-		__git_complete_diff_index_file "HEAD"
+		__git_complete_index_file "--committable"
 	else
 		# This is the first commit
 		__git_complete_index_file "--cached"
@@ -1251,7 +1162,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
 			--patience --histogram --minimal
-			--raw
+			--raw --word-diff
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
@@ -1299,7 +1210,7 @@ _git_difftool ()
 		return
 		;;
 	esac
-	__git_complete_file
+	__git_complete_revlist_file
 }
 
 __git_fetch_options="
@@ -1319,11 +1230,12 @@ _git_fetch ()
 }
 
 __git_format_patch_options="
-	--stdout --attach --no-attach --thread --thread= --output-directory
+	--stdout --attach --no-attach --thread --thread= --no-thread
 	--numbered --start-number --numbered-files --keep-subject --signoff
 	--signature --no-signature --in-reply-to= --cc= --full-index --binary
 	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
 	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
+	--output-directory --reroll-count --to= --quiet --notes
 "
 
 _git_format_patch ()
@@ -1354,7 +1266,6 @@ _git_fsck ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_gc ()
@@ -1365,7 +1276,6 @@ _git_gc ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_gitk ()
@@ -1442,7 +1352,6 @@ _git_init ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_ls_files ()
@@ -1578,7 +1487,6 @@ _git_mergetool ()
 		return
 		;;
 	esac
-	COMPREPLY=()
 }
 
 _git_merge_base ()
@@ -1819,7 +1727,7 @@ __git_config_get_set_variables ()
 _git_config ()
 {
 	case "$prev" in
-	branch.*.remote)
+	branch.*.remote|branch.*.pushremote)
 		__gitcomp_nl "$(__git_remotes)"
 		return
 		;;
@@ -1827,11 +1735,19 @@ _git_config ()
 		__gitcomp_nl "$(__git_refs)"
 		return
 		;;
+	branch.*.rebase)
+		__gitcomp "false true"
+		return
+		;;
+	remote.pushdefault)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+		;;
 	remote.*.fetch)
 		local remote="${prev#remote.}"
 		remote="${remote%.fetch}"
 		if [ -z "$cur" ]; then
-			COMPREPLY=("refs/heads/")
+			__gitcomp_nl "refs/heads/" "" "" ""
 			return
 		fi
 		__gitcomp_nl "$(__git_refs_remotes "$remote")"
@@ -1866,6 +1782,10 @@ _git_config ()
 			"
 		return
 		;;
+	diff.submodule)
+		__gitcomp "log short"
+		return
+		;;
 	help.format)
 		__gitcomp "man info web html"
 		return
@@ -1891,7 +1811,6 @@ _git_config ()
 		return
 		;;
 	*.*)
-		COMPREPLY=()
 		return
 		;;
 	esac
@@ -1908,7 +1827,7 @@ _git_config ()
 		;;
 	branch.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur_"
+		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
 		return
 		;;
 	branch.*)
@@ -2039,7 +1958,6 @@ _git_config ()
 		core.fileMode
 		core.fsyncobjectfiles
 		core.gitProxy
-		core.ignoreCygwinFSTricks
 		core.ignoreStat
 		core.ignorecase
 		core.logAllRefUpdates
@@ -2061,13 +1979,14 @@ _git_config ()
 		core.whitespace
 		core.worktree
 		diff.autorefreshindex
-		diff.statGraphWidth
 		diff.external
 		diff.ignoreSubmodules
 		diff.mnemonicprefix
 		diff.noprefix
 		diff.renameLimit
 		diff.renames
+		diff.statGraphWidth
+		diff.submodule
 		diff.suppressBlankEmpty
 		diff.tool
 		diff.wordRegex
@@ -2202,6 +2121,7 @@ _git_config ()
 		receive.fsckObjects
 		receive.unpackLimit
 		receive.updateserverinfo
+		remote.pushdefault
 		remotes.
 		repack.usedeltabaseoffset
 		rerere.autoupdate
@@ -2272,7 +2192,6 @@ _git_remote ()
 		__gitcomp "$c"
 		;;
 	*)
-		COMPREPLY=()
 		;;
 	esac
 }
@@ -2356,7 +2275,7 @@ _git_show ()
 		return
 		;;
 	esac
-	__git_complete_file
+	__git_complete_revlist_file
 }
 
 _git_show_branch ()
@@ -2388,8 +2307,6 @@ _git_stash ()
 		*)
 			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
 				__gitcomp "$subcommands"
-			else
-				COMPREPLY=()
 			fi
 			;;
 		esac
@@ -2402,14 +2319,12 @@ _git_stash ()
 			__gitcomp "--index --quiet"
 			;;
 		show,--*|drop,--*|branch,--*)
-			COMPREPLY=()
 			;;
 		show,*|apply,*|drop,*|pop,*|branch,*)
 			__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
 					| sed -n -e 's/:.*//p')"
 			;;
 		*)
-			COMPREPLY=()
 			;;
 		esac
 	fi
@@ -2419,7 +2334,7 @@ _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init update summary foreach sync"
+	local subcommands="add status init deinit update summary foreach sync"
 	if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
 		case "$cur" in
 		--*)
@@ -2451,7 +2366,7 @@ _git_svn ()
 			--no-metadata --use-svm-props --use-svnsync-props
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
-			--ignore-paths= $remote_opts
+			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
 			--template= --shared= --trunk= --tags=
@@ -2526,7 +2441,6 @@ _git_svn ()
 			__gitcomp "--revision= --parent"
 			;;
 		*)
-			COMPREPLY=()
 			;;
 		esac
 	fi
@@ -2551,13 +2465,10 @@ _git_tag ()
 
 	case "$prev" in
 	-m|-F)
-		COMPREPLY=()
 		;;
 	-*|tag)
 		if [ $f = 1 ]; then
 			__gitcomp_nl "$(__git_tags)"
-		else
-			COMPREPLY=()
 		fi
 		;;
 	*)
@@ -2579,9 +2490,10 @@ __git_main ()
 		i="${words[c]}"
 		case "$i" in
 		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
+		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
 		--bare)      __git_dir="." ;;
 		--help) command="help"; break ;;
-		-c) c=$((++c)) ;;
+		-c|--work-tree|--namespace) ((c++)) ;;
 		-*) ;;
 		*) command="$i"; break ;;
 		esac
@@ -2599,6 +2511,7 @@ __git_main ()
 			--exec-path
 			--exec-path=
 			--html-path
+			--man-path
 			--info-path
 			--work-tree=
 			--namespace=
@@ -2693,35 +2606,19 @@ if [[ -n ${ZSH_VERSION-} ]]; then
 		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
 	}
 
-	__git_zsh_helper ()
-	{
-		emulate -L ksh
-		local cur cword prev
-		cur=${words[CURRENT-1]}
-		prev=${words[CURRENT-2]}
-		let cword=CURRENT-1
-		__${service}_main
-	}
-
 	_git ()
 	{
-		emulate -L zsh
-		local _ret=1
-		__git_zsh_helper
-		let _ret && _default -S '' && _ret=0
+		local _ret=1 cur cword prev
+		cur=${words[CURRENT]}
+		prev=${words[CURRENT-1]}
+		let cword=CURRENT-1
+		emulate ksh -c __${service}_main
+		let _ret && _default && _ret=0
 		return _ret
 	}
 
 	compdef _git git gitk
 	return
-elif [[ -n ${BASH_VERSION-} ]]; then
-	if ((${BASH_VERSINFO[0]} < 4)); then
-		# compopt is not supported
-		__git_index_file_list_filter ()
-		{
-			__git_index_file_list_filter_compat
-		}
-	fi
 fi
 
 __git_func_wrap ()
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 65f8368f1..a81ef5a48 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
 # Distributed under the GNU General Public License, version 2.0.
 #
-# This script allows you to see the current branch in your prompt.
+# This script allows you to see repository status in your prompt.
 #
 # To enable:
 #
@@ -13,23 +13,27 @@
 #    3a) Change your PS1 to call __git_ps1 as
 #        command-substitution:
 #        Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
-#        ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#        ZSH:  setopt PROMPT_SUBST ; PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
 #        the optional argument will be used as format string.
-#    3b) Alternatively, if you are using bash, __git_ps1 can be
-#        used for PROMPT_COMMAND with two parameters, <pre> and
-#        <post>, which are strings you would put in $PS1 before
-#        and after the status string generated by the git-prompt
-#        machinery.  e.g.
-#           PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
-#        will show username, at-sign, host, colon, cwd, then
-#        various status string, followed by dollar and SP, as
-#        your prompt.
+#    3b) Alternatively, for a slightly faster prompt, __git_ps1 can
+#        be used for PROMPT_COMMAND in Bash or for precmd() in Zsh
+#        with two parameters, <pre> and <post>, which are strings
+#        you would put in $PS1 before and after the status string
+#        generated by the git-prompt machinery.  e.g.
+#        Bash: PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
+#          will show username, at-sign, host, colon, cwd, then
+#          various status string, followed by dollar and SP, as
+#          your prompt.
+#        ZSH:  precmd () { __git_ps1 "%n" ":%~$ " "|%s" }
+#          will show username, pipe, then various status string,
+#          followed by colon, cwd, dollar and SP, as your prompt.
 #        Optionally, you can supply a third argument with a printf
 #        format string to finetune the output of the branch status
 #
-# The argument to __git_ps1 will be displayed only if you are currently
-# in a git repository.  The %s token will be the name of the current
-# branch.
+# The repository status will be displayed only if you are currently in a
+# git repository. The %s token is the placeholder for the shown status.
+#
+# The prompt status always includes the current branch name.
 #
 # In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty value,
 # unstaged (*) and staged (+) changes will be shown next to the branch
@@ -77,31 +81,8 @@
 #
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
-# the colored output of "git status -sb".
-
-# __gitdir accepts 0 or 1 arguments (i.e., location)
-# returns location of .git repo
-__gitdir ()
-{
-	# Note: this function is duplicated in git-completion.bash
-	# When updating it, make sure you update the other one to match.
-	if [ -z "${1-}" ]; then
-		if [ -n "${__git_dir-}" ]; then
-			echo "$__git_dir"
-		elif [ -n "${GIT_DIR-}" ]; then
-			test -d "${GIT_DIR-}" || return 1
-			echo "$GIT_DIR"
-		elif [ -d .git ]; then
-			echo .git
-		else
-			git rev-parse --git-dir 2>/dev/null
-		fi
-	elif [ -d "$1/.git" ]; then
-		echo "$1/.git"
-	else
-		echo "$1"
-	fi
-}
+# the colored output of "git status -sb" and are available only when
+# using __git_ps1 for PROMPT_COMMAND or precmd.
 
 # stores the divergence from upstream in $p
 # used by GIT_PS1_SHOWUPSTREAM
@@ -124,7 +105,7 @@ __git_ps1_show_upstream ()
 			fi
 			;;
 		svn-remote.*.url)
-			svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value"
+			svn_remote[$((${#svn_remote[@]} + 1))]="$value"
 			svn_url_pattern+="\\|$value"
 			upstream=svn+git # default upstream is SVN if available, else git
 			;;
@@ -146,10 +127,11 @@ __git_ps1_show_upstream ()
 	svn*)
 		# get the upstream from the "git-svn-id: ..." in a commit message
 		# (git-svn uses essentially the same procedure internally)
-		local svn_upstream=($(git log --first-parent -1 \
+		local -a svn_upstream
+		svn_upstream=($(git log --first-parent -1 \
 					--grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
 		if [[ 0 -ne ${#svn_upstream[@]} ]]; then
-			svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
+			svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]}
 			svn_upstream=${svn_upstream%@*}
 			local n_stop="${#svn_remote[@]}"
 			for ((n=1; n <= n_stop; n++)); do
@@ -222,6 +204,51 @@ __git_ps1_show_upstream ()
 
 }
 
+# Helper function that is meant to be called from __git_ps1.  It
+# injects color codes into the appropriate gitstring variables used
+# to build a gitstring.
+__git_ps1_colorize_gitstring ()
+{
+	if [[ -n ${ZSH_VERSION-} ]]; then
+		local c_red='%F{red}'
+		local c_green='%F{green}'
+		local c_lblue='%F{blue}'
+		local c_clear='%f'
+	else
+		# Using \[ and \] around colors is necessary to prevent
+		# issues with command line editing/browsing/completion!
+		local c_red='\[\e[31m\]'
+		local c_green='\[\e[32m\]'
+		local c_lblue='\[\e[1;34m\]'
+		local c_clear='\[\e[0m\]'
+	fi
+	local bad_color=$c_red
+	local ok_color=$c_green
+	local flags_color="$c_lblue"
+
+	local branch_color=""
+	if [ $detached = no ]; then
+		branch_color="$ok_color"
+	else
+		branch_color="$bad_color"
+	fi
+	c="$branch_color$c"
+
+	z="$c_clear$z"
+	if [ "$w" = "*" ]; then
+		w="$bad_color$w"
+	fi
+	if [ -n "$i" ]; then
+		i="$ok_color$i"
+	fi
+	if [ -n "$s" ]; then
+		s="$flags_color$s"
+	fi
+	if [ -n "$u" ]; then
+		u="$bad_color$u"
+	fi
+	r="$c_clear$r"
+}
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
 # when called from PS1 using command substitution
@@ -254,39 +281,83 @@ __git_ps1 ()
 		;;
 	esac
 
-	local g="$(__gitdir)"
-	if [ -z "$g" ]; then
+	local repo_info rev_parse_exit_code
+	repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
+		--is-bare-repository --is-inside-work-tree \
+		--short HEAD 2>/dev/null)"
+	rev_parse_exit_code="$?"
+
+	if [ -z "$repo_info" ]; then
 		if [ $pcmode = yes ]; then
 			#In PC mode PS1 always needs to be set
 			PS1="$ps1pc_start$ps1pc_end"
 		fi
-	else
-		local r=""
-		local b=""
+		return
+	fi
+
+	local short_sha
+	if [ "$rev_parse_exit_code" = "0" ]; then
+		short_sha="${repo_info##*$'\n'}"
+		repo_info="${repo_info%$'\n'*}"
+	fi
+	local inside_worktree="${repo_info##*$'\n'}"
+	repo_info="${repo_info%$'\n'*}"
+	local bare_repo="${repo_info##*$'\n'}"
+	repo_info="${repo_info%$'\n'*}"
+	local inside_gitdir="${repo_info##*$'\n'}"
+	local g="${repo_info%$'\n'*}"
+
+	local r=""
+	local b=""
+	local step=""
+	local total=""
+	if [ -d "$g/rebase-merge" ]; then
+		read b 2>/dev/null <"$g/rebase-merge/head-name"
+		read step 2>/dev/null <"$g/rebase-merge/msgnum"
+		read total 2>/dev/null <"$g/rebase-merge/end"
 		if [ -f "$g/rebase-merge/interactive" ]; then
 			r="|REBASE-i"
-			b="$(cat "$g/rebase-merge/head-name")"
-		elif [ -d "$g/rebase-merge" ]; then
-			r="|REBASE-m"
-			b="$(cat "$g/rebase-merge/head-name")"
 		else
-			if [ -d "$g/rebase-apply" ]; then
-				if [ -f "$g/rebase-apply/rebasing" ]; then
-					r="|REBASE"
-				elif [ -f "$g/rebase-apply/applying" ]; then
-					r="|AM"
-				else
-					r="|AM/REBASE"
-				fi
-			elif [ -f "$g/MERGE_HEAD" ]; then
-				r="|MERGING"
-			elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
-				r="|CHERRY-PICKING"
-			elif [ -f "$g/BISECT_LOG" ]; then
-				r="|BISECTING"
+			r="|REBASE-m"
+		fi
+	else
+		if [ -d "$g/rebase-apply" ]; then
+			read step 2>/dev/null <"$g/rebase-apply/next"
+			read total 2>/dev/null <"$g/rebase-apply/last"
+			if [ -f "$g/rebase-apply/rebasing" ]; then
+				read b 2>/dev/null <"$g/rebase-apply/head-name"
+				r="|REBASE"
+			elif [ -f "$g/rebase-apply/applying" ]; then
+				r="|AM"
+			else
+				r="|AM/REBASE"
 			fi
+		elif [ -f "$g/MERGE_HEAD" ]; then
+			r="|MERGING"
+		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
+			r="|CHERRY-PICKING"
+		elif [ -f "$g/REVERT_HEAD" ]; then
+			r="|REVERTING"
+		elif [ -f "$g/BISECT_LOG" ]; then
+			r="|BISECTING"
+		fi
 
-			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
+		if [ -n "$b" ]; then
+			:
+		elif [ -h "$g/HEAD" ]; then
+			# symlink symbolic ref
+			b="$(git symbolic-ref HEAD 2>/dev/null)"
+		else
+			local head=""
+			if ! read head 2>/dev/null <"$g/HEAD"; then
+				if [ $pcmode = yes ]; then
+					PS1="$ps1pc_start$ps1pc_end"
+				fi
+				return
+			fi
+			# is it a symbolic ref?
+			b="${head#ref: }"
+			if [ "$head" = "$b" ]; then
 				detached=yes
 				b="$(
 				case "${GIT_PS1_DESCRIBE_STYLE-}" in
@@ -300,100 +371,75 @@ __git_ps1 ()
 					git describe --tags --exact-match HEAD ;;
 				esac 2>/dev/null)" ||
 
-				b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||
-				b="unknown"
+				b="$short_sha..."
 				b="($b)"
-			}
-		fi
-
-		local w=""
-		local i=""
-		local s=""
-		local u=""
-		local c=""
-		local p=""
-
-		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
-			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
-				c="BARE:"
-			else
-				b="GIT_DIR!"
 			fi
-		elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
-			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
-			   [ "$(git config --bool bash.showDirtyState)" != "false" ]
-			then
-				git diff --no-ext-diff --quiet --exit-code || w="*"
-				if git rev-parse --quiet --verify HEAD >/dev/null; then
-					git diff-index --cached --quiet HEAD -- || i="+"
-				else
-					i="#"
-				fi
-			fi
-			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
-				git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
-			fi
-
-			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
-			   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
-			   [ -n "$(git ls-files --others --exclude-standard)" ]
-			then
-				u="%%"
-			fi
-
-			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
-				__git_ps1_show_upstream
-			fi
-		fi
-
-		local f="$w$i$s$u"
-		if [ $pcmode = yes ]; then
-			local gitstring=
-			if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-				local c_red='\e[31m'
-				local c_green='\e[32m'
-				local c_lblue='\e[1;34m'
-				local c_clear='\e[0m'
-				local bad_color=$c_red
-				local ok_color=$c_green
-				local branch_color="$c_clear"
-				local flags_color="$c_lblue"
-				local branchstring="$c${b##refs/heads/}"
-
-				if [ $detached = no ]; then
-					branch_color="$ok_color"
-				else
-					branch_color="$bad_color"
-				fi
-
-				# Setting gitstring directly with \[ and \] around colors
-				# is necessary to prevent wrapping issues!
-				gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
-
-				if [ -n "$w$i$s$u$r$p" ]; then
-					gitstring="$gitstring "
-				fi
-				if [ "$w" = "*" ]; then
-					gitstring="$gitstring\[$bad_color\]$w"
-				fi
-				if [ -n "$i" ]; then
-					gitstring="$gitstring\[$ok_color\]$i"
-				fi
-				if [ -n "$s" ]; then
-					gitstring="$gitstring\[$flags_color\]$s"
-				fi
-				if [ -n "$u" ]; then
-					gitstring="$gitstring\[$bad_color\]$u"
-				fi
-				gitstring="$gitstring\[$c_clear\]$r$p"
-			else
-				gitstring="$c${b##refs/heads/}${f:+ $f}$r$p"
-			fi
-			gitstring=$(printf -- "$printf_format" "$gitstring")
-			PS1="$ps1pc_start$gitstring$ps1pc_end"
-		else
-			# NO color option unless in PROMPT_COMMAND mode
-			printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p"
 		fi
 	fi
+
+	if [ -n "$step" ] && [ -n "$total" ]; then
+		r="$r $step/$total"
+	fi
+
+	local w=""
+	local i=""
+	local s=""
+	local u=""
+	local c=""
+	local p=""
+
+	if [ "true" = "$inside_gitdir" ]; then
+		if [ "true" = "$bare_repo" ]; then
+			c="BARE:"
+		else
+			b="GIT_DIR!"
+		fi
+	elif [ "true" = "$inside_worktree" ]; then
+		if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
+		   [ "$(git config --bool bash.showDirtyState)" != "false" ]
+		then
+			git diff --no-ext-diff --quiet --exit-code || w="*"
+			if [ -n "$short_sha" ]; then
+				git diff-index --cached --quiet HEAD -- || i="+"
+			else
+				i="#"
+			fi
+		fi
+		if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
+		   [ -r "$g/refs/stash" ]; then
+			s="$"
+		fi
+
+		if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
+		   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
+		   git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
+		then
+			u="%${ZSH_VERSION+%}"
+		fi
+
+		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
+			__git_ps1_show_upstream
+		fi
+	fi
+
+	local z="${GIT_PS1_STATESEPARATOR-" "}"
+
+	# NO color option unless in PROMPT_COMMAND mode
+	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+		__git_ps1_colorize_gitstring
+	fi
+
+	local f="$w$i$s$u"
+	local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
+
+	if [ $pcmode = yes ]; then
+		if [[ -n ${ZSH_VERSION-} ]]; then
+			gitstring=$(printf -- "$printf_format" "$gitstring")
+		else
+			printf -v gitstring -- "$printf_format" "$gitstring"
+		fi
+		PS1="$ps1pc_start$gitstring$ps1pc_end"
+	else
+		printf -- "$printf_format" "$gitstring"
+	fi
 }

From 300118ec05e6a88d8331c007d076ec1fbf9c5e9c Mon Sep 17 00:00:00 2001
From: dchusovitin <dchusovitin@gmail.com>
Date: Sat, 24 Aug 2013 13:12:03 +0400
Subject: [PATCH 0372/1378] Fixed opening documentation on Linux (node)

---
 plugins/node/node.plugin.zsh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 3bbed6f04..2d78f2b4c 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,5 +1,13 @@
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
 function node-docs {
-	open "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
+  # get the open command
+  local open_cmd
+  if [[ $(uname -s) == 'Darwin' ]]; then
+    open_cmd='open'
+  else
+    open_cmd='xdg-open'
+  fi
+
+  $open_cmd "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
 }

From baffc3b0bd2594b789316cb135ba84fb54f50dd9 Mon Sep 17 00:00:00 2001
From: Mr Prud <prudprud@gmail.com>
Date: Thu, 29 Aug 2013 14:07:09 +0200
Subject: [PATCH 0373/1378] Replace no unicode glyph on hexa string

---
 themes/agnoster.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c7a59ad0d..8b5f4ef7a 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -26,7 +26,7 @@
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 
 CURRENT_BG='NONE'
-SEGMENT_SEPARATOR=''
+SEGMENT_SEPARATOR='\u2b80'
 
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\//\u2b60 }${vcs_info_msg_0_}"
   fi
 }
 
@@ -110,7 +110,7 @@ prompt_hg() {
 				# if working copy is clean
 				prompt_segment green black
 			fi
-			echo -n $(hg prompt " {rev}@{branch}") $st
+			echo -n $(hg prompt "\u2b60 {rev}@{branch}") $st
 		else
 			st=""
 			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
@@ -124,7 +124,7 @@ prompt_hg() {
 			else
 				prompt_segment green black
 			fi
-			echo -n " $rev@$branch" $st
+			echo -n "\u2b60 $rev@$branch" $st
 		fi
 	fi
 }

From 958c847f54a0c9101b4e0bc8c29b539a42c263ad Mon Sep 17 00:00:00 2001
From: Alexander Gronemann <ag@highcode.dk>
Date: Thu, 29 Aug 2013 16:20:40 +0200
Subject: [PATCH 0374/1378] Update bundler.plugin.zsh

Added taps to bundled_commands
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c01241409..d76639f30 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -7,7 +7,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 ## Functions
 

From dd220152be26163c93ed1c0f9f98e7bad0653941 Mon Sep 17 00:00:00 2001
From: Dimitri Jorge <jorge.dimitri@gmail.com>
Date: Sun, 1 Sep 2013 18:20:08 +0200
Subject: [PATCH 0375/1378] Add autocompletion plugin for meteor command

---
 plugins/meteor/_meteor | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 plugins/meteor/_meteor

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
new file mode 100644
index 000000000..c90ed6caf
--- /dev/null
+++ b/plugins/meteor/_meteor
@@ -0,0 +1,32 @@
+#compdef meteor
+#autoload
+
+# Meteor Autocomplete plugin for Oh-My-Zsh, based on homebrew completion
+# Original author: Dimitri JORGE (https://github.com/jorge-d)
+
+local -a _1st_arguments
+_1st_arguments=(
+  'run:[Default] Run this project in local development mode'
+  'create:Create a new project'
+  'update:Upgrade this project to the latest version of Meteor'
+  'add:Add a package to this project'
+  'remove:Remove a package from this project'
+  'list:List available packages'
+  'help:Display Meteor help'
+  'bundle:Pack this project up into a tarball'
+  'mongo:Connect to the Mongo database for the specified site'
+  'deploy:Deploy this project to Meteor'
+  'logs:Show logs for specified site'
+  'reset:Reset the project state. Erases the local database.'
+  'test-packages:Test one or more packages'
+)
+
+if (( CURRENT == 2 )); then
+  _describe -t commands "meteor subcommand" _1st_arguments
+  return
+fi
+
+case "$words[2]" in
+    help)
+      _describe -t commands "brew subcommand" _1st_arguments
+esac
\ No newline at end of file

From 90b83b81017bbf55d5c10e6bced835f6d184499d Mon Sep 17 00:00:00 2001
From: Dimitri Jorge <jorge.dimitri@gmail.com>
Date: Sun, 1 Sep 2013 19:23:21 +0200
Subject: [PATCH 0376/1378] Add completion for package add and remove

---
 plugins/meteor/_meteor | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/plugins/meteor/_meteor b/plugins/meteor/_meteor
index c90ed6caf..cd7fc304f 100644
--- a/plugins/meteor/_meteor
+++ b/plugins/meteor/_meteor
@@ -4,6 +4,13 @@
 # Meteor Autocomplete plugin for Oh-My-Zsh, based on homebrew completion
 # Original author: Dimitri JORGE (https://github.com/jorge-d)
 
+_meteor_all_packages() {
+  packages=(`meteor list | cut -d" " -f1`)
+}
+_meteor_installed_packages() {
+  installed_packages=(`meteor list --using`)
+}
+
 local -a _1st_arguments
 _1st_arguments=(
   'run:[Default] Run this project in local development mode'
@@ -21,6 +28,9 @@ _1st_arguments=(
   'test-packages:Test one or more packages'
 )
 
+local expl
+local -a packages installed_packages
+
 if (( CURRENT == 2 )); then
   _describe -t commands "meteor subcommand" _1st_arguments
   return
@@ -28,5 +38,11 @@ fi
 
 case "$words[2]" in
     help)
-      _describe -t commands "brew subcommand" _1st_arguments
+      _describe -t commands "meteor subcommand" _1st_arguments ;;
+    remove)
+      _meteor_installed_packages
+      _wanted installed_packages expl 'installed packages' compadd -a installed_packages ;;
+    add)
+      _meteor_all_packages
+      _wanted packages expl 'all packages' compadd -a packages ;;
 esac
\ No newline at end of file

From e3c02bfeba64b655ca506d0d46eca724f2889a87 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <paul.melnikow@bodylabs.com>
Date: Wed, 4 Sep 2013 18:07:58 -0400
Subject: [PATCH 0377/1378] Plugin for Node Version Manager

---
 plugins/nvm/_nvm           | 24 ++++++++++++++++++++++++
 plugins/nvm/nvm.plugin.zsh |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 plugins/nvm/_nvm
 create mode 100644 plugins/nvm/nvm.plugin.zsh

diff --git a/plugins/nvm/_nvm b/plugins/nvm/_nvm
new file mode 100644
index 000000000..038196a6e
--- /dev/null
+++ b/plugins/nvm/_nvm
@@ -0,0 +1,24 @@
+#compdef nvm
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+  'help:show help'
+  'install:download and install a version'
+  'uninstall:uninstall a version'
+  'use:modify PATH to use version'
+  'run:run version with given arguments'
+  'ls:list installed versions or versions matching a given description'
+  'ls-remote:list remote versions available for install'
+  'deactivate:undo effects of NVM on current shell'
+  'alias:show or set aliases'
+  'unalias:deletes an alias'
+  'copy-packages:install global NPM packages to current version'
+)
+
+_arguments -C '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "nvm subcommand" _1st_arguments
+  return
+fi
\ No newline at end of file
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
new file mode 100644
index 000000000..9709719fe
--- /dev/null
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -0,0 +1,3 @@
+# The addition 'nvm install' attempts in ~/.profile
+
+[[ -s ~/.nvm/nvm.sh ]] && . ~/.nvm/nvm.sh

From 5bf20572cc303cd02a915c91ffa91f96a26bba39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20B=C3=BChl?= <tbuehl@itm-labs.de>
Date: Thu, 5 Sep 2013 14:37:37 +0200
Subject: [PATCH 0378/1378] Add commonly used git stash aliases

---
 plugins/git/git.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6b91b4a72..9596931eb 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -80,7 +80,11 @@ compdef _git gm=git-mergetool
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 alias gk='gitk --all --branches'
+
 alias gsts='git stash show --text'
+alias gsta='git stash'
+alias gstp='git stash pop'
+alias gstd='git stash drop'
 
 # Will cd into the top of the current repository
 # or submodule.

From 3007f96090e0f5a9e6430575afc7dfa92b235bc9 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <paul.melnikow@bodylabs.com>
Date: Thu, 5 Sep 2013 10:09:19 -0400
Subject: [PATCH 0379/1378] NVM: Avoid providing completions when nvm is not
 installed

---
 plugins/nvm/_nvm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/nvm/_nvm b/plugins/nvm/_nvm
index 038196a6e..a95c9e375 100644
--- a/plugins/nvm/_nvm
+++ b/plugins/nvm/_nvm
@@ -1,6 +1,8 @@
 #compdef nvm
 #autoload
 
+[[ -s ~/.nvm/nvm.sh ]] || return 0
+
 local -a _1st_arguments
 _1st_arguments=(
   'help:show help'

From 4da4d12d33eb7d36552fa1ffb0797380793970d1 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <paul.melnikow@bodylabs.com>
Date: Thu, 5 Sep 2013 10:12:12 -0400
Subject: [PATCH 0380/1378] Sublime Text: Harmonize alias with the Sublime Text
 install instructions

The typical command is `subl`, not `st`. Leaving both for backward compatibility.

See http://www.sublimetext.com/docs/2/osx_command_line.html
---
 plugins/sublime/sublime.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 82faf87c9..72f56754c 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -21,7 +21,8 @@ elif  [[ $('uname') == 'Darwin' ]]; then
 
 	for _sublime_path in $_sublime_darwin_paths; do
 		if [[ -a $_sublime_path ]]; then
-			alias st="'$_sublime_path'"
+			alias subl="'$_sublime_path'"
+			alias st=subl
 			break
 		fi
 	done

From 128cd3f5661d42f10ef3bae742ae3416f401c7ad Mon Sep 17 00:00:00 2001
From: Justin Aiken <60tonangel@gmail.com>
Date: Thu, 5 Sep 2013 09:39:22 -0600
Subject: [PATCH 0381/1378] Filter out missing links with jump autocomplete

---
 plugins/jump/jump.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 349d3e01f..8f1468206 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -7,13 +7,13 @@
 # marks: lists all marks
 #
 export MARKPATH=$HOME/.marks
-function jump { 
+function jump {
 	cd -P "$MARKPATH/$1" 2>/dev/null || echo "No such mark: $1"
 }
-function mark { 
+function mark {
 	mkdir -p "$MARKPATH"; ln -s "$(pwd)" $MARKPATH/$1
 }
-function unmark { 
+function unmark {
 	rm -i "$MARKPATH/$1"
 }
 function marks {
@@ -21,7 +21,7 @@ function marks {
 }
 
 function _completemarks {
-  reply=($(ls $MARKPATH))
+  reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([a-z]*):$/\2/g'))
 }
 
 compctl -K _completemarks jump

From a265acee4f991dfd96fb3a9057309e9c1a345a2c Mon Sep 17 00:00:00 2001
From: Justin Aiken <60tonangel@gmail.com>
Date: Thu, 5 Sep 2013 10:00:14 -0600
Subject: [PATCH 0382/1378] Better filename matching

---
 plugins/jump/jump.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 8f1468206..60eae85ad 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -21,7 +21,7 @@ function marks {
 }
 
 function _completemarks {
-  reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([a-z]*):$/\2/g'))
+  reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
 }
 
 compctl -K _completemarks jump

From 69ce2362d6b4c46450a07d9ffdb3deabc48b5ffd Mon Sep 17 00:00:00 2001
From: Stanislav Mekhonoshin <ejabberd@gmail.com>
Date: Thu, 5 Sep 2013 20:22:46 +0400
Subject: [PATCH 0383/1378] Support of parallel bundle install

---
 plugins/bundler/bundler.plugin.zsh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c01241409..1e70db6af 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,10 +1,17 @@
 alias be="bundle exec"
-alias bi="bundle install"
 alias bl="bundle list"
 alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
+if [[ "$(uname)" == 'Darwin' ]]
+then
+  local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+else
+  local cores_num="$(nproc)"
+fi
+eval "alias bi='bundle install --jobs=$cores_num'"
+
 # The following is based on https://github.com/gma/bundler-exec
 
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor thin thor unicorn unicorn_rails puma)
@@ -42,3 +49,4 @@ for cmd in $bundled_commands; do
         compdef _$cmd bundled_$cmd=$cmd
   fi
 done
+

From 4517db6acc6e4217a25aa353da37fb8de617bfc4 Mon Sep 17 00:00:00 2001
From: Jeroen Janssens <jeroen.janssens@visualrevenue.com>
Date: Fri, 6 Sep 2013 09:34:27 -0400
Subject: [PATCH 0384/1378] Add _completemarks function as suggested by
 pielgrzym in
 https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22826540

---
 plugins/jump/jump.plugin.zsh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 60eae85ad..1035191ac 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -7,15 +7,19 @@
 # marks: lists all marks
 #
 export MARKPATH=$HOME/.marks
+
 function jump {
 	cd -P "$MARKPATH/$1" 2>/dev/null || echo "No such mark: $1"
 }
+
 function mark {
 	mkdir -p "$MARKPATH"; ln -s "$(pwd)" $MARKPATH/$1
 }
+
 function unmark {
 	rm -i "$MARKPATH/$1"
 }
+
 function marks {
 	ls -l "$MARKPATH" | sed 's/  / /g' | cut -d' ' -f9- | sed 's/ -/\t-/g' && echo
 }
@@ -23,6 +27,13 @@ function marks {
 function _completemarks {
   reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
 }
-
 compctl -K _completemarks jump
 compctl -K _completemarks unmark
+
+_mark_expansion() {
+	setopt extendedglob
+	autoload -U modify-current-argument
+	modify-current-argument '$(readlink "$MARKPATH/$ARG")'
+}
+zle -N _mark_expansion
+bindkey "^g" _mark_expansion

From 55d4873f91b8cebbb2e6df5f3a405022e76e0c2c Mon Sep 17 00:00:00 2001
From: Jeroen Janssens <jeroen.janssens@visualrevenue.com>
Date: Fri, 6 Sep 2013 09:40:44 -0400
Subject: [PATCH 0385/1378] Change marks function and remove 'function' keyword
 as suggested by pielgrzym in
 https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22820224

---
 plugins/jump/jump.plugin.zsh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 1035191ac..c6f266ae5 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -8,24 +8,30 @@
 #
 export MARKPATH=$HOME/.marks
 
-function jump {
+jump() {
 	cd -P "$MARKPATH/$1" 2>/dev/null || echo "No such mark: $1"
 }
 
-function mark {
+mark() {
 	mkdir -p "$MARKPATH"; ln -s "$(pwd)" $MARKPATH/$1
 }
 
-function unmark {
+unmark() {
 	rm -i "$MARKPATH/$1"
 }
 
-function marks {
-	ls -l "$MARKPATH" | sed 's/  / /g' | cut -d' ' -f9- | sed 's/ -/\t-/g' && echo
+autoload colors
+marks() {
+	for link in $MARKPATH/*(@); do
+		local markname="$fg[cyan]${link:t}$reset_color"
+		local markpath="$fg[blue]$(readlink $link)$reset_color"
+		printf "%s\t" $markname
+		printf "-> %s \t\n" $markpath
+	done
 }
 
-function _completemarks {
-  reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
+_completemarks() {
+	reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
 }
 compctl -K _completemarks jump
 compctl -K _completemarks unmark

From 255b0c4f5e16465ace326ddf1884ea2e7c1f3df1 Mon Sep 17 00:00:00 2001
From: Jeroen Janssens <jeroen.janssens@visualrevenue.com>
Date: Fri, 6 Sep 2013 09:55:43 -0400
Subject: [PATCH 0386/1378] Mark function asks for confirmation and uses
 basename of directory when no argument is given

---
 plugins/jump/jump.plugin.zsh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index c6f266ae5..e32a5a0b4 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -13,7 +13,15 @@ jump() {
 }
 
 mark() {
-	mkdir -p "$MARKPATH"; ln -s "$(pwd)" $MARKPATH/$1
+	DIR="$(pwd)"
+	if (( $# == 0 )); then
+		MARK=$(basename $DIR)
+	else
+		MARK=$1
+	fi
+	if read -q \?"Mark ${DIR} as ${MARK}? (y/n) "; then
+		mkdir -p "$MARKPATH"; ln -s "${DIR}" "$MARKPATH/$MARK"
+	fi
 }
 
 unmark() {

From d3e005d6b42995021ad6f1009734a55cb65be6ce Mon Sep 17 00:00:00 2001
From: Jeroen Janssens <jeroen.janssens@visualrevenue.com>
Date: Fri, 6 Sep 2013 15:29:14 -0400
Subject: [PATCH 0387/1378] Fix aliasing pwd

---
 plugins/jump/jump.plugin.zsh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index e32a5a0b4..a3c5cf8c3 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -13,14 +13,13 @@ jump() {
 }
 
 mark() {
-	DIR="$(pwd)"
 	if (( $# == 0 )); then
-		MARK=$(basename $DIR)
+		MARK=$(basename "$(pwd)")
 	else
-		MARK=$1
+		MARK="$1"
 	fi
-	if read -q \?"Mark ${DIR} as ${MARK}? (y/n) "; then
-		mkdir -p "$MARKPATH"; ln -s "${DIR}" "$MARKPATH/$MARK"
+	if read -q \?"Mark $(pwd) as ${MARK}? (y/n) "; then
+		mkdir -p "$MARKPATH"; ln -s "$(pwd)" "$MARKPATH/$MARK"
 	fi
 }
 

From dff966afad231f66f6e7345383412682992f9e84 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 6 Sep 2013 16:00:24 -0700
Subject: [PATCH 0388/1378] Logo draft 1...

---
 README.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.textile b/README.textile
index 1916d9f4e..86dd5da22 100644
--- a/README.textile
+++ b/README.textile
@@ -1,3 +1,5 @@
+!https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png!
+
 oh-my-zsh is an open source, community-driven framework for managing your ZSH configuration. It comes bundled with a ton of helpful functions, helpers, plugins, themes, and few things that make you shout...
 
 bq. "OH MY ZSHELL!"

From f6fb34845d31a840c73416f138dae1761ea4adb9 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 10 Sep 2013 09:14:24 +0200
Subject: [PATCH 0389/1378] updated the arguments list to the newest version
 (0.24.0) of cocoapods

---
 plugins/pod/_pod | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 563fa5e66..6dd8b6371 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -3,18 +3,19 @@
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  Cocoapods (0.24.0) autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
 #       TWITTER:  @jolyAlexandre
-#       VERSION:  0.0.1
+#       VERSION:  0.0.2
 #       LICENSE:  MIT
 # -----------------------------------------------------------------------------
 
 local -a _1st_arguments
 _1st_arguments=(
     'help:Show help for the given command.'
+    'init:Generate a Podfile for the current directory.'
     'install:Install project dependencies'
     'ipc:Inter-process communication'
     'list:List pods'

From bdb2cabaa68a8c3af72df5a10bb3925fe1eda45e Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 10 Sep 2013 09:17:09 +0200
Subject: [PATCH 0390/1378] typo

---
 plugins/pod/_pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 6dd8b6371..745e9b15d 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -14,8 +14,8 @@
 
 local -a _1st_arguments
 _1st_arguments=(
-    'help:Show help for the given command.'
-    'init:Generate a Podfile for the current directory.'
+    'help:Show help for the given command'
+    'init:Generate a Podfile for the current directory'
     'install:Install project dependencies'
     'ipc:Inter-process communication'
     'list:List pods'

From 8735dfd87e98d79aa3a809117630cec907c1a86d Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 10 Sep 2013 11:19:00 +0200
Subject: [PATCH 0391/1378] New aliases for repo plugin

This helps a lot in day to day android development:
- rs: repo sync (git fetch on all projects)
- rra: auto rebase for all projet without loosing uncommited changes
- rsrra: do both steps at once

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/repo/repo.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/repo/repo.plugin.zsh b/plugins/repo/repo.plugin.zsh
index 9cc336959..d690a9d22 100644
--- a/plugins/repo/repo.plugin.zsh
+++ b/plugins/repo/repo.plugin.zsh
@@ -1,2 +1,12 @@
 # Aliases
 alias r='repo'
+compdef _repo r=repo
+
+alias rra='repo rebase --auto-stash'
+compdef _repo rra='repo rebase --auto-stash'
+
+alias rs='repo sync'
+compdef _repo rs='repo sync'
+
+alias rsrra='repo sync ; repo rebase --auto-stash'
+compdef _repo rsrra='repo sync ; repo rebase --auto-stash'

From 0fcb7dd55e02871f2280db5cabecc803e522ec0a Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 10 Sep 2013 11:28:31 +0200
Subject: [PATCH 0392/1378] Display right prompt in theme chooser

I didn't found the way to right-align the right prompt
properly.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 tools/theme_chooser.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index 4d7047444..2c2a379ba 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -24,7 +24,8 @@ function theme_preview() {
     THEME_NAME=`echo $THEME | sed s/\.zsh-theme$//`
     print "$fg[blue]${(l.((${COLUMNS}-${#THEME_NAME}-5))..─.)}$reset_color $THEME_NAME $fg[blue]───$reset_color"
     source "$THEMES_DIR/$THEME"
-    print -P $PROMPT
+    cols=$(tput cols)
+    print -P "$PROMPT                                                                                      $RPROMPT"
 }
 
 function banner() {

From 45438528761b0bbc143f8f2f013ee01917eb48cc Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 10 Sep 2013 11:33:58 +0200
Subject: [PATCH 0393/1378] Completion for python, pep8, autopep8 and pylint

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/autopep8/_autopep8           | 32 +++++++++++++++++
 plugins/autopep8/autopep8.plugin.zsh |  0
 plugins/pep8/_pep8                   | 34 ++++++++++++++++++
 plugins/pylint/_pylint               | 31 ++++++++++++++++
 plugins/pylint/pylint.plugin.zsh     |  3 ++
 plugins/python/_python               | 54 ++++++++++++++++++++++++++++
 plugins/python/python.plugin.zsh     |  1 +
 7 files changed, 155 insertions(+)
 create mode 100644 plugins/autopep8/_autopep8
 create mode 100644 plugins/autopep8/autopep8.plugin.zsh
 create mode 100644 plugins/pep8/_pep8
 create mode 100644 plugins/pylint/_pylint
 create mode 100644 plugins/pylint/pylint.plugin.zsh
 create mode 100644 plugins/python/_python

diff --git a/plugins/autopep8/_autopep8 b/plugins/autopep8/_autopep8
new file mode 100644
index 000000000..c14d06d66
--- /dev/null
+++ b/plugins/autopep8/_autopep8
@@ -0,0 +1,32 @@
+#compdef autopep8
+#
+# this is zsh completion function file.
+# generated by genzshcomp(ver: 0.5.1)
+#
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+  "--help[show this help message and exit]:" \
+  "-h[show this help message and exit]:" \
+  "--version[show program's version number and exit]:" \
+  "--verbose[print verbose messages; multiple -v result in more verbose messages]" \
+  "-v[print verbose messages; multiple -v result in more verbose messages]" \
+  "--diff[print the diff for the fixed source]" \
+  "-d[print the diff for the fixed source]" \
+  "--in-place[make changes to files in place]" \
+  "-i[make changes to files in place]" \
+  "--recursive[run recursively; must be used with --in-place or --diff]" \
+  "-r[run recursively; must be used with --in-place or --diff]" \
+  "--jobs[number of parallel jobs; match CPU count if value is less than 1]::n        number of parallel jobs; match CPU count if value is:_files" \
+  "-j[number of parallel jobs; match CPU count if value is less than 1]::n        number of parallel jobs; match CPU count if value is:_files" \
+  "--pep8-passes[maximum number of additional pep8 passes (default: 100)]::n:_files" \
+  "-p[maximum number of additional pep8 passes (default: 100)]::n:_files" \
+  "-a[-a result in more aggressive changes]::result:_files" \
+  "--exclude[exclude files/directories that match these comma- separated globs]::globs:_files" \
+  "--list-fixes[list codes for fixes; used by --ignore and --select]" \
+  "--ignore[do not fix these errors/warnings (default E226,E24)]::errors:_files" \
+  "--select[fix only these errors/warnings (e.g. E4,W)]::errors:_files" \
+  "--max-line-length[set maximum allowed line length (default: 79)]::n:_files" \
+  "*::args:_files"
diff --git a/plugins/autopep8/autopep8.plugin.zsh b/plugins/autopep8/autopep8.plugin.zsh
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/pep8/_pep8 b/plugins/pep8/_pep8
new file mode 100644
index 000000000..ce19951dc
--- /dev/null
+++ b/plugins/pep8/_pep8
@@ -0,0 +1,34 @@
+#compdef pep8
+#
+# this is zsh completion function file.
+# generated by genzshcomp(ver: 0.5.1)
+#
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+  "--help[show this help message and exit]:" \
+  "-h[show this help message and exit]:" \
+  "--version[show program's version number and exit]:" \
+  "--verbose[print status messages, or debug with -vv]" \
+  "-v[print status messages, or debug with -vv]" \
+  "--quiet[report only file names, or nothing with -qq]" \
+  "-q[report only file names, or nothing with -qq]" \
+  "--repeat[(obsolete) show all occurrences of the same error]" \
+  "-r[(obsolete) show all occurrences of the same error]" \
+  "--first[show first occurrence of each error]" \
+  "--exclude[exclude files or directories which match these comma separated patterns (default: .svn,CVS,.bzr,.hg,.git,__pycache__)]::patterns:_files" \
+  "--filename[when parsing directories, only check filenames matching these comma separated patterns (default: *.py)]::patterns:_files" \
+  "--select[select errors and warnings (e.g. E,W6)]::errors:_files" \
+  "--ignore[skip errors and warnings (e.g. E4,W)]::errors:_files" \
+  "--show-source[show source code for each error]" \
+  "--show-pep8[show text of PEP 8 for each error (implies --first)]" \
+  "--statistics[count errors and warnings]" \
+  "--count[print total number of errors and warnings to standard error and set exit code to 1 if total is not null]" \
+  "--max-line-length[set maximum allowed line length (default: 79)]::n:_files" \
+  "--format[set the error format \[default|pylint|<custom>\]]::format:_files" \
+  "--diff[report only lines changed according to the unified diff received on STDIN]" \
+  "--benchmark[measure processing speed   are read from the \[pep8\] section of the tox.ini fg file located in any parent folder of the path(s) llowed options are: exclude, filename, select, ngth, count, format, quiet, show-pep8, show-source, .]" \
+  "--config[user config file location (default: /home/gsemet/.config/pep8)]::path:_files" \
+  "*::args:_files"
diff --git a/plugins/pylint/_pylint b/plugins/pylint/_pylint
new file mode 100644
index 000000000..e466d051b
--- /dev/null
+++ b/plugins/pylint/_pylint
@@ -0,0 +1,31 @@
+#compdef pylint
+#
+# this is zsh completion function file.
+# generated by genzshcomp(ver: 0.5.1)
+#
+
+typeset -A opt_args
+local context state line
+
+_arguments -s -S \
+  "--help[show this help message and exit]:" \
+  "-h[show this help message and exit]:" \
+  "--version[show program's version number and exit]:" \
+  "--long-help[more verbose help.]" \
+  "--rcfile[Specify a configuration file.]::<file>:_files" \
+  "--errors-only[In error mode, checkers without error messages are disabled and for others, only the ERROR messages are displayed, and no reports are done by default]" \
+  "-E[In error mode, checkers without error messages are disabled and for others, only the ERROR messages are displayed, and no reports are done by default]" \
+  "--ignore[Add files or directories to the blacklist. They should be base names, not paths. \[current: CVS\]]::<file>[,<file>...]:_files" \
+  "--help-msg[Display a help message for the given message id and exit. The value may be a comma separated list of message ids.]::<msg-id>:_files" \
+  "--generate-rcfile[Generate a sample configuration file according to the current configuration. You can put other options before this one to get them in the generated configuration.]" \
+  "--enable[Enable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time.]::<msg ids>:_files" \
+  "-e[Enable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time.]::<msg ids>:_files" \
+  "--disable[Disable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time (only on the command line, not in the configuration file where it should appear only once).]::<msg ids>:_files" \
+  "-d[Disable the message, report, category or checker with the given id(s). You can either give multiple identifier separated by comma (,) or put this option multiple time (only on the command line, not in the configuration file where it should appear only once).]::<msg ids>:_files" \
+  "--output-format[Set the output format. Available formats are text, parseable, colorized, msvs (visual studio) and html \[current: text\]]::<format>:_files" \
+  "-f[Set the output format. Available formats are text, parseable, colorized, msvs (visual studio) and html \[current: text\]]::<format>:_files" \
+  "--include-ids[Include message's id in output \[current: no\]]::<y_or_n>:_files" \
+  "-i[Include message's id in output \[current: no\]]::<y_or_n>:_files" \
+  "--reports[Tells whether to display a full report or only the messages \[current: yes\]]::<y_or_n>:_files" \
+  "-r[Tells whether to display a full report or only the messages \[current: yes\]]::<y_or_n>:_files" \
+  "*::args:_files"
diff --git a/plugins/pylint/pylint.plugin.zsh b/plugins/pylint/pylint.plugin.zsh
new file mode 100644
index 000000000..6760c67b0
--- /dev/null
+++ b/plugins/pylint/pylint.plugin.zsh
@@ -0,0 +1,3 @@
+# Aliases
+alias pylint-quick='pylint --reports=n --include-ids=y'
+compdef _pylint-quick pylint-quick='pylint --reports=n --include-ids=y'
\ No newline at end of file
diff --git a/plugins/python/_python b/plugins/python/_python
new file mode 100644
index 000000000..f517d4806
--- /dev/null
+++ b/plugins/python/_python
@@ -0,0 +1,54 @@
+#compdef python
+
+# Python 2.6
+# Python 3.0
+
+local curcontext="$curcontext" state line expl
+typeset -A opt_args
+
+local -a args
+
+if _pick_variant python3=Python\ 3 python2 --version; then
+  args=(
+    '(-bb)-b[issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str]'
+    '(-b)-bb[issue errors about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str]'
+  )
+else
+  args=(
+    '-Q+[division options]:division option:(old warn warnall new)'
+    '(-tt)-t[issue warnings about inconsistent tab usage]'
+    '(-t)-tt[issue errors about inconsistent tab usage]'
+    '-3[warn about Python 3.x incompatibilities]'
+  )
+fi
+
+_arguments -C -s -S "$args[@]" \
+  "-B[don't write .py\[co\] files on import]" \
+  '(1 -)-c+[program passed in as string (terminates option list)]:python command:' \
+  '-d[debug output from parser]' \
+  '-E[ignore PYTHON* environment variables (such as PYTHONPATH)]' \
+  '(1 * -)-h[display help information]' \
+  '-i[inspect interactively after running script]' \
+  '(1 * -)-m[run library module as a script (terminates option list)]:module:->modules' \
+  '-O[optimize generated bytecode slightly]' \
+  '-OO[remove doc-strings in addition to the -O optimizations]' \
+  "-s[don't add user site directory to sys.path]" \
+  "-S[don't imply 'import site' on initialization]" \
+  '-u[unbuffered binary stdout and stderr]' \
+  '-v[verbose (trace import statements)]' \
+  '(1 * -)'{-V,--version}'[display version information]' \
+  '-W+[warning control]:warning filter (action\:message\:category\:module\:lineno):(default always ignore module once error)' \
+  '-x[skip first line of source, allowing use of non-Unix forms of #!cmd]' \
+  '(-)1:script file:_files -g "*.py(|c|o)(-.)"' \
+  '*::script argument: _normal' && return
+
+if [[ "$state" = modules ]]; then
+  local -a modules
+  modules=(
+    ${${=${(f)"$(_call_program modules $words[1] -c \
+      'from\ pydoc\ import\ help\;\ help\(\"modules\"\)')"}[2,-3]}:#\(package\)}
+  )
+  _wanted modules expl module compadd -a modules && return
+fi
+
+return 1
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 852c8b919..319bf0bf0 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -10,3 +10,4 @@ function pyclean() {
 
 # Grep among .py files
 alias pygrep='grep --include="*.py"'
+

From 40b1cf01035a3d74395b5d9def4f79af17fca4c8 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 10 Sep 2013 15:20:57 +0200
Subject: [PATCH 0394/1378] repo list search one level deeper

the folder structure changed '.cocoapods/' -> '.cocoapods/repos'
---
 plugins/pod/_pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 745e9b15d..ba0c9ab30 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -159,7 +159,7 @@ __first_command_list ()
 }
 
 __repo_list() {
-    _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods 2>/dev/null | sed -e 's/ /\\ /g')
+    _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods/repos 2>/dev/null | sed -e 's/ /\\ /g')
 }
 
 __pod-repo() {

From 9d2b5c841e251840d7965163f4eb9797bc0db49f Mon Sep 17 00:00:00 2001
From: David Strawn <dstrawn@caanes.com>
Date: Sat, 14 Sep 2013 12:26:33 -0600
Subject: [PATCH 0395/1378] Fixed comments in zshrc.zsh-template about
 disabling auto updates.

Previously they did not make sense nor were they accurate.
---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index d4dded73a..1dfb6998c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -14,7 +14,7 @@ ZSH_THEME="robbyrussell"
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
-# Comment this out to disable bi-weekly auto-update checks
+# Uncomment this to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
 # Uncomment to change how often before auto-updates occur? (in days)

From a7c88c988a4be02b8883c06e57c6eb290c8fcb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A4ntz=20Miccoli?= <frantz.miccoli@fakedomain.com>
Date: Sun, 15 Sep 2013 23:16:11 +0200
Subject: [PATCH 0396/1378] Removed comments and other elements that might
 appear in the phing -l output. The current version doesn't work at all on my
 environment (OSX 10.7)

---
 plugins/phing/phing.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/phing.plugin.zsh
index 795f1db85..9af03af24 100644
--- a/plugins/phing/phing.plugin.zsh
+++ b/plugins/phing/phing.plugin.zsh
@@ -7,7 +7,7 @@ _phing_does_target_list_need_generating () {
 _phing () {
   if [ -f build.xml ]; then
     if _phing_does_target_list_need_generating; then
-      phing -l |grep -v ":$" |grep -v "^-*$" > .phing_targets
+      phing -l|grep -v "\[property\]"|grep -v "Buildfile"|sed 1d|grep -v ":$" |grep -v "^\-*$"|awk '{print $1}' > .phing_targets
     fi
     compadd `cat .phing_targets`
   fi

From dfe36d7b7b6d70e5179f57afadfd923a36b3ff5a Mon Sep 17 00:00:00 2001
From: Nathan Cox <akujin@akujin.com>
Date: Wed, 18 Sep 2013 08:09:15 -0700
Subject: [PATCH 0397/1378] Added virtualenv plugin data to af-magic theme.

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index c1b00c62b..4cf282590 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-RPROMPT='$my_gray%n@%m%{$reset_color%}%'
+PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 91b6a6b5a496d7e7f3702040401cd99fd609514d Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomashipp@gmail.com>
Date: Wed, 18 Sep 2013 13:37:36 +0200
Subject: [PATCH 0398/1378] jump plugin: fix autocompletion with single mark

Autocompletion fails if there's only one mark, since the ls command
will not display the parent directory with the trailing colon.
Handling the single mark case separately and validating the symlink
explicitly, resolves the issue.
---
 plugins/jump/jump.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index a3c5cf8c3..5096879d8 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -38,7 +38,13 @@ marks() {
 }
 
 _completemarks() {
-	reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
+	if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
+		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
+	else
+		if readlink -e "${MARKPATH}"/* &>/dev/null; then
+			reply=($(ls "${MARKPATH}"))
+		fi
+	fi
 }
 compctl -K _completemarks jump
 compctl -K _completemarks unmark

From 095a01d92adf6af6d33647b61718e4ad0a4cce2b Mon Sep 17 00:00:00 2001
From: Maxime Chaisse-Leal <maxime.chaisseleal@gmail.com>
Date: Wed, 18 Sep 2013 21:54:23 +0200
Subject: [PATCH 0399/1378] Added WIP (work in progress) feature to git.plugin

---
 plugins/git/git.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6b91b4a72..bd11d796f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -126,3 +126,17 @@ function _git_log_prettily(){
 }
 alias glp="_git_log_prettily"
 compdef _git glp=git-log
+
+# Work In Progress (wip)
+# These features allow to pause a branch development and switch to another one (wip)
+# When you want to go back to work, just unwip it
+#
+# This function return a warning if the current branch is a wip
+function work_in_progress() {
+  if $(git log -n 1 | grep -q -c wip); then
+    echo "WIP!!"
+  fi
+}
+# these alias commit and uncomit wip branches
+alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
+alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
\ No newline at end of file

From 4dbe4378db658d29c10841791a95b8c57e7c77e5 Mon Sep 17 00:00:00 2001
From: Maxime Chaisse-Leal <maxime.chaisseleal@gmail.com>
Date: Wed, 18 Sep 2013 21:56:10 +0200
Subject: [PATCH 0400/1378] Added WIP alert to the gallois' theme

---
 themes/gallois.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index 3eac14867..d624e3afc 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -7,12 +7,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
 git_custom_status() {
   local cb=$(current_branch)
   if [ -n "$cb" ]; then
-    echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
   fi
 }
 
 #RVM and git settings
-if [[ -s ~/.rvm/scripts/rvm ]] ; then 
+if [[ -s ~/.rvm/scripts/rvm ]] ; then
   RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
 else
   if which rbenv &> /dev/null; then

From 61e3951e4be2f496d8ce8022afc58817c06e5dee Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 19 Sep 2013 13:18:16 -0700
Subject: [PATCH 0401/1378] Revert "Replace no unicode glyph on hexa string"

This reverts commit baffc3b0bd2594b789316cb135ba84fb54f50dd9.
---
 themes/agnoster.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 8b5f4ef7a..c7a59ad0d 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -26,7 +26,7 @@
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 
 CURRENT_BG='NONE'
-SEGMENT_SEPARATOR='\u2b80'
+SEGMENT_SEPARATOR=''
 
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//\u2b60 }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
   fi
 }
 
@@ -110,7 +110,7 @@ prompt_hg() {
 				# if working copy is clean
 				prompt_segment green black
 			fi
-			echo -n $(hg prompt "\u2b60 {rev}@{branch}") $st
+			echo -n $(hg prompt " {rev}@{branch}") $st
 		else
 			st=""
 			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
@@ -124,7 +124,7 @@ prompt_hg() {
 			else
 				prompt_segment green black
 			fi
-			echo -n "\u2b60 $rev@$branch" $st
+			echo -n " $rev@$branch" $st
 		fi
 	fi
 }

From e8c3619486289fc21158ecd63d7fd91e3576c75c Mon Sep 17 00:00:00 2001
From: Maxim Dobryakov <mdobryakov@spbtv.com>
Date: Tue, 24 Sep 2013 13:58:48 +0400
Subject: [PATCH 0402/1378] Check bundler version to avoid error with
 unsupported command line arguments

---
 plugins/bundler/bundler.plugin.zsh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 5bd28cbdc..2e657e5a8 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -4,13 +4,18 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
-if [[ "$(uname)" == 'Darwin' ]]
-then
-  local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+bundler_version=`bundle version | cut -d' ' -f3`
+if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
+  if [[ "$(uname)" == 'Darwin' ]]
+  then
+    local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+  else
+    local cores_num="$(nproc)"
+  fi
+  eval "alias bi='bundle install --jobs=$cores_num'"
 else
-  local cores_num="$(nproc)"
+  alias bi='bundle install' 
 fi
-eval "alias bi='bundle install --jobs=$cores_num'"
 
 # The following is based on https://github.com/gma/bundler-exec
 

From 244533320062afd470e4aa6aab92e1532cf2fec3 Mon Sep 17 00:00:00 2001
From: Rimenes Ribeiro <eu@rimenes.net>
Date: Tue, 24 Sep 2013 15:20:52 -0300
Subject: [PATCH 0403/1378] Add reload and status alises to postgres

---
 plugins/postgres/postgres.plugin.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/postgres/postgres.plugin.zsh b/plugins/postgres/postgres.plugin.zsh
index cdd142e92..c2dbef244 100644
--- a/plugins/postgres/postgres.plugin.zsh
+++ b/plugins/postgres/postgres.plugin.zsh
@@ -1,6 +1,8 @@
-# Aliases to stop, start and restart Postgres
-# Paths noted below are for Postgress installed via Homebrew on OSX
+# Aliases to control Postgres
+# Paths noted below are for Postgres installed via Homebrew on OSX
 
 alias startpost='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
 alias stoppost='pg_ctl -D /usr/local/var/postgres stop -s -m fast'
-alias restartpost='stoppost && sleep 1 && startpost'
\ No newline at end of file
+alias restartpost='stoppost && sleep 1 && startpost'
+alias reloadpost='pg_ctl reload -D /usr/local/var/postgres -s'
+alias statuspost='pg_ctl status -D /usr/local/var/postgres -s'
\ No newline at end of file

From 05b3ea342ad581d02ed652a4bbe29786026a5b50 Mon Sep 17 00:00:00 2001
From: Steven Schmid <stevschmid@gmail.com>
Date: Tue, 1 Oct 2013 18:08:15 +0200
Subject: [PATCH 0404/1378] Fix work_in_progress in empty git repos

I noticed that the function ``work_in_progress``, which is used in the "gallois"-theme, would print ``fatal: bad default revision 'HEAD'`` in a new folder after ``git init``.

This is the fix.
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d8ea3ae0c..14172b881 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -138,7 +138,7 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 | grep -q -c wip); then
+  if $(git log -n 1 2>/dev/null | grep -q -c wip); then
     echo "WIP!!"
   fi
 }

From 2be4158d8fc5f8e4999ddcbcd100c129ab7e9147 Mon Sep 17 00:00:00 2001
From: kaving <johan.kaving@symsoft.com>
Date: Wed, 2 Oct 2013 10:51:21 +0200
Subject: [PATCH 0405/1378] Add support for ForkLift 2 to the ForkLift plugin

The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
---
 plugins/forklift/forklift.plugin.zsh | 35 ++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/plugins/forklift/forklift.plugin.zsh b/plugins/forklift/forklift.plugin.zsh
index 056069d36..b0e60a434 100644
--- a/plugins/forklift/forklift.plugin.zsh
+++ b/plugins/forklift/forklift.plugin.zsh
@@ -1,5 +1,6 @@
-# Open folder in ForkLift.app from console
+# Open folder in ForkLift.app of ForkLift2.app from console
 # Author: Adam Strzelecki nanoant.com, modified by Bodo Tasche bitboxer.de
+#         Updated to support ForkLift2 by Johan Kaving
 #
 # Usage:
 #   fl [<folder>]
@@ -22,9 +23,33 @@ function fl {
     fi
   fi
   osascript 2>&1 1>/dev/null <<END
-    tell application "ForkLift"
-      activate
-    end tell
+
+    try
+      tell application "Finder"
+        set appName to name of application file id "com.binarynights.ForkLift2"
+      end tell
+    on error err_msg number err_num
+      tell application "Finder"
+        set appName to name of application file id "com.binarynights.ForkLift"
+      end tell
+    end try
+
+    if application appName is running
+      tell application appName
+        activate
+      end tell
+    else
+      tell application appName
+        activate
+      end tell
+      repeat until application appName is running
+        delay 1
+      end repeat
+      tell application appName
+        activate
+      end tell
+    end if
+
     tell application "System Events"
       tell application process "ForkLift"
         try
@@ -36,7 +61,7 @@ function fl {
         keystroke "g" using {command down, shift down}
         tell sheet 1 of topWindow
           set value of text field 1 to "$PWD"
-        	keystroke return
+          keystroke return
         end tell
       end tell
     end tell

From fa85b4d6ee4817a91bece2987f72da22ffe007a4 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 2 Oct 2013 23:24:21 +0200
Subject: [PATCH 0406/1378] More expressive symbols for git and mercurial.

---
 themes/agnoster.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c7a59ad0d..7df4ec1e8 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\//± }${vcs_info_msg_0_}"
   fi
 }
 
@@ -110,7 +110,7 @@ prompt_hg() {
 				# if working copy is clean
 				prompt_segment green black
 			fi
-			echo -n $(hg prompt " {rev}@{branch}") $st
+			echo -n $(hg prompt "☿ {rev}@{branch}") $st
 		else
 			st=""
 			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')

From 387de3a57e1927b1db210419b87e2404f8f809de Mon Sep 17 00:00:00 2001
From: Timo Sand <timo.j.sand@gmail.com>
Date: Thu, 3 Oct 2013 09:48:49 +0300
Subject: [PATCH 0407/1378] Added '.war' extension to unzip

---
 plugins/extract/extract.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 23e86c593..6e26b54c0 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -52,7 +52,7 @@ function extract() {
       (*.xz) unxz "$1" ;;
       (*.lzma) unlzma "$1" ;;
       (*.Z) uncompress "$1" ;;
-      (*.zip) unzip "$1" -d $extract_dir ;;
+      (*.zip|*.war) unzip "$1" -d $extract_dir ;;
       (*.rar) unrar x -ad "$1" ;;
       (*.7z) 7za x "$1" ;;
       (*.deb)

From 671db71d211e5596cb64c6185ac183c3d6930274 Mon Sep 17 00:00:00 2001
From: Timo Sand <timo.j.sand@gmail.com>
Date: Thu, 3 Oct 2013 13:00:12 +0300
Subject: [PATCH 0408/1378] Added '.jar'

---
 plugins/extract/extract.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 6e26b54c0..7352e5bad 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -52,7 +52,7 @@ function extract() {
       (*.xz) unxz "$1" ;;
       (*.lzma) unlzma "$1" ;;
       (*.Z) uncompress "$1" ;;
-      (*.zip|*.war) unzip "$1" -d $extract_dir ;;
+      (*.zip|*.war|*.jar) unzip "$1" -d $extract_dir ;;
       (*.rar) unrar x -ad "$1" ;;
       (*.7z) 7za x "$1" ;;
       (*.deb)

From 33b1a3bcfed1d52d48a3a467f81da1599d2fa883 Mon Sep 17 00:00:00 2001
From: futjikato <m.spindelhirn@cashiers-check.de>
Date: Fri, 4 Oct 2013 22:29:33 +0200
Subject: [PATCH 0409/1378] Added gitignore plugin ( for gitignore.io )

---
 custom/plugins/gitignore/gitignore.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 custom/plugins/gitignore/gitignore.plugin.zsh

diff --git a/custom/plugins/gitignore/gitignore.plugin.zsh b/custom/plugins/gitignore/gitignore.plugin.zsh
new file mode 100644
index 000000000..1b866c0d0
--- /dev/null
+++ b/custom/plugins/gitignore/gitignore.plugin.zsh
@@ -0,0 +1,11 @@
+function gi() { curl http://gitignore.io/api/$@ ;}
+
+_gitignireio_get_command_list() {
+  curl -s http://gitignore.io/api/list | tr "," "\n"
+}
+
+_gitignireio () {
+  compadd `_gitignireio_get_command_list`
+}
+
+compdef _gitignireio gi
\ No newline at end of file

From 9afb139d20f12f93c086140db3e9bfd4913f15a0 Mon Sep 17 00:00:00 2001
From: futjikato <m.spindelhirn@cashiers-check.de>
Date: Sat, 5 Oct 2013 00:56:17 +0200
Subject: [PATCH 0410/1378] Updated completion to work with comma seperated
 list

---
 custom/plugins/gitignore/gitignore.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/plugins/gitignore/gitignore.plugin.zsh b/custom/plugins/gitignore/gitignore.plugin.zsh
index 1b866c0d0..332497cec 100644
--- a/custom/plugins/gitignore/gitignore.plugin.zsh
+++ b/custom/plugins/gitignore/gitignore.plugin.zsh
@@ -5,7 +5,8 @@ _gitignireio_get_command_list() {
 }
 
 _gitignireio () {
-  compadd `_gitignireio_get_command_list`
+  compset -P '*,'
+  compadd -S '' `_gitignireio_get_command_list`
 }
 
 compdef _gitignireio gi
\ No newline at end of file

From 190fcdffa7bc413dc7a9ebef4a6eaed37beb6896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20M=C4=83gheru=C8=99an-Stanciu?=
 <cristi.magherusan@gmail.com>
Date: Wed, 9 Oct 2013 16:42:28 +0200
Subject: [PATCH 0411/1378] Added a completion plugin for the new aws-cli tool

It also supports quickly switching AWS profiles defined in
~/.aws/config using the asp alias
---
 plugins/aws/aws.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/aws/aws.plugin.zsh

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
new file mode 100644
index 000000000..3f7fb1995
--- /dev/null
+++ b/plugins/aws/aws.plugin.zsh
@@ -0,0 +1,17 @@
+export AWS_HOME=~/.aws
+
+function agp {
+  echo $AWS_DEFAULT_PROFILE
+  
+}
+function asp {
+  export AWS_DEFAULT_PROFILE=$1
+    export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>"
+    
+}
+function aws_profiles {
+  reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))
+}
+
+compctl -K aws_profiles asp
+source `which aws_zsh_completer.sh`

From 1dddec6f0f947ed80eed128033e4ebc4d4448138 Mon Sep 17 00:00:00 2001
From: Puneet Goyal <pungoyal@gmail.com>
Date: Sat, 12 Oct 2013 07:30:16 +0530
Subject: [PATCH 0412/1378] removing a github redirect during install

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 86dd5da22..810569486 100644
--- a/README.textile
+++ b/README.textile
@@ -14,11 +14,11 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 

From a7693b096f2573dfcf47f47a8f99c2ccd2690cbf Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Sun, 13 Oct 2013 15:49:24 -0400
Subject: [PATCH 0413/1378] gitignore fix for custom folder.

---
 .gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5db11ce5c..c2b47bba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/example
-custom/example.zsh
+-custom/*
+-!custom/example
+-!custom/example.zsh
 *.swp
 !custom/example.zshcache
 cache/

From c5902d3f3498f9cd7553f358f2bf741b0784dbd0 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 14 Oct 2013 07:39:59 -0400
Subject: [PATCH 0414/1378] Moved misplaced plugins.

---
 {custom/plugins => plugins}/gitignore/gitignore.plugin.zsh | 0
 {custom/plugins => plugins}/sfffe/sfffe.plugin.zsh         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {custom/plugins => plugins}/gitignore/gitignore.plugin.zsh (100%)
 rename {custom/plugins => plugins}/sfffe/sfffe.plugin.zsh (100%)

diff --git a/custom/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
similarity index 100%
rename from custom/plugins/gitignore/gitignore.plugin.zsh
rename to plugins/gitignore/gitignore.plugin.zsh
diff --git a/custom/plugins/sfffe/sfffe.plugin.zsh b/plugins/sfffe/sfffe.plugin.zsh
similarity index 100%
rename from custom/plugins/sfffe/sfffe.plugin.zsh
rename to plugins/sfffe/sfffe.plugin.zsh

From 3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2 Mon Sep 17 00:00:00 2001
From: Wes Morgan <cap10morgan@gmail.com>
Date: Mon, 14 Oct 2013 09:59:20 -0600
Subject: [PATCH 0415/1378] don't clobber existing RBENV_ROOT & follow
 Homebrew's default behavior

---
 plugins/rbenv/rbenv.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 78f76c3a3..57ae2ca1f 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -10,12 +10,18 @@ FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
 if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
+    if [[ $RBENV_ROOT = '' ]]; then 
+      RBENV_ROOT="$HOME/.rbenv"
+    fi
 fi
 
 for rbenvdir in "${rbenvdirs[@]}" ; do
   if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
     FOUND_RBENV=1
-    export RBENV_ROOT=$rbenvdir
+    if [[ $RBENV_ROOT = '' ]]; then
+      RBENV_ROOT=$rbenvdir
+    fi
+    export RBENV_ROOT
     export PATH=${rbenvdir}/bin:$PATH
     eval "$(rbenv init --no-rehash - zsh)"
 

From d608fbfc7fcabf9994f8064e67670e69130d2ee1 Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad.preukschas@antevorte.org>
Date: Tue, 15 Oct 2013 14:34:03 +0200
Subject: [PATCH 0416/1378] Make the virtualenv plugin themable

---
 plugins/virtualenv/virtualenv.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index 8e06450b1..e250eb63e 100644
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -1,7 +1,6 @@
 function virtualenv_prompt_info(){
-  if [[ -n $VIRTUAL_ENV ]]; then
-    printf "%s[%s] " "%{${fg[yellow]}%}" ${${VIRTUAL_ENV}:t}
-  fi
+  [[ -n ${VIRTUAL_ENV} ]] || return
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX:=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX:=]}"
 }
 
 # disables prompt mangling in virtual_env/bin/activate

From c0c9fc02543eb14de49b0416e3df1100845633d8 Mon Sep 17 00:00:00 2001
From: Lei Zhang <zhang.lei.fly@gmail.com>
Date: Wed, 16 Oct 2013 15:44:49 +0800
Subject: [PATCH 0417/1378] Add support .venv folder as virtual env

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 670c287bd..16f32da6e 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -17,6 +17,8 @@ if (( $+commands[$virtualenvwrapper] )); then
             # Check for virtualenv name override
             if [[ -f "$PROJECT_ROOT/.venv" ]]; then
                 ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then 
+                ENV_NAME="$PROJECT_ROOT/.venv"
             elif [[ "$PROJECT_ROOT" != "." ]]; then
                 ENV_NAME=`basename "$PROJECT_ROOT"`
             else
@@ -27,6 +29,8 @@ if (( $+commands[$virtualenvwrapper] )); then
                 if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
                     if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
                         workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+                    elif [[ -e "$ENV_NAME/bin/activate" ]]; then
+                        source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
                     fi
                 fi
             elif [ $CD_VIRTUAL_ENV ]; then

From 500e5a73b61b063f83e1eecbf424e4b3733e59b7 Mon Sep 17 00:00:00 2001
From: oxnz <yunxinyi@gmail.com>
Date: Wed, 16 Oct 2013 16:43:03 +0800
Subject: [PATCH 0418/1378] add itunes function to control itnues from the
 terminal

---
 plugins/osx/osx.plugin.zsh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index dd785f911..608ec3789 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -157,3 +157,37 @@ function trash() {
 function vncviewer() {
   open vnc://$@
 }
+
+# iTunes control function
+function itunes() {
+	local opt=$1
+	shift
+	case "$opt" in
+		launch|play|pause|stop|rewind|resume|quit)
+			;;
+		mute)
+			opt="set mute to true"
+			;;
+		unmute)
+			opt="set mute to false"
+			;;
+		next|previous)
+			opt="$opt track"
+			;;
+		""|-h|--help)
+			echo "Usage: itunes <option>"
+			echo "option:"
+			echo "\tlaunch|play|pause|stop|rewind|resume|quit"
+			echo "\tmute|unmute\tcontrol volume set"
+			echo "\tnext|previous\tplay next or previous track"
+			echo "\thelp\tshow this message and exit"
+			return 0
+			;;
+		*)
+			print "Unkonwn option: $opt"
+			return 1
+			;;
+	esac
+	osascript -e "tell application \"iTunes\" to $opt"
+}
+

From f057737e57b3e3acbd32614b4f4f03103ce764aa Mon Sep 17 00:00:00 2001
From: dejan <dejan@proteansec.comi>
Date: Wed, 16 Oct 2013 12:36:48 +0200
Subject: [PATCH 0419/1378] Added the spectrum_bls function, which prints all
 256 colors set as the background.

We can easily see which color we want to set when changing the PS1 shell variable,
since the colors are more distinctive.
---
 lib/spectrum.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 2fdf537ef..166c942fb 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -26,3 +26,10 @@ function spectrum_ls() {
   done
 }
 
+# Show all 256 colors where the background is set to specific color
+function spectrum_bls() {
+  for code in {000..255}; do
+    ((cc = code + 1))
+    print -P -- "$BG[$code]$code: Test %{$reset_color%}"
+  done
+}

From 0f9db24f9f4c4e6d6882d5857e94da810b8f243d Mon Sep 17 00:00:00 2001
From: Jacob Magnusson <m@jacobian.se>
Date: Sun, 20 Oct 2013 16:07:19 +0200
Subject: [PATCH 0420/1378] Fix: Agnoster theme added venv name even if
 disabled See
 http://www.virtualenv.org/en/latest/index.html\?highlight\=virtual_env_disable_prompt\#activate-script
 for info regarding this.

---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c7a59ad0d..3ad4eff1f 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -137,7 +137,7 @@ prompt_dir() {
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
   local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path ]]; then
+  if [[ -n $virtualenv_path && -z $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
     prompt_segment blue black "(`basename $virtualenv_path`)"
   fi
 }

From d01ca03635e50c10b8d3fac0253da9cdfe5bb093 Mon Sep 17 00:00:00 2001
From: Kevin Traver <kevintraver@gmail.com>
Date: Wed, 23 Oct 2013 23:17:43 -0700
Subject: [PATCH 0421/1378] Add tmux aliases

---
 plugins/tmux/tmux.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 96fab80a6..626c41f3d 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -1,3 +1,11 @@
+#
+# Aliases
+#
+
+alias ta='tmux attach -t'
+alias ts='tmux new-session -s'
+alias tl='tmux list-sessions'
+
 # Only run if tmux is actually installed
 if which tmux &> /dev/null
 	then

From e3c489bd08236828286e01b4561e6b73b5e518bd Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Fri, 25 Oct 2013 01:40:55 -0400
Subject: [PATCH 0422/1378] Minor gitignore fix.

(Sorry my bad).
---
 .gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2b47bba7..51a5ee6c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
--custom/*
--!custom/example
--!custom/example.zsh
+custom/*
+!custom/example
+!custom/example.zsh
 *.swp
 !custom/example.zshcache
 cache/

From 03dc3a84630a1e3227bd0e772cca5d5f1fd4a9d4 Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Fri, 25 Oct 2013 11:54:56 -0400
Subject: [PATCH 0423/1378] Add command blacklist support to bundler plugin

---
 plugins/bundler/bundler.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 5bd28cbdc..9b589c5a8 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -13,9 +13,13 @@ fi
 eval "alias bi='bundle install --jobs=$cores_num'"
 
 # The following is based on https://github.com/gma/bundler-exec
-
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
+# Remove $UNBUNDLED_COMMANDS from the bundled_commands list
+for cmd in $UNBUNDLED_COMMANDS; do
+  bundled_commands=(${bundled_commands#$cmd});
+done
+
 ## Functions
 
 _bundler-installed() {

From 7567fd7f27f80bb6f168cd8fcf589157348b069f Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Fri, 25 Oct 2013 12:01:28 -0400
Subject: [PATCH 0424/1378] Re-add whitespace

---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 9b589c5a8..10b1e21cf 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -13,6 +13,7 @@ fi
 eval "alias bi='bundle install --jobs=$cores_num'"
 
 # The following is based on https://github.com/gma/bundler-exec
+
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list

From 1e9f55f09ddae273836ad1a69a0068b039de9fcd Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Mon, 23 Apr 2012 14:03:26 -0700
Subject: [PATCH 0425/1378] Add configuration placeholders to installer
 template

Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.
---
 templates/zshrc.zsh-template | 19 ++++++++++++++++++-
 tools/install.sh             |  5 ++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1dfb6998c..2ebfaf3e7 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -44,4 +44,21 @@ plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 
-# Customize to your needs...
+# User configuration
+
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# # Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/dsa_id"
+
diff --git a/tools/install.sh b/tools/install.sh
index a2bd5665a..9017bd302 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -21,7 +21,9 @@ echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
-echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
+sed -i -e "/export PATH=/ c\\
+export PATH=\"$PATH\"
+" ~/.zshrc
 
 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
 chsh -s `which zsh`
@@ -34,5 +36,6 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
 echo "\033[0;32m"'                        /____/                       '"\033[0m"
 
 echo "\n\n \033[0;32m....is now installed.\033[0m"
+echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
 /usr/bin/env zsh
 source ~/.zshrc

From 103fc334d6ccb04120b87596e82b5ddaca6d6d44 Mon Sep 17 00:00:00 2001
From: Adrien Dudouit-Exposito <capitaine.gloumi@gmail.com>
Date: Sat, 26 Oct 2013 11:43:59 +0200
Subject: [PATCH 0426/1378] Add "options" as a valide 1st argument

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index bf0a286c1..a25caf40c 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -26,6 +26,7 @@ _1st_arguments=(
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
   'missing:check all installed formuale for missing dependencies.'
+  'options:display install options specific to formula.'
   'outdated:list formulas for which a newer version is available'
   'prune:remove dead links'
   'reinstall:reinstall a formula'

From f731d6c16fd49e8140250a90e91d01f49d13da17 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 28 Oct 2013 11:06:10 -0400
Subject: [PATCH 0427/1378] themes plugin now picks a random theme if no
 argument is provided.

---
 plugins/themes/themes.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh
index 8bab257ea..7519b0253 100644
--- a/plugins/themes/themes.plugin.zsh
+++ b/plugins/themes/themes.plugin.zsh
@@ -1,6 +1,6 @@
 function theme
 {
-    if [ "$1" = "random" ]; then
+    if [ -z "$1" ] || [ "$1" = "random" ]; then
 	themes=($ZSH/themes/*zsh-theme)
 	N=${#themes[@]}
 	((N=(RANDOM%N)+1))

From 0eb86f82d6d3a6cf05b11818bb69ba4de80124da Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@futurecom.ch>
Date: Tue, 29 Oct 2013 10:33:37 +0100
Subject: [PATCH 0428/1378] updated to the latest version of cocoapods 0.27.1

---
 plugins/pod/_pod | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index ba0c9ab30..8c0f4460f 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -3,12 +3,12 @@
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods (0.24.0) autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  Cocoapods (0.27.1) autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
 #       TWITTER:  @jolyAlexandre
-#       VERSION:  0.0.2
+#       VERSION:  0.0.3
 #       LICENSE:  MIT
 # -----------------------------------------------------------------------------
 
@@ -33,6 +33,7 @@ local -a _repo_arguments
 _repo_arguments=(
     'add:Add a spec repo'
     'lint:Validates all specs in a repo'
+    'remove:Remove a spec repo.'
     'update:Update a spec repo'
 )
 
@@ -194,6 +195,12 @@ __pod-repo() {
                 (add)
                     _arguments \
                         $_inherited_options
+
+                (remove)
+                    _arguments \
+                        $_inherited_options \
+                        ':feature:__repo_list'
+                ;;
             esac
         ;;
     esac

From c81e42f050b9b7152d9ebfa4a3d5a0442159b8d1 Mon Sep 17 00:00:00 2001
From: onemouth <and.liting@gmail.com>
Date: Wed, 30 Oct 2013 11:05:35 +0800
Subject: [PATCH 0429/1378] Update git.plugin.zsh

add command to ignore changes to file temporarily
---
 plugins/git/git.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c7e98654a..d0b51434d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -149,3 +149,12 @@ function work_in_progress() {
 # these alias commit and uncomit wip branches
 alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
 alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
+
+# these alias ignore changes to file
+alias gignore='git update-index --assume-unchanged'
+alias gunignore='git update-index --no-assume-unchanged'
+# list temporarily ignored files
+alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+
+
+

From 78df6e96f5ad2d6df77af39f70f4906a09700849 Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Tue, 29 Oct 2013 23:02:44 -0400
Subject: [PATCH 0430/1378] pip: successfully cache all the packages

Switch to using curl and regular expressions to generate a local cache
file so that we don't need to hit pypi.python.org every time.
This (obviously) results in a massive speed improvement, especially if
you spawn new shells frequently.

This also makes the autocompletion work for me, it didn't before. (pip
would always time out.)

And, also, for fun: This allows you to explicitly set which pip indexes
to use. Technically the old version of the plugin should have had this
behavior automatically -- without having to do more than configure pip
-- but the install completion never worked for me so this is a net gain
in functionality.
---
 plugins/pip/_pip           |  4 ++--
 plugins/pip/pip.plugin.zsh | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 plugins/pip/pip.plugin.zsh

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index fb8765c7e..967da48ca 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -6,8 +6,8 @@
 _pip_all() {
   # we cache the list of packages (originally from the macports plugin)
   if (( ! $+piplist )); then
-      echo -n " (caching package index...)"
-      piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
+      zsh-pip-cache-packages
+      piplist=($(cat $ZSH_PIP_CACHE_FILE))
   fi
 }
 
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
new file mode 100644
index 000000000..78532a6d3
--- /dev/null
+++ b/plugins/pip/pip.plugin.zsh
@@ -0,0 +1,37 @@
+# Usage:
+# Just add pip to your installed plugins.
+
+# If you would like to change the cheeseshops used for autocomplete set
+# ZSH_PIP_INDEXES in your zshrc. If one of your indexes are bogus you won't get
+# any kind of error message, pip will just not autocomplete from them. Double
+# check!
+#
+# If you would like to clear your cache, go ahead and do a
+# "zsh-pip-clear-cache".
+
+ZSH_PIP_CACHE_FILE=~/.pip/zsh-cache
+ZSH_PIP_INDEXES=(https://pypi.python.org/simple/)
+
+zsh-pip-clear-cache() {
+  rm $ZSH_PIP_CACHE_FILE
+  unset piplist
+}
+
+zsh-pip-cache-packages() {
+  if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
+      mkdir -p ${PIP_CACHE_FILE:h}
+  fi
+
+  if [[ ! -f $ZSH_PIP_CACHE_FILE ]]; then
+      echo -n "(...caching package index...)"
+      tmp_cache=/tmp/zsh_tmp_cache
+      for index in $ZSH_PIP_INDEXES ; do
+          # well... I've already got two problems
+          curl $index 2>/dev/null | \
+              sed -nr '/^<a href/ s/.*>([^<]+).*/\1/p' \
+               >> $tmp_cache
+      done
+      sort $tmp_cache | uniq | tr '\n' ' ' > $ZSH_PIP_CACHE_FILE
+      rm $tmp_cache
+  fi
+}

From 008e57aa5aec0f38445785da58a11462ef9451f9 Mon Sep 17 00:00:00 2001
From: Brandon W Maister <quodlibetor@gmail.com>
Date: Wed, 30 Oct 2013 21:00:08 -0400
Subject: [PATCH 0431/1378] Make the pip cache work with djangopypi2

Also add a test function that allows messing with the cache-creating
regex with some assurance that you're not trampling other people's
index-parsing.
---
 plugins/pip/pip.plugin.zsh | 43 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 78532a6d3..71f977bbf 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -17,6 +17,10 @@ zsh-pip-clear-cache() {
   unset piplist
 }
 
+zsh-pip-clean-packages() {
+    sed -nr '/<a href/ s/.*>([^<]+).*/\1/p'
+}
+
 zsh-pip-cache-packages() {
   if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
       mkdir -p ${PIP_CACHE_FILE:h}
@@ -28,10 +32,47 @@ zsh-pip-cache-packages() {
       for index in $ZSH_PIP_INDEXES ; do
           # well... I've already got two problems
           curl $index 2>/dev/null | \
-              sed -nr '/^<a href/ s/.*>([^<]+).*/\1/p' \
+              zsh-pip-clean-packages \
                >> $tmp_cache
       done
       sort $tmp_cache | uniq | tr '\n' ' ' > $ZSH_PIP_CACHE_FILE
       rm $tmp_cache
   fi
 }
+
+# A test function that validates the regex against known forms of the simple
+# index. If you modify the regex to make it work for you, you should add a test
+# case in here and make sure that your changes don't break things for someone
+# else.
+zsh-pip-test-clean-packages() {
+    local expected
+    local actual
+    expected="0x10c-asm
+1009558_nester"
+
+    actual=$(echo -n "<html><head><title>Simple Index</title><meta name=\"api-version\" value=\"2\" /></head><body>
+<a href='0x10c-asm'>0x10c-asm</a><br/>
+<a href='1009558_nester'>1009558_nester</a><br/>
+</body></html>" | zsh-pip-clean-packages)
+
+    if [[ $actual != $expected ]] ; then
+        echo -e "python's simple index is broken:\n$actual\n  !=\n$expected"
+    else
+        echo "python's simple index is fine"
+    fi
+
+    actual=$(echo -n '<html>
+  <head>
+    <title>Simple Package Index</title>
+  </head>
+  <body>
+    <a href="0x10c-asm">0x10c-asm</a><br/>
+    <a href="1009558_nester">1009558_nester</a><br/>
+</body></html>' | zsh-pip-clean-packages)
+
+    if [[ $actual != $expected ]] ; then
+        echo -e "the djangopypi2 index is broken:\n$actual\n  !=\n$expected"
+    else
+        echo "the djangopypi2 index is fine"
+    fi
+}

From 37be62ffb7856cda96a187f4acf79afe2fed2514 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 31 Oct 2013 13:38:12 +0100
Subject: [PATCH 0432/1378] randquote plugin correcting an issue about encoding
 some people was having added a message when the user doesn't have curl added
 varibles for colors->easier to customize

---
 plugins/rand-quote/rand-quote.plugin.zsh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index 5544ca565..c3bf6234e 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -5,13 +5,24 @@
 # Don't remove this header, thank you
 # Usage: quote
 
+WHO_COLOR="\e[0;33m"
+TEXT_COLOR="\e[0;35m"
+COLON_COLOR="\e[0;35m"
+END_COLOR="\e[m"
+
 if [[ -x `which curl` ]]; then
     function quote()
     {
-        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php3" | grep -m 1 "dt ")
+        Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php3" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
         TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
         W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
-        echo "\e[0;33m${W}\e[0;30m: \e[0;35m“${TXT}”\e[m"
+        if [ "$W" -a "$TXT" ]; then
+          echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}"
+        else
+          quote
+        fi
     }
     #quote
+else
+    echo "rand-quote plugin needs curl to work" >&2
 fi

From 7eb2f528a65a45b88fdda6bdeb76ceb5ea16f5e3 Mon Sep 17 00:00:00 2001
From: Wari Wahab <wahabmw@i2r.a-star.edu.sg>
Date: Mon, 4 Nov 2013 23:20:12 +0800
Subject: [PATCH 0433/1378] `linuxonly` doesn't work unless renamed properly

Unlike all other files listed in the themes directory, this file is the only
one that's "doing it's own thing"
---
 themes/{linuxonly => linuxonly.zsh-theme} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename themes/{linuxonly => linuxonly.zsh-theme} (100%)

diff --git a/themes/linuxonly b/themes/linuxonly.zsh-theme
similarity index 100%
rename from themes/linuxonly
rename to themes/linuxonly.zsh-theme

From 5718d2b688e1711cdc571fa0ab39871dd4e5bb48 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 4 Nov 2013 23:35:42 +0100
Subject: [PATCH 0434/1378] Forgot one symbol for hg.

---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 7df4ec1e8..54916a95d 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -124,7 +124,7 @@ prompt_hg() {
 			else
 				prompt_segment green black
 			fi
-			echo -n " $rev@$branch" $st
+			echo -n "☿ $rev@$branch" $st
 		fi
 	fi
 }

From dd4f57010cdfaba8c3240b21e138c5b3f8a3607d Mon Sep 17 00:00:00 2001
From: nishigori <nishigori.tak@gmail.com>
Date: Tue, 5 Nov 2013 08:40:13 +0900
Subject: [PATCH 0435/1378] Fix bad ps syntax in ssh-agent plugin

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 019322f7b..a1e64ad0f 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -57,7 +57,7 @@ if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
 elif [ -f "${_plugin__ssh_env}" ]; then
   # Source SSH settings, if applicable
   . ${_plugin__ssh_env} > /dev/null
-  ps -x | grep ${SSH_AGENT_PID} | grep ssh-agent > /dev/null || {
+  ps x | grep ${SSH_AGENT_PID} | grep ssh-agent > /dev/null || {
     _plugin__start_agent;
   }
 else

From 8cfc7d66774e12c8502b63ed0c48f3a216c33acf Mon Sep 17 00:00:00 2001
From: James Seward <james@jamesoff.net>
Date: Mon, 4 Nov 2013 21:00:11 -0500
Subject: [PATCH 0436/1378] Prevent errors in prompts if no info available.
 Define empty functions instead of none at all if we can't figure out the
 platform.

---
 plugins/battery/battery.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 66bf46d13..9f053383a 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -79,4 +79,14 @@ elif [[ $(uname) == "Linux"  ]] ; then
       echo "∞"
     fi
   }
+else
+	# Empty functions so we don't cause errors in prompts
+	function battery_pct_remaining() {
+	}
+
+	function battery_time_remaining() {
+	}
+
+	function battery_pct_prompt() {
+	}
 fi

From efc37c1f715eb77be5f30411fa36589727643126 Mon Sep 17 00:00:00 2001
From: Pablo Rubianes <pablorubianes@gmail.com>
Date: Wed, 6 Nov 2013 20:10:59 -0200
Subject: [PATCH 0437/1378] Modification to the frisk theme to work with the
 BZR lib

---
 lib/bzr.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lib/bzr.zsh

diff --git a/lib/bzr.zsh b/lib/bzr.zsh
new file mode 100644
index 000000000..005a16500
--- /dev/null
+++ b/lib/bzr.zsh
@@ -0,0 +1,10 @@
+## Bazaar integration
+## Just works with the GIT integration just add $(bzr_prompt_info) to the PROMPT
+function bzr_prompt_info() {
+	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
+	if [ -n "$BZR_CB" ]; then
+		BZR_DIRTY=""
+		[[ -n `bzr status` ]] && BZR_DIRTY=" %{$fg[red]%} * %{$fg[green]%}"
+		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
+	fi
+}
\ No newline at end of file

From 248890b6e699365dee469178ec96f5d1fad91871 Mon Sep 17 00:00:00 2001
From: Pablo Rubianes <pablorubianes@gmail.com>
Date: Wed, 6 Nov 2013 20:16:09 -0200
Subject: [PATCH 0438/1378] Modification to the frisk theme to work with the
 BZR lib

---
 themes/frisk.zsh-theme | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
index 2c999a6a6..653c7461f 100644
--- a/themes/frisk.zsh-theme
+++ b/themes/frisk.zsh-theme
@@ -10,13 +10,3 @@ ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-## Bazaar integration
-bzr_prompt_info() {
-	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
-	if [ -n "$BZR_CB" ]; then
-		BZR_DIRTY=""
-		[[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}"
-		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
-	fi
-}

From 5c73cb671bde7a151a7a36fe782ce44dba1b0531 Mon Sep 17 00:00:00 2001
From: isquariel <tavsophi@gmail.com>
Date: Fri, 8 Nov 2013 23:26:05 +0400
Subject: [PATCH 0439/1378] Added nvm.zsh to detect current Node.js version

---
 lib/nvm.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lib/nvm.zsh

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
new file mode 100644
index 000000000..5cadf7061
--- /dev/null
+++ b/lib/nvm.zsh
@@ -0,0 +1,9 @@
+# get the node.js version
+function nvm_prompt_info() {
+  [ -f $HOME/.nvm/nvm.sh ] || return
+  local nvm_prompt
+  nvm_prompt=$(node -v 2>/dev/null)
+  [[ "${nvm_prompt}x" == "x" ]] && return
+  nvm_prompt=${nvm_prompt:1}
+  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
+}

From d34ab7f3732b49fd624c80e950aae3f166800a24 Mon Sep 17 00:00:00 2001
From: isquariel <tavsophi@gmail.com>
Date: Fri, 8 Nov 2013 23:26:25 +0400
Subject: [PATCH 0440/1378] Added the Bureau theme

---
 themes/bureau.zsh-theme | 113 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 themes/bureau.zsh-theme

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
new file mode 100644
index 000000000..1d88f54d0
--- /dev/null
+++ b/themes/bureau.zsh-theme
@@ -0,0 +1,113 @@
+# oh-my-zsh Bureau Theme
+
+### NVM
+
+ZSH_THEME_NVM_PROMPT_PREFIX="%B⬡%b "
+ZSH_THEME_NVM_PROMPT_SUFFIX=""
+
+### Git [±master ▾●]
+
+ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg_bold[green]%}±%{$reset_color%}%{$fg_bold[white]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}]"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[cyan]%}▴%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[magenta]%}▾%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
+
+bureau_git_branch () {
+  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+  echo "${ref#refs/heads/}"
+}
+
+bureau_git_status () {
+  _INDEX=$(command git status --porcelain -b 2> /dev/null)
+  _STATUS=""
+  if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
+  fi
+  if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
+  fi
+  if $(echo "$_INDEX" | grep -E '^\?\? ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+  fi
+  if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+  fi
+  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
+  fi
+  if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then
+    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
+  fi
+
+  echo $_STATUS
+}
+
+bureau_git_prompt () {
+  local _branch=$(bureau_git_branch)
+  local _status=$(bureau_git_status)
+  local _result=""
+  if [[ "${_branch}x" != "x" ]]; then
+    _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch"
+    if [[ "${_status}x" != "x" ]]; then
+      _result="$_result $_status"
+    fi
+    _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+  echo $_result
+}
+
+
+_PATH="%{$fg_bold[white]%}%~%{$reset_color%}"
+
+if [[ "%#" == "#" ]]; then
+  _USERNAME="%{$fg_bold[red]%}%n"
+  _LIBERTY="%{$fg[red]%}#"
+else
+  _USERNAME="%{$fg_bold[white]%}%n"
+  _LIBERTY="%{$fg[green]%}$"
+fi
+_USERNAME="$_USERNAME%{$reset_color%}@%m"
+_LIBERTY="$_LIBERTY%{$reset_color%}"
+
+
+get_space () {
+  local STR=$1$2
+  local zero='%([BSUbfksu]|([FB]|){*})'
+  local LENGTH=${#${(S%%)STR//$~zero/}} 
+  local SPACES=""
+  (( LENGTH = ${COLUMNS} - $LENGTH - 1))
+  
+  for i in {0..$LENGTH}
+    do
+      SPACES="$SPACES "
+    done
+
+  echo $SPACES
+}
+
+_1LEFT="$_USERNAME $_PATH"
+_1RIGHT="[%*] "
+
+bureau_precmd () {
+  _1SPACES=`get_space $_1LEFT $_1RIGHT`
+  echo
+}
+
+setopt prompt_subst
+PROMPT='$_1LEFT$_1SPACES$_1RIGHT
+> $_LIBERTY '
+RPROMPT='$(nvm_prompt_info) $(bureau_git_prompt)'
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd bureau_precmd

From 009b906111ba0c71d3b2a5c6dd7a8f68ce3f521f Mon Sep 17 00:00:00 2001
From: Leonardo Santagada <santagada@gmail.com>
Date: Sat, 9 Nov 2013 13:02:38 -0200
Subject: [PATCH 0441/1378] agnoster theme not showing virtualenv status

agnoster theme was checking if the default virtualenv prompt was turned off and not showing its own... so there was no way to see which virtualenv was selected.
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 2db565266..2836de4b7 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -137,7 +137,7 @@ prompt_dir() {
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
   local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path && -z $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
+  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
     prompt_segment blue black "(`basename $virtualenv_path`)"
   fi
 }

From 96798c42f046fec7f01f53d10dd63f30ed6a1e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20Sz=2E=20Sztup=C3=A1k?= <zsolt.sztupak@gamesys.co.uk>
Date: Mon, 11 Nov 2013 18:09:33 +0000
Subject: [PATCH 0442/1378] Fix issues with special characters when running mvn

Setting the locale to C will stabilize sed, so it won't stop processing
the mvn output when it encounters invalid characters (like binary data)

This makes it also more viable to add the `alias mvn='mvn-color`, as
the coloring is less obtrusive, and there won't be any issues with sed
breaking because of an invalid character inside the stream
---
 plugins/mvn/mvn.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 799f6fc8c..0c9141907 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -24,16 +24,18 @@ export RESET_FORMATTING=`tput sgr0`
 # Wrapper function for Maven's mvn command.
 mvn-color()
 {
-  # Filter mvn output using sed
-  mvn $@ | sed -e "s/\(\[INFO\]\ \-.*\)/${TEXT_BLUE}${BOLD}\1/g" \
-               -e "s/\(\[INFO\]\ \[.*\)/${RESET_FORMATTING}${BOLD}\1${RESET_FORMATTING}/g" \
+  (
+  # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
+  unset LANG
+  LC_CTYPE=C mvn $@ | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
                -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[WARNING\].*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
+               -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
                -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
  
   # Make sure formatting is reset
   echo -ne ${RESET_FORMATTING}
+  )
 }
  
 # Override the mvn command with the colorized one.

From 27f9747143e421e6908e9c2d0eb6247df4a3af8c Mon Sep 17 00:00:00 2001
From: Sabarish Kumar R <skumar@crri.co.in>
Date: Tue, 12 Nov 2013 12:31:13 +0530
Subject: [PATCH 0443/1378] bundle plugin throwing error when bundle is not in
 path while initializing

---
 plugins/bundler/bundler.plugin.zsh | 44 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 2e657e5a8..e390f8620 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -4,18 +4,6 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
-bundler_version=`bundle version | cut -d' ' -f3`
-if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-  if [[ "$(uname)" == 'Darwin' ]]
-  then
-    local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
-  else
-    local cores_num="$(nproc)"
-  fi
-  eval "alias bi='bundle install --jobs=$cores_num'"
-else
-  alias bi='bundle install' 
-fi
 
 # The following is based on https://github.com/gma/bundler-exec
 
@@ -44,14 +32,28 @@ _run-with-bundler() {
   fi
 }
 
-## Main program
-for cmd in $bundled_commands; do
-  eval "function unbundled_$cmd () { $cmd \$@ }"
-  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
-  alias $cmd=bundled_$cmd
+if _bundler-installed; then
+	bundler_version=`bundle version | cut -d' ' -f3`
+	if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
+		if [[ "$(uname)" == 'Darwin' ]]
+		then
+			local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+		else
+			local cores_num="$(nproc)"
+		fi
+		eval "alias bi='bundle install --jobs=$cores_num'"
+	else
+		alias bi='bundle install' 
+	fi
 
-  if which _$cmd > /dev/null 2>&1; then
-        compdef _$cmd bundled_$cmd=$cmd
-  fi
-done
+	## Main program
+	for cmd in $bundled_commands; do
+		eval "function unbundled_$cmd () { $cmd \$@ }"
+		eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
+		alias $cmd=bundled_$cmd
 
+		if which _$cmd > /dev/null 2>&1; then
+			compdef _$cmd bundled_$cmd=$cmd
+		fi
+	done
+fi

From bb2064e92bdb2f64dfeb148bc0b9a61dfeff8f43 Mon Sep 17 00:00:00 2001
From: Marco Chan <marco.cc.chan@gmail.com>
Date: Tue, 12 Nov 2013 15:55:16 +0800
Subject: [PATCH 0444/1378] Use environment specific open command when creating
 a new Jira issue.

---
 plugins/jira/jira.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 9aa192c1e..739ee7142 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -31,7 +31,7 @@ open_jira_issue () {
 
   if [ -z "$1" ]; then
     echo "Opening new issue"
-    `open $jira_url/secure/CreateIssue!default.jspa`
+    $open_cmd "$jira_url/secure/CreateIssue!default.jspa"
   else
     echo "Opening issue #$1"
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then

From 4e7b0fe083ecc99c1ea8c250d8b9cfcde09f2cd3 Mon Sep 17 00:00:00 2001
From: Amila Perera <perera.amila@gmail.com>
Date: Wed, 13 Nov 2013 00:35:19 +0530
Subject: [PATCH 0445/1378] getting the projects name correctly and making
 compdef to work with mux alias

---
 plugins/tmuxinator/_tmuxinator | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index f0ff304dd..117685279 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -1,4 +1,4 @@
-#compdef tmuxinator
+#compdef tmuxinator mux
 #autoload
 
 local curcontext="$curcontext" state line ret=1
@@ -25,7 +25,7 @@ case $state in
   args)
     case $line[1] in
       start|open|copy|delete)
-        _configs=(`tmuxinator list | sed -n 's/^[ \t]\+//p'`)
+        _configs=(`find ~/.tmuxinator/ -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         _values 'configs' $_configs
         ret=0
         ;;
@@ -33,4 +33,4 @@ case $state in
     ;;
 esac
 
-return ret
\ No newline at end of file
+return ret

From c6dce05fabd31c018cd77197329a6d5212e56787 Mon Sep 17 00:00:00 2001
From: Carlos Cardoso <cadu@oscardoso.com.br>
Date: Tue, 12 Nov 2013 22:55:28 -0200
Subject: [PATCH 0446/1378] python3 clean updated.

---
 plugins/python/python.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 852c8b919..a8f9760ad 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -6,6 +6,7 @@ alias pyfind='find . -name "*.py"'
 function pyclean() {
     ZSH_PYCLEAN_PLACES=${*:-'.'}
     find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
+    find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
 }
 
 # Grep among .py files

From a7540844d5142d0ab3fae38b660c690859435bb5 Mon Sep 17 00:00:00 2001
From: Petter Abrahamsson <petter@jebus.nu>
Date: Thu, 14 Nov 2013 07:06:54 -0500
Subject: [PATCH 0447/1378] Add support for colored ls output on OpenBSD

---
 lib/theme-and-appearance.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 2677615c0..0353f9db4 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -11,6 +11,10 @@ then
     # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); 
     # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
     gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
+  elif [[ "$(uname -s)" == "OpenBSD" ]]; then
+    # On OpenBSD, test if "colorls" is installed (this one supports colors);
+    # otherwise, leave ls as is, because OpenBSD's ls doesn't support -G
+    colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G'
   else
     ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
   fi

From ae6b26327a01211e7109c00c36650db05be75a55 Mon Sep 17 00:00:00 2001
From: Pedro Henrique Passalini <hen‍rique.passalini@gmail.com>
Date: Thu, 14 Nov 2013 14:30:21 -0200
Subject: [PATCH 0448/1378] add new alias to zeus

---
 plugins/zeus/zeus.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index eddfb4f94..5ec9fa579 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -53,3 +53,17 @@ alias zall='zeus test test/unit/*; zeus test test/functional/; zeus cucumber'
 # Clean up crashed zeus instances.
 alias zsw='rm .zeus.sock'
 alias zweep='rm .zeus.sock'
+
+# Reset database
+alias zdbr='zeus rake db:reset db:test:prepare'
+alias zdbreset='zeus rake db:reset db:test:prepare'
+
+# Migrate and prepare database
+alias zdbm='zeus rake db:migrate db:test:prepare'
+alias zdbmigrate='zeus rake db:migrate db:test:prepare'
+
+# Create database
+alias zdbc='zeus rake db:create'
+
+# Create, migrate and prepare database
+alias zdbcm='zeus rake db:create db:migrate db:test:prepare'
\ No newline at end of file

From dcf7c7cce0c4824a728de9ed0cabdfa073829e8d Mon Sep 17 00:00:00 2001
From: Pedro Henrique Passalini <hen‍rique.passalini@gmail.com>
Date: Thu, 14 Nov 2013 14:36:20 -0200
Subject: [PATCH 0449/1378] add aliases to readme

---
 plugins/zeus/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md
index d7c2aef80..8964eaaec 100644
--- a/plugins/zeus/README.md
+++ b/plugins/zeus/README.md
@@ -41,3 +41,13 @@
 
 * `zsw` aliases `rm .zeus.sock`
 * `zweep` aliases `rm .zeus.sock`
+
+`zdbr` aliases `zeus rake db:reset db:test:prepare`
+`zdbreset` aliases `zeus rake db:reset db:test:prepare`
+
+`zdbm` aliases `zeus rake db:migrate db:test:prepare`
+`zdbmigrate` aliases `zeus rake db:migrate db:test:prepare`
+
+`zdbc` aliases `zeus rake db:create`
+
+`zdbcm` aliases `zeus rake db:create db:migrate db:test:prepare`

From 51b273a66f0b99202e79807c0651e2afd2399d1b Mon Sep 17 00:00:00 2001
From: Chris Martin <christopher.martin2@nike.com>
Date: Thu, 14 Nov 2013 16:04:38 -0800
Subject: [PATCH 0450/1378] basic command line xcode functionality

---
 plugins/xcode/xcode.plugin.zsh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/xcode/xcode.plugin.zsh

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
new file mode 100644
index 000000000..f137253f3
--- /dev/null
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -0,0 +1,18 @@
+#xc function courtesy of http://gist.github.com/subdigital/5420709
+function xc {
+  xcode_proj=`find . -name "*.xc*" -d 1 | sort -r | head -1`
+  if [[ `echo -n $xcode_proj | wc -m` == 0 ]]
+  then
+    echo "No xcworkspace/xcodeproj file found in the current directory."
+  else
+    echo "Found $xcode_proj" 
+    open "$xcode_proj" 
+  fi
+}
+
+function xcsel {
+  sudo xcode-select --switch "$*"
+}
+
+alias xcb='xcodebuild'
+alias xcp='xcode-select --print-path'

From 3930a63253c08eafb5baf73508031932e0ed7437 Mon Sep 17 00:00:00 2001
From: Eddie Monge <eddie@eddiemonge.com>
Date: Thu, 14 Nov 2013 16:17:23 -0800
Subject: [PATCH 0451/1378] no tabs in a space-d file

---
 themes/agnoster.zsh-theme | 64 +++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 762f63c5b..01cdc80e5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -95,38 +95,38 @@ prompt_git() {
 }
 
 prompt_hg() {
-	local rev status
-	if $(hg id >/dev/null 2>&1); then
-		if $(hg prompt >/dev/null 2>&1); then
-			if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
-				# if files are not added
-				prompt_segment red white
-				st='±'
-			elif [[ -n $(hg prompt "{status|modified}") ]]; then
-				# if any modification
-				prompt_segment yellow black
-				st='±'
-			else
-				# if working copy is clean
-				prompt_segment green black
-			fi
-			echo -n $(hg prompt "☿ {rev}@{branch}") $st
-		else
-			st=""
-			rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
-			branch=$(hg id -b 2>/dev/null)
-			if `hg st | grep -Eq "^\?"`; then
-				prompt_segment red black
-				st='±'
-			elif `hg st | grep -Eq "^(M|A)"`; then
-				prompt_segment yellow black
-				st='±'
-			else
-				prompt_segment green black
-			fi
-			echo -n "☿ $rev@$branch" $st
-		fi
-	fi
+  local rev status
+  if $(hg id >/dev/null 2>&1); then
+    if $(hg prompt >/dev/null 2>&1); then
+      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
+        # if files are not added
+        prompt_segment red white
+        st='±'
+      elif [[ -n $(hg prompt "{status|modified}") ]]; then
+        # if any modification
+        prompt_segment yellow black
+        st='±'
+      else
+        # if working copy is clean
+        prompt_segment green black
+      fi
+      echo -n $(hg prompt "☿ {rev}@{branch}") $st
+    else
+      st=""
+      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
+      branch=$(hg id -b 2>/dev/null)
+      if `hg st | grep -Eq "^\?"`; then
+        prompt_segment red black
+        st='±'
+      elif `hg st | grep -Eq "^(M|A)"`; then
+        prompt_segment yellow black
+        st='±'
+      else
+        prompt_segment green black
+      fi
+      echo -n "☿ $rev@$branch" $st
+    fi
+  fi
 }
 
 # Dir: current working directory

From 1f334ba66053038bfd5236ffa8e1000c5adf1b44 Mon Sep 17 00:00:00 2001
From: Atem18 <messer.kevin@gmail.com>
Date: Fri, 15 Nov 2013 02:36:15 +0100
Subject: [PATCH 0452/1378] Rebranded plugin according to Zypper's official
 alias

---
 plugins/suse/suse.plugin.zsh | 68 ++++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index d46286948..3fdb8a032 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -1,7 +1,61 @@
-alias zi='sudo zypper install'
-alias zrf='sudo zypper refresh'
-alias zs='zypper search'
-alias zup='sudo zypper dist-upgrade'
-alias zrm='sudo zypper remove'
-alias zp='sudo zypper patch'
-alias zps='sudo zypper ps'
+#Alias for Zypper according to the offical Zypper's alias
+
+#Main commands
+alias z='sudo zypper' #call zypper
+alias zh='sudo zypper -h' #print help
+alias zhse='sudo zypper -h se' #print help for the search command
+alias zlicenses='sudo zypper licenses' #prints a report about licenses and EULAs of installed packages
+alias zps='sudo zypper ps' #list process using deleted files
+alias zshell='sudo zypper shell' #open a zypper shell session
+alias zsource-download='sudo zypper source-download' #download source rpms for all installed packages
+alias ztos='sudo zypper tos' #shows  the  ID string of the target operating system
+alias zvcmp='sudo zypper vcmp' #tell whether version1 is older or newer than version2
+
+#Packages commands
+alias zin='sudo zypper in' #install packages
+alias zinr='sudo zypper inr' #install newly added packages recommended by already installed ones
+alias zrm='sudo zypper rm' #remove packages
+alias zsi='sudo zypper si' #install source of a package
+alias zve='sudo zypper ve' #verify dependencies of installed packages
+
+#Updates commands
+alias zdup='sudo zypper dup' #upgrade packages
+alias zlp='sudo zypper lp' #list necessary patchs
+alias zlu='sudo zypper lu' #list updates
+alias zpchk='sudo zypper pchk' #check for patches
+alias zup='sudo zypper up' #update packages
+alias zpatch='sudo zypper patch' #install patches
+
+#Request commands
+alias zif='sudo zypper if' #display info about packages
+alias zpa='sudo zypper pa' #list packages
+alias zpatch-info='sudo zyper patch-info' #display info about patches
+alias zpattern-info='sudo zyper patch-info' #display info about patterns
+alias zproduct-info='sudo zyper patch-info' #display info about products
+alias zpch='sudo zypper pch' #list all patches
+alias zpd='sudo zypper pd' #list products
+alias zpt='sudo zypper pt' #list patterns
+alias zse='sudo zypper se' #search for packages
+alias zwp='sudo zypper wp' #list all packages providing the specified capability
+
+#Repositories commands
+alias zar='sudo zypper ar' #add a repository
+alias zcl='sudo zypper clean' #clean cache
+alias zlr='sudo zypper lr' #list repositories
+alias zmr='sudo zypper mr' #modify repositories
+alias znr='sudo zypper nr' #rename repositories (for the alias only)
+alias zref='sudo zypper ref' #refresh repositories
+alias zrr='sudo zypper rr' #remove repositories
+
+#Services commands
+alias zas='sudo zypper as' #adds a service specified by URI to the system
+alias zms='sudo zypper ms' #modify properties of specified services
+alias zrefs='sudo zypper refs' #refreshing a service mean executing the service's special task
+alias zrs='sudo zypper rs' #remove specified repository index service from the sytem
+alias zls='sudo zypper ls' #list services defined on the system
+
+#Package Locks Management commands
+alias zal='sudo zypper al' #add a package lock
+alias zcl='sudo zypper cl' #Remove unused locks
+alias zll='sudo zypper ll' #list currently active package locks
+alias zrl='sudo zypper rl' #remove specified package lock

From 6f48f586ba55507bb90fa8dd078b01c0333b907d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20F=C3=A6revaag?= <mf@bitblueprint.com>
Date: Sat, 16 Nov 2013 02:15:17 +0100
Subject: [PATCH 0453/1378] Added wd plugin

---
 plugins/wd2/wd2/wd.plugin.zsh |   9 ++
 plugins/wd2/wd2/wd.sh         | 201 ++++++++++++++++++++++++++++++++++
 2 files changed, 210 insertions(+)
 create mode 100755 plugins/wd2/wd2/wd.plugin.zsh
 create mode 100755 plugins/wd2/wd2/wd.sh

diff --git a/plugins/wd2/wd2/wd.plugin.zsh b/plugins/wd2/wd2/wd.plugin.zsh
new file mode 100755
index 000000000..e0846ffd9
--- /dev/null
+++ b/plugins/wd2/wd2/wd.plugin.zsh
@@ -0,0 +1,9 @@
+#!/bin/zsh
+
+# WARP
+# ====
+# oh-my-zsh plugin
+#
+# @github.com/mfaerevaag/wd
+
+alias wd='. ~/.oh-my-zsh/plugins/wd/wd.sh'
diff --git a/plugins/wd2/wd2/wd.sh b/plugins/wd2/wd2/wd.sh
new file mode 100755
index 000000000..7852028c0
--- /dev/null
+++ b/plugins/wd2/wd2/wd.sh
@@ -0,0 +1,201 @@
+#!/bin/zsh
+
+# WARP
+# ====
+# Jump to custom directories in terminal
+# because `cd` takes too long...
+#
+# @github.com/mfaerevaag/wd
+
+
+## variables
+CONFIG=$HOME/.warprc
+
+## colors
+BLUE="\033[96m"
+GREEN="\033[92m"
+YELLOW="\033[93m"
+RED="\033[91m"
+NOC="\033[m"
+
+
+## load warp points
+typeset -A points
+while read line
+do
+    arr=(${(s,:,)line})
+    key=${arr[1]}
+    val=${arr[2]}
+
+    points[$key]=$val
+done < $CONFIG
+
+
+## functions
+# prepended wd_ to not conflict with your environment (no sub shell)
+
+wd_warp()
+{
+    if [[ $1 =~ "^\.+$" ]]
+    then
+        if [[ $#1 < 2 ]]
+        then
+            wd_print_msg $YELLOW "Warping to current directory?"
+        else
+            (( n = $#1 - 1 ))
+            wd_print_msg $BLUE "Warping..."
+            cd -$n > /dev/null
+        fi
+    elif [[ ${points[$1]} != "" ]]
+    then
+        wd_print_msg $BLUE "Warping..."
+        cd ${points[$1]}
+    else
+        wd_print_msg $RED "Unkown warp point '$1'"
+    fi
+}
+
+wd_add()
+{
+    if [[ $1 =~ "^\.+$" ]]
+    then
+        wd_print_msg $RED "Illeagal warp point (see README)."
+    elif [[ ${points[$1]} == "" ]] || $2
+    then
+        wd_remove $1 > /dev/null
+        print "$1:$PWD" >> $CONFIG
+        wd_print_msg $GREEN "Warp point added"
+    else
+        wd_print_msg $YELLOW "Warp point '$1' alredy exists. Use 'add!' to overwrite."
+    fi
+}
+
+wd_remove()
+{
+    if [[ ${points[$1]} != "" ]]
+    then
+        if wd_tmp=`sed "/^$1:/d" $CONFIG`
+        then
+            echo $wd_tmp > $CONFIG
+            wd_print_msg $GREEN "Warp point removed"
+        else
+            wd_print_msg $RED "Warp point unsuccessfully removed. Sorry!"
+        fi
+    else
+        wd_print_msg $RED "Warp point was not found"
+    fi
+}
+
+wd_show()
+{
+    wd_print_msg $BLUE "Warp points to current directory:"
+    wd_list_all | grep $PWD$
+}
+
+wd_list_all()
+{
+    wd_print_msg $BLUE "All warp points:"
+    while read line
+    do
+        if [[ $line != "" ]]
+        then
+            arr=(${(s,:,)line})
+            key=${arr[1]}
+            val=${arr[2]}
+
+            print "\t" $key "\t -> \t" $val
+        fi
+    done < $CONFIG
+}
+
+wd_print_msg()
+{
+    if [[ $1 == "" || $2 == "" ]]
+    then
+        print " $RED*$NOC Could not print message. Sorry!"
+    else
+        print " $1*$NOC $2"
+    fi
+}
+
+wd_print_usage()
+{
+		print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
+    print "\nCommands:"
+    print "\t add \t Adds the current working directory to your warp points"
+    print "\t add! \t Overwrites existing warp point"
+    print "\t remove  Removes the given warp point"
+    print "\t list \t Outputs all stored warp points"
+    print "\t help \t Show this extremely helpful text"
+}
+
+
+## run
+
+# get opts
+args=`getopt -o a:r:lhs -l add:,remove:,list,help,show -- $*`
+
+if [[ $? -ne 0 || $#* -eq 0 ]]
+then
+    wd_print_usage
+else
+    # can't exit, as this would exit the excecuting shell
+    # e.i. your terminal
+
+    #set -- $args # WTF
+
+    for i
+    do
+		    case "$i"
+		        in
+			      -a|--add|add)
+                wd_add $2 false
+				        shift
+                shift
+                break
+                ;;
+            -a!|--add!|add!)
+                wd_add $2 true
+				        shift
+                shift
+                break
+                ;;
+			      -r|--remove|rm)
+				        wd_remove $2
+                shift
+				        shift
+                break
+                ;;
+			      -l|--list|ls)
+				        wd_list_all
+				        shift
+                break
+                ;;
+			      -h|--help|help)
+				        wd_print_usage
+				        shift
+                break
+                ;;
+			      -s|--show|show)
+				        wd_show
+				        shift
+                break
+                ;;
+            *)
+                wd_warp $i
+                shift
+                break
+                ;;
+			      --)
+				        shift; break;;
+		    esac
+    done
+fi
+
+
+## garbage collection
+# if not, next time warp will pick up variables from this run
+# remember, there's no sub shell
+points=""
+args=""
+unhash -d val &> /dev/null # fixes issue #1

From 81192343568b924c901e260f7b6beda887e43fff Mon Sep 17 00:00:00 2001
From: Eddie Monge <eddie@eddiemonge.com>
Date: Sat, 16 Nov 2013 11:59:15 -0800
Subject: [PATCH 0454/1378] standardize logic blocks

---
 oh-my-zsh.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 15c1dce44..2ae07668c 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,5 @@
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" != "true" ]
-then
+if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
@@ -69,8 +68,7 @@ done
 unset config_file
 
 # Load the theme
-if [ "$ZSH_THEME" = "random" ]
-then
+if [ "$ZSH_THEME" = "random" ]; then
   themes=($ZSH/themes/*zsh-theme)
   N=${#themes[@]}
   ((N=(RANDOM%N)+1))
@@ -78,13 +76,10 @@ then
   source "$RANDOM_THEME"
   echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
 else
-  if [ ! "$ZSH_THEME" = ""  ]
-  then
-    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
-    then
+  if [ ! "$ZSH_THEME" = ""  ]; then
+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
       source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
-    elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]
-    then
+    elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
       source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
     else
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"

From ae1fe0029c63debfe44dcba52761389c6c876b31 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Sun, 17 Nov 2013 00:03:16 +0100
Subject: [PATCH 0455/1378] Add support for sublime 3

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/sublime/sublime.plugin.zsh | 38 ++++++++++++++++--------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 72f56754c..566279183 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -2,30 +2,32 @@
 
 local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
-	"/usr/local/bin/subl"
-	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
-	"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "/usr/local/bin/subl"
+    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 )
 
 if [[ $('uname') == 'Linux' ]]; then
-	if [ -f '/usr/bin/sublime_text' ]; then
-		st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
-	else
-		st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
-	fi
-	alias st=st_run
+    if [ -f '/usr/bin/sublime_text' ]; then
+        st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
+    else
+        st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
+    fi
+    alias st=st_run
 
 elif  [[ $('uname') == 'Darwin' ]]; then
 
-	for _sublime_path in $_sublime_darwin_paths; do
-		if [[ -a $_sublime_path ]]; then
-			alias subl="'$_sublime_path'"
-			alias st=subl
-			break
-		fi
-	done
+    for _sublime_path in $_sublime_darwin_paths; do
+        if [[ -a $_sublime_path ]]; then
+            alias subl="'$_sublime_path'"
+            alias st=subl
+            break
+        fi
+    done
 fi
 
 alias stt='st .'

From 037b39a8172b8a268ca5c857e5badee047b32929 Mon Sep 17 00:00:00 2001
From: Sean Escriva <sean.escriva@gmail.com>
Date: Sat, 16 Nov 2013 15:39:01 -0800
Subject: [PATCH 0456/1378] Add simple plugin for chruby ruby version manager

---
 plugins/chruby/chruby.plugin.zsh | 99 ++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 plugins/chruby/chruby.plugin.zsh

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
new file mode 100644
index 000000000..2a2c80cf6
--- /dev/null
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -0,0 +1,99 @@
+#
+# INSTRUCTIONS
+#
+#  With either a manual or brew installed chruby things should just work.
+#
+#  If you'd prefer to specify an explicit path to load chruby from
+#  you can set variables like so:
+#
+#    zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
+#    zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
+# 
+# TODO
+#  - autodetermine correct source path on non OS X systems
+#  - completion if ruby-install exists
+
+# rvm and rbenv plugins also provide this alias
+alias rubies='chruby'
+
+local _chruby_path
+local _chruby_auto
+
+_homebrew-installed() {
+    whence brew &> /dev/null
+}
+
+_chruby-from-homebrew-installed() {
+    brew --prefix chruby &> /dev/null
+}
+
+_ruby-build_installed() {
+    whence ruby-build &> /dev/null
+}
+
+_ruby-install-installed() {
+    whence ruby-install &> /dev/null
+}
+
+# Simple definition completer for ruby-build
+if _ruby-build_installed; then
+    _ruby-build() { compadd $(ruby-build --definitions) }
+    compdef _ruby-build ruby-build
+fi
+
+_source_from_omz_settings() {
+    zstyle -s :omz:plugins:chruby path _chruby_path
+    zstyle -s :omz:plugins:chruby auto _chruby_auto
+
+    if _chruby_path && [[ -r _chruby_path ]]; then
+        source ${_chruby_path}
+    fi
+
+    if _chruby_auto && [[ -r _chruby_auto ]]; then
+        source ${_chruby_auto}
+    fi
+}
+
+_chruby_dirs() {
+    chrubydirs=($HOME/.rubies/ $PREFIX/opt/rubies)
+    for dir in chrubydirs; do
+        if [[ -d $dir ]]; then
+            RUBIES+=$dir
+        fi
+    done
+}
+
+if _homebrew-installed && _chruby-from-homebrew-installed ; then
+    source $(brew --prefix chruby)/share/chruby/chruby.sh
+    source $(brew --prefix chruby)/share/chruby/auto.sh
+    _chruby_dirs
+elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
+    source /usr/local/share/chruby/chruby.sh
+    source /usr/local/share/chruby/auto.sh
+    _chruby_dirs
+else
+    _source_from_omz_settings
+    _chruby_dirs
+fi
+
+function ensure_chruby() {
+    $(whence chruby)
+}
+
+function current_ruby() {
+    local _ruby
+    _ruby="$(chruby |grep \* |tr -d '* ')"
+    if [[ $(chruby |grep -c \*) -eq 1 ]]; then
+        echo ${_ruby}
+    else
+        echo "system"
+    fi
+}
+
+function chruby_prompt_info() {
+    echo "$(current_ruby)"
+}
+
+# complete on installed rubies
+_chruby() { compadd $(chruby | tr -d '* ') }
+compdef _chruby chruby

From 613d116cda381b9747e22d13ed1381cec26eb8e3 Mon Sep 17 00:00:00 2001
From: Stig Sandbeck Mathisen <ssm@fnord.no>
Date: Tue, 19 Nov 2013 09:12:05 +0100
Subject: [PATCH 0457/1378] Add pyenv plugin

---
 plugins/pyenv/pyenv.plugin.zsh | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 plugins/pyenv/pyenv.plugin.zsh

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
new file mode 100644
index 000000000..b3dc7aa17
--- /dev/null
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -0,0 +1,31 @@
+_homebrew-installed() {
+    type brew &> /dev/null
+}
+
+_pyenv-from-homebrew-installed() {
+    brew --prefix pyenv &> /dev/null
+}
+
+FOUND_PYENV=0
+pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv")
+if _homebrew-installed && _pyenv-from-homebrew-installed ; then
+    pyenvdirs=($(brew --prefix pyenv) "${pyenvdirs[@]}")
+fi
+
+for pyenvdir in "${pyenvdirs[@]}" ; do
+    if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then
+        FOUND_PYENV=1
+        export PYENV_ROOT=$pyenvdir
+        export PATH=${pyenvdir}/bin:$PATH
+        eval "$(pyenv init --no-rehash - zsh)"
+
+        function pyenv_prompt_info() {
+            echo "$(pyenv version-name)"
+        }
+    fi
+done
+unset pyenvdir
+
+if [ $FOUND_PYENV -eq 0 ] ; then
+    function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" }
+fi

From 9b37fcba5e350d049d4bbf145672cecd37356c23 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Tue, 19 Nov 2013 17:05:48 +0100
Subject: [PATCH 0458/1378] unified and improved Rails plugin

---
 plugins/{rails3/_rails3 => rails/_rails} | 17 ++++--
 plugins/rails/rails.plugin.zsh           | 68 ++++++++++++++++++++----
 plugins/rails3/rails3.plugin.zsh         | 32 -----------
 plugins/rails4/rails4.plugin.zsh         | 32 -----------
 4 files changed, 71 insertions(+), 78 deletions(-)
 rename plugins/{rails3/_rails3 => rails/_rails} (80%)
 delete mode 100644 plugins/rails3/rails3.plugin.zsh
 delete mode 100644 plugins/rails4/rails4.plugin.zsh

diff --git a/plugins/rails3/_rails3 b/plugins/rails/_rails
similarity index 80%
rename from plugins/rails3/_rails3
rename to plugins/rails/_rails
index 97915e68b..96f57ce64 100644
--- a/plugins/rails3/_rails3
+++ b/plugins/rails/_rails
@@ -1,10 +1,6 @@
 #compdef rails
 #autoload
 
-# rails 3 zsh completion, based on homebrew completion
-# Extracted from https://github.com/robbyrussell/oh-my-zsh/blob/30620d463850c17f86e7a56fbf6a8b5e793a4e07/plugins/rails3/_rails3
-# Published by Christopher Chow
-
 local -a _1st_arguments
 _1st_arguments=(
     'generate:Generate new code (short-cut alias: "g")'
@@ -14,14 +10,20 @@ _1st_arguments=(
     'new:Create a new Rails application. "rails new my_app" creates a new application called MyApp in "./my_app"'
     'application:Generate the Rails application code'
     'destroy:Undo code generated with "generate"'
+
     'benchmarker:See how fast a piece of code runs'
     'profiler:Get profile information from a piece of code'
     'plugin:Install a plugin'
+
+    'plugin new:Generates skeleton for developing a Rails plugin'
+    'runner:Run a piece of code in the application environment (short-cut alias: "r")'
 )
 
 _rails_generate_arguments() {
     generate_arguments=(
+        assets
         controller
+        decorator
         generator
         helper
         integration_test
@@ -36,9 +38,11 @@ _rails_generate_arguments() {
         scaffold_controller
         session_migration
         stylesheets
+        task
     )
 }
 
+
 _arguments \
     '(--version)--version[show version]' \
     '(--help)--help[show help]' \
@@ -50,7 +54,10 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  generate)
+  g|generate)
+    _rails_generate_arguments
+    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
+  d|destroy)
     _rails_generate_arguments
     _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
 esac
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index dd8b174b2..23d15a9a1 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,20 +1,70 @@
+function _rails_command () {
+  if [ -e "script/server" ]; then
+    ruby script/$@
+  elif [ -e "script/rails" ]; then
+    ruby script/rails $@
+  elif [ -e "bin/rails" ]; then
+    bin/rails $@
+  else
+    rails $@
+  fi
+}
+
+function _rake_command () {
+  if [ -e "bin/rake" ]; then
+    bin/rake $@
+  else
+    rake $@
+  fi
+}
+
+alias rails='_rails_command'
+compdef _rails_command=rails
+
+alias rake='_rake_command'
+compdef _rake_command=rake
+
+alias devlog='tail -f log/development.log'
+alias prodlog='tail -f log/production.log'
+alias testlog='tail -f log/test.log'
+
+alias -g RED='RAILS_ENV=development'
+alias -g REP='RAILS_ENV=production'
+alias -g RET='RAILS_ENV=test'
+
+# Rails aliases
+alias rc='rails console'
+alias rd='rails destroy'
+alias rdb='rails dbconsole'
+alias rg='rails generate'
+alias rgm='rails generate migration'
+alias rp='rails plugin'
+alias ru='rails runner'
+alias rs='rails server'
+alias rsd='rails server --debugger'
+
+# Rake aliases
+alias rdm='rake db:migrate'
+alias rdr='rake db:rollback'
+alias rdc='rake db:create'
+alias rds='rake db:seed'
+alias rdd='rake db:drop'
+alias rdtc='rake db:test:clone'
+alias rdtp='rake db:test:prepare'
+
+alias rlc='rake log:clear'
+alias rn='rake notes'
+alias rr='rake routes'
+
+# legacy stuff
 alias ss='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
 alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
-alias rdbm='rake db:migrate'
-alias rdbtp='rake db:test:prepare'
-alias migrate='rake db:migrate && rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
-alias devlog='tail -f log/development.log'
-alias testlog='tail -f log/test.log'
-alias prodlog='tail -f log/production.log'
-alias -g RET='RAILS_ENV=test'
-alias -g REP='RAILS_ENV=production'
-alias -g RED='RAILS_ENV=development'
 
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
deleted file mode 100644
index b53d18d08..000000000
--- a/plugins/rails3/rails3.plugin.zsh
+++ /dev/null
@@ -1,32 +0,0 @@
-# Rails 3 aliases, backwards-compatible with Rails 2.
-
-function _rails_command () {
-  if [ -e "script/server" ]; then
-    ruby script/$@
-  else
-    if [ -e "bin/rails" ]; then
-      bin/rails $@
-    else
-      rails $@
-    fi
-  fi
-}
-
-alias rc='_rails_command console'
-alias rd='_rails_command destroy'
-alias rdb='_rails_command dbconsole'
-alias rdbm='rake db:migrate db:test:clone'
-alias rg='_rails_command generate'
-alias rgm='_rails_command generate migration'
-alias rp='_rails_command plugin'
-alias ru='_rails_command runner'
-alias rs='_rails_command server'
-alias rsd='_rails_command server --debugger'
-alias devlog='tail -f log/development.log'
-alias testlog='tail -f log/test.log'
-alias prodlog='tail -f log/production.log'
-alias rdm='rake db:migrate'
-alias rdr='rake db:rollback'
-alias -g RET='RAILS_ENV=test'
-alias -g REP='RAILS_ENV=production'
-alias -g RED='RAILS_ENV=development'
diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
deleted file mode 100644
index cb6cf816d..000000000
--- a/plugins/rails4/rails4.plugin.zsh
+++ /dev/null
@@ -1,32 +0,0 @@
-# Rails 4 aliases
-
-function _rails_command () {
-  if [ -e "script/server" ]; then
-    ruby script/$@
-  elif [ -e "script/rails" ]; then
-    ruby script/rails $@
-  else
-    ruby bin/rails $@  
-  fi
-}
-
-alias rc='_rails_command console'
-alias rd='_rails_command destroy'
-alias rdb='_rails_command dbconsole'
-alias rdbm='rake db:migrate db:test:clone'
-alias rg='_rails_command generate'
-alias rgm='_rails_command generate migration'
-alias rp='_rails_command plugin'
-alias ru='_rails_command runner'
-alias rs='_rails_command server'
-alias rsd='_rails_command server --debugger'
-alias devlog='tail -f log/development.log'
-alias testlog='tail -f log/test.log'
-alias prodlog='tail -f log/production.log'
-alias rdm='rake db:migrate'
-alias rdc='rake db:create'
-alias rdr='rake db:rollback'
-alias rds='rake db:seed'
-alias rlc='rake log:clear'
-alias rn='rake notes'
-alias rr='rake routes'

From fbd479b68e2c58068666f738a009ef7a1ca8abde Mon Sep 17 00:00:00 2001
From: Michael Orr <michael.orr@coxinc.com>
Date: Wed, 20 Nov 2013 12:30:55 -0500
Subject: [PATCH 0459/1378] adding a check for git config option to disable
 git_prompt_info() on a per repo basis

---
 lib/git.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index df0fcedbb..305a77aff 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,8 +1,10 @@
 # get the name of the branch we are on
 function git_prompt_info() {
-  ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
 }
 
 

From 4d3fb286d84846b2c64368c38dd8b728da466eac Mon Sep 17 00:00:00 2001
From: aph <a.hewson@gmail.com>
Date: Thu, 21 Nov 2013 16:58:57 +0000
Subject: [PATCH 0460/1378] fix pip plugin

---
 plugins/pip/pip.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 71f977bbf..b5433ae9d 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -18,12 +18,12 @@ zsh-pip-clear-cache() {
 }
 
 zsh-pip-clean-packages() {
-    sed -nr '/<a href/ s/.*>([^<]+).*/\1/p'
+    sed -n '/<a href/ s/.*>\([^<]\{1,\}\).*/\1/p'
 }
 
 zsh-pip-cache-packages() {
-  if [[ ! -d ${PIP_CACHE_FILE:h} ]]; then
-      mkdir -p ${PIP_CACHE_FILE:h}
+  if [[ ! -d ${ZSH_PIP_CACHE_FILE:h} ]]; then
+      mkdir -p ${ZSH_PIP_CACHE_FILE:h}
   fi
 
   if [[ ! -f $ZSH_PIP_CACHE_FILE ]]; then

From 7c56364dc4a432a0ef2972ea1a6043e6154499df Mon Sep 17 00:00:00 2001
From: Valentin Shevko <tuikiken@gmail.com>
Date: Fri, 22 Nov 2013 02:34:33 +0300
Subject: [PATCH 0461/1378] Add update statistics

After the upgrade is interesting to know what's new.
---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e04fc672f..9a8497d96 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,6 +1,6 @@
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd "$ZSH"
-if git pull --rebase origin master
+if git pull --rebase --stat origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
   printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '

From b5b3519ac7c163b62bfc01a42a87a7a745d9df6d Mon Sep 17 00:00:00 2001
From: Thibaud Guillaume-Gentil <thibaud@thibaud.me>
Date: Fri, 22 Nov 2013 09:48:51 +0100
Subject: [PATCH 0462/1378] Update _heroku config arguments (Heroku Client v3)

---
 plugins/heroku/_heroku | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index a95c38647..46663303a 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -23,8 +23,10 @@ _1st_arguments=(
   "auth\:login":"log in with your heroku credentials"
   "auth\:logout":"clear local authentication credentials"
   "config":"display the config vars for an app"
-  "config\:add":"add one or more config vars"
-  "config\:remove":"remove a config var"
+  "config\:pull":"pull heroku config vars down to the local environment"
+  "config\:push":"push local config vars to heroku"
+  "config\:set":"set one or more config vars"
+  "config\:unset":"unset one or more config vars"
   "db\:push":"push local data up to your app"
   "db\:pull":"pull heroku data down into your local database"
   "domains":"list custom domains for an app"

From d12113a9e89fed866db625f7e110fb62333b2746 Mon Sep 17 00:00:00 2001
From: Johann Visagie <johann@visagie.za.net>
Date: Fri, 22 Nov 2013 14:59:04 +0100
Subject: [PATCH 0463/1378] Use precmd hook for updating OS X proxy icon

Using the chpwd hook function causes some junk to be printed to STDOUT after
returning from a subshell wherein the working directory was changed. In rare
cases, this can cause issues with 3rd party tools. An example is this issue
with the Python virtualenvwrapper tool:

https://bitbucket.org/dhellmann/virtualenvwrapper/issue/216/lsvirtualenv-and-workon-output-broken-in
---
 plugins/terminalapp/terminalapp.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
index 2249b1e2f..6e47ee188 100644
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
@@ -32,7 +32,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
     # Register the function so it is called whenever the working
     # directory changes.
     autoload add-zsh-hook
-    add-zsh-hook chpwd update_terminal_cwd
+    add-zsh-hook precmd update_terminal_cwd
 
     # Tell the terminal about the initial directory.
     update_terminal_cwd

From ec779d5f737f0f70a7353bb0e78dc2d38606c8d9 Mon Sep 17 00:00:00 2001
From: christianschmidt <cs@chrische.net>
Date: Sat, 23 Nov 2013 15:32:22 +0100
Subject: [PATCH 0464/1378] Update _pass to follow symlinks for completion

Based on: http://comments.gmane.org/gmane.comp.encryption.pass/235
---
 plugins/pass/_pass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index f6c1a6c4b..d8ec38828 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -101,7 +101,7 @@ _pass_cmd_show () {
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' $(find "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
+	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
 }
 
 _pass_complete_entries_with_subdirs () {

From 240b25daaaee81ccdb9e6e2016667a60f5241f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20F=C3=A6revaag?= <mf@bitblueprint.com>
Date: Tue, 26 Nov 2013 00:45:24 +0100
Subject: [PATCH 0465/1378] wd.plugin: Fixed nested dirs

---
 plugins/{wd2/wd2 => wd}/wd.plugin.zsh |  2 +-
 plugins/{wd2/wd2 => wd}/wd.sh         | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)
 rename plugins/{wd2/wd2 => wd}/wd.plugin.zsh (63%)
 rename plugins/{wd2/wd2 => wd}/wd.sh (88%)

diff --git a/plugins/wd2/wd2/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
similarity index 63%
rename from plugins/wd2/wd2/wd.plugin.zsh
rename to plugins/wd/wd.plugin.zsh
index e0846ffd9..bbec4a715 100755
--- a/plugins/wd2/wd2/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -6,4 +6,4 @@
 #
 # @github.com/mfaerevaag/wd
 
-alias wd='. ~/.oh-my-zsh/plugins/wd/wd.sh'
+alias wd='. $ZSH/plugins/wd/wd.sh'
diff --git a/plugins/wd2/wd2/wd.sh b/plugins/wd/wd.sh
similarity index 88%
rename from plugins/wd2/wd2/wd.sh
rename to plugins/wd/wd.sh
index 7852028c0..744f58bc2 100755
--- a/plugins/wd2/wd2/wd.sh
+++ b/plugins/wd/wd.sh
@@ -19,6 +19,13 @@ RED="\033[91m"
 NOC="\033[m"
 
 
+# check if config file exists
+if [[ ! -a $CONFIG ]]
+then
+  # if not: create config file
+  touch $CONFIG
+fi
+
 ## load warp points
 typeset -A points
 while read line
@@ -120,11 +127,12 @@ wd_print_msg()
 
 wd_print_usage()
 {
-		print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
+    print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
     print "\nCommands:"
     print "\t add \t Adds the current working directory to your warp points"
     print "\t add! \t Overwrites existing warp point"
     print "\t remove  Removes the given warp point"
+    print "\t show \t Outputs warp points to current directory"
     print "\t list \t Outputs all stored warp points"
     print "\t help \t Show this extremely helpful text"
 }
@@ -135,13 +143,20 @@ wd_print_usage()
 # get opts
 args=`getopt -o a:r:lhs -l add:,remove:,list,help,show -- $*`
 
+# check if no arguments were given
 if [[ $? -ne 0 || $#* -eq 0 ]]
 then
     wd_print_usage
-else
-    # can't exit, as this would exit the excecuting shell
-    # e.i. your terminal
 
+# check if config file is writeable
+elif [[ ! -w $CONFIG ]]
+then
+    wd_print_msg $RED "\'$CONFIG\' is not writeable."
+    # do nothing => exit
+    # can't run `exit`, as this would exit the executing shell
+    # i.e. your terminal
+
+else
     #set -- $args # WTF
 
     for i

From b4ffe5cf0a9e0a076fc1c52f6a46eefe05ad5627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20F=C3=A6revaag?= <mf@bitblueprint.com>
Date: Tue, 26 Nov 2013 00:46:13 +0100
Subject: [PATCH 0466/1378] wd.plugin: Added checks, readme and completion

---
 plugins/wd/README.md | 38 +++++++++++++++++++++++++++++++++++
 plugins/wd/_wd.sh    | 48 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 plugins/wd/README.md
 create mode 100644 plugins/wd/_wd.sh

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
new file mode 100644
index 000000000..f9f4e7ac1
--- /dev/null
+++ b/plugins/wd/README.md
@@ -0,0 +1,38 @@
+## wd
+
+**Maintainer:** [mfaerevaag](https://github.com/mfaerevaag)
+
+`wd` (warp directory) lets you jump to custom directories in zsh, without using cd. Why? Because cd seems ineffecient when the folder is frequently visited or has a long path. [Source](https://github.com/mfaerevaag/wd)
+
+### Usage
+
+ * Add warp point to current working directory:
+
+        wd add test
+
+    If a warp point with the same name exists, use `add!` to overwrite it.
+
+ * From an other directory, warp to test with:
+
+        wd test
+
+ * You can warp back to previous directory, and so on, with the puncticulation syntax:
+
+        wd ..
+        wd ...
+
+    This is a wrapper for the zsh `dirs` function.
+
+ * Remove warp point test point:
+
+        wd rm test
+
+ * List warp points to current directory (stored in `~/.warprc`):
+
+        wd show
+
+ * List all warp points (stored in `~/.warprc`):
+
+        wd ls
+
+ * Print usage with no opts or the `help` argument.
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
new file mode 100644
index 000000000..950564435
--- /dev/null
+++ b/plugins/wd/_wd.sh
@@ -0,0 +1,48 @@
+#compdef wd.sh
+
+zstyle ":completion:*:descriptions" format "%B%d%b"
+
+CONFIG=$HOME/.warprc
+
+local -a main_commands
+main_commands=(
+    add:'Adds the current working directory to your warp points'
+    #add'\!':'Overwrites existing warp point' # TODO: Fix
+    rm:'Removes the given warp point'
+    ls:'Outputs all stored warp points'
+    show:'Outputs warp points to current directory'
+)
+
+local -a points
+while read line
+do
+    points+=$(awk "{ gsub(/\/Users\/$USER|\/home\/$USER/,\"~\"); print }" <<< $line)
+done < $CONFIG
+
+_wd()
+{
+    # init variables
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    # init state
+    _arguments \
+        '1: :->command' \
+        '2: :->argument'
+
+    case $state in
+        command)
+            compadd "$@" add rm ls show
+            _describe -t warp-points 'Warp points:' points && ret=0
+            ;;
+        argument)
+            case $words[2] in
+                rm|add!)
+                    _describe -t warp-points 'warp points' points && ret=0
+                    ;;
+                *)
+            esac
+    esac
+}
+
+_wd "$@"

From 3d851daf456f4ba418fb00eccb20ea2f4f7dd4b5 Mon Sep 17 00:00:00 2001
From: Dhruva Sagar <dhruva.sagar@gmail.com>
Date: Fri, 29 Nov 2013 12:28:52 +0530
Subject: [PATCH 0467/1378] Added Amuse zsh theme

---
 themes/amuse.zsh-theme | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 themes/amuse.zsh-theme

diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
new file mode 100644
index 000000000..548f6d39d
--- /dev/null
+++ b/themes/amuse.zsh-theme
@@ -0,0 +1,21 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+rvm_current() {
+  rvm current 2>/dev/null
+}
+
+rbenv_version() {
+  rbenv version 2>/dev/null | awk '{print $1}'
+}
+
+PROMPT='
+%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
+$ '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}⭠ "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'

From 699c82eb89094e3c2ca81dfd96b44d155bca6fba Mon Sep 17 00:00:00 2001
From: ych <ych@cs.nctu.edu.tw>
Date: Fri, 29 Nov 2013 18:34:12 +0800
Subject: [PATCH 0468/1378] Add FreeBSD support for autojump plugin

---
 plugins/autojump/autojump.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index f856f2f01..0aa14959d 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -5,6 +5,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /etc/profile.d/autojump.zsh
   elif [ -f /etc/profile.d/autojump.sh ]; then # gentoo installation
     . /etc/profile.d/autojump.sh
+  elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
+    . /usr/local/share/autojump/autojump.zsh
   elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
     . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports

From c9f2c947e4bdc94676aeaf989ba16dbe35aa45ee Mon Sep 17 00:00:00 2001
From: Stefan Tatschner <stefan@sevenbyte.org>
Date: Fri, 29 Nov 2013 14:24:14 +0100
Subject: [PATCH 0469/1378] Added/modified some useful aliases.

---
 lib/aliases.zsh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 9b3709172..517e4daf7 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -6,6 +6,11 @@ alias po='popd'
 alias ...='cd ../..'
 alias -- -='cd -'
 
+# Prevent headaches
+alias cp='cp -v'
+alias rm='rm -v'
+alias mv='mv -v'
+
 # Super user
 alias _='sudo'
 alias please='sudo'
@@ -17,9 +22,9 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
-alias ll='ls -l'
-alias la='ls -lA'
+alias l='ls -lah'
+alias ll='ls -lh'
+alias la='ls -lAh'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'

From 1493d88e3f92c7034da5c1b1638ba19544aa3ccb Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Sun, 1 Dec 2013 15:31:48 +0100
Subject: [PATCH 0470/1378] Added migration notification for rails plugin

---
 plugins/rails3/rails3.plugin.zsh | 4 ++++
 plugins/rails4/rails4.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 plugins/rails3/rails3.plugin.zsh
 create mode 100644 plugins/rails4/rails4.plugin.zsh

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
new file mode 100644
index 000000000..261b92108
--- /dev/null
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -0,0 +1,4 @@
+echo "It looks like you have been using the 'rails3' plugin,"
+echo "which has been deprecated in favor of a newly consolidated 'rails' plugin."
+echo "You will want to modify your ~/.zshrc configuration to begin using it."
+echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240"
diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
new file mode 100644
index 000000000..5452c242c
--- /dev/null
+++ b/plugins/rails4/rails4.plugin.zsh
@@ -0,0 +1,4 @@
+echo "It looks like you have been using the 'rails4' plugin,"
+echo "which has been deprecated in favor of a newly consolidated 'rails' plugin."
+echo "You will want to modify your ~/.zshrc configuration to begin using it."
+echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240"

From 96bd365542dd9df0afe37e944996936bdaa17969 Mon Sep 17 00:00:00 2001
From: Jens Tinfors <jens.tinfors@gmail.com>
Date: Sun, 1 Dec 2013 15:33:23 +0100
Subject: [PATCH 0471/1378] Adds the hgsl alias for one-line shortlog
 convenience

---
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index c18aa726c..d2db89d04 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -13,6 +13,7 @@ alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'
+alias hgsl='log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 

From 84e178fa3d5e6e5bc36cb353c5c051d4f12ec35d Mon Sep 17 00:00:00 2001
From: Kevin Messer <messer.kevin@gmail.com>
Date: Sun, 1 Dec 2013 23:29:55 +0100
Subject: [PATCH 0472/1378] Fixed lines 32, 33, 34 where one 'p' was missing in
 'zypper' command.

---
 plugins/suse/suse.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index 3fdb8a032..afd8ecabd 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -29,9 +29,9 @@ alias zpatch='sudo zypper patch' #install patches
 #Request commands
 alias zif='sudo zypper if' #display info about packages
 alias zpa='sudo zypper pa' #list packages
-alias zpatch-info='sudo zyper patch-info' #display info about patches
-alias zpattern-info='sudo zyper patch-info' #display info about patterns
-alias zproduct-info='sudo zyper patch-info' #display info about products
+alias zpatch-info='sudo zypper patch-info' #display info about patches
+alias zpattern-info='sudo zypper patch-info' #display info about patterns
+alias zproduct-info='sudo zypper patch-info' #display info about products
 alias zpch='sudo zypper pch' #list all patches
 alias zpd='sudo zypper pd' #list products
 alias zpt='sudo zypper pt' #list patterns

From 22c0db64eed9b771a4d83abfd6f4cb8980d82229 Mon Sep 17 00:00:00 2001
From: Brandon Siegel <brandon@smartercode.net>
Date: Wed, 30 Oct 2013 11:01:49 -0400
Subject: [PATCH 0473/1378] Change `bi` alias to a function

Only check the bundler version when we call bi. This fixes two issues:
First, if there is no bundler available system-wide this will cause an
error each time zsh loads. Second, if new bundler is installed
system-wide but you change into an rbenv with an older version, the
alias will no longer work.
---
 plugins/bundler/bundler.plugin.zsh | 52 ++++++++++++++++--------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e390f8620..4c3580cac 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -4,13 +4,31 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 
-
 # The following is based on https://github.com/gma/bundler-exec
 
 bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 ## Functions
 
+bi() {
+  if _bundler-installed && _within-bundled-project; then
+    local bundler_version=`bundle version | cut -d' ' -f3`
+    if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
+      if [[ "$(uname)" == 'Darwin' ]]
+      then
+        local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
+      else
+        local cores_num="$(nproc)"
+      fi
+      bundle install --jobs=$cores_num $@
+    else
+      bundle install $@
+    fi
+  else
+    echo "Can't 'bundle install' outside a bundled project"
+  fi
+}
+
 _bundler-installed() {
   which bundle > /dev/null 2>&1
 }
@@ -32,28 +50,14 @@ _run-with-bundler() {
   fi
 }
 
-if _bundler-installed; then
-	bundler_version=`bundle version | cut -d' ' -f3`
-	if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-		if [[ "$(uname)" == 'Darwin' ]]
-		then
-			local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
-		else
-			local cores_num="$(nproc)"
-		fi
-		eval "alias bi='bundle install --jobs=$cores_num'"
-	else
-		alias bi='bundle install' 
-	fi
+## Main program
+for cmd in $bundled_commands; do
+  eval "function unbundled_$cmd () { $cmd \$@ }"
+  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
+  alias $cmd=bundled_$cmd
 
-	## Main program
-	for cmd in $bundled_commands; do
-		eval "function unbundled_$cmd () { $cmd \$@ }"
-		eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
-		alias $cmd=bundled_$cmd
+  if which _$cmd > /dev/null 2>&1; then
+        compdef _$cmd bundled_$cmd=$cmd
+  fi
+done
 
-		if which _$cmd > /dev/null 2>&1; then
-			compdef _$cmd bundled_$cmd=$cmd
-		fi
-	done
-fi

From 858c515df2d8ce1f75ac3d505f77a71984653929 Mon Sep 17 00:00:00 2001
From: Patrick Stadler <patrick.stadler@gmail.com>
Date: Tue, 3 Dec 2013 09:52:51 +0100
Subject: [PATCH 0474/1378] source ~/.profile only if it exists

---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 14d294328..0f8c9c391 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -20,7 +20,7 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
-[ ~/.profile ] && source ~/.profile
+[ -f ~/.profile ] && source ~/.profile
 
 if [ -f ~/.zsh-update ]
 then

From 2ffca0680623d2a3875ac6a8bb9458a06aa57938 Mon Sep 17 00:00:00 2001
From: Peter van der Does <github@avirtualhome.com>
Date: Tue, 3 Dec 2013 08:56:18 -0500
Subject: [PATCH 0475/1378] Update git-flow-avh 1.7.0

---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
index d76f55ef6..ba98fff01 100644
--- a/plugins/git-flow-avh/git-flow-avh.plugin.zsh
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -41,6 +41,9 @@ _git-flow ()
 				'hotfix:Manage your hotfix branches.'
 				'support:Manage your support branches.'
 				'version:Shows version information.'
+				'finish:Finish the branch you are currently on.'
+				'delete:Delete the branch you are currently on.'
+				'publish:Publish the branch you are currently on.'
 			)
 			_describe -t commands 'git flow' subcommands
 		;;
@@ -95,7 +98,7 @@ __git-flow-release ()
 				'list:List all your release branches. (Alias to `git flow release`)'
 				'publish:Publish release branch to remote.'
 				'track:Checkout remote release branch.'
-				'delet:Delete a release branch.'
+				'delete:Delete a release branch.'
 			)
 			_describe -t commands 'git flow release' subcommands
 			_arguments \

From f082d7a245da8767a11dcc20a7e68ababefa5f34 Mon Sep 17 00:00:00 2001
From: Bob Bonifield <bobbonifield@gmail.com>
Date: Wed, 4 Dec 2013 20:59:57 -0700
Subject: [PATCH 0476/1378] Making auto-correction off by default

- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
---
 lib/correction.zsh | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 436446101..47eb83b1d 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,14 +1,13 @@
-if [[ "$DISABLE_CORRECTION" == "true" ]]; then
-  return
-else
+alias man='nocorrect man'
+alias mv='nocorrect mv'
+alias mysql='nocorrect mysql'
+alias mkdir='nocorrect mkdir'
+alias gist='nocorrect gist'
+alias heroku='nocorrect heroku'
+alias ebuild='nocorrect ebuild'
+alias hpodder='nocorrect hpodder'
+alias sudo='nocorrect sudo'
+
+if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   setopt correct_all
-  alias man='nocorrect man'
-  alias mv='nocorrect mv'
-  alias mysql='nocorrect mysql'
-  alias mkdir='nocorrect mkdir'
-  alias gist='nocorrect gist'
-  alias heroku='nocorrect heroku'
-  alias ebuild='nocorrect ebuild'
-  alias hpodder='nocorrect hpodder'
-  alias sudo='nocorrect sudo'
 fi

From 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 Mon Sep 17 00:00:00 2001
From: Michael Orr <michael.orr@coxinc.com>
Date: Fri, 6 Dec 2013 17:31:35 -0500
Subject: [PATCH 0477/1378] accidentally blew away a git config setting used
 for another purpose, renaming in order to distinguish

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 305a77aff..a1396653b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -13,7 +13,7 @@ parse_git_dirty() {
   local SUBMODULE_SYNTAX=''
   local GIT_STATUS=''
   local CLEAN_MESSAGE='nothing to commit (working directory clean)'
-  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi

From be6b1b3b8fda01bebc499e02b6945eaddaf45b84 Mon Sep 17 00:00:00 2001
From: Foivos <foivos@zakkak.net>
Date: Sun, 8 Dec 2013 07:11:33 +0200
Subject: [PATCH 0478/1378] Improve comments

---
 templates/zshrc.zsh-template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index b2cad20e8..869bd52c3 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -11,13 +11,13 @@ ZSH_THEME="robbyrussell"
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# Set to this to use case-sensitive completion
+# Set this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
 # Uncomment this to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how often before auto-updates occur? (in days)
+# Uncomment to change how often to auto-update? (in days)
 # export UPDATE_ZSH_DAYS=13
 
 # Uncomment following line if you want to disable colors in ls
@@ -37,9 +37,9 @@ ZSH_THEME="robbyrussell"
 # much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Uncomment following line if you want to  shown in the command execution time stamp 
-# in the history command output. The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|
-# yyyy-mm-dd
+# Uncomment following line if you want to the command execution time stamp shown 
+# in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)

From e97811913b9349349e35853a8c2fe3e93cabacd9 Mon Sep 17 00:00:00 2001
From: Foivos <foivos@zakkak.net>
Date: Sun, 8 Dec 2013 07:16:40 +0200
Subject: [PATCH 0479/1378] Improve comments

---
 templates/zshrc.zsh-template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 869bd52c3..c2254d055 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -66,4 +66,3 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # ssh
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
-

From 0185d9920b7d6c380277a4a15c9e4818df41700a Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 9 Dec 2013 08:54:38 +0100
Subject: [PATCH 0480/1378] catimg plugin allow to print an image to the stdout
 using convert

---
 plugins/catimg/catimg.plugin.zsh |  16 ++++++
 plugins/catimg/catimg.sh         |  87 +++++++++++++++++++++++++++++++
 plugins/catimg/colors.png        | Bin 0 -> 353 bytes
 3 files changed, 103 insertions(+)
 create mode 100644 plugins/catimg/catimg.plugin.zsh
 create mode 100755 plugins/catimg/catimg.sh
 create mode 100644 plugins/catimg/colors.png

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
new file mode 100644
index 000000000..01e81eca7
--- /dev/null
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -0,0 +1,16 @@
+################################################################################
+# catimg script by Eduardo San Martin Morote aka Posva                         #
+# http://posva.net                                                             #
+#                                                                              #
+# Ouput the content of an image to the stdout using the 256 colors of the      #
+# terminal.                                                                    #
+# Github: https://github.com/posva/catimg                                      #
+################################################################################
+
+if [[ -x  `which convert` ]]; then
+  function catimg() {
+    source $(dirname $0)/catimg.sh $@
+  }
+else
+  echo "catimg need convert (ImageMagick) to work)"
+fi
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
new file mode 100755
index 000000000..f9e067e34
--- /dev/null
+++ b/plugins/catimg/catimg.sh
@@ -0,0 +1,87 @@
+################################################################################
+# catimg script by Eduardo San Martin Morote aka Posva                         #
+# http://posva.net                                                             #
+#                                                                              #
+# Ouput the content of an image to the stdout using the 256 colors of the      #
+# terminal.                                                                    #
+# Github: https://github.com/posva/catimg                                      #
+################################################################################
+
+function help() {
+  echo "Usage catimg [-h] [-w width] [-c char] img"
+  echo "By default char is \"  \" and w is the terminal width"
+}
+
+# VARIABLES
+COLOR_FILE=$(dirname $0)/colors.png
+CHAR="  "
+
+WIDTH=""
+IMG=""
+
+while getopts qw:c:h opt; do
+  case "$opt" in
+    w) WIDTH="$OPTARG" ;;
+    c) CHAR="$OPTARG" ;;
+    h) help; exit ;;
+    *) help ; exit 1;;
+    esac
+  done
+
+while [ "$1" ]; do
+  IMG="$1"
+  shift
+done
+
+if [ "$IMG" = "" -o ! -f "$IMG" ]; then
+  help
+  exit 1
+fi
+
+if [ ! "$WIDTH" ]; then
+  COLS=$(expr $(tput cols) "/" $(echo -n "$CHAR" | wc -c))
+else
+  COLS=$(expr $WIDTH "/" $(echo -n "$CHAR" | wc -c))
+fi
+WIDTH=$(convert ${IMG} -print "%w\n" /dev/null)
+if [ "$WIDTH" -gt "$COLS" ]; then
+  WIDTH=$COLS
+fi
+
+REMAP=""
+if convert "$IMG" -resize $COLS\> +dither -remap $COLOR_FILE /dev/null ; then
+  REMAP="-remap $COLOR_FILE"
+else
+  echo "The version of convert is too old, don't expect good results :(" >&2
+  #convert "$IMG" -colors 256 PNG8:tmp.png
+  #IMG="tmp.png"
+fi
+
+# Display the image
+convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- |
+sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
+while read R G B f; do
+  if [ ! "$R" = "NO" ]; then
+    if [ "$R" -eq "$G" -a "$G" -eq "$B" ]; then
+      ((
+      I++,
+      IDX = 232 + R * 23 / 255
+      ))
+    else
+      ((
+      I++,
+      IDX = 16
+      + R * 5 / 255 * 36
+      + G * 5 / 255 * 6
+      + B * 5 / 255
+      ))
+    fi
+    #echo "$R,$G,$B: $IDX"
+    echo -ne "\e[48;5;${IDX}m${CHAR}"
+  else
+    (( I++ ))
+    echo -ne "\e[0m${CHAR}"
+  fi
+  # New lines
+  (( $I % $WIDTH )) || echo -e "\e[0m"
+done
diff --git a/plugins/catimg/colors.png b/plugins/catimg/colors.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f2c8126bc0d8911a9de5d3ffbd4e37372b41671
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7H9TD$Ln`8u|NQ@N&#bKc
z_<sc(8=I>_8haA2${CI+9qz)+Cykjz%^8kLO5T$EmmJCv;@V^J`0Hz){|D6`T{v*^
z<iP_+kG2XMyScdhiQm{XmvMFOjye4)lHNP)teyATF*BQm$D}LhoZGaJX%R;XgO78O
zk@4YbLBX~IdU|XD4vicE4B=)Ac8M&R_tD<@cfFg^oGu~b6LB{-%xi3vSgzDA=u=y6
zZp?i8^71`A?;97^2zE%CIIe796h2~{z?$kXeZ!o8I%gMrloaB-e%q7Z=h*-2*Z-#<
znaF0ApT>6Fo|~JSSz20pMs7lb)P$bvlIxs>gl00HWa4spqTy1`yO1G`^IBS)da#?K
z<D_7f<eK0A|4Y5FoN%It#c%Kb_5Y7cb{xn#cfx^zf#JxJghSG&FP>sxU|{fc^>bP0
Hl+XkKlf#Hs

literal 0
HcmV?d00001


From cbd63f220dff93ad6c9d00734949106443a5b03b Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@variableaction.com>
Date: Mon, 9 Dec 2013 19:38:27 +0000
Subject: [PATCH 0481/1378] Fix for virtualenv support - fixes #2328, fixes
 #2297, resolves #2319

---
 themes/af-magic.zsh-theme | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..cd90b106e 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,12 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+if type "virtualenv_prompt" > /dev/null
+then
+	RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+else
+	RPROMPT='$my_gray%n@%m%{$reset_color%}%'
+fi
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 349fa15b187a1b2c411db90f2022013caf3479e8 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 9 Dec 2013 22:07:19 +0100
Subject: [PATCH 0482/1378] Fixed a dirs bug for catimg

---
 plugins/catimg/catimg.plugin.zsh | 2 +-
 plugins/catimg/catimg.sh         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index 01e81eca7..ee721cd03 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -9,7 +9,7 @@
 
 if [[ -x  `which convert` ]]; then
   function catimg() {
-    source $(dirname $0)/catimg.sh $@
+    source $ZSH/plugins/catimg/catimg.sh $@
   }
 else
   echo "catimg need convert (ImageMagick) to work)"
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index f9e067e34..c05fddcd4 100755
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -43,7 +43,7 @@ if [ ! "$WIDTH" ]; then
 else
   COLS=$(expr $WIDTH "/" $(echo -n "$CHAR" | wc -c))
 fi
-WIDTH=$(convert ${IMG} -print "%w\n" /dev/null)
+WIDTH=$(convert "$IMG" -print "%w\n" /dev/null)
 if [ "$WIDTH" -gt "$COLS" ]; then
   WIDTH=$COLS
 fi
@@ -58,6 +58,7 @@ else
 fi
 
 # Display the image
+I=0
 convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- |
 sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
 while read R G B f; do

From 44b23ae194a1580a6af6d692e4ba268d61828929 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Mon, 9 Dec 2013 22:18:20 +0100
Subject: [PATCH 0483/1378] catimg: fix exit without using source supresses
 errors from convert whilen converting, as they are usually just warnings

---
 plugins/catimg/catimg.plugin.zsh | 2 +-
 plugins/catimg/catimg.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index ee721cd03..70ef9a63c 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -9,7 +9,7 @@
 
 if [[ -x  `which convert` ]]; then
   function catimg() {
-    source $ZSH/plugins/catimg/catimg.sh $@
+    zsh $ZSH/plugins/catimg/catimg.sh $@
   }
 else
   echo "catimg need convert (ImageMagick) to work)"
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index c05fddcd4..cd0f2e333 100755
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -59,7 +59,7 @@ fi
 
 # Display the image
 I=0
-convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- |
+convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
 sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
 while read R G B f; do
   if [ ! "$R" = "NO" ]; then

From c05a28a7d9c5ca86b66b0fdf2f509e07b2a7b616 Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@variableaction.com>
Date: Tue, 10 Dec 2013 00:11:22 +0000
Subject: [PATCH 0484/1378] typo fix

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index cd90b106e..f40aa284a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-if type "virtualenv_prompt" > /dev/null
+if type "virtualenv_prompt_info" > /dev/null
 then
 	RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 else

From fdfc90705242841d7491bb945c35a3601d1c8996 Mon Sep 17 00:00:00 2001
From: Mikhail Nikalyukin <idups1k@gmail.com>
Date: Fri, 6 Dec 2013 12:20:38 +0200
Subject: [PATCH 0485/1378] Add rdmtc alias for rails plugin.

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 23d15a9a1..4a96754e4 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -51,6 +51,7 @@ alias rds='rake db:seed'
 alias rdd='rake db:drop'
 alias rdtc='rake db:test:clone'
 alias rdtp='rake db:test:prepare'
+alias rdmtc='rake db:migrate db:test:clone'
 
 alias rlc='rake log:clear'
 alias rn='rake notes'

From dbdd23d0fa1309444d01d7540a0f3065d514e741 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Donoso <jidonoso@gmail.com>
Date: Fri, 13 Dec 2013 19:05:35 -0300
Subject: [PATCH 0486/1378] Prevents oh-my-zsh loading the .zshenv twice

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 2ae07668c..3c0f4f8f5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,6 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh

From 152e1e07e0397ecc3f1778ea597d081c33ee8ff4 Mon Sep 17 00:00:00 2001
From: "n.st" <git@n-st.de>
Date: Wed, 18 Dec 2013 18:27:20 +0100
Subject: [PATCH 0487/1378] Cancel update if the current user doesn't have
 write permissions for the oh-my-zsh directory.

---
 tools/check_for_upgrade.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 0f8c9c391..d877e2a89 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -26,6 +26,13 @@ if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
 
+  # cancel update if the current user doesn't have write permissions for the
+  # oh-my-zsh directory
+  if [ -n $(find -not -writable "$ZSH") ]
+  then
+    return 0;
+  fi
+
   if [[ -z "$LAST_EPOCH" ]]; then
     _update_zsh_update && return 0;
   fi

From a38af27991d15d14ac4ca55c919bb694d7eafb7a Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 18 Dec 2013 17:03:33 -0800
Subject: [PATCH 0488/1378] Revert "Cancel update if the current user doesn't
 have write permissions for the oh-my-zsh directory."

This reverts commit 152e1e07e0397ecc3f1778ea597d081c33ee8ff4.
---
 tools/check_for_upgrade.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index d877e2a89..0f8c9c391 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -26,13 +26,6 @@ if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
 
-  # cancel update if the current user doesn't have write permissions for the
-  # oh-my-zsh directory
-  if [ -n $(find -not -writable "$ZSH") ]
-  then
-    return 0;
-  fi
-
   if [[ -z "$LAST_EPOCH" ]]; then
     _update_zsh_update && return 0;
   fi

From e41b6acd2a34bd2ad2a092b94629c95b1f932f82 Mon Sep 17 00:00:00 2001
From: chuancong <chuancong@users.noreply.github.com>
Date: Thu, 19 Dec 2013 11:24:38 -0800
Subject: [PATCH 0489/1378] Add support to command "show"

---
 plugins/pip/_pip | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 967da48ca..7c1238db7 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -20,6 +20,7 @@ _1st_arguments=(
   'bundle:create pybundles (archives containing multiple packages)'
   'freeze:output all currently installed packages (exact versions) to stdout'
   'help:show available commands'
+  'show:show information about installed packages'
   'install:install packages'
   'search:search PyPI'
   'uninstall:uninstall packages'
@@ -76,4 +77,7 @@ case "$words[1]" in
   uninstall)
     _pip_installed
     _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
+  show)
+    _pip_installed
+    _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
 esac

From 00b2cc653421c1465f7596f22c19d21f42aa0396 Mon Sep 17 00:00:00 2001
From: Andrew Dwyer <andrewrdwyer@gmail.com>
Date: Sat, 21 Dec 2013 11:17:05 +1030
Subject: [PATCH 0490/1378] New plugin for the n98-magerun Magento command line
 tool

---
 plugins/n98-magerun/n98-magerun.plugin.zsh | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 plugins/n98-magerun/n98-magerun.plugin.zsh

diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
new file mode 100755
index 000000000..e4b0d6885
--- /dev/null
+++ b/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------------------
+# FILE: n98-magerun.plugin.zsh
+# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin 
+# AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com)
+# VERSION: 1.0.0
+# ------------------------------------------------------------------------------
+
+# n98-magerun basic command completion
+_n98_magerun_get_command_list () {
+  n98-magerun.phar --no-ansi | sed "1,/Available commands/d" | awk '/^\s+[a-z]+/ { print $1 }'
+}
+
+_n98_magerun () {
+  compadd `_n98_magerun_get_command_list`
+}
+
+compdef _n98_magerun n98-magerun.phar
+
+# Aliases
+alias n98-magerun='n98-magerun.phar'
+alias mage='n98-magerun.phar'
+alias magefl='n98-magerun.phar cache:flush'
+
+# Install n98-magerun into the current directory
+alias mage-get='wget https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar'

From b58b996b40f8de1f030d59336e3594b63ef598ee Mon Sep 17 00:00:00 2001
From: lumbric <lumbric@gmail.com>
Date: Sat, 21 Dec 2013 19:49:44 +0100
Subject: [PATCH 0491/1378] fix name schema for sudo plugin

Plugin won't load automatically if added to variable $plugins, if name schema different than $name/$name.plugin.zsh is used (see is_plugin() in oh-my-zsh.sh).
---
 plugins/sudo/{sudo.zsh => sudo.plugin.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/sudo/{sudo.zsh => sudo.plugin.zsh} (100%)

diff --git a/plugins/sudo/sudo.zsh b/plugins/sudo/sudo.plugin.zsh
similarity index 100%
rename from plugins/sudo/sudo.zsh
rename to plugins/sudo/sudo.plugin.zsh

From f6bb74e452590c18b8545cb444a998448c7ae4f0 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Fri, 27 Dec 2013 14:25:06 +0100
Subject: [PATCH 0492/1378] add chruby info to gallois theme

---
 themes/gallois.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index d624e3afc..1ff86b54c 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -18,7 +18,11 @@ else
   if which rbenv &> /dev/null; then
     RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
   else
-    RPS1='$(git_custom_status) $EPS1'
+    if which chruby_prompt_info &> /dev/null; then
+      RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
+    else
+      RPS1='$(git_custom_status) $EPS1'
+    fi
   fi
 fi
 

From bbbff94cca497103d0f9854f9d8a67b9049f59c9 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 00:35:57 +0100
Subject: [PATCH 0493/1378] Fixes rvm_prompt_info() in lib/rvm.zsh

---
 lib/rvm.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index e8744e61e..d14b45632 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -2,7 +2,7 @@
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return
   local rvm_prompt
-  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
+  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
   [[ "${rvm_prompt}x" == "x" ]] && return
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }

From 468b24a8d54f294ab9802cac3801ba580c5c4397 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 01:06:14 +0100
Subject: [PATCH 0494/1378] Returns false when rvm is not found.

---
 lib/rvm.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index d14b45632..04d116397 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,8 +1,8 @@
 # get the name of the ruby version
 function rvm_prompt_info() {
-  [ -f $HOME/.rvm/bin/rvm-prompt ] || return
+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
   local rvm_prompt
   rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
-  [[ "${rvm_prompt}x" == "x" ]] && return
+  [[ "${rvm_prompt}x" == "x" ]] && return 1
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }

From ae6ded5ad795a7f4174bc10a5a02e1c0502e1352 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 01:15:35 +0100
Subject: [PATCH 0495/1378] Returns false when rbenv is not found.

---
 lib/rbenv.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
index a8b6c323c..f58074b83 100644
--- a/lib/rbenv.zsh
+++ b/lib/rbenv.zsh
@@ -1,2 +1,4 @@
 # using the rbenv plugin will override this with a real implementation
-function rbenv_prompt_info() {}
+function rbenv_prompt_info() {
+  return 1
+}

From 7aa766168cead04f677b4828cc5c837f823f7cd7 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 01:44:51 +0100
Subject: [PATCH 0496/1378] Adds chruby_prompt_info dummy function.

---
 lib/chruby.zsh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 lib/chruby.zsh

diff --git a/lib/chruby.zsh b/lib/chruby.zsh
new file mode 100644
index 000000000..b78d04f86
--- /dev/null
+++ b/lib/chruby.zsh
@@ -0,0 +1,4 @@
+# using the chruby plugin will override this with a real implementation
+function chruby_prompt_info() {
+  return 1
+}

From 8a887c505282b771193ac3ee6df05a1fa3f8426a Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 02:11:02 +0100
Subject: [PATCH 0497/1378] Joins ruby prompt files and adds ruby_prompt_info.

---
 lib/chruby.zsh       |  4 ----
 lib/rbenv.zsh        |  4 ----
 lib/ruby_prompts.zsh | 22 ++++++++++++++++++++++
 lib/rvm.zsh          |  8 --------
 4 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 lib/chruby.zsh
 delete mode 100644 lib/rbenv.zsh
 create mode 100644 lib/ruby_prompts.zsh
 delete mode 100644 lib/rvm.zsh

diff --git a/lib/chruby.zsh b/lib/chruby.zsh
deleted file mode 100644
index b78d04f86..000000000
--- a/lib/chruby.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# using the chruby plugin will override this with a real implementation
-function chruby_prompt_info() {
-  return 1
-}
diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
deleted file mode 100644
index f58074b83..000000000
--- a/lib/rbenv.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# using the rbenv plugin will override this with a real implementation
-function rbenv_prompt_info() {
-  return 1
-}
diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
new file mode 100644
index 000000000..287b3ff0a
--- /dev/null
+++ b/lib/ruby_prompts.zsh
@@ -0,0 +1,22 @@
+# get the name of the rvm ruby version
+function rvm_prompt_info() {
+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
+  local rvm_prompt
+  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
+  [[ "${rvm_prompt}x" == "x" ]] && return 1
+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
+}
+
+# using the rbenv plugin will override this with a real implementation
+function rbenv_prompt_info() {
+  return 1
+}
+
+# using the chruby plugin will override this with a real implementation
+function chruby_prompt_info() {
+  return 1
+}
+
+function ruby_prompt_info() {
+  echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
+}
diff --git a/lib/rvm.zsh b/lib/rvm.zsh
deleted file mode 100644
index 04d116397..000000000
--- a/lib/rvm.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# get the name of the ruby version
-function rvm_prompt_info() {
-  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
-  local rvm_prompt
-  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
-  [[ "${rvm_prompt}x" == "x" ]] && return 1
-  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
-}

From c6aacf611d51f7c00d216f77c3b32174cc3bed9c Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 02:45:09 +0100
Subject: [PATCH 0498/1378] Refactors ruby_prompts.zsh

---
 lib/ruby_prompts.zsh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
index 287b3ff0a..2ef334d5f 100644
--- a/lib/ruby_prompts.zsh
+++ b/lib/ruby_prompts.zsh
@@ -7,13 +7,9 @@ function rvm_prompt_info() {
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
 
-# using the rbenv plugin will override this with a real implementation
-function rbenv_prompt_info() {
-  return 1
-}
-
-# using the chruby plugin will override this with a real implementation
-function chruby_prompt_info() {
+# using the chruby and/or rbenv plugins will override
+# these with real implementations
+function chruby_prompt_info rbenv_prompt_info {
   return 1
 }
 

From 3e5e2d45e95f0ee523ce2572a5e88f6e761e7067 Mon Sep 17 00:00:00 2001
From: Daniele <raiervol@gmail.com>
Date: Tue, 31 Dec 2013 12:41:28 +0100
Subject: [PATCH 0499/1378] Fix bad right prompt placing.

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..f241efb6a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 6a40557a8bc5411881682e3993333da8fbe64e68 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 14:54:34 +0100
Subject: [PATCH 0500/1378] Updates spectrum.zsh

---
 lib/spectrum.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 166c942fb..b683aca29 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -19,17 +19,19 @@ for color in {000..255}; do
     BG[$color]="%{[48;5;${color}m%}"
 done
 
+
+ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
+
 # Show all 256 colors with color number
 function spectrum_ls() {
   for code in {000..255}; do
-    print -P -- "$code: %F{$code}Test%f"
+    print -P -- "$code: %F{$code}$ZSH_SPECTRUM_TEXT%f"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
   for code in {000..255}; do
-    ((cc = code + 1))
-    print -P -- "$BG[$code]$code: Test %{$reset_color%}"
+    print -P -- "$BG[$code]$code: $ZSH_SPECTRUM_TEXT %{$reset_color%}"
   done
 }

From 827d9dfcb406c5d25470010933fc6fde85a7ded7 Mon Sep 17 00:00:00 2001
From: Sam O <soluwalana@gmail.com>
Date: Thu, 2 Jan 2014 15:48:09 -0800
Subject: [PATCH 0501/1378] Update git.plugin.zsh

---
 plugins/git/git.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fde22a37d..42b4698f9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -142,13 +142,13 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c wip); then
+  if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then
     echo "WIP!!"
   fi
 }
 # these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
-alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
+alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
+alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1'
 
 # these alias ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From d60522c7a290565c9de7594817a9d201732d5dd9 Mon Sep 17 00:00:00 2001
From: Sam O <soluwalana@gmail.com>
Date: Thu, 2 Jan 2014 15:53:34 -0800
Subject: [PATCH 0502/1378] escape dashes

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 42b4698f9..1285a3247 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -142,13 +142,13 @@ compdef _git glp=git-log
 #
 # This function return a warning if the current branch is a wip
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "--wip--"); then
+  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
     echo "WIP!!"
   fi
 }
 # these alias commit and uncomit wip branches
 alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
-alias gunwip='git log -n 1 | grep -q -c "--wip--" && git reset HEAD~1'
+alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
 # these alias ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From 288604ef1a19c5808eff439acf32330fda126f93 Mon Sep 17 00:00:00 2001
From: Patrick Stadler <patrick.stadler@gmail.com>
Date: Fri, 3 Jan 2014 14:32:49 +0100
Subject: [PATCH 0503/1378] add brew-cask plugin

---
 plugins/brew-cask/brew-cask.plugin.zsh | 80 ++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 plugins/brew-cask/brew-cask.plugin.zsh

diff --git a/plugins/brew-cask/brew-cask.plugin.zsh b/plugins/brew-cask/brew-cask.plugin.zsh
new file mode 100644
index 000000000..ef4f5208d
--- /dev/null
+++ b/plugins/brew-cask/brew-cask.plugin.zsh
@@ -0,0 +1,80 @@
+# Autocompletion for homebrew-cask.
+#
+# This script intercepts calls to the brew plugin and adds autocompletion
+# for the cask subcommand.
+#
+# Author: https://github.com/pstadler
+
+compdef _brew-cask brew
+
+_brew-cask()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		':subcmd:->subcmd' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+			__call_original_brew
+			cask_commands=(
+				'cask:manage casks'
+			)
+			_describe -t commands 'brew cask command' cask_commands ;;
+
+		(subcmd)
+			case "$line[1]" in
+				cask)
+					if (( CURRENT == 3 )); then
+						local -a subcommands
+						subcommands=(
+							"alfred:used to modify Alfred's scope to include the Caskroom"
+							'audit:verifies installability of casks'
+							'checklinks:checks for bad cask links'
+							'create:creates a cask of the given name and opens it in an editor'
+							'edit:edits the cask of the given name'
+							'home:opens the homepage of the cask of the given name'
+							'info:displays information about the cask of the given name'
+							'install:installs the cask of the given name'
+							'list:with no args, lists installed casks; given installed casks, lists installed files'
+							'search:searches all known casks'
+							'uninstall:uninstalls the cask of the given name'
+						)
+						_describe -t commands "brew cask subcommand" subcommands
+					fi ;;
+
+				*)
+					__call_original_brew ;;
+			esac ;;
+
+		(options)
+			local -a casks installed_casks
+			local expl
+			case "$line[2]" in
+				list|uninstall)
+					__brew_installed_casks
+					_wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
+				audit|edit|home|info|install)
+					__brew_all_casks
+					_wanted casks expl 'all casks' compadd -a casks ;;
+			esac ;;
+	esac
+}
+
+__brew_all_casks() {
+	casks=(`brew cask search`)
+}
+
+__brew_installed_casks() {
+	installed_casks=(`brew cask list`)
+}
+
+__call_original_brew()
+{
+	local ret=1
+	_call_function ret _brew
+	compdef _brew-cask brew
+}

From 4354f911710572f9ec0a8e4435571ea3c19cb0f8 Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Fri, 3 Jan 2014 11:52:33 -0200
Subject: [PATCH 0504/1378] Fixes tmuxinator plugin find on OSX

---
 plugins/tmuxinator/_tmuxinator | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index 117685279..cd227b7df 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -25,7 +25,7 @@ case $state in
   args)
     case $line[1] in
       start|open|copy|delete)
-        _configs=(`find ~/.tmuxinator/ -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
+        _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         _values 'configs' $_configs
         ret=0
         ;;

From 9ce1b6289aebc8e19b8bb25e4f7ac1cbc84e83de Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Sat, 4 Jan 2014 22:06:09 +0100
Subject: [PATCH 0505/1378] new faster SVN plugin

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 plugins/svn-fast-info/svn-fast-info.plugin.zsh

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
new file mode 100644
index 000000000..d8fc53989
--- /dev/null
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -0,0 +1,64 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+# Faster alternative to the current SVN plugin implementation.
+#
+# Works with svn 1.6, 1.7, 1.8.
+# Use `svn_prompt_info` method to enquire the svn data.
+# It's faster because his efficient use of svn (single svn call) done in the `parse_svn` function
+# Also changed prompt suffix *after* the svn dirty marker
+#
+# *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
+
+function parse_svn() {
+    info=$(svn info 2> /dev/null) || return
+    in_svn=true
+	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
+    svn_branch_name="$(svn_get_branch_name $info)"
+    svn_dirty="$(svn_dirty_choose)"
+    svn_repo_name="$(svn_get_repo_name $info)"
+    svn_rev="$(svn_get_revision $info)"
+}
+
+function svn_prompt_info() {
+    eval parse_svn
+
+    if [ ${in_svn} ]; then
+        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+$ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
+$ZSH_PROMPT_BASE_COLOR${svn_dirty}\
+$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX\
+$ZSH_PROMPT_BASE_COLOR"
+    fi
+}
+
+
+function svn_repo_need_upgrade() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+	[ "${info}" = "E155036" ] && echo "upgrade repo with svn upgrade"
+}
+
+function svn_get_branch_name() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+    echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
+    echo $SVN_URL
+}
+
+function svn_get_repo_name() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+    echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+    echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+}
+
+function svn_get_revision() {
+	info=$1
+	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
+    echo $info 2> /dev/null | sed -n s/Revision:\ //p
+}
+
+function svn_dirty_choose() {
+    svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
+    echo $ZSH_THEME_SVN_PROMPT_CLEAN
+}
\ No newline at end of file

From 72392a2c27386706c78efe1ace9b84e602d9d1ff Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:57:09 +0100
Subject: [PATCH 0506/1378] Adds all other dummy implementations.

---
 lib/ruby_prompts.zsh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
index 2ef334d5f..9ca6e1fc7 100644
--- a/lib/ruby_prompts.zsh
+++ b/lib/ruby_prompts.zsh
@@ -1,3 +1,10 @@
+function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
+  rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
+  virtualenv_prompt_info {
+  return 1
+}
+
+# oh-my-zsh supports an rvm prompt by default
 # get the name of the rvm ruby version
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
@@ -7,12 +14,8 @@ function rvm_prompt_info() {
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
 
-# using the chruby and/or rbenv plugins will override
-# these with real implementations
-function chruby_prompt_info rbenv_prompt_info {
-  return 1
-}
-
+# use this to enable users to see their ruby version, no matter which
+# version management system they use
 function ruby_prompt_info() {
   echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
 }

From 082607c165c6ae16b7b059e941c8bfa3eddabbb8 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:57:23 +0100
Subject: [PATCH 0507/1378] Adds documentation.

---
 lib/ruby_prompts.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/ruby_prompts.zsh b/lib/ruby_prompts.zsh
index 9ca6e1fc7..1aaf9de17 100644
--- a/lib/ruby_prompts.zsh
+++ b/lib/ruby_prompts.zsh
@@ -1,3 +1,15 @@
+# *_prompt_info functions for usage in your prompt
+#
+# Plugin creators, please add your *_prompt_info function to the list
+# of dummy implementations to help theme creators not receiving errors
+# without the need of implementing conditional clauses.
+#
+# See also lib/bzr.zsh, lib/git.zsh and lib/nvm.zsh for
+# git_prompt_info, bzr_prompt_info and nvm_prompt_info
+
+# Dummy implementations that return false to prevent command_not_found
+# errors with themes, that implement these functions
+# Real implementations will be used when the respective plugins are loaded
 function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
   rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
   virtualenv_prompt_info {

From 85fde31991dc04f34450390e7d20992a7334c90a Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:58:40 +0100
Subject: [PATCH 0508/1378] Renames the file to prompt_info_functions.zsh

---
 lib/{ruby_prompts.zsh => prompt_info_functions.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/{ruby_prompts.zsh => prompt_info_functions.zsh} (100%)

diff --git a/lib/ruby_prompts.zsh b/lib/prompt_info_functions.zsh
similarity index 100%
rename from lib/ruby_prompts.zsh
rename to lib/prompt_info_functions.zsh

From 2d6d9d525fbf791affef71e2d7fd0a0f2cd0c30c Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Mon, 6 Jan 2014 09:59:50 +0100
Subject: [PATCH 0509/1378] Fixes RPROMPT in af-magic.zsh-theme

---
 themes/af-magic.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 4cf282590..f241efb6a 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
 
 # right prompt
-PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
+RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"

From 1304ed8d2521e452615bcf7563700018443f5470 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Mon, 6 Jan 2014 14:09:40 +0100
Subject: [PATCH 0510/1378] Report the SVN need upgrade

This happen when subversion 1.7+ is used on a repository created with subversion up to 1.6
---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index d8fc53989..1027bcac2 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -10,7 +10,7 @@
 # *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
 
 function parse_svn() {
-    info=$(svn info 2> /dev/null) || return
+	info=$(svn info 2>&1) || return; # capture stdout and stdout
     in_svn=true
 	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
     svn_branch_name="$(svn_get_branch_name $info)"
@@ -22,7 +22,13 @@ function parse_svn() {
 function svn_prompt_info() {
     eval parse_svn
 
-    if [ ${in_svn} ]; then
+	if [ ! -z $repo_need_upgrade ]; then
+		echo $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX$ZSH_PROMPT_BASE_COLOR\
+$repo_need_upgrade\
+$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR
+	fi
+
+    if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
 $ZSH_PROMPT_BASE_COLOR${svn_dirty}\
@@ -34,8 +40,8 @@ $ZSH_PROMPT_BASE_COLOR"
 
 function svn_repo_need_upgrade() {
 	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	[ "${info}" = "E155036" ] && echo "upgrade repo with svn upgrade"
+	[ -z "${info}" ] && info=$(svn info 2>&1)
+	if grep -q "E155036" <<< $info; then echo "E155036: upgrade repo with svn upgrade"; fi
 }
 
 function svn_get_branch_name() {
@@ -61,4 +67,4 @@ function svn_get_revision() {
 function svn_dirty_choose() {
     svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
     echo $ZSH_THEME_SVN_PROMPT_CLEAN
-}
\ No newline at end of file
+}

From 642ae64bc50f93739ca280e8dcb1d6dbb5932f58 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Tue, 7 Jan 2014 02:10:34 +0100
Subject: [PATCH 0511/1378] Inline `parse_svn` to avoid leaky state

As noted in review, `in_svn` is not properly reset to false. This is better anyway to not leak state.
---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 1027bcac2..e75f21599 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -9,18 +9,14 @@
 #
 # *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
 
-function parse_svn() {
-	info=$(svn info 2>&1) || return; # capture stdout and stdout
-    in_svn=true
-	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
-    svn_branch_name="$(svn_get_branch_name $info)"
-    svn_dirty="$(svn_dirty_choose)"
-    svn_repo_name="$(svn_get_repo_name $info)"
-    svn_rev="$(svn_get_revision $info)"
-}
-
 function svn_prompt_info() {
-    eval parse_svn
+	info=$(svn info 2>&1) || return; # capture stdout and stdout
+	in_svn=true
+	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
+	svn_branch_name="$(svn_get_branch_name $info)"
+	svn_dirty="$(svn_dirty_choose)"
+	svn_repo_name="$(svn_get_repo_name $info)"
+	svn_rev="$(svn_get_revision $info)"
 
 	if [ ! -z $repo_need_upgrade ]; then
 		echo $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX$ZSH_PROMPT_BASE_COLOR\
@@ -28,13 +24,13 @@ $repo_need_upgrade\
 $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR
 	fi
 
-    if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
-        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+	if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
+		echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
 $ZSH_PROMPT_BASE_COLOR${svn_dirty}\
 $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX\
 $ZSH_PROMPT_BASE_COLOR"
-    fi
+	fi
 }
 
 
@@ -47,24 +43,24 @@ function svn_repo_need_upgrade() {
 function svn_get_branch_name() {
 	info=$1
 	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-    echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
-    echo $SVN_URL
+	echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
+	echo $SVN_URL
 }
 
 function svn_get_repo_name() {
 	info=$1
 	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-    echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-    echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+	echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+	echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
 }
 
 function svn_get_revision() {
 	info=$1
 	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-    echo $info 2> /dev/null | sed -n s/Revision:\ //p
+	echo $info 2> /dev/null | sed -n s/Revision:\ //p
 }
 
 function svn_dirty_choose() {
-    svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
-    echo $ZSH_THEME_SVN_PROMPT_CLEAN
+	svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
+	echo $ZSH_THEME_SVN_PROMPT_CLEAN
 }

From 8bf8e1ecf9eeb4117b1196a5fd02d788979f05f7 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 7 Jan 2014 10:07:02 +0100
Subject: [PATCH 0512/1378] Heavy refactor of svn-fast-info

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 88 +++++++++++--------
 1 file changed, 50 insertions(+), 38 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index e75f21599..2183010ba 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -1,4 +1,4 @@
-# vim:ft=zsh ts=2 sw=2 sts=2
+# vim:ft=zsh ts=2 sw=2 sts=2 et
 #
 # Faster alternative to the current SVN plugin implementation.
 #
@@ -10,57 +10,69 @@
 # *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
 
 function svn_prompt_info() {
-	info=$(svn info 2>&1) || return; # capture stdout and stdout
-	in_svn=true
-	repo_need_upgrade="$(svn_repo_need_upgrade $info)"
-	svn_branch_name="$(svn_get_branch_name $info)"
-	svn_dirty="$(svn_dirty_choose)"
-	svn_repo_name="$(svn_get_repo_name $info)"
-	svn_rev="$(svn_get_revision $info)"
+  local info
+  info=$(svn info 2>&1) || return 1; # capture stdout and stderr
+  local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
-	if [ ! -z $repo_need_upgrade ]; then
-		echo $ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX$ZSH_PROMPT_BASE_COLOR\
-$repo_need_upgrade\
-$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR
-	fi
-
-	if [[ ${in_svn} == true && -z $repo_need_upgrade ]]; then
-		echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR${svn_branch_name}\
-$ZSH_PROMPT_BASE_COLOR${svn_dirty}\
-$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX\
-$ZSH_PROMPT_BASE_COLOR"
-	fi
+  if [ -n $repo_need_upgrade ]; then
+    printf '%s%s%s%s%s%s%s\n' \
+      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_THEME_SVN_PROMPT_PREFIX \
+      $ZSH_PROMPT_BASE_COLOR \
+      $repo_need_upgrade \
+      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_THEME_SVN_PROMPT_SUFFIX \
+      $ZSH_PROMPT_BASE_COLOR \
+  else
+    # something left for you to fix -
+    # repo name and rev aren't used here, did you forget them?
+    # especially since you set a repo name color
+    # if the prompt is alright this way, leave it as is and just
+    # delete the comment. The functions itself could stay imo,
+    # gives others the chance to use them.
+    printf '%s%s%s%s%s%s%s%s%s\n' \
+      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_THEME_SVN_PROMPT_PREFIX \
+      $ZSH_THEME_REPO_NAME_COLOR \
+      $(svn_get_branch_name $info)
+      ${svn_branch_name}\
+      $ZSH_PROMPT_BASE_COLOR
+      $(svn_dirty_choose $info)
+      $ZSH_PROMPT_BASE_COLOR
+      $ZSH_THEME_SVN_PROMPT_SUFFIX\
+      $ZSH_PROMPT_BASE_COLOR
+  fi
 }
 
-
 function svn_repo_need_upgrade() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2>&1)
-	if grep -q "E155036" <<< $info; then echo "E155036: upgrade repo with svn upgrade"; fi
+  grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
+    echo "E155036: upgrade repo with svn upgrade"
 }
 
 function svn_get_branch_name() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	echo $info | grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' | egrep -o '[^/]+$' | read SVN_URL
-	echo $SVN_URL
+  echo ${1:-$(svn info 2> /dev/null)} |\
+    grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' |\
+    egrep -o '[^/]+$'
 }
 
 function svn_get_repo_name() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	echo $info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-	echo $info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
+  # I think this can be further cleaned up as well, not sure how,
+  # as I can't test it
+  local svn_root
+  local info=${1:-$(svn info 2> /dev/null)}
+  echo $info | sed 's/Repository\ Root:\ .*\///p' | read svn_root
+  echo $info | sed "s/URL:\ .*$svn_root\///p"
 }
 
 function svn_get_revision() {
-	info=$1
-	[ -z "${info}" ] && info=$(svn info 2> /dev/null)
-	echo $info 2> /dev/null | sed -n s/Revision:\ //p
+  # does this work as it should?
+  echo ${1:-$(svn info 2> /dev/null)} | sed 's/Revision: //p'
 }
 
 function svn_dirty_choose() {
-	svn status | grep -E '^\s*[ACDIM!?L]' > /dev/null 2>/dev/null && echo $ZSH_THEME_SVN_PROMPT_DIRTY && return
-	echo $ZSH_THEME_SVN_PROMPT_CLEAN
+  if svn status | grep -E '^\s*[ACDIM!?L]' &> /dev/null; then
+    echo $ZSH_THEME_SVN_PROMPT_DIRTY
+  else
+    echo $ZSH_THEME_SVN_PROMPT_CLEAN
+  fi
 }

From b0b79e0abae5f1d228e16c36174bad2bf7ba5fee Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 7 Jan 2014 19:08:20 +0100
Subject: [PATCH 0513/1378] No need to eval in rvm_prompt_info!

Just activate word-splitting.
---
 lib/prompt_info_functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 1aaf9de17..335c02a3d 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -21,7 +21,7 @@ function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
   local rvm_prompt
-  rvm_prompt=$(eval "$HOME/.rvm/bin/rvm-prompt $ZSH_THEME_RVM_PROMPT_OPTIONS" 2>/dev/null)
+  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${=ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ "${rvm_prompt}x" == "x" ]] && return 1
   echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }

From 8ede6c6af3b3f11d9b688e4bf9c97be8a54c6c4d Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Wed, 8 Jan 2014 02:50:58 +0100
Subject: [PATCH 0514/1378] Added further cleanup and svn status information

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 64 +++++++++----------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 2183010ba..2d43d365b 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -14,7 +14,7 @@ function svn_prompt_info() {
   info=$(svn info 2>&1) || return 1; # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
-  if [ -n $repo_need_upgrade ]; then
+  if [[ -n $repo_need_upgrade ]]; then
     printf '%s%s%s%s%s%s%s\n' \
       $ZSH_PROMPT_BASE_COLOR \
       $ZSH_THEME_SVN_PROMPT_PREFIX \
@@ -22,57 +22,53 @@ function svn_prompt_info() {
       $repo_need_upgrade \
       $ZSH_PROMPT_BASE_COLOR \
       $ZSH_THEME_SVN_PROMPT_SUFFIX \
-      $ZSH_PROMPT_BASE_COLOR \
+      $ZSH_PROMPT_BASE_COLOR
   else
-    # something left for you to fix -
-    # repo name and rev aren't used here, did you forget them?
-    # especially since you set a repo name color
-    # if the prompt is alright this way, leave it as is and just
-    # delete the comment. The functions itself could stay imo,
-    # gives others the chance to use them.
-    printf '%s%s%s%s%s%s%s%s%s\n' \
+    printf '%s%s%s %s%s:%s%s%s%s%s' \
       $ZSH_PROMPT_BASE_COLOR \
       $ZSH_THEME_SVN_PROMPT_PREFIX \
-      $ZSH_THEME_REPO_NAME_COLOR \
-      $(svn_get_branch_name $info)
-      ${svn_branch_name}\
-      $ZSH_PROMPT_BASE_COLOR
-      $(svn_dirty_choose $info)
-      $ZSH_PROMPT_BASE_COLOR
-      $ZSH_THEME_SVN_PROMPT_SUFFIX\
+      \
+      "$(svn_status_info $info)" \
+      $ZSH_PROMPT_BASE_COLOR \
+      \
+      $ZSH_THEME_BRANCH_NAME_COLOR \
+      $(svn_get_branch_name $info) \
+      $ZSH_PROMPT_BASE_COLOR \
+      \
+      $(svn_get_revision $info) \
+      $ZSH_PROMPT_BASE_COLOR \
+      \
+      $ZSH_THEME_SVN_PROMPT_SUFFIX \
       $ZSH_PROMPT_BASE_COLOR
   fi
 }
 
+
 function svn_repo_need_upgrade() {
   grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
 function svn_get_branch_name() {
-  echo ${1:-$(svn info 2> /dev/null)} |\
-    grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' |\
-    egrep -o '[^/]+$'
+  grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'	
 }
 
-function svn_get_repo_name() {
-  # I think this can be further cleaned up as well, not sure how,
-  # as I can't test it
-  local svn_root
-  local info=${1:-$(svn info 2> /dev/null)}
-  echo $info | sed 's/Repository\ Root:\ .*\///p' | read svn_root
-  echo $info | sed "s/URL:\ .*$svn_root\///p"
+function svn_get_repo_root_name() {
+  grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
 }
 
 function svn_get_revision() {
-  # does this work as it should?
-  echo ${1:-$(svn info 2> /dev/null)} | sed 's/Revision: //p'
+  echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
 }
 
-function svn_dirty_choose() {
-  if svn status | grep -E '^\s*[ACDIM!?L]' &> /dev/null; then
-    echo $ZSH_THEME_SVN_PROMPT_DIRTY
-  else
-    echo $ZSH_THEME_SVN_PROMPT_CLEAN
-  fi
+function svn_status_info() {
+  local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
+  local svn_status="$(svn status 2> /dev/null)";
+  if grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
+  if grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
+  if grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
+  if grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
+  if grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
+  if grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi
+  echo $svn_status_string
 }

From f66ab7f98f9be0486b3a55858d9466232fc97ef6 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Wed, 8 Jan 2014 03:04:54 +0100
Subject: [PATCH 0515/1378] Renamed the methods of this script

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 2d43d365b..a12007ec6 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -4,12 +4,10 @@
 #
 # Works with svn 1.6, 1.7, 1.8.
 # Use `svn_prompt_info` method to enquire the svn data.
-# It's faster because his efficient use of svn (single svn call) done in the `parse_svn` function
-# Also changed prompt suffix *after* the svn dirty marker
-#
-# *** IMPORTANT *** DO NO USE with the simple svn plugin, this plugin acts as a replacement of it.
+# It's faster because his efficient use of svn (single svn call) which saves a lot on a huge codebase
+# It displays the current status of the local files (added, deleted, modified, replaced, or else...)
 
-function svn_prompt_info() {
+function svn_fast_info() {
   local info
   info=$(svn info 2>&1) || return 1; # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
@@ -32,10 +30,10 @@ function svn_prompt_info() {
       $ZSH_PROMPT_BASE_COLOR \
       \
       $ZSH_THEME_BRANCH_NAME_COLOR \
-      $(svn_get_branch_name $info) \
+      $(svn_current_branch_name $info) \
       $ZSH_PROMPT_BASE_COLOR \
       \
-      $(svn_get_revision $info) \
+      $(svn_current_revision $info) \
       $ZSH_PROMPT_BASE_COLOR \
       \
       $ZSH_THEME_SVN_PROMPT_SUFFIX \
@@ -43,21 +41,20 @@ function svn_prompt_info() {
   fi
 }
 
-
 function svn_repo_need_upgrade() {
   grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
-function svn_get_branch_name() {
+function svn_current_branch_name() {
   grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'	
 }
 
-function svn_get_repo_root_name() {
+function svn_repo_root_name() {
   grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
 }
 
-function svn_get_revision() {
+function svn_current_revision() {
   echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
 }
 

From ca129bb55085cf93510346dcd70b1190b87d5bc0 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Fri, 10 Jan 2014 14:03:10 +0100
Subject: [PATCH 0516/1378] Renames main plugin function to `svn_prompt_info`

---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index a12007ec6..ea19bcea0 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -6,8 +6,10 @@
 # Use `svn_prompt_info` method to enquire the svn data.
 # It's faster because his efficient use of svn (single svn call) which saves a lot on a huge codebase
 # It displays the current status of the local files (added, deleted, modified, replaced, or else...)
+#
+# Use as a drop-in replacement of the svn plugin not as complementary plugin
 
-function svn_fast_info() {
+function svn_prompt_info() {
   local info
   info=$(svn info 2>&1) || return 1; # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)

From a6671919ab2a5b0732dbc07d6f8becd9346917da Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 22:52:18 +0100
Subject: [PATCH 0517/1378] Fixes _rails_command

Changes precedence of the conditional clause, more recent versions come
first now. Fixes problems when users update their app and still have
the old rails files inside of their file tree.
Closes #2405 - check the discussion there for further info.
---
 plugins/rails/rails.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 23d15a9a1..210fdfcf7 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,10 +1,10 @@
 function _rails_command () {
-  if [ -e "script/server" ]; then
-    ruby script/$@
+  if [ -e "bin/rails" ]; then
+    bin/rails $@
   elif [ -e "script/rails" ]; then
     ruby script/rails $@
-  elif [ -e "bin/rails" ]; then
-    bin/rails $@
+  elif [ -e "script/server" ]; then
+    ruby script/$@
   else
     rails $@
   fi

From 23e57c177c44b3177c0545acaf9f6211db78f774 Mon Sep 17 00:00:00 2001
From: Tomas Pelka <tpelka@redhat.com>
Date: Thu, 16 Jan 2014 12:15:41 +0100
Subject: [PATCH 0518/1378] Adding commit hash to branch name in my favorit
 rjk-repos theme.

---
 themes/rkj-repos.zsh-theme | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 4ab3bc757..6289427c2 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -18,8 +18,11 @@ ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
 
 function mygit() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  ref1=$(git symbolic-ref HEAD 2> /dev/null) || return
+  ref2=$(git rev-parse HEAD | head -c 6) || return
+  ref="$ref1 %{$fg[grey]%}$ref2"
+  #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
 }
 
 function retcode() {}

From 7b9e48992fa82a72587e451018926e2607172e95 Mon Sep 17 00:00:00 2001
From: Evgeny Golubev <evgeny@golubev.eu>
Date: Fri, 17 Jan 2014 12:59:14 +0300
Subject: [PATCH 0519/1378] Add Laravel4 plugin

---
 plugins/laravel4/laravel4.plugin.zsh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/laravel4/laravel4.plugin.zsh

diff --git a/plugins/laravel4/laravel4.plugin.zsh b/plugins/laravel4/laravel4.plugin.zsh
new file mode 100644
index 000000000..4b1022b66
--- /dev/null
+++ b/plugins/laravel4/laravel4.plugin.zsh
@@ -0,0 +1,20 @@
+# Laravel4 basic command completion
+_laravel4_get_command_list () {
+	php artisan --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+}
+
+_laravel4 () {
+  if [ -f artisan ]; then
+    compadd `_laravel4_get_command_list`
+  fi
+}
+
+compdef _laravel4 artisan
+compdef _laravel4 la4
+
+#Alias
+alias la4='php artisan'
+
+alias la4dump='php artisan dump-autoload'
+alias la4cache='php artisan cache:clear'
+alias la4routes='php artisan routes'

From cc8b09366b62d8f260e1cdd3d4a1acd868e5c9e0 Mon Sep 17 00:00:00 2001
From: Brice Dutheil <brice.dutheil@gmail.com>
Date: Mon, 6 Jan 2014 02:09:15 +0100
Subject: [PATCH 0520/1378] Adds a method that print a battery gauge

It is especially useful for themes, this function is a port of the code written by Steve Losh
and made available on [this blog entry](http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/#my-right-prompt-battery-capacity)
---
 plugins/battery/battery.plugin.zsh | 80 ++++++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 11 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 9f053383a..16ad3e651 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -11,8 +11,9 @@
 if [[ $(uname) == "Darwin" ]] ; then
 
   function battery_pct() {
-    typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
-    typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
+    local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
+    typeset -F maxcapacity=$(echo $smart_battery_status | grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
+    typeset -F currentcapacity=$(echo $smart_battery_status | grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
     integer i=$(((currentcapacity/maxcapacity) * 100))
     echo $i
   }
@@ -26,8 +27,9 @@ if [[ $(uname) == "Darwin" ]] ; then
   }
 
   function battery_time_remaining() {
-    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      timeremaining=$(ioreg -rc "AppleSmartBattery"| grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
+  	local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
+    if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
+      timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
       echo "~$((timeremaining / 60)):$((timeremaining % 60))"
     else
       echo "∞"
@@ -49,6 +51,10 @@ if [[ $(uname) == "Darwin" ]] ; then
       echo "∞"
     fi
   }
+  
+  function battery_is_charging() {
+	  [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
+  }
 
 elif [[ $(uname) == "Linux"  ]] ; then
 
@@ -79,14 +85,66 @@ elif [[ $(uname) == "Linux"  ]] ; then
       echo "∞"
     fi
   }
+  
+  function battery_pct() {
+    # todo for on linux
+  }
+  
+  function battery_is_charging() {
+    # todo on linux
+	false
+  }
+
 else
-	# Empty functions so we don't cause errors in prompts
-	function battery_pct_remaining() {
-	}
+  # Empty functions so we don't cause errors in prompts
+  function battery_pct_remaining() {
+  }
 
-	function battery_time_remaining() {
-	}
+  function battery_time_remaining() {
+  }
 
-	function battery_pct_prompt() {
-	}
+  function battery_pct_prompt() {
+  }
 fi
+
+function battery_level_gauge() {
+  local gauge_slots=${BATTERY_GAUGE_SLOTS:-10};
+  local green_threshold=${BATTERY_GREEN_THRESHOLD:-6};
+  local yellow_threshold=${BATTERY_YELLOW_THRESHOLD:-4};
+  local color_green=${BATTERY_COLOR_GREEN:-%F{green}};
+  local color_yellow=${BATTERY_COLOR_YELLOW:-%F{yellow}};
+  local color_red=${BATTERY_COLOR_RED:-%F{red}};
+  local color_reset=${BATTERY_COLOR_RESET:-%{%f%k%b%}};
+  local battery_prefix=${BATTERY_GAUGE_PREFIX:-'['};
+  local battery_suffix=${BATTERY_GAUGE_SUFFIX:-']'};
+  local filled_symbol=${BATTERY_GAUGE_FILLED_SYMBOL:-'▶'};
+  local empty_symbol=${BATTERY_GAUGE_EMPTY_SYMBOL:-'▷'};
+  local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow};
+  local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'};
+
+  local battery_remaining_percentage=$(battery_pct);
+
+  if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
+    local filled=$(((( $battery_remaining_percentage + $gauge_slots - 1) / $gauge_slots)));
+    local empty=$(($gauge_slots - $filled));
+	
+    if [[ $filled -gt $green_threshold ]]; then local gauge_color=$color_green;
+    elif [[ $filled -gt $yellow_threshold ]]; then local gauge_color=$color_yellow;
+    else local gauge_color=$color_red;
+    fi
+  else
+    local filled=$gauge_slots;
+    local empty=0;
+  	filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
+  fi
+
+  
+  local charging=' ' && battery_is_charging && charging=$charging_symbol;
+
+  printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}
+  printf ${filled_symbol//\%/\%\%}'%.0s' {1..$filled}
+  [[ $filled -lt $gauge_slots ]] && printf ${empty_symbol//\%/\%\%}'%.0s' {1..$empty}
+  printf ${color_reset//\%/\%\%}${battery_suffix//\%/\%\%}${color_reset//\%/\%\%}
+}
+
+

From 9b3344dd8085bdcb16d08b5e47492b275e44955e Mon Sep 17 00:00:00 2001
From: Kevin Lange <k@dakko.us>
Date: Thu, 23 Jan 2014 20:58:23 -0800
Subject: [PATCH 0521/1378] change nyancat telnet server

miku.acm.uiuc.edu was decommissioned a while ago; this is a sanctioned mirror
---
 plugins/nyan/nyan.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nyan/nyan.plugin.zsh b/plugins/nyan/nyan.plugin.zsh
index 6321e5f5a..af01c9605 100644
--- a/plugins/nyan/nyan.plugin.zsh
+++ b/plugins/nyan/nyan.plugin.zsh
@@ -1,5 +1,5 @@
 if [[ -x `which nc` ]]; then
-  alias nyan='nc -v miku.acm.uiuc.edu 23' # nyan cat
+  alias nyan='nc -v nyan.howes.net.nz 23' # nyan cat
 fi
 
 

From a48fd1e80882e1f3008d5ee027b3e41d38844414 Mon Sep 17 00:00:00 2001
From: Kevin Lange <k@dakko.us>
Date: Fri, 24 Jan 2014 10:27:41 -0800
Subject: [PATCH 0522/1378] Update nyan.plugin.zsh

---
 plugins/nyan/nyan.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nyan/nyan.plugin.zsh b/plugins/nyan/nyan.plugin.zsh
index af01c9605..ac9d0017e 100644
--- a/plugins/nyan/nyan.plugin.zsh
+++ b/plugins/nyan/nyan.plugin.zsh
@@ -1,5 +1,5 @@
 if [[ -x `which nc` ]]; then
-  alias nyan='nc -v nyan.howes.net.nz 23' # nyan cat
+  alias nyan='nc -v nyancat.dakko.us 23' # nyan cat
 fi
 
 

From 3d41804fbce109a09f8d9549e875b428621cd85b Mon Sep 17 00:00:00 2001
From: Christoph Heer <Christoph.Heer@gmail.com>
Date: Fri, 24 Jan 2014 23:01:35 +0100
Subject: [PATCH 0523/1378] Improve virtualenv prompt in steeef theme

---
 themes/steeef.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 312229e9f..e0080b8a5 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -8,7 +8,7 @@
 # http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
 function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+    [ $VIRTUAL_ENV ] && echo '('$fg[blue]`basename $VIRTUAL_ENV`%{$reset_color%}') '
 }
 PR_GIT_UPDATE=1
 
@@ -87,7 +87,7 @@ function steeef_precmd {
         else
             FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
         fi
-        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+        zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} "
 
         vcs_info 'prompt'
         PR_GIT_UPDATE=
@@ -96,5 +96,5 @@ function steeef_precmd {
 add-zsh-hook precmd steeef_precmd
 
 PROMPT=$'
-%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_
-$(virtualenv_info)$ '
+%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_$(virtualenv_info)%{$reset_color%}
+$ '

From 16ae4e127f6af2f8f3332025ce46d45ab5bcadac Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Sun, 26 Jan 2014 10:18:04 -0200
Subject: [PATCH 0524/1378] Adds support capistrano multistage completion

---
 plugins/capistrano/_capistrano           | 53 ++++++++++++++++++++----
 plugins/capistrano/capistrano.plugin.zsh | 11 +++++
 2 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 plugins/capistrano/capistrano.plugin.zsh

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index 3cadf3d54..7a74b3732 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -1,10 +1,49 @@
-#compdef cap
+#compdef xcap cap
 #autoload
 
-if [[ -f config/deploy.rb || -f Capfile ]]; then
-  if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then
-    echo "\nGenerating .cap_tasks~..." > /dev/stderr
-    cap -v --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
+# Added `xcap` because `cap` is a reserved word. `cap` completion doesn't work.
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
+
+local curcontext="$curcontext" state line ret=1
+local -a _configs
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+_cap_tasks() {
+  if [[ -f config/deploy.rb || -f Capfile ]]; then
+    if [[ ! -f .cap_tasks~ ]]; then
+      xcap -v --tasks | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
+    fi
+
+    OLD_IFS=$IFS
+    IFS=$'\n'
+    _values 'cap commands' $(< .cap_tasks~)
+    IFS=$OLD_IFS
+    # zmodload zsh/mapfile
+    # _values ${(f)mapfile[.cap_tasks~]}
   fi
-  compadd `cat .cap_tasks~`
-fi
+}
+
+_cap_stages() {
+  compadd $(find config/deploy -name \*.rb | cut -d/ -f3 | sed s:.rb::g)
+}
+
+case $state in
+  cmds)
+    # check if it uses multistage
+    if [[ -d config/deploy ]]; then
+      _cap_stages
+    else
+      _cap_tasks
+    fi
+    ret=0
+    ;;
+  args)
+    _cap_tasks
+    ret=0
+    ;;
+esac
+
+return ret
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
new file mode 100644
index 000000000..9a4a2cc34
--- /dev/null
+++ b/plugins/capistrano/capistrano.plugin.zsh
@@ -0,0 +1,11 @@
+# Added `xcap` because `cap` is a reserved word. `cap` completion doesn't work.
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
+
+func xcap() {
+  if [ -f Gemfile ]
+  then
+    bundle exec cap $*
+  else
+    cap $*
+  fi
+}

From 78ffa71cb6ecb40ec8ca97d5fb9682ceb74a05b7 Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Tue, 28 Jan 2014 18:02:40 -0600
Subject: [PATCH 0525/1378] updated url to latest powerline-patched fonts

clearing up some confusion in issue#1906
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 01cdc80e5..a0d60ea88 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -6,7 +6,7 @@
 # # README
 #
 # In order for this theme to render correctly, you will need a
-# [Powerline-patched font](https://gist.github.com/1595572).
+# [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts).
 #
 # In addition, I recommend the
 # [Solarized theme](https://github.com/altercation/solarized/) and, if you're

From 7daaa188da6255ef89f3076ad70370dd31762437 Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Tue, 28 Jan 2014 21:54:00 -0600
Subject: [PATCH 0526/1378] corrected branch character
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

changed ± to 
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index a0d60ea88..a5c47f9b5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//± }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
   fi
 }
 

From 685ea4a36162a0bca9b0176b268c25e45023e97e Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Wed, 29 Jan 2014 13:35:21 -0600
Subject: [PATCH 0527/1378] theme agnoster: remove trailing space

re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759
---
 themes/agnoster.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index a5c47f9b5..85b846cb5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -88,9 +88,9 @@ prompt_git() {
     zstyle ':vcs_info:*' stagedstr '✚'
     zstyle ':vcs_info:git:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'
-    zstyle ':vcs_info:*' actionformats '%u%c'
+    zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }"
   fi
 }
 

From 4d83da770a85f4d2e6b0e0990cb83c925de128bd Mon Sep 17 00:00:00 2001
From: Felds Liscia <felds@carbon6.cc>
Date: Thu, 30 Jan 2014 15:04:09 -0200
Subject: [PATCH 0528/1378] highlight the username when root

---
 themes/ys.zsh-theme | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 43c101c2a..a44f295f4 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -32,3 +32,16 @@ PROMPT="
 ${git_info} \
 %{$fg[white]%}[%*]
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
+
+if [[ "$(whoami)" == "root" ]]; then
+PROMPT="
+%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
+%{$bg[yellow]%}%{$fg[cyan]%}%n%{$reset_color%} \
+%{$fg[white]%}at \
+%{$fg[green]%}$(box_name) \
+%{$fg[white]%}in \
+%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
+${git_info} \
+%{$fg[white]%}[%*]
+%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
+fi

From 217d8f0540a41b2927caf986561e45634fa1952a Mon Sep 17 00:00:00 2001
From: "Huang, Tao" <tech@huangtao.me>
Date: Thu, 6 Feb 2014 17:29:33 +0800
Subject: [PATCH 0529/1378] `fc -l 1` instead of `history` in zsh_stats #2501

$HIST_STAMP breaks zsh_stats. see #2501
---
 lib/functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index aaf8a03e3..fda84a953 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,5 +1,5 @@
 function zsh_stats() {
-  history | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
+  fc -l 1 | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
 }
 
 function uninstall_oh_my_zsh() {

From ed19ffee5ecc0db6617c1ae753e515d60cb486c6 Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Sat, 8 Feb 2014 19:49:54 -0500
Subject: [PATCH 0530/1378] Add scd plugin for smart change of directory.

Synced with the scd-tracker branch pavoljuhas/oh-my-zsh@9d04d8ca78030d4c9af4bf0f58b49532a6ef1b35
---
 plugins/scd/README.md      | 123 +++++++++++++
 plugins/scd/scd            | 350 +++++++++++++++++++++++++++++++++++++
 plugins/scd/scd.plugin.zsh |  19 ++
 3 files changed, 492 insertions(+)
 create mode 100644 plugins/scd/README.md
 create mode 100755 plugins/scd/scd
 create mode 100644 plugins/scd/scd.plugin.zsh

diff --git a/plugins/scd/README.md b/plugins/scd/README.md
new file mode 100644
index 000000000..ea7c72464
--- /dev/null
+++ b/plugins/scd/README.md
@@ -0,0 +1,123 @@
+# scd - smart change of directory
+
+Define `scd` shell function for changing to any directory with
+a few keystrokes.
+
+`scd` keeps history of the visited directories, which serves as an index of
+the known paths.  The directory index is updated after every `cd` command in
+the shell and can be also filled manually by running `scd -a`.  To switch to
+some directory, `scd` needs few fragments of the desired path to match with
+the index.  A selection menu is displayed in case of several matches, with a
+preference given to recently visited paths.  `scd` can create permanent
+directory aliases, which appear as named directories in zsh session.
+
+## INSTALLATION
+
+For oh-my-zsh, add `scd` to the `plugins` array in the ~/.zshrc file as in the
+[template file](../../templates/zshrc.zsh-template#L45).
+
+Besides zsh, `scd` can be used with *bash*, *dash* or *tcsh*
+shells and is also available as [Vim](http://www.vim.org/) plugin and
+[IPython](http://ipython.org/) extension.  For installation details, see
+https://github.com/pavoljuhas/smart-change-directory.
+
+## SYNOPSIS
+
+```sh
+scd [options] [pattern1 pattern2 ...]
+```
+
+## OPTIONS
+
+<dl><dt>
+-a, --add</dt><dd>
+  add specified directories to the directory index.</dd><dt>
+
+--unindex</dt><dd>
+  remove specified directories from the index.</dd><dt>
+
+-r, --recursive</dt><dd>
+  apply options <em>--add</em> or <em>--unindex</em> recursively.</dd><dt>
+
+--alias=ALIAS</dt><dd>
+  create alias for the current or specified directory and save it to
+  <em>~/.scdalias.zsh</em>.</dd><dt>
+
+--unalias</dt><dd>
+  remove ALIAS definition for the current or specified directory from
+  <em>~/.scdalias.zsh</em>.</dd><dt>
+
+--list</dt><dd>
+  show matching directories and exit.</dd><dt>
+
+-v, --verbose</dt><dd>
+  display directory rank in the selection menu.</dd><dt>
+
+-h, --help</dt><dd>
+  display this options summary and exit.</dd>
+</dl>
+
+## Examples
+
+```sh
+# Index recursively some paths for the very first run
+scd -ar ~/Documents/
+
+# Change to a directory path matching "doc"
+scd doc
+
+# Change to a path matching all of "a", "b" and "c"
+scd a b c
+
+# Change to a directory path that ends with "ts"
+scd "ts(#e)"
+
+# Show selection menu and ranking of 20 most likely directories
+scd -v
+
+# Alias current directory as "xray"
+scd --alias=xray
+
+# Jump to a previously defined aliased directory
+scd xray
+```
+
+# FILES
+
+<dl><dt>
+~/.scdhistory</dt><dd>
+    time-stamped index of visited directories.</dd><dt>
+
+~/.scdalias.zsh</dt><dd>
+    scd-generated definitions of directory aliases.</dd>
+</dl>
+
+# ENVIRONMENT
+
+<dl><dt>
+SCD_HISTFILE</dt><dd>
+    path to the scd index file (by default ~/.scdhistory).</dd><dt>
+
+SCD_HISTSIZE</dt><dd>
+    maximum number of entries in the index (5000).  Index is trimmed when it
+    exceeds <em>SCD_HISTSIZE</em> by more than 20%.</dd><dt>
+
+SCD_MENUSIZE</dt><dd>
+    maximum number of items for directory selection menu (20).</dd><dt>
+
+SCD_MEANLIFE</dt><dd>
+    mean lifetime in seconds for exponential decay of directory
+    likelihood (86400).</dd><dt>
+
+SCD_THRESHOLD</dt><dd>
+    threshold for cumulative directory likelihood.  Directories with
+    lower likelihood are excluded unless they are the only match to
+    scd patterns.
+    </dd><dt>
+
+SCD_SCRIPT</dt><dd>
+    command script file where scd writes the final <code>cd</code>
+    command.  This variable must be defined when scd runs in its own
+    process rather than as a shell function.  It is up to the
+    scd caller to use the output in <em>SCD_SCRIPT</em>.</dd>
+</dl>
diff --git a/plugins/scd/scd b/plugins/scd/scd
new file mode 100755
index 000000000..9e055eadd
--- /dev/null
+++ b/plugins/scd/scd
@@ -0,0 +1,350 @@
+#!/bin/zsh -f
+
+emulate -L zsh
+if [[ $(whence -w $0) == *:' 'command ]]; then
+    emulate -R zsh
+    alias return=exit
+    local RUNNING_AS_COMMAND=1
+fi
+
+local DOC='scd -- smart change to a recently used directory
+usage: scd [options] [pattern1 pattern2 ...]
+Go to a directory path that contains all fixed string patterns.  Prefer
+recently visited directories and directories with patterns in their tail
+component.  Display a selection menu in case of multiple matches.
+
+Options:
+  -a, --add         add specified directories to the directory index
+  --unindex         remove specified directories from the index
+  -r, --recursive   apply options --add or --unindex recursively
+  --alias=ALIAS     create alias for the current or specified directory and
+                    store it in ~/.scdalias.zsh
+  --unalias         remove ALIAS definition for the current or specified
+                    directory from ~/.scdalias.zsh
+  --list            show matching directories and exit
+  -v, --verbose     display directory rank in the selection menu
+  -h, --help        display this message and exit
+'
+
+local SCD_HISTFILE=${SCD_HISTFILE:-${HOME}/.scdhistory}
+local SCD_HISTSIZE=${SCD_HISTSIZE:-5000}
+local SCD_MENUSIZE=${SCD_MENUSIZE:-20}
+local SCD_MEANLIFE=${SCD_MEANLIFE:-86400}
+local SCD_THRESHOLD=${SCD_THRESHOLD:-0.005}
+local SCD_SCRIPT=${RUNNING_AS_COMMAND:+$SCD_SCRIPT}
+local SCD_ALIAS=~/.scdalias.zsh
+
+local ICASE a d m p i tdir maxrank threshold
+local opt_help opt_add opt_unindex opt_recursive opt_verbose
+local opt_alias opt_unalias opt_list
+local -A drank dalias dkey
+local dmatching
+
+setopt extendedhistory extendedglob noautonamedirs brace_ccl
+
+# If SCD_SCRIPT is defined make sure the file exists and is empty.
+# This removes any previous old commands.
+[[ -n "$SCD_SCRIPT" ]] && [[ -s $SCD_SCRIPT || ! -f $SCD_SCRIPT ]] && (
+    umask 077
+    : >| $SCD_SCRIPT
+)
+
+# process command line options
+zmodload -i zsh/zutil
+zmodload -i zsh/datetime
+zparseopts -D -- a=opt_add -add=opt_add -unindex=opt_unindex \
+    r=opt_recursive -recursive=opt_recursive \
+    -alias:=opt_alias -unalias=opt_unalias -list=opt_list \
+    v=opt_verbose -verbose=opt_verbose h=opt_help -help=opt_help \
+    || return $?
+
+if [[ -n $opt_help ]]; then
+    print $DOC
+    return
+fi
+
+# load directory aliases if they exist
+[[ -r $SCD_ALIAS ]] && source $SCD_ALIAS
+
+# works faster than the (:a) modifier and is compatible with zsh 4.2.6
+_scd_Y19oug_abspath() {
+    set -A $1 ${(ps:\0:)"$(
+        unfunction -m "*"; shift
+        for d; do
+            cd $d && print -Nr -- $PWD && cd $OLDPWD
+        done
+        )"}
+}
+
+# define directory alias
+if [[ -n $opt_alias ]]; then
+    if [[ -n $1 && ! -d $1 ]]; then
+        print -u2 "'$1' is not a directory"
+        return 1
+    fi
+    a=${opt_alias[-1]#=}
+    _scd_Y19oug_abspath d ${1:-$PWD}
+    # alias in the current shell, update alias file if successful
+    hash -d -- $a=$d &&
+    (
+        umask 077
+        hash -dr
+        [[ -r $SCD_ALIAS ]] && source $SCD_ALIAS
+        hash -d -- $a=$d
+        hash -dL >| $SCD_ALIAS
+    )
+    return $?
+fi
+
+# undefine directory alias
+if [[ -n $opt_unalias ]]; then
+    if [[ -n $1 && ! -d $1 ]]; then
+        print -u2 "'$1' is not a directory"
+        return 1
+    fi
+    _scd_Y19oug_abspath a ${1:-$PWD}
+    a=$(print -rD ${a})
+    if [[ $a != [~][^/]## ]]; then
+        return
+    fi
+    a=${a#[~]}
+    # unalias in the current shell, update alias file if successful
+    if unhash -d -- $a 2>/dev/null && [[ -r $SCD_ALIAS ]]; then
+        (
+            umask 077
+            hash -dr
+            source $SCD_ALIAS
+            unhash -d -- $a 2>/dev/null &&
+            hash -dL >| $SCD_ALIAS
+        )
+    fi
+    return $?
+fi
+
+# Rewrite the history file if it is at least 20% oversized
+if [[ -s $SCD_HISTFILE ]] && \
+(( $(wc -l <$SCD_HISTFILE) > 1.2 * $SCD_HISTSIZE )); then
+    m=( ${(f)"$(<$SCD_HISTFILE)"} )
+    print -lr -- ${m[-$SCD_HISTSIZE,-1]} >| ${SCD_HISTFILE}
+fi
+
+# Internal functions are prefixed with "_scd_Y19oug_".
+# The "record" function adds a non-repeating directory to the history
+# and turns on history writing.
+_scd_Y19oug_record() {
+    while [[ -n $1 && $1 == ${history[$HISTCMD]} ]]; do
+        shift
+    done
+    if [[ $# != 0 ]]; then
+        ( umask 077; : >>| $SCD_HISTFILE )
+        p=": ${EPOCHSECONDS}:0;"
+        print -lr -- ${p}${^*} >> $SCD_HISTFILE
+    fi
+}
+
+if [[ -n $opt_add ]]; then
+    for a; do
+        if [[ ! -d $a ]]; then
+            print -u 2 "Directory $a does not exist"
+            return 2
+        fi
+    done
+    _scd_Y19oug_abspath m ${*:-$PWD}
+    _scd_Y19oug_record $m
+    if [[ -n $opt_recursive ]]; then
+        for d in $m; do
+            print -n "scanning ${d} ... "
+            _scd_Y19oug_record ${d}/**/*(-/N)
+            print "[done]"
+        done
+    fi
+    return
+fi
+
+# take care of removing entries from the directory index
+if [[ -n $opt_unindex ]]; then
+    if [[ ! -s $SCD_HISTFILE ]]; then
+        return
+    fi
+    # expand existing directories in the argument list
+    for i in {1..$#}; do
+        if [[ -d ${argv[i]} ]]; then
+            _scd_Y19oug_abspath d ${argv[i]}
+            argv[i]=${d}
+        fi
+    done
+    m="$(awk -v recursive=${opt_recursive} '
+        BEGIN {
+            for (i = 2; i < ARGC; ++i) {
+                argset[ARGV[i]] = 1;
+                delete ARGV[i];
+            }
+        }
+        1 {
+            d = $0;  sub(/^[^;]*;/, "", d);
+            if (d in argset)  next;
+        }
+        recursive {
+            for (a in argset) {
+                if (substr(d, 1, length(a) + 1) == a"/")  next;
+            }
+        }
+        { print $0 }
+        ' $SCD_HISTFILE ${*:-$PWD} )" || return $?
+    : >| ${SCD_HISTFILE}
+    [[ ${#m} == 0 ]] || print -r -- $m >> ${SCD_HISTFILE}
+    return
+fi
+
+# The "action" function is called when there is just one target directory.
+_scd_Y19oug_action() {
+    if [[ -n $opt_list ]]; then
+        for d; do
+            a=${(k)dalias[(r)${d}]}
+            print -r -- "# $a"
+            print -r -- $d
+        done
+    elif [[ $# == 1 ]]; then
+        if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
+            print -u2 "Warning: running as command with SCD_SCRIPT undefined."
+        fi
+        [[ -n $SCD_SCRIPT ]] && (umask 077;
+            print -r "cd ${(q)1}" >| $SCD_SCRIPT)
+        [[ -N $SCD_HISTFILE ]] && touch -a $SCD_HISTFILE
+        cd $1
+        # record the new directory unless already done in some chpwd hook
+        [[ -N $SCD_HISTFILE ]] || _scd_Y19oug_record $PWD
+    fi
+}
+
+# handle different argument scenarios ----------------------------------------
+
+## single argument that is an existing directory
+if [[ $# == 1 && -d $1 && -x $1 ]]; then
+    _scd_Y19oug_action $1
+    return $?
+## single argument that is an alias
+elif [[ $# == 1 && -d ${d::=${nameddirs[$1]}} ]]; then
+    _scd_Y19oug_action $d
+    return $?
+fi
+
+# ignore case unless there is an argument with an uppercase letter
+[[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
+
+# calculate rank of all directories in the SCD_HISTFILE and keep it as drank
+# include a dummy entry for splitting of an empty string is buggy
+[[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
+    print -l /dev/null -10
+    <$SCD_HISTFILE \
+    awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
+        BEGIN { FS = "[:;]"; }
+        length($0) < 4096 && $2 > 0 {
+            tau = 1.0 * ($2 - epochseconds) / meanlife;
+            if (tau < -4.61)  tau = -4.61;
+            prec = exp(tau);
+            sub(/^[^;]*;/, "");
+            if (NF)  ptot[$0] += prec;
+        }
+        END { for (di in ptot)  { print di; print ptot[di]; } }'
+    )"}
+)
+unset "drank[/dev/null]"
+
+# filter drank to the entries that match all arguments
+for a; do
+    p=${ICASE}"*${a}*"
+    drank=( ${(kv)drank[(I)${~p}]} )
+done
+
+# build a list of matching directories reverse-sorted by their probabilities
+dmatching=( ${(f)"$(
+    for d p in ${(kv)drank}; do
+        print -r -- "$p $d";
+    done | sort -grk1 | cut -d ' ' -f 2-
+    )"}
+)
+
+# if some directory paths match all patterns in order, discard all others
+p=${ICASE}"*${(j:*:)argv}*"
+m=( ${(M)dmatching:#${~p}} )
+[[ -d ${m[1]} ]] && dmatching=( $m )
+# if some directory names match last pattern, discard all others
+p=${ICASE}"*${(j:*:)argv}[^/]#"
+m=( ${(M)dmatching:#${~p}} )
+[[ -d ${m[1]} ]] && dmatching=( $m )
+# if some directory names match all patterns, discard all others
+m=( $dmatching )
+for a; do
+    p=${ICASE}"*/[^/]#${a}[^/]#"
+    m=( ${(M)m:#${~p}} )
+done
+[[ -d ${m[1]} ]] && dmatching=( $m )
+# if some directory names match all patterns in order, discard all others
+p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
+m=( ${(M)dmatching:#${~p}} )
+[[ -d ${m[1]} ]] && dmatching=( $m )
+
+# do not match $HOME or $PWD when run without arguments
+if [[ $# == 0 ]]; then
+    dmatching=( ${dmatching:#(${HOME}|${PWD})} )
+fi
+
+# keep at most SCD_MENUSIZE of matching and valid directories
+m=( )
+for d in $dmatching; do
+    [[ ${#m} == $SCD_MENUSIZE ]] && break
+    [[ -d $d && -x $d ]] && m+=$d
+done
+dmatching=( $m )
+
+# find the maximum rank
+maxrank=0.0
+for d in $dmatching; do
+    [[ ${drank[$d]} -lt maxrank ]] || maxrank=${drank[$d]}
+done
+
+# discard all directories below the rank threshold
+threshold=$(( maxrank * SCD_THRESHOLD ))
+dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
+
+## process whatever directories that remained
+case ${#dmatching} in
+(0)
+    print -u2 "no matching directory"
+    return 1
+    ;;
+(1)
+    _scd_Y19oug_action $dmatching
+    return $?
+    ;;
+(*)
+    # build a list of strings to be displayed in the selection menu
+    m=( ${(f)"$(print -lD ${dmatching})"} )
+    if [[ -n $opt_verbose ]]; then
+        for i in {1..${#dmatching}}; do
+            d=${dmatching[i]}
+            m[i]=$(printf "%.3g %s" ${drank[$d]} $d)
+        done
+    fi
+    # build a map of string names to actual directory paths
+    for i in {1..${#m}}; dalias[${m[i]}]=${dmatching[i]}
+    # opt_list - output matching directories and exit
+    if [[ -n $opt_list ]]; then
+        _scd_Y19oug_action ${dmatching}
+        return
+    fi
+    # finally use the selection menu to get the answer
+    a=( {a-z} {A-Z} )
+    p=( )
+    for i in {1..${#m}}; do
+        [[ -n ${a[i]} ]] || break
+        dkey[${a[i]}]=${dalias[$m[i]]}
+        p+="${a[i]}) ${m[i]}"
+    done
+    print -c -r -- $p
+    if read -s -k 1 d && [[ -n ${dkey[$d]} ]]; then
+        _scd_Y19oug_action ${dkey[$d]}
+    fi
+    return $?
+esac
diff --git a/plugins/scd/scd.plugin.zsh b/plugins/scd/scd.plugin.zsh
new file mode 100644
index 000000000..0197c53a1
--- /dev/null
+++ b/plugins/scd/scd.plugin.zsh
@@ -0,0 +1,19 @@
+## The scd script should autoload as a shell function.
+autoload scd
+
+
+## If the scd function exists, define a change-directory-hook function
+## to record visited directories in the scd index.
+if [[ ${+functions[scd]} == 1 ]]; then
+    scd_chpwd_hook() { scd --add $PWD }
+    autoload add-zsh-hook
+    add-zsh-hook chpwd scd_chpwd_hook
+fi
+
+
+## Allow scd usage with unquoted wildcard characters such as "*" or "?".
+alias scd='noglob scd'
+
+
+## Load the directory aliases created by scd if any.
+if [[ -s ~/.scdalias.zsh ]]; then source ~/.scdalias.zsh; fi

From c563fe95fbf58721caa7de0ffe5d8117a6ada51a Mon Sep 17 00:00:00 2001
From: Florian Franzen <FlorianFranzen@gmail.com>
Date: Sun, 9 Feb 2014 14:06:58 +0100
Subject: [PATCH 0531/1378] Makes history-substring-search use term specific up
 and down buttons. Fixes #2089.

---
 .../history-substring-search/history-substring-search.zsh    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 53f707c79..405eeaade 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -163,8 +163,9 @@ function history-substring-search-down() {
 zle -N history-substring-search-up
 zle -N history-substring-search-down
 
-bindkey '\e[A' history-substring-search-up
-bindkey '\e[B' history-substring-search-down
+zmodload zsh/terminfo
+bindkey "$terminfo[kcuu1]" history-substring-search-up
+bindkey "$terminfo[kcud1]" history-substring-search-down
 
 #-----------------------------------------------------------------------------
 # implementation details

From 0cb2ecff8002e478f5e7e64cb529eb2af71b0299 Mon Sep 17 00:00:00 2001
From: Tobias Kirschstein <lev@ideegeo.com>
Date: Tue, 11 Feb 2014 19:56:13 +1300
Subject: [PATCH 0532/1378] provides iwhois command to use CNAMES under
 whois.geek.nz to find most accurate whois server

---
 plugins/iwhois/iwhois.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/iwhois/iwhois.plugin.zsh

diff --git a/plugins/iwhois/iwhois.plugin.zsh b/plugins/iwhois/iwhois.plugin.zsh
new file mode 100644
index 000000000..38790bf28
--- /dev/null
+++ b/plugins/iwhois/iwhois.plugin.zsh
@@ -0,0 +1,8 @@
+# provide a whois command with a more accurate and up to date list of whois
+# servers using CNAMES via whois.geek.nz
+
+function iwhois() {
+    resolver="whois.geek.nz"
+    tld=`echo ${@: -1} | awk -F "." '{print $NF}'`
+    whois -h ${tld}.${resolver} "$@" ;
+}

From 0d212bb218617dfb62c9c31a19b64e321cb1d9b6 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Tue, 11 Feb 2014 21:14:02 -0600
Subject: [PATCH 0533/1378] Add 'services' command to homebrew completion

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index a25caf40c..d4306f223 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -33,6 +33,7 @@ _1st_arguments=(
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
   'server:start a local web app that lets you browse formulae (requires Sinatra)'
+  'services:manage background services via launchctl'
   'unlink:unlink a formula'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'

From f3f0a54259f384c35dad48a40d6e931df079b3c9 Mon Sep 17 00:00:00 2001
From: Ed Lui <edmund.lui@gmail.com>
Date: Tue, 11 Feb 2014 22:45:41 -0500
Subject: [PATCH 0534/1378] Updated _brew zsh autocompletion to latest Homebrew
 upstream

---
 plugins/brew/_brew | 75 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index d4306f223..9eb3bb557 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -11,10 +11,25 @@ _brew_installed_formulae() {
   installed_formulae=(`brew list`)
 }
 
+_brew_installed_taps() {
+  installed_taps=(`brew tap`)
+}
+
+_brew_outdated_formulae() {
+  outdated_formulae=(`brew outdated`)
+}
+
+_brew_running_services() {
+  running_services=(`brew services list | awk '{print $1}'`)
+}
+
 local -a _1st_arguments
 _1st_arguments=(
+  'audit:check formulae for Homebrew coding style'
+  'bundle:look for a Brewfile and run each line as a brew command'
   'cat:display formula file for a formula'
   'cleanup:uninstall unused and old versions of packages'
+  'commands:show a list of commands'
   'create:create a new formula'
   'deps:list dependencies and dependants of a formula'
   'doctor:audits your installation for common issues'
@@ -22,27 +37,38 @@ _1st_arguments=(
   'home:visit the homepage of a formula or the brew project'
   'info:information about a formula'
   'install:install a formula'
+  'reinstall:install a formula anew; re-using its current options'
   'link:link a formula'
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
   'missing:check all installed formuale for missing dependencies.'
-  'options:display install options specific to formula.'
-  'outdated:list formulas for which a newer version is available'
+  'outdated:list formulae for which a newer version is available'
+  'pin:pin specified formulae'
   'prune:remove dead links'
-  'reinstall:reinstall a formula'
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
   'server:start a local web app that lets you browse formulae (requires Sinatra)'
-  'services:manage background services via launchctl'
+  'services:small wrapper around `launchctl` for supported formulae'
+  'tap:tap a new formula repository from GitHub, or list existing taps'
   'unlink:unlink a formula'
+  'unpin:unpin specified formulae'
+  'untap:remove a tapped repository'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'
-  'uses:show formulas which depend on a formula'
-  'versions:show all available formula versions'
+  'uses:show formulae which depend on a formula'
+)
+
+local -a _service_arguments
+_service_arguments=(
+  'cleanup:get rid of stale services and unused plists'
+  'list:list all services managed by `brew services`'
+  'restart:gracefully restart selected service'
+  'start:start selected service'
+  'stop:stop selected service'
 )
 
 local expl
-local -a formulae installed_formulae
+local -a formulae installed_formulae installed_taps outdated_formulae running_services
 
 _arguments \
   '(-v)-v[verbose]' \
@@ -61,24 +87,41 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  search|-S)
-    _arguments \
-      '(--macports)--macports[search the macports repository]' \
-      '(--fink)--fink[search the fink repository]' ;;
+  install|reinstall|audit|home|homepage|log|info|abv|uses|cat|deps|edit|options)
+    _brew_all_formulae
+    _wanted formulae expl 'all formulae' compadd -a formulae ;;
   list|ls)
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '(--pinned)--pinned[list all versions of pinned formulae]' \
       '(--versions)--versions[list all installed versions of a formula]' \
-      '1: :->forms' &&  return 0
+      '1: :->forms' && return 0
 
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
         _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|homepage|log|info|abv|uses|cat|deps|edit|options|versions)
-    _brew_all_formulae
-    _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  reinstall|remove|rm|uninstall|unlink|cleanup|link|ln)
+  remove|rm|uninstall|unlink|cleanup|link|ln|pin|unpin)
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
+  search|-S)
+    _arguments \
+      '(--macports)--macports[search the macports repository]' \
+      '(--fink)--fink[search the fink repository]' ;;
+  services)
+    if [[ -n "$words[2]" ]]; then
+      case "$words[2]" in
+        restart|start|stop)
+          _brew_running_services
+          _wanted running_services expl 'running services' compadd -a running_services ;;
+      esac
+    else
+      _describe -t commands "brew services subcommand" _service_arguments
+    fi ;;
+  untap)
+    _brew_installed_taps
+    _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;;
+  upgrade)
+    _brew_outdated_formulae
+    _wanted outdated_formulae expl 'outdated formulae' compadd -a outdated_formulae ;;
 esac

From 2078e7d4deac2546deea6b707837b39c535eaa78 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Wed, 12 Feb 2014 20:09:44 -0600
Subject: [PATCH 0535/1378] remove duplicate 'go' plugin, symlink to 'golang'

---
 plugins/go/go.plugin.zsh | 152 +--------------------------------------
 1 file changed, 1 insertion(+), 151 deletions(-)
 mode change 100644 => 120000 plugins/go/go.plugin.zsh

diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
deleted file mode 100644
index 23afa9656..000000000
--- a/plugins/go/go.plugin.zsh
+++ /dev/null
@@ -1,151 +0,0 @@
-# install in /etc/zsh/zshrc or your personal .zshrc
-
-# gc
-prefixes=(5 6 8)
-for p in $prefixes; do
-	compctl -g "*.${p}" ${p}l
-	compctl -g "*.go" ${p}g
-done
-
-# standard go tools
-compctl -g "*.go" gofmt
-
-# gccgo
-compctl -g "*.go" gccgo
-
-# go tool
-__go_tool_complete() {
-  typeset -a commands build_flags
-  commands+=(
-    'build[compile packages and dependencies]'
-    'clean[remove object files]'
-    'doc[run godoc on package sources]'
-    'fix[run go tool fix on packages]'
-    'fmt[run gofmt on package sources]'
-    'get[download and install packages and dependencies]'
-    'help[display help]'
-    'install[compile and install packages and dependencies]'
-    'list[list packages]'
-    'run[compile and run Go program]'
-    'test[test packages]'
-    'tool[run specified go tool]'
-    'version[print Go version]'
-    'vet[run go tool vet on packages]'
-  )
-  if (( CURRENT == 2 )); then
-    # explain go commands
-    _values 'go tool commands' ${commands[@]}
-    return
-  fi
-  build_flags=(
-    '-a[force reinstallation of packages that are already up-to-date]'
-    '-n[print the commands but do not run them]'
-    "-p[number of parallel builds]:number"
-    '-x[print the commands]'
-    "-work[print temporary directory name and keep it]"
-    "-gcflags[flags for 5g/6g/8g]:flags"
-    "-ldflags[flags for 5l/6l/8l]:flags"
-    "-gccgoflags[flags for gccgo]:flags"
-  )
-  __go_list() {
-      local expl importpaths
-      declare -a importpaths
-      importpaths=($(go list ${words[$CURRENT]}... 2>/dev/null))
-      _wanted importpaths expl 'import paths' compadd "$@" - "${importpaths[@]}"
-  }
-  case ${words[2]} in
-  clean|doc)
-      _arguments -s -w : '*:importpaths:__go_list'
-      ;;
-  fix|fmt|list|vet)
-      _alternative ':importpaths:__go_list' ':files:_path_files -g "*.go"'
-      ;;
-  install)
-      _arguments -s -w : ${build_flags[@]} \
-        "-v[show package names]" \
-	'*:importpaths:__go_list'
-      ;;
-  get)
-      _arguments -s -w : \
-        ${build_flags[@]}
-      ;;
-  build)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-v[show package names]" \
-        "-o[output file]:file:_files" \
-        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  test)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-c[do not run, compile the test binary]" \
-        "-i[do not run, install dependencies]" \
-        "-v[print test output]" \
-        "-x[print the commands]" \
-        "-short[use short mode]" \
-        "-parallel[number of parallel tests]:number" \
-        "-cpu[values of GOMAXPROCS to use]:number list" \
-        "-run[run tests and examples matching regexp]:regexp" \
-        "-bench[run benchmarks matching regexp]:regexp" \
-        "-benchtime[run each benchmark during n seconds]:duration" \
-        "-timeout[kill test after that duration]:duration" \
-        "-cpuprofile[write CPU profile to file]:file:_files" \
-        "-memprofile[write heap profile to file]:file:_files" \
-        "-memprofilerate[set heap profiling rate]:number" \
-        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  help)
-      _values "${commands[@]}" \
-        'gopath[GOPATH environment variable]' \
-        'importpath[description of import paths]' \
-        'remote[remote import path syntax]' \
-        'testflag[description of testing flags]' \
-        'testfunc[description of testing functions]'
-      ;;
-  run)
-      _arguments -s -w : \
-          ${build_flags[@]} \
-          '*:file:_path_files -g "*.go"'
-      ;;
-  tool)
-      if (( CURRENT == 3 )); then
-          _values "go tool" $(go tool)
-          return
-      fi
-      case ${words[3]} in
-      [568]g)
-          _arguments -s -w : \
-              '-I[search for packages in DIR]:includes:_path_files -/' \
-              '-L[show full path in file:line prints]' \
-              '-S[print the assembly language]' \
-              '-V[print the compiler version]' \
-              '-e[no limit on number of errors printed]' \
-              '-h[panic on an error]' \
-              '-l[disable inlining]' \
-              '-m[print optimization decisions]' \
-              '-o[file specify output file]:file' \
-              '-p[assumed import path for this code]:importpath' \
-              '-u[disable package unsafe]' \
-              "*:file:_files -g '*.go'"
-          ;;
-      [568]l)
-          local O=${words[3]%l}
-          _arguments -s -w : \
-              '-o[file specify output file]:file' \
-              '-L[search for packages in DIR]:includes:_path_files -/' \
-              "*:file:_files -g '*.[ao$O]'"
-          ;;
-      dist)
-          _values "dist tool" banner bootstrap clean env install version
-          ;;
-      *)
-          # use files by default
-          _files
-          ;;
-      esac
-      ;;
-  esac
-}
-
-compdef __go_tool_complete go
diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
new file mode 120000
index 000000000..cf943e2e1
--- /dev/null
+++ b/plugins/go/go.plugin.zsh
@@ -0,0 +1 @@
+../golang/golang.plugin.zsh
\ No newline at end of file

From aa9db3e8f9e03156f350b5d32fdf5dfde76a6038 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Wed, 12 Feb 2014 20:13:00 -0600
Subject: [PATCH 0536/1378] update golang plugin to match official version

---
 plugins/golang/golang.plugin.zsh | 34 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index e60c4afe4..18bcaaff2 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,9 +1,10 @@
-# From : http://golang.org/misc/zsh/go?m=text
+# install in /etc/zsh/zshrc or your personal .zshrc
+
 # gc
 prefixes=(5 6 8)
 for p in $prefixes; do
-    compctl -g "*.${p}" ${p}l
-    compctl -g "*.go" ${p}g
+	compctl -g "*.${p}" ${p}l
+	compctl -g "*.go" ${p}g
 done
 
 # standard go tools
@@ -19,6 +20,7 @@ __go_tool_complete() {
     'build[compile packages and dependencies]'
     'clean[remove object files]'
     'doc[run godoc on package sources]'
+    'env[print Go environment information]'
     'fix[run go tool fix on packages]'
     'fmt[run gofmt on package sources]'
     'get[download and install packages and dependencies]'
@@ -39,12 +41,17 @@ __go_tool_complete() {
   build_flags=(
     '-a[force reinstallation of packages that are already up-to-date]'
     '-n[print the commands but do not run them]'
-    "-p[number of parallel builds]:number"
+    '-p[number of parallel builds]:number'
+    '-race[enable data race detection]'
     '-x[print the commands]'
-    "-work[print temporary directory name and keep it]"
-    "-gcflags[flags for 5g/6g/8g]:flags"
-    "-ldflags[flags for 5l/6l/8l]:flags"
-    "-gccgoflags[flags for gccgo]:flags"
+    '-work[print temporary directory name and keep it]'
+    '-ccflags[flags for 5c/6c/8c]:flags'
+    '-gcflags[flags for 5g/6g/8g]:flags'
+    '-ldflags[flags for 5l/6l/8l]:flags'
+    '-gccgoflags[flags for gccgo]:flags'
+    '-compiler[name of compiler to use]:name'
+    '-installsuffix[suffix to add to package directory]:suffix'
+    '-tags[list of build tags to consider satisfied]:tags'
   )
   __go_list() {
       local expl importpaths
@@ -62,7 +69,7 @@ __go_tool_complete() {
   install)
       _arguments -s -w : ${build_flags[@]} \
         "-v[show package names]" \
-    '*:importpaths:__go_list'
+        '*:importpaths:__go_list'
       ;;
   get)
       _arguments -s -w : \
@@ -87,7 +94,10 @@ __go_tool_complete() {
         "-cpu[values of GOMAXPROCS to use]:number list" \
         "-run[run tests and examples matching regexp]:regexp" \
         "-bench[run benchmarks matching regexp]:regexp" \
-        "-benchtime[run each benchmark during n seconds]:duration" \
+        "-benchmem[print memory allocation stats]" \
+        "-benchtime[run each benchmark until taking this long]:duration" \
+        "-blockprofile[write goroutine blocking profile to file]:file" \
+        "-blockprofilerate[set sampling rate of goroutine blocking profile]:number" \
         "-timeout[kill test after that duration]:duration" \
         "-cpuprofile[write CPU profile to file]:file:_files" \
         "-memprofile[write heap profile to file]:file:_files" \
@@ -97,7 +107,7 @@ __go_tool_complete() {
   help)
       _values "${commands[@]}" \
         'gopath[GOPATH environment variable]' \
-        'importpath[description of import paths]' \
+        'packages[description of package lists]' \
         'remote[remote import path syntax]' \
         'testflag[description of testing flags]' \
         'testfunc[description of testing functions]'
@@ -147,4 +157,4 @@ __go_tool_complete() {
   esac
 }
 
-compdef __go_tool_complete go
\ No newline at end of file
+compdef __go_tool_complete go

From f6f3e9301940dc21680aa50156355c8dba61b441 Mon Sep 17 00:00:00 2001
From: Emanuele Zattin <emanuelez@gmail.com>
Date: Thu, 13 Feb 2014 10:32:52 +0100
Subject: [PATCH 0537/1378] Improve oneline logs

Add decorate and color to the normal oneline and add a new alias for graph oneline logs.
---
 plugins/git/git.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1285a3247..2b5983f33 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -62,8 +62,10 @@ alias glgg='git log --graph --max-count=10'
 compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
 compdef _git glgga=git-log
-alias glo='git log --oneline'
+alias glo='git log --oneline --decorate --color'
 compdef _git glo=git-log
+alias glog='git log --oneline --decorate --color --graph'
+compdef _git glog=git-log
 alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'

From 1a029f293541d37e545f4706791ca41ce129600b Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Thu, 13 Feb 2014 12:27:00 -0500
Subject: [PATCH 0538/1378] Add rake-fast plugin for fast rake autocompletion

---
 plugins/rake-fast/rake-fast.plugin.zsh | 56 ++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 plugins/rake-fast/rake-fast.plugin.zsh

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
new file mode 100644
index 000000000..0c268355e
--- /dev/null
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -0,0 +1,56 @@
+# rake-fast
+# Fast rake autocompletion plugin for oh-my-zsh
+
+# This script caches the output for later usage and significantly speeds it up.
+# It generates a .rake_tasks file in parallel to the Rakefile.
+
+# You'll want to add `.rake_tasks` to your global .git_ignore file:
+# https://help.github.com/articles/ignoring-files#global-gitignore
+
+# You can force .rake_tasks to refresh with:
+# $ rake_refresh
+
+# This is entirely based on Ullrich Schäfer's work
+# (https://github.com/robb/.dotfiles/pull/10/),
+# which is inspired by this Ruby on Rails trick from 2006:
+# http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
+
+# Author: Kevin Bongart
+# contact@kevinbongart.net
+# http://kevinbongart.net
+# https://github.com/KevinBongart
+
+_rake_refresh () {
+  if [ -f .rake_tasks ]; then
+    rm .rake_tasks
+  fi
+  echo "Generating .rake_tasks..." > /dev/stderr
+  _rake_generate
+  cat .rake_tasks
+}
+
+_rake_does_task_list_need_generating () {
+  if [ ! -f .rake_tasks ]; then return 0;
+  else
+    accurate=$(stat -f%m .rake_tasks)
+    changed=$(stat -f%m Rakefile)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+_rake_generate () {
+  rake --silent --tasks | cut -d " " -f 2 > .rake_tasks
+}
+
+_rake () {
+  if [ -f Rakefile ]; then
+    if _rake_does_task_list_need_generating; then
+      echo "\nGenerating .rake_tasks..." > /dev/stderr
+      _rake_generate
+    fi
+    compadd `cat .rake_tasks`
+  fi
+}
+
+compdef _rake rake
+alias rake_refresh='_rake_refresh'

From 354593e9b2b3a7ec3a0840eeadbc7d760cdd7263 Mon Sep 17 00:00:00 2001
From: Igor Timoshenko <igor.timoshenko@i.ua>
Date: Fri, 14 Feb 2014 14:54:28 +0000
Subject: [PATCH 0539/1378] Added Yii basic command completion

---
 plugins/yii/yii.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/yii/yii.plugin.zsh

diff --git a/plugins/yii/yii.plugin.zsh b/plugins/yii/yii.plugin.zsh
new file mode 100644
index 000000000..b816160f0
--- /dev/null
+++ b/plugins/yii/yii.plugin.zsh
@@ -0,0 +1,17 @@
+# Yii basic command completion
+
+_yii_get_command_list () {
+	protected/yiic | awk '/^ - [a-z]+/ { print $2 }'
+}
+
+_yii () {
+  if [ -f protected/yiic ]; then
+    compadd `_yii_get_command_list`
+  fi
+}
+
+compdef _yii protected/yiic
+compdef _yii yiic
+
+# Aliases
+alias yiic='protected/yiic'

From fdd864bd5b5444848c492454e025257f3c4fa675 Mon Sep 17 00:00:00 2001
From: Chris Wiggins <chris@chriswiggins.co.nz>
Date: Mon, 17 Feb 2014 13:32:24 +1300
Subject: [PATCH 0540/1378] Update battery plugin to show calculating - OSX

Instantly after removing the charger, I have found that the "AvgTimeToEmpty" value can swing to rediculous values. Apple's current claim is that the max battery life is 12 hours, so any value larger than this is considered a "time is being calculated" value.
---
 plugins/battery/battery.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 16ad3e651..2c00ff141 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -30,7 +30,11 @@ if [[ $(uname) == "Darwin" ]] ; then
   	local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
       timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
-      echo "~$((timeremaining / 60)):$((timeremaining % 60))"
+      if [ $timeremaining -gt 720 ] ; then
+        echo "::"
+      else
+        echo "~$((timeremaining / 60)):$((timeremaining % 60))"
+      fi
     else
       echo "∞"
     fi

From 358b6ffcde9e3732ed08387fc176851e07c1862f Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Tue, 18 Feb 2014 14:37:59 -0700
Subject: [PATCH 0541/1378] Add cabal_sandbox_info function

Reports whether the current working directory is within a
sandbox. Useful to check before installing Cabal packages into the
global registry.
---
 plugins/cabal/cabal.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index 8d3c64587..9f76add7a 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -1,3 +1,14 @@
+function cabal_sandbox_info() {
+    cabal_files=(*.cabal(N))
+    if [ $#cabal_files -gt 0 ]; then
+        if [ -f cabal.sandbox.config ]; then
+            echo "%{$fg[green]%}sandboxed%{$reset_color%}"
+        else
+            echo "%{$fg[red]%}not sandboxed%{$reset_color%}"
+        fi
+    fi
+}
+
 function _cabal_commands() {
     local ret=1 state
     _arguments ':subcommand:->subcommand' && ret=0

From 1df7d01618f06cc80b7f9d14bd088c70e6382d33 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Tue, 18 Feb 2014 14:43:42 -0700
Subject: [PATCH 0542/1378] Fix URL to gi (gitignore) function

Previous URL doesn't seem to work because the host requires a www
prefix.
---
 plugins/gitignore/gitignore.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index 332497cec..be3c3a635 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,4 +1,4 @@
-function gi() { curl http://gitignore.io/api/$@ ;}
+function gi() { curl http://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
   curl -s http://gitignore.io/api/list | tr "," "\n"

From bd4f7e24ea1451eeab351b0a68ac3729213b369b Mon Sep 17 00:00:00 2001
From: Alexander Hramov <alexander.hramov@gmail.com>
Date: Wed, 19 Feb 2014 15:08:47 +0300
Subject: [PATCH 0543/1378] Update gitignore.plugin.zsh

Fix URL to gi (gitignore) function in _gitignireio_get_command_list function
---
 plugins/gitignore/gitignore.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index be3c3a635..be037d87a 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
 function gi() { curl http://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
-  curl -s http://gitignore.io/api/list | tr "," "\n"
+  curl -s http://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignireio () {
@@ -9,4 +9,4 @@ _gitignireio () {
   compadd -S '' `_gitignireio_get_command_list`
 }
 
-compdef _gitignireio gi
\ No newline at end of file
+compdef _gitignireio gi

From c0f716b2e5ce7bd36baf812e8b6175a65bb1097e Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@simpleenergy.com>
Date: Wed, 19 Feb 2014 13:33:02 -0700
Subject: [PATCH 0544/1378] Fix remaining broken URL in gitignore function

---
 plugins/gitignore/gitignore.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index be3c3a635..4f68831da 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
 function gi() { curl http://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
-  curl -s http://gitignore.io/api/list | tr "," "\n"
+  curl -s http://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignireio () {

From 840ae4382ec5b60f9a5f4ef500e40b7193c4ee87 Mon Sep 17 00:00:00 2001
From: Brandon Beacher <brandon.beacher@gmail.com>
Date: Wed, 19 Feb 2014 18:55:52 -0500
Subject: [PATCH 0545/1378] Remove mailcatcher from the bundler plugin.

Recommended by @sj26 per https://github.com/sj26/mailcatcher#bundler.
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 9dfed61a4..df30ed7c7 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 598a9c6f990756386517d66b6bcf77e53791e905 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 20 Feb 2014 10:18:53 -0800
Subject: [PATCH 0546/1378] Adieu l'ami.

 @jimweirich -- You will be missed.
---
 plugins/rake/rake.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
index 16b933c14..121150017 100644
--- a/plugins/rake/rake.plugin.zsh
+++ b/plugins/rake/rake.plugin.zsh
@@ -1,3 +1,7 @@
+# Thank you Jim for everything you contributed to the Ruby and open source community 
+# over the years. We will miss you dearly.
+alias jimweirich="rake"  
+
 alias rake="noglob rake" # allows square brackts for rake task invocation
 alias brake='noglob bundle exec rake' # execute the bundled rake gem
 alias srake='noglob sudo rake' # noglob must come before sudo

From b0fbe0d11ac60074b4fdc20e332bc2db3e0c0066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 12 Dec 2013 23:27:22 +0100
Subject: [PATCH 0547/1378] Avoid evaluating special chars in $LINE on title
 command (fixes #2234)

---
 lib/termsupport.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 80319e1a8..6eba8f69a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,9 +27,8 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2:gs/$/\\$}"
-  LINE="${LINE:gs/%/%%}"
-  title "$CMD" "%100>...>$LINE%<<"
+  local LINE="${2}"
+  title "$CMD" '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From b73ced397fc74618d92f748e2744e65f901b368f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Dec 2013 02:13:18 +0100
Subject: [PATCH 0548/1378] Use single quotes also in $LINE definiton

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 6eba8f69a..d3d8c967f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2}"
+  local LINE='${2}'
   title "$CMD" '%100>...>$LINE%<<'
 }
 

From 3e5de21dc5b71e332a1526ae14beb662a66d6e26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Dec 2013 04:30:29 +0100
Subject: [PATCH 0549/1378] Revert previous commit, escape %

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index d3d8c967f..623bf1f09 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE='${2}'
+  local LINE="${2:gs/%/%%}"
   title "$CMD" '%100>...>$LINE%<<'
 }
 

From a951600b4e81d73d71a098e48aa8d296be853bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 16 Dec 2013 09:24:24 +0100
Subject: [PATCH 0550/1378] Avoid 'title:parse error' with single quotes in
 $CMD Fixes #2182

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 623bf1f09..5f2fe63d4 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,7 +28,7 @@ function omz_termsupport_preexec {
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
   local LINE="${2:gs/%/%%}"
-  title "$CMD" '%100>...>$LINE%<<'
+  title '$CMD' '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From 7a546362d35d6c74f9c301aa477594fdf2cc1bfc Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@brack3t.com>
Date: Fri, 21 Feb 2014 22:47:56 -0800
Subject: [PATCH 0551/1378] Much needed PEP8 love. Use spaces, not tabs.

---
 plugins/git-prompt/gitstatus.py | 88 +++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index ee6fab9bd..6d64e8277 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,20 +1,30 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
+from subprocess import Popen, PIPE
+import re
 
 # change those symbols to whatever you prefer
-symbols = {'ahead of': '↑', 'behind': '↓', 'staged':'♦', 'changed':'‣', 'untracked':'…', 'clean':'⚡', 'unmerged':'≠', 'sha1':':'}
+symbols = {
+    'ahead of': '↑',
+    'behind': '↓',
+    'staged': '♦',
+    'changed': '‣',
+    'untracked': '…',
+    'clean': '⚡',
+    'unmerged': '≠',
+    'sha1': ':'
+}
 
-from subprocess import Popen, PIPE
-
-output,error = Popen(['git','status'], stdout=PIPE, stderr=PIPE).communicate()
+output, error = Popen(
+    ['git', 'status'], stdout=PIPE, stderr=PIPE).communicate()
 
 if error:
-	import sys
-	sys.exit(0)
+    import sys
+    sys.exit(0)
 lines = output.splitlines()
 
-import re
-behead_re = re.compile(r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
+behead_re = re.compile(
+    r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
 diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
 
 status = ''
@@ -23,46 +33,50 @@ changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
 untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
 unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
 
+
 def execute(*command):
-	out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
-	if not err:
-		nb = len(out.splitlines())
-	else:
-		nb = '?'
-	return nb
+    out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
+    if not err:
+        nb = len(out.splitlines())
+    else:
+        nb = '?'
+    return nb
 
 if staged.search(output):
-	nb = execute(['git','diff','--staged','--name-only','--diff-filter=ACDMRT'])
-	status += '%s%s' % (symbols['staged'], nb)
+    nb = execute(
+        ['git', 'diff', '--staged', '--name-only', '--diff-filter=ACDMRT'])
+    status += '%s%s' % (symbols['staged'], nb)
 if unmerged.search(output):
-	nb = execute(['git','diff', '--staged','--name-only', '--diff-filter=U'])
-	status += '%s%s' % (symbols['unmerged'], nb)
+    nb = execute(['git', 'diff', '--staged', '--name-only', '--diff-filter=U'])
+    status += '%s%s' % (symbols['unmerged'], nb)
 if changed.search(output):
-	nb = execute(['git','diff','--name-only', '--diff-filter=ACDMRT'])
-	status += '%s%s' % (symbols['changed'], nb)
+    nb = execute(['git', 'diff', '--name-only', '--diff-filter=ACDMRT'])
+    status += '%s%s' % (symbols['changed'], nb)
 if untracked.search(output):
-## 		nb = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
-## 		status += "%s" % (symbols['untracked']*(nb//3 + 1), )
-	status += symbols['untracked']
+    status += symbols['untracked']
 if status == '':
-	status = symbols['clean']
+    status = symbols['clean']
 
 remote = ''
 
 bline = lines[0]
 if bline.find('Not currently on any branch') != -1:
-	branch = symbols['sha1']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
+    branch = symbols['sha1'] + Popen([
+        'git',
+        'rev-parse',
+        '--short',
+        'HEAD'], stdout=PIPE).communicate()[0][:-1]
 else:
-	branch = bline.split(' ')[3]
-	bstatusline = lines[1]
-	match = behead_re.match(bstatusline)
-	if match:
-		remote = symbols[match.groups()[0]]
-		remote += match.groups()[2]
-	elif lines[2:]:
-		div_match = diverge_re.match(lines[2])
-	 	if div_match:
-			remote = "{behind}{1}{ahead of}{0}".format(*div_match.groups(), **symbols)
-
-print '\n'.join([branch,remote,status])
+    branch = bline.split(' ')[3]
+    bstatusline = lines[1]
+    match = behead_re.match(bstatusline)
+    if match:
+        remote = symbols[match.groups()[0]]
+        remote += match.groups()[2]
+    elif lines[2:]:
+        div_match = diverge_re.match(lines[2])
+        if div_match:
+            remote = "{behind}{1}{ahead of}{0}".format(
+                *div_match.groups(), **symbols)
 
+print('\n'.join([branch, remote, status]))

From c397000b3b0c1cf3bceb95dfc5fcdaf1844aa751 Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@brack3t.com>
Date: Fri, 21 Feb 2014 22:48:38 -0800
Subject: [PATCH 0552/1378] grab last item in list which is the branch instead
 of relying on position.

---
 plugins/git-prompt/gitstatus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 6d64e8277..ef894bff2 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -67,7 +67,7 @@ if bline.find('Not currently on any branch') != -1:
         '--short',
         'HEAD'], stdout=PIPE).communicate()[0][:-1]
 else:
-    branch = bline.split(' ')[3]
+    branch = bline.split(' ')[-1]
     bstatusline = lines[1]
     match = behead_re.match(bstatusline)
     if match:

From 8309b0a19baa351d643194f897d59de7b3d3b3dd Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 23 Feb 2014 10:07:26 +0100
Subject: [PATCH 0553/1378] Verification of convert inside the function

Depending on when the path is declared this solution would work in any case
---
 plugins/catimg/catimg.plugin.zsh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index 70ef9a63c..cb92f5986 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -7,10 +7,11 @@
 # Github: https://github.com/posva/catimg                                      #
 ################################################################################
 
-if [[ -x  `which convert` ]]; then
-  function catimg() {
+
+function catimg() {
+  if [[ -x  `which convert` ]]; then
     zsh $ZSH/plugins/catimg/catimg.sh $@
-  }
-else
-  echo "catimg need convert (ImageMagick) to work)"
-fi
+  else
+    echo "catimg need convert (ImageMagick) to work)"
+  fi
+}

From 6cc240811fd5756a7e2fd1a79ac529ca5f284e1d Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 25 Feb 2014 20:27:33 -0800
Subject: [PATCH 0554/1378] ..a fundamental piece of matter.

---
 plugins/atom/atom.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/atom/atom.plugin.zsh

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
new file mode 100644
index 000000000..048fd7521
--- /dev/null
+++ b/plugins/atom/atom.plugin.zsh
@@ -0,0 +1,4 @@
+#
+# Your guess is as good as mine. Let's just assume that we will need this...
+#   - For more info visit... http://atom.io/
+#
\ No newline at end of file

From 56babe6538450f85ac2e8ef3dd04bf1654c46d75 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Wed, 26 Feb 2014 19:35:24 -0500
Subject: [PATCH 0555/1378] Adds command line aliases useful for dealing with
 JSON

---
 plugins/jsontools/jsontools.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/jsontools/jsontools.plugin.zsh

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
new file mode 100644
index 000000000..51578b349
--- /dev/null
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -0,0 +1,14 @@
+# JSON Tools
+# Adds command line aliases useful for dealing with JSON
+
+if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
+    JSONTOOLS_METHOD=""
+fi
+
+if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+	alias pp_json='python -mjson.tool'
+elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
+	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+fi
+
+unset JSONTOOLS_METHOD
\ No newline at end of file

From f139401485ba389cbec5c83357e8827b1c53447b Mon Sep 17 00:00:00 2001
From: Josh Burns <admin@joshburns.ml>
Date: Fri, 28 Feb 2014 01:26:17 +1100
Subject: [PATCH 0556/1378] add gem build alias

---
 plugins/gem/gem.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/gem/gem.plugin.zsh

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
new file mode 100644
index 000000000..5b14fe7d0
--- /dev/null
+++ b/plugins/gem/gem.plugin.zsh
@@ -0,0 +1 @@
+alias gb="gem build *.gemspec"
\ No newline at end of file

From da573f635648efb07603d7172bb08c2f271e1164 Mon Sep 17 00:00:00 2001
From: Josh Burns <admin@joshburns.ml>
Date: Fri, 28 Feb 2014 01:26:54 +1100
Subject: [PATCH 0557/1378] add gem push alias

---
 plugins/gem/gem.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index 5b14fe7d0..ca2900353 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1 +1,2 @@
-alias gb="gem build *.gemspec"
\ No newline at end of file
+alias gemb="gem build *.gemspec"
+alias gemp="gem push *.gem"
\ No newline at end of file

From fdbf0cbe4687c32846764695fabdf4acdb63a62f Mon Sep 17 00:00:00 2001
From: Josh Burns <admin@joshburns.ml>
Date: Fri, 28 Feb 2014 01:32:01 +1100
Subject: [PATCH 0558/1378] gem push alias and gem yank alias

---
 plugins/gem/gem.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index ca2900353..938f5c993 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1,2 +1,7 @@
 alias gemb="gem build *.gemspec"
-alias gemp="gem push *.gem"
\ No newline at end of file
+alias gemp="gem push *.gem"
+
+# gemy GEM 0.0.0 = gem yank GEM -v 0.0.0
+function gemy {
+	gem yank $1 -v $2
+}
\ No newline at end of file

From 185cb6e37352cc0d92042e35d259b0de3f5f3886 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Thu, 27 Feb 2014 10:56:07 -0500
Subject: [PATCH 0559/1378] adding support for node

---
 plugins/jsontools/jsontools.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 51578b349..7b6f8c585 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -5,7 +5,9 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
     JSONTOOLS_METHOD=""
 fi
 
-if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
+    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'

From 6dcdfe61e2005728ff7e1e48d452de4b38294799 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Thu, 27 Feb 2014 11:52:21 +0200
Subject: [PATCH 0560/1378] :panda_face: Added simulator alias for Xcode plugin

It is often required to start simulator without Xcode.
---
 plugins/xcode/xcode.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index f137253f3..4816ab0ed 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -16,3 +16,4 @@ function xcsel {
 
 alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
+alias simulator='open $(xcode-select  -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'

From 5ba96e9a053514d6beb25e5c27cf4af746f142ef Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Sun, 2 Mar 2014 03:59:27 -0500
Subject: [PATCH 0561/1378] Fixed sublime plugin behaviors.

- Fixed subl search path order in Mac because Sublime Text 3 is named
  Sublime Text.app by default instead of Sublime Text 3.app and they are
  mostly likely to be placed in /Applications instead of
  $HOME/Applications.
- Fixed sublime text binary path in Linux. The sublime_text binary
  installed by Ubuntu installer is placed in /opt/sublime_text/sublime_text
  instead of /usr/bin/sublime_text.
- Use zsh's built-in process detach syntax instead of nohup.
---
 plugins/sublime/sublime.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 566279183..6ca5892e5 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -3,19 +3,19 @@
 local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
     "/usr/local/bin/subl"
-    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
     "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
     "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
 )
 
 if [[ $('uname') == 'Linux' ]]; then
-    if [ -f '/usr/bin/sublime_text' ]; then
-        st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
+    if [ -f '/opt/sublime_text/sublime_text' ]; then
+        st_run() { /opt/sublime_text/sublime_text $@ &| }
     else
-        st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
+        st_run() { /usr/bin/sublime-text $@ &| }
     fi
     alias st=st_run
 

From 564a708d6af90b1bc5bf4d13e7ad80abca92ad74 Mon Sep 17 00:00:00 2001
From: Thiago Perrotta <thiagoperrotta95@gmail.com>
Date: Sun, 2 Mar 2014 14:47:35 -0300
Subject: [PATCH 0562/1378] added the linux implementation to the battery
 plugin

---
 plugins/battery/battery.plugin.zsh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 16ad3e651..670c6a47d 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -58,9 +58,19 @@ if [[ $(uname) == "Darwin" ]] ; then
 
 elif [[ $(uname) == "Linux"  ]] ; then
 
+  function battery_is_charging() {
+    ! [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]]
+  }
+
+  function battery_pct() {
+    echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+  }
+
   function battery_pct_remaining() {
-    if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
-      echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+    if [ ! $(battery_is_charging) ] ; then
+      battery_pct
+    else
+      echo "External Power"
     fi
   }
 
@@ -86,15 +96,6 @@ elif [[ $(uname) == "Linux"  ]] ; then
     fi
   }
   
-  function battery_pct() {
-    # todo for on linux
-  }
-  
-  function battery_is_charging() {
-    # todo on linux
-	false
-  }
-
 else
   # Empty functions so we don't cause errors in prompts
   function battery_pct_remaining() {

From 2691520d6f84fd0022fcb82a497042bb92c777b7 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Sun, 2 Mar 2014 14:13:55 -0500
Subject: [PATCH 0563/1378] Integrate changes from #1841.

---
 plugins/sublime/sublime.plugin.zsh | 41 +++++++++++++++++-------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 6ca5892e5..a2042343a 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,25 +1,32 @@
 # Sublime Text 2 Aliases
 
-local _sublime_darwin_paths > /dev/null 2>&1
-_sublime_darwin_paths=(
-    "/usr/local/bin/subl"
-    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
-    "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
-    "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
-    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-)
-
 if [[ $('uname') == 'Linux' ]]; then
-    if [ -f '/opt/sublime_text/sublime_text' ]; then
-        st_run() { /opt/sublime_text/sublime_text $@ &| }
-    else
-        st_run() { /usr/bin/sublime-text $@ &| }
-    fi
-    alias st=st_run
+    local _sublime_linux_paths > /dev/null 2>&1
+    _sublime_linux_paths=(
+        "$HOME/bin/sublime_text"
+        "/opt/sublime_text/sublime_text"
+        "/usr/bin/sublime_text"
+        "/usr/local/bin/sublime_text"
+    )
+    for _sublime_path in $_sublime_linux_paths; do
+        if [[ -a $_sublime_path ]]; then
+            st_run() { $_sublime_path $@ >/dev/null 2>&1 &| }
+            alias st=st_run
+            break
+        fi
+    done
 
 elif  [[ $('uname') == 'Darwin' ]]; then
+    local _sublime_darwin_paths > /dev/null 2>&1
+    _sublime_darwin_paths=(
+        "/usr/local/bin/subl"
+        "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+        "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+        "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+        "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+        "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
+        "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+    )
 
     for _sublime_path in $_sublime_darwin_paths; do
         if [[ -a $_sublime_path ]]; then

From c0b98cd6aca5b6148a5ee147b087772bfb9f5e21 Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffsmessages@gmail.com>
Date: Mon, 3 Mar 2014 10:18:10 -0500
Subject: [PATCH 0564/1378] Added dirhistory plugin.

This plugin navigates directory history using ALT-LEFT and ALT-RIGHT.
---
 plugins/dirhistory/dirhistory.plugin.zsh | 132 +++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 plugins/dirhistory/dirhistory.plugin.zsh

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
new file mode 100644
index 000000000..504d7ec14
--- /dev/null
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -0,0 +1,132 @@
+## 
+#   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories 
+#   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
+# 
+
+dirhistory_past=(`pwd`)
+dirhistory_future=()
+export dirhistory_past
+export dirhistory_future
+
+export DIRHISTORY_SIZE=30
+
+# Pop the last element of dirhistory_past. 
+# Pass the name of the variable to return the result in. 
+# Returns the element if the array was not empty,
+# otherwise returns empty string.
+function pop_past() {
+  eval "$1='$dirhistory_past[$#dirhistory_past]'"
+  if [[ $#dirhistory_past -gt 0 ]]; then
+    dirhistory_past[$#dirhistory_past]=()
+  fi
+}
+
+function pop_future() {
+  eval "$1='$dirhistory_future[$#dirhistory_future]'"
+  if [[ $#dirhistory_future -gt 0 ]]; then
+    dirhistory_future[$#dirhistory_future]=()
+  fi
+}
+
+# Push a new element onto the end of dirhistory_past. If the size of the array 
+# is >= DIRHISTORY_SIZE, the array is shifted
+function push_past() {
+  if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
+    shift dirhistory_past
+  fi
+  if [[ $#dirhistory_past -eq 0 || $dirhistory_past[$#dirhistory_past] != "$1" ]]; then
+    dirhistory_past+=($1)
+  fi
+}
+
+function push_future() {
+  if [[ $#dirhistory_future -ge $DIRHISTORY_SIZE ]]; then
+    shift dirhistory_future
+  fi
+  if [[ $#dirhistory_future -eq 0 || $dirhistory_futuret[$#dirhistory_future] != "$1" ]]; then
+    dirhistory_future+=($1)
+  fi
+}
+
+# Called by zsh when directory changes
+function chpwd() {
+  push_past `pwd`
+  # If DIRHISTORY_CD is not set...
+  if [[ -z "${DIRHISTORY_CD+x}" ]]; then
+    # ... clear future.
+    dirhistory_future=()
+  fi
+}
+
+function dirhistory_cd(){
+  DIRHISTORY_CD="1"
+  cd $1
+  unset DIRHISTORY_CD
+}
+
+# Move backward in directory history
+function dirhistory_back() {
+  local cw=""
+  local d=""
+  # Last element in dirhistory_past is the cwd.
+
+  pop_past cw 
+  if [[ "" == "$cw" ]]; then
+    # Someone overwrote our variable. Recover it.
+    dirhistory_past=(`pwd`)
+    return
+  fi
+
+  pop_past d
+  if [[ "" != "$d" ]]; then
+    dirhistory_cd $d
+    push_future $cw
+  else
+    push_past $cw
+  fi
+}
+
+
+# Move forward in directory history
+function dirhistory_forward() {
+  local d=""
+
+  pop_future d
+  if [[ "" != "$d" ]]; then
+    dirhistory_cd $d
+    push_past $d
+  fi
+}
+
+
+# Bind keys to history navigation
+function dirhistory_zle_dirhistory_back() {
+  # Erase current line in buffer
+  zle kill-buffer
+  dirhistory_back 
+  zle accept-line
+}
+
+function dirhistory_zle_dirhistory_future() {
+  # Erase current line in buffer
+  zle kill-buffer
+  dirhistory_forward
+  zle accept-line
+}
+
+zle -N dirhistory_zle_dirhistory_back
+# xterm in normal mode
+bindkey "\e[3D" dirhistory_zle_dirhistory_back
+bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
+# Putty:
+bindkey "\e\e[D" dirhistory_zle_dirhistory_back
+# GNU screen:
+bindkey "\eO3D" dirhistory_zle_dirhistory_back
+
+zle -N dirhistory_zle_dirhistory_future
+bindkey "\e[3C" dirhistory_zle_dirhistory_future
+bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
+bindkey "\e\e[C" dirhistory_zle_dirhistory_future
+bindkey "\eO3C" dirhistory_zle_dirhistory_future
+
+

From d41ac7fe3e52783054610c2cc57bbbfcdb2202b0 Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mf@bitblueprint.com>
Date: Tue, 4 Mar 2014 20:25:54 +0100
Subject: [PATCH 0565/1378] Updated wd plugin to v0.3.0

---
 plugins/wd/_wd.sh        | 96 ++++++++++++++++++++++++----------------
 plugins/wd/wd.plugin.zsh |  4 +-
 plugins/wd/wd.sh         | 75 ++++++++++++++-----------------
 3 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 950564435..29df63520 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -1,48 +1,68 @@
-#compdef wd.sh
+#compdef wd
 
-zstyle ":completion:*:descriptions" format "%B%d%b"
+zstyle ':completion:*:descriptions' format '%B%d%b'
+zstyle ':completion::complete:wd:*:commands' group-name commands
+zstyle ':completion::complete:wd:*:warp_points' group-name warp_points
+zstyle ':completion::complete:wd::' list-grouped
 
-CONFIG=$HOME/.warprc
+# Call `_wd()` when when trying to complete the command `wd`
 
-local -a main_commands
-main_commands=(
-    add:'Adds the current working directory to your warp points'
-    #add'\!':'Overwrites existing warp point' # TODO: Fix
-    rm:'Removes the given warp point'
-    ls:'Outputs all stored warp points'
-    show:'Outputs warp points to current directory'
-)
+zmodload zsh/mapfile
+function _wd() {
+  local ret=1
+  local CONFIG=$HOME/.warprc
 
-local -a points
-while read line
-do
-    points+=$(awk "{ gsub(/\/Users\/$USER|\/home\/$USER/,\"~\"); print }" <<< $line)
-done < $CONFIG
+  # Stolen from
+  # http://stackoverflow.com/questions/9000698/completion-when-program-has-sub-commands
 
-_wd()
-{
-    # init variables
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
+  # local curcontext="$curcontext" state line
+  # typeset -A opt_args
 
-    # init state
-    _arguments \
-        '1: :->command' \
-        '2: :->argument'
+  local -a commands
+  local -a warp_points
+  warp_points=( "${(f)mapfile[$CONFIG]}" )
+  # LIST="${mapfile[$FNAME]}" # Not required unless stuff uses it
 
-    case $state in
-        command)
-            compadd "$@" add rm ls show
-            _describe -t warp-points 'Warp points:' points && ret=0
-            ;;
-        argument)
-            case $words[2] in
-                rm|add!)
-                    _describe -t warp-points 'warp points' points && ret=0
-                    ;;
-                *)
-            esac
-    esac
+  commands=(
+    'add:Adds the current working directory to your warp points'
+    'add!:Overwrites existing warp point'
+    'rm:Removes the given warp point'
+    'ls:Outputs all stored warp points'
+    'show:Outputs all warp points that point to the current directory'
+    'help:Show this extremely helpful text'
+    '..:Go back to last directory'
+  )
+
+  _arguments -C \
+    '1: :->first_arg' \
+    '2: :->second_arg' && ret=0
+
+  case $state in
+    first_arg)
+      _describe -t warp_points "Warp points" warp_points && ret=0
+      _describe -t commands "Commands" commands && ret=0
+      ;;
+    second_arg)
+      case $words[2] in
+        add\!|rm)
+          _describe -t points "Warp points" warp_points && ret=0
+          ;;
+        add)
+          _message 'Write the name of your warp point' && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return $ret
 }
 
 _wd "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index bbec4a715..9800335fc 100755
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -6,4 +6,6 @@
 #
 # @github.com/mfaerevaag/wd
 
-alias wd='. $ZSH/plugins/wd/wd.sh'
+wd() {
+    . $ZSH/plugins/wd/wd.sh
+}
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 744f58bc2..96a3426fc 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -50,12 +50,12 @@ wd_warp()
             wd_print_msg $YELLOW "Warping to current directory?"
         else
             (( n = $#1 - 1 ))
-            wd_print_msg $BLUE "Warping..."
+            #wd_print_msg $BLUE "Warping..."
             cd -$n > /dev/null
         fi
     elif [[ ${points[$1]} != "" ]]
     then
-        wd_print_msg $BLUE "Warping..."
+        #wd_print_msg $BLUE "Warping..."
         cd ${points[$1]}
     else
         wd_print_msg $RED "Unkown warp point '$1'"
@@ -64,16 +64,16 @@ wd_warp()
 
 wd_add()
 {
-    if [[ $1 =~ "^\.+$" ]]
+    if [[ $2 =~ "^\.+$" || $2 =~ "^\s*$" ]]
     then
-        wd_print_msg $RED "Illeagal warp point (see README)."
-    elif [[ ${points[$1]} == "" ]] || $2
+        wd_print_msg $RED "Illegal warp point (see README)."
+    elif [[ ${points[$2]} == "" ]] || $1
     then
-        wd_remove $1 > /dev/null
-        print "$1:$PWD" >> $CONFIG
+        wd_remove $2 > /dev/null
+        print "$2:$PWD" >> $CONFIG
         wd_print_msg $GREEN "Warp point added"
     else
-        wd_print_msg $YELLOW "Warp point '$1' alredy exists. Use 'add!' to overwrite."
+        wd_print_msg $YELLOW "Warp point '$2' already exists. Use 'add!' to overwrite."
     fi
 }
 
@@ -83,7 +83,9 @@ wd_remove()
     then
         if wd_tmp=`sed "/^$1:/d" $CONFIG`
         then
-            echo $wd_tmp > $CONFIG
+            # `>!` forces overwrite
+            # we need this if people use `setopt NO_CLOBBER`
+            echo $wd_tmp >! $CONFIG
             wd_print_msg $GREEN "Warp point removed"
         else
             wd_print_msg $RED "Warp point unsuccessfully removed. Sorry!"
@@ -131,9 +133,9 @@ wd_print_usage()
     print "\nCommands:"
     print "\t add \t Adds the current working directory to your warp points"
     print "\t add! \t Overwrites existing warp point"
-    print "\t remove  Removes the given warp point"
+    print "\t rm \t  Removes the given warp point"
     print "\t show \t Outputs warp points to current directory"
-    print "\t list \t Outputs all stored warp points"
+    print "\t ls \t Outputs all stored warp points"
     print "\t help \t Show this extremely helpful text"
 }
 
@@ -141,7 +143,7 @@ wd_print_usage()
 ## run
 
 # get opts
-args=`getopt -o a:r:lhs -l add:,remove:,list,help,show -- $*`
+args=`getopt -o a:r:lhs -l add:,rm:,ls,help,show -- $*`
 
 # check if no arguments were given
 if [[ $? -ne 0 || $#* -eq 0 ]]
@@ -161,49 +163,40 @@ else
 
     for i
     do
-		    case "$i"
-		        in
-			      -a|--add|add)
-                wd_add $2 false
-				        shift
-                shift
+        case "$i"
+            in
+            -a|--add|add)
+                wd_add false $2
                 break
                 ;;
             -a!|--add!|add!)
-                wd_add $2 true
-				        shift
-                shift
+                wd_add true $2
                 break
                 ;;
-			      -r|--remove|rm)
-				        wd_remove $2
-                shift
-				        shift
+            -r|--remove|rm)
+                wd_remove $2
                 break
                 ;;
-			      -l|--list|ls)
-				        wd_list_all
-				        shift
+            -l|--list|ls)
+                wd_list_all
                 break
                 ;;
-			      -h|--help|help)
-				        wd_print_usage
-				        shift
+            -h|--help|help)
+                wd_print_usage
                 break
                 ;;
-			      -s|--show|show)
-				        wd_show
-				        shift
+            -s|--show|show)
+                wd_show
                 break
                 ;;
             *)
                 wd_warp $i
-                shift
                 break
                 ;;
-			      --)
-				        shift; break;;
-		    esac
+            --)
+                break
+                ;;
+        esac
     done
 fi
 
@@ -211,6 +204,6 @@ fi
 ## garbage collection
 # if not, next time warp will pick up variables from this run
 # remember, there's no sub shell
-points=""
-args=""
-unhash -d val &> /dev/null # fixes issue #1
+unset points
+unset args
+unset val &> /dev/null # fixes issue #1

From 8b667b229973dee2abb52edacbd056cbe52bb8f7 Mon Sep 17 00:00:00 2001
From: Jouko Johansson <jouko.johansson@sanoma.fi>
Date: Fri, 7 Mar 2014 01:09:04 +0200
Subject: [PATCH 0566/1378] added mvn-update

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 0c9141907..4ef342e60 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -52,7 +52,7 @@ alias mvnc='mvn clean'
 alias mvncom='mvn compile'
 alias mvnt='mvn test'
 alias mvnag='mvn archetype:generate'
-
+alias mvn-updates='mvn versions:display-dependency-updates'
 function listMavenCompletions { 
      reply=(
         # common lifecycle

From 7378765a79491c836831543a6da3d88dac9b7568 Mon Sep 17 00:00:00 2001
From: Jouko Johansson <jouko.johansson@sanoma.fi>
Date: Fri, 7 Mar 2014 01:22:37 +0200
Subject: [PATCH 0567/1378] added aliases for tomcat:run tomcat7:run

---
 plugins/mvn/mvn.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 4ef342e60..e9d7c0fc1 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -53,6 +53,10 @@ alias mvncom='mvn compile'
 alias mvnt='mvn test'
 alias mvnag='mvn archetype:generate'
 alias mvn-updates='mvn versions:display-dependency-updates'
+alias mvntc7='mvn tomcat7:run' 
+alias mvntc='mvn tomcat:run'
+
+
 function listMavenCompletions { 
      reply=(
         # common lifecycle

From fd8ce7f8e3ea96a7746e46339e447f7cbb83aa57 Mon Sep 17 00:00:00 2001
From: Jouko Johansson <jouko.johansson@sanoma.fi>
Date: Fri, 7 Mar 2014 01:23:37 +0200
Subject: [PATCH 0568/1378] added mvnjetty alias

---
 plugins/mvn/mvn.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index e9d7c0fc1..ed7968534 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -55,6 +55,7 @@ alias mvnag='mvn archetype:generate'
 alias mvn-updates='mvn versions:display-dependency-updates'
 alias mvntc7='mvn tomcat7:run' 
 alias mvntc='mvn tomcat:run'
+alias mvnjetty='mvn jetty:run'
 
 
 function listMavenCompletions { 

From c249c69065f1216bd83f5bd92e87f560e42675fb Mon Sep 17 00:00:00 2001
From: Dan Kerimdzhanov <kerimdzhanov@gmail.com>
Date: Sat, 8 Mar 2014 23:51:16 +0600
Subject: [PATCH 0569/1378] Remove all copyright information in themes. Closes
 #2587

---
 themes/adben.zsh-theme         | 13 +++++--------
 themes/af-magic.zsh-theme      |  6 ------
 themes/avit.zsh-theme          | 18 ------------------
 themes/candy-kingdom.zsh-theme |  7 -------
 themes/dogenpunk.zsh-theme     |  8 +-------
 themes/duellj.zsh-theme        |  1 -
 themes/eastwood.zsh-theme      |  4 ++--
 themes/essembeh.zsh-theme      |  1 -
 themes/fino-time.zsh-theme     |  2 +-
 themes/fino.zsh-theme          |  5 ++---
 themes/fox.zsh-theme           |  3 ++-
 themes/gianu.zsh-theme         |  5 -----
 themes/intheloop.zsh-theme     |  3 +--
 themes/itchy.zsh-theme         |  1 -
 themes/jaischeema.zsh-theme    |  9 +--------
 themes/juanghurtado.zsh-theme  |  7 ++-----
 themes/junkfood.zsh-theme      |  4 ----
 themes/kphoen.zsh-theme        |  9 +--------
 themes/pure.zsh-theme          | 22 ----------------------
 themes/rixius.zsh-theme        |  3 ---
 themes/smt.zsh-theme           |  8 +-------
 themes/sorin.zsh-theme         | 10 ++--------
 themes/sunrise.zsh-theme       |  4 +---
 themes/trapd00r.zsh-theme      |  3 +--
 24 files changed, 23 insertions(+), 133 deletions(-)

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index b64714f32..aa3093f64 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -2,12 +2,12 @@
 # #
 # # #README
 # #
-# # This theme provides two customizable header functionalities : 
+# # This theme provides two customizable header functionalities:
 # # a) displaying a pseudo-random message from a database of quotations
 # # (https://en.wikipedia.org/wiki/Fortune_%28Unix%29)
-# # b) displaying randomly command line tips from The command line fu 
+# # b) displaying randomly command line tips from The command line fu
 # # (http://www.commandlinefu.com) community: in order to make use of this functionality
-# # you will need Internet connection. 
+# # you will need Internet connection.
 # # This theme provides as well information for the current user's context, like;
 # # branch and status for the current version control system (git and svn currently
 # # supported) and time, presented to the user in a non invasive volatile way.
@@ -25,11 +25,8 @@
 # # -Solarized theme (https://github.com/altercation/solarized/)
 # # -OS X: iTerm 2 (http://www.iterm2.com/)
 # # -font Source code pro (https://github.com/adobe/source-code-pro)
-# # 
-# # Author: Adolfo Benedetti
-# # email: adolfo.benedetti@gmail.com
-# # License: Public Domain
-# # This theme's look and feel is based on the Aaron Toponce's zsh theme , more info: 
+# #
+# # This theme's look and feel is based on the Aaron Toponce's zsh theme, more info:
 # # http://pthree.org/2008/11/23/727/
 # # enjoy!
 ########## COLOR ###########
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 3c2f45658..97d142a0f 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -1,12 +1,6 @@
 # af-magic.zsh-theme
-#
-# Author: Andy Fleming
-# URL: http://andyfleming.com/
 # Repo: https://github.com/andyfleming/oh-my-zsh
 # Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
-#
-# Created on:		June 19, 2012
-# Last modified on:	June 20, 2012
 
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 51f5e375a..a21a9c8c4 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -1,22 +1,4 @@
-#
-# Author:: Andrew Vit (<andrew@avit.ca>)
-#
 # AVIT ZSH Theme
-#
-# Copyright 2011, Andrew Vit
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 PROMPT='
 $(_user_host)${_current_dir} $(git_prompt_info) $(_ruby_version)
diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index 25aeb6597..718977d90 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -1,11 +1,4 @@
 # neuralsanwich.zsh-theme
-#
-# Author: Sean Jones
-# URL: http://www.neuralsandwich.com
-# Repo: 
-# Direct link:
-# Create:
-# Modified: 
 
 if [ "x$OH_MY_ZSH_HG" = "x" ]; then
     OH_MY_ZSH_HG="hg"
diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index f4d65ab74..0bd38acc2 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -1,10 +1,4 @@
-# -----------------------------------------------------------------------------
-#          FILE: dogenpunk.zsh-theme
-#   DESCRIPTION: oh-my-zsh theme file.
-#        AUTHOR: Matthew Nelson (dogenpunk@gmail.com)
-#       VERSION: 0.1
-#    SCREENSHOT: coming soon
-# -----------------------------------------------------------------------------
+# dogenpunk.zsh-theme
 
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
diff --git a/themes/duellj.zsh-theme b/themes/duellj.zsh-theme
index 7350b4335..3849c35be 100644
--- a/themes/duellj.zsh-theme
+++ b/themes/duellj.zsh-theme
@@ -1,4 +1,3 @@
-
 # user, host, full path, and time/date
 # on two lines for easier vgrepping
 # entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
index db2529990..1b284cdc2 100644
--- a/themes/eastwood.zsh-theme
+++ b/themes/eastwood.zsh-theme
@@ -1,4 +1,4 @@
-#RVM settings
+# RVM settings
 if [[ -s ~/.rvm/scripts/rvm ]] ; then 
   RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
 else
@@ -12,7 +12,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
 git_custom_status() {
   local cb=$(current_branch)
   if [ -n "$cb" ]; then
diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index 8c98ea1ed..939bb7a4c 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -1,7 +1,6 @@
 # Theme with full path names and hostname
 # Handy if you work on different servers all the time;
 
-
 local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
 
 function my_git_prompt_info() {
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 7154e09f1..901c4d99f 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -1,4 +1,4 @@
-# Fino-time theme by Aexander Berezovsky (http://berezovsky.me) based on Fino by Max Masnick (http://max.masnick.me)
+# fino-time.zsh-theme
 
 # Use with a dark background and 256-color terminal!
 # Meant for people with RVM and git. Tested only on OS X 10.7.
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 4c7aabcff..35e6e02c1 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -1,4 +1,4 @@
-# Fino theme by Max Masnick (http://max.masnick.me)
+# fino.zsh-theme
 
 # Use with a dark background and 256-color terminal!
 # Meant for people with rbenv and git. Tested only on OS X 10.7.
@@ -11,7 +11,6 @@
 #
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
-
 function prompt_char {
   git branch >/dev/null 2>/dev/null && echo "±" && return
   echo '○'
@@ -41,4 +40,4 @@ PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$F
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
diff --git a/themes/fox.zsh-theme b/themes/fox.zsh-theme
index 1959853cf..3ecd4e204 100644
--- a/themes/fox.zsh-theme
+++ b/themes/fox.zsh-theme
@@ -1,4 +1,5 @@
-#fox theme
+# fox.zsh-theme
+
 PROMPT='%{$fg[cyan]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[cyan]%}☮%{$fg_bold[white]%}%M%{$reset_color%}%{$fg[cyan]%}]%{$fg[white]%}-%{$fg[cyan]%}(%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[cyan]%})$(git_prompt_info)
 └> % %{$reset_color%}'
 
diff --git a/themes/gianu.zsh-theme b/themes/gianu.zsh-theme
index c7fe40665..faa80218e 100644
--- a/themes/gianu.zsh-theme
+++ b/themes/gianu.zsh-theme
@@ -1,8 +1,3 @@
-# Oh-my-Zsh prompt created by gianu
-#
-# github.com/gianu
-# sgianazza@gmail.com
-
 PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)%{$reset_color%}]$ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg_bold[green]%}"
diff --git a/themes/intheloop.zsh-theme b/themes/intheloop.zsh-theme
index 85b4a4d95..7a98db27a 100644
--- a/themes/intheloop.zsh-theme
+++ b/themes/intheloop.zsh-theme
@@ -1,4 +1,3 @@
-# ZSH theme by James Smith (http://loopj.com)
 # A multiline prompt with username, hostname, full path, return status, git branch, git dirty status, git remote status
 
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
@@ -21,4 +20,4 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[grey]%}) %{$fg[yellow]%}⚡%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[grey]%})"
 ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="%{$fg_bold[magenta]%}↓%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="%{$fg_bold[magenta]%}↑%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="%{$fg_bold[magenta]%}↕%{$reset_color%}"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="%{$fg_bold[magenta]%}↕%{$reset_color%}"
diff --git a/themes/itchy.zsh-theme b/themes/itchy.zsh-theme
index afc2abf69..c23889edf 100644
--- a/themes/itchy.zsh-theme
+++ b/themes/itchy.zsh-theme
@@ -1,4 +1,3 @@
-# Created by Daniel Bayerlein https://github.com/danielbayerlein
 # Inspired by http://peepcode.com/blog/2012/my-command-line-prompt
 
 local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
diff --git a/themes/jaischeema.zsh-theme b/themes/jaischeema.zsh-theme
index aecc5b961..da1dd1e5d 100644
--- a/themes/jaischeema.zsh-theme
+++ b/themes/jaischeema.zsh-theme
@@ -1,11 +1,4 @@
-# ------------------------------------------------------------------------------
-#          FILE:  jaischeema.zsh-theme
-#   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Jais Cheema
-#       VERSION:  0.0.1
-# ------------------------------------------------------------------------------
-
-
+# jaischeema.zsh-theme
 
 PROMPT='%{$fg_bold[magenta]%}%m%{$reset_color%} at %{$fg_bold[green]%}%~%{$reset_color%} %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%}%{$fg[red]%}❯%{$reset_color%} '
 
diff --git a/themes/juanghurtado.zsh-theme b/themes/juanghurtado.zsh-theme
index 2f715cc9e..bc470e838 100644
--- a/themes/juanghurtado.zsh-theme
+++ b/themes/juanghurtado.zsh-theme
@@ -1,7 +1,4 @@
-# ------------------------------------------------------------------------
-# Juan G. Hurtado oh-my-zsh theme
-# (Needs Git plugin for current_branch method)
-# ------------------------------------------------------------------------
+# Needs Git plugin for current_branch method
 
 # Color shortcuts
 RED=$fg[red]
@@ -43,4 +40,4 @@ ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
 PROMPT='
 %{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
 %{$BLUE%}>%{$RESET_COLOR%} '
-RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
\ No newline at end of file
+RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index 57b4070dc..01fae4b95 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -1,8 +1,4 @@
-# ------------------------------------------------------------------------
-# Tyler Cipriani 
-# oh-my-zsh theme
 # Totally ripped off Dallas theme
-# ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
 JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}"
diff --git a/themes/kphoen.zsh-theme b/themes/kphoen.zsh-theme
index 0e9b5e73c..8e8894a34 100644
--- a/themes/kphoen.zsh-theme
+++ b/themes/kphoen.zsh-theme
@@ -1,11 +1,4 @@
-# ------------------------------------------------------------------------------
-#          FILE:  kphoen.zsh-theme
-#   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Kévin Gomez (geek63@gmail.com)
-#       VERSION:  1.0.0
-#    SCREENSHOT:
-# ------------------------------------------------------------------------------
-
+# kphoen.zsh-theme
 
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
     PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
diff --git a/themes/pure.zsh-theme b/themes/pure.zsh-theme
index d7ed624e4..1473194a5 100644
--- a/themes/pure.zsh-theme
+++ b/themes/pure.zsh-theme
@@ -18,28 +18,6 @@
 #   Github:   https://github.com/nicoulaj
 #   Twitter:  https://twitter.com/nicoulaj
 #
-# License
-#
-# Copyright (c) 2013 Kasper Kronborg Isager
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
 # ------------------------------------------------------------------------------
 
 # Set required options
diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
index c0c5c9c71..b33f23e1c 100644
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@@ -1,6 +1,3 @@
-# /|/ Code by Stephen
-# /|/ "Rixius" Middleton
-# 
 # name in folder (github)
 # ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
 function collapse_pwd {
diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index bbd1031e1..f2b0526b7 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -1,10 +1,4 @@
-# -----------------------------------------------------------------------------
-#          FILE: smt.zsh-theme
-#   DESCRIPTION: oh-my-zsh theme file, based on dogenpunk by Matthew Nelson.
-#        AUTHOR: Stephen Tudor (stephen@tudorstudio.com
-#       VERSION: 0.1
-#    SCREENSHOT: coming soon
-# -----------------------------------------------------------------------------
+# smt.zsh-theme, based on dogenpunk by Matthew Nelson.
 
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%} "
diff --git a/themes/sorin.zsh-theme b/themes/sorin.zsh-theme
index 601dbe5d7..ac6a49840 100644
--- a/themes/sorin.zsh-theme
+++ b/themes/sorin.zsh-theme
@@ -1,11 +1,5 @@
-# ------------------------------------------------------------------------------
-#          FILE:  sorin.zsh-theme
-#   DESCRIPTION:  oh-my-zsh theme file.
-#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.2
-#    SCREENSHOT:  http://i.imgur.com/aipDQ.png
-# ------------------------------------------------------------------------------
-
+# sorin.zsh-theme
+# screenshot: http://i.imgur.com/aipDQ.png
 
 if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index acc6ed312..4bea20a1b 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -1,8 +1,6 @@
-#-------------------------------------------------------------------------------
-# Sunrise theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
+# Sunrise theme for oh-my-zsh
 # Intended to be used with Solarized: http://ethanschoonover.com/solarized
 # (Needs Git plugin for current_branch method)
-#-------------------------------------------------------------------------------
 
 # Color shortcuts
 R=$fg_no_bold[red]
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index cba14c42c..cb1c43c56 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -1,5 +1,4 @@
-# Name:   trapd00r zsh theme
-# Author: Magnus Woldrich <m@japh.se>
+# trapd00r.zsh-theme
 #
 # This theme needs a terminal supporting 256 colors as well as unicode. It also
 # needs the script that splits up the current path and makes it fancy as located

From 5bd590ceb30ca58d96ec8d5dcfc1fec71bc6ca1f Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sat, 8 Mar 2014 13:13:52 -0800
Subject: [PATCH 0570/1378] Reference default install path from ZSH variable

---
 tools/install.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index b24bb4ad3..01984ea2b 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,16 +1,16 @@
-ZSH=`/usr/bin/env|grep 'ZSH='|cut -d '=' -f 2`
-if [ -d "$ZSH" ]
+if [ ! -n $ZSH ]
+then
+  ZSH=~/.oh-my-zsh
+fi
+
+if [ -d $ZSH ]
 then
   echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
   exit
-elif [ -d ~/.oh-my-zsh ]
-then
-  echo "\033[0;33mYou already have One Oh My Zsh Directory.\033[0m You'll need to remove  ~/.oh-my-zsh if you want to clone"
-  exit
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
+hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }
@@ -23,7 +23,7 @@ then
 fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
-cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
 sed -i -e "/export PATH=/ c\\

From 2e11e2ab5adaea762b7f2eaa6c63332a9618bb3f Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sat, 8 Mar 2014 13:15:18 -0800
Subject: [PATCH 0571/1378] Write install path into .zshrc

---
 tools/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index 01984ea2b..5c7a5b6ca 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -24,6 +24,9 @@ fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
 cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
+sed -i -e "/^ZSH=/ c\\
+ZSH=$ZSH
+" ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
 sed -i -e "/export PATH=/ c\\

From da1fa3b06a6369a5b3337025da164eeec275db70 Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sat, 8 Mar 2014 13:17:16 -0800
Subject: [PATCH 0572/1378] Abort installer on errors

---
 tools/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index 5c7a5b6ca..343f251ae 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,3 +1,5 @@
+set -e
+
 if [ ! -n $ZSH ]
 then
   ZSH=~/.oh-my-zsh

From 9f66d5b797ab73a54d944a7bd43d920a508625ea Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Mon, 23 Apr 2012 14:01:14 -0700
Subject: [PATCH 0573/1378] Document alternate install paths via ZSH variable

Uses environment variable $ZSH to configure install location.
---
 README.textile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 810569486..0fa9b30ec 100644
--- a/README.textile
+++ b/README.textile
@@ -20,8 +20,18 @@ h4. via `wget`
 
 @wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
 
-h3. The manual way
+h4. Optional: change the install directory
 
+The default location is `~/.oh-my-zsh` (hidden in your home directory).
+
+You can change the install directory with the ZSH environment variable, either
+by running `export ZSH=/your/path` before installing, or setting it before the
+end of the install pipeline like this:
+
+@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
+
+
+h3. The manual way
 
 1. Clone the repository
 
@@ -35,7 +45,6 @@ h3. The manual way
 
   @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
 
-
 4. Set zsh as your default shell:
 
   @chsh -s /bin/zsh@
@@ -46,6 +55,8 @@ h3. Problems?
 
 You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
 
+If you installed manually or changed the install location, check ZSH in ~/.zshrc
+
 h2. Usage
 
 * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)

From de0e7b5dc82ca3f18d20bc0d8aab8d9c5dd13ff9 Mon Sep 17 00:00:00 2001
From: Zhou Hua <zhouhua015@gmail.com>
Date: Mon, 10 Mar 2014 11:41:25 +0800
Subject: [PATCH 0574/1378] Fix hgsl alias.

The original 'hgsl' missed 'hg' part.
---
 plugins/mercurial/mercurial.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index d2db89d04..2e99a12fb 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -13,7 +13,7 @@ alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 alias hgp='hg push'
 alias hgs='hg status'
-alias hgsl='log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
+alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
 

From b71a2b9d0f21c0b95840a2534eca2d866a48a941 Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 10 Mar 2014 04:05:14 -0400
Subject: [PATCH 0575/1378] Removed unsolicited aliases.

Those aliases should be in user's .zshrc file, instead of being default.
---
 lib/aliases.zsh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 2094f60a0..3044c9660 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -6,11 +6,6 @@ alias po='popd'
 alias ...='cd ../..'
 alias -- -='cd -'
 
-# Prevent headaches
-alias cp='cp -v'
-alias rm='rm -v'
-alias mv='mv -v'
-
 # Super user
 alias _='sudo'
 alias please='sudo'

From 3c9a29b0d639f52162eb8056a9b657fe4b6f2850 Mon Sep 17 00:00:00 2001
From: Bob Maerten <bob.maerten@gmail.com>
Date: Mon, 10 Mar 2014 16:23:14 +0100
Subject: [PATCH 0576/1378] Fix typo in autocomplete arguments

---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index f13f876cf..12eee7a15 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -111,7 +111,7 @@ __ps() {
         '-beforeId="[Show only container created before Id, include non-running ones.]' \
         '-l[Show only the latest created container, include non-running ones.]' \
         '-n=[Show n last created containers, include non-running ones.]' \
-        '-notrurrrrnc[Dont truncate output]' \
+        '-notrunc[Dont truncate output]' \
         '-q[Only display numeric IDs]' \
         '-s[Display sizes]' \
         '-sinceId="[Show only containers created since Id, include non-running ones.]'

From b9841b0bae97049d426c652f6a9be361c7492040 Mon Sep 17 00:00:00 2001
From: Samvel Khalatyan <sn.khalatyan@gmail.com>
Date: Mon, 10 Mar 2014 17:18:50 -0500
Subject: [PATCH 0577/1378] Add github url shortener

---
 plugins/github/github.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 66a10cfdb..25b1a1e1b 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -84,5 +84,14 @@ exist_gh() { # [DIRECTORY]
     git push -u origin master
 }
 
+# git.io "GitHub URL"
+#
+# Shorten GitHub url, example:
+#   https://github.com/nvogel/dotzsh    >   http://git.io/8nU25w  
+# source: https://github.com/nvogel/dotzsh
+# documentation: https://github.com/blog/985-git-io-github-url-shortener
+#
+git.io() {curl -i -s http://git.io -F "url=$1" | grep "Location" | cut -f 2 -d " "}
+
 # End Functions #############################################################
 

From c3c8cc318de898257fd7c5be6f862098966fbbdf Mon Sep 17 00:00:00 2001
From: Ryan Marsh <ryan.marsh@mac.com>
Date: Mon, 10 Mar 2014 18:36:51 -0500
Subject: [PATCH 0578/1378] Fixes #2467 tab completion scrolls back in terminal
 when using bureau theme

---
 themes/bureau.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 1d88f54d0..4d9cae0cc 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -101,12 +101,12 @@ _1RIGHT="[%*] "
 
 bureau_precmd () {
   _1SPACES=`get_space $_1LEFT $_1RIGHT`
-  echo
+  print 
+  print -rP "$_1LEFT$_1SPACES$_1RIGHT"
 }
 
 setopt prompt_subst
-PROMPT='$_1LEFT$_1SPACES$_1RIGHT
-> $_LIBERTY '
+PROMPT='> $_LIBERTY '
 RPROMPT='$(nvm_prompt_info) $(bureau_git_prompt)'
 
 autoload -U add-zsh-hook

From ae2f6f34e3c3a335d6cb16df8ea88a709ef6b36b Mon Sep 17 00:00:00 2001
From: Josh Chih-Hsueh Huang <huangjs@gmail.com>
Date: Tue, 11 Mar 2014 11:29:25 +0800
Subject: [PATCH 0579/1378] List pkgs by size

---
 plugins/debian/debian.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 1e15487ba..28dfb82a5 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -217,3 +217,11 @@ kerndeb () {
         "$revision" kernel_image kernel_headers
 }
 
+# List packages by size
+function apt-list-packages {
+    dpkg-query -W --showformat='${Installed-Size} ${Package} ${Status}\n' | \
+    grep -v deinstall | \
+    sort -n | \
+    awk '{print $1" "$2}'
+}
+

From b6cbba9dfee5985232b473e94595c2fb1ab83715 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 12 Mar 2014 07:52:20 -0700
Subject: [PATCH 0580/1378] Updating README to show the new install URL, which
 redirects to the raw files on github.

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 810569486..b80294c60 100644
--- a/README.textile
+++ b/README.textile
@@ -14,11 +14,11 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh@
+@curl -L http://install.ohmyz.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
 
 h3. The manual way
 

From 5f5e5508b0560339f7f57fa125496d0b9f1ea077 Mon Sep 17 00:00:00 2001
From: Jon Tewksbury <jontewks@gmail.com>
Date: Wed, 12 Mar 2014 22:37:25 -0700
Subject: [PATCH 0581/1378] Update license year

Fix outdated copyright year (updated to 2014).
The copyright year was out of date. Copyright notices must reflect the current year, so this commit updates the listed year to 2014.

See http://www.copyright.gov/circs/circ01.pdf for more info.
---
 MIT-LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
index f6edab65b..6eb8aab34 100644
--- a/MIT-LICENSE.txt
+++ b/MIT-LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2013 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
+Copyright (c) 2009-2014 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 71d94206370c258383beddfa6d3122524c26d8e8 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 17 Dec 2012 12:22:33 +0100
Subject: [PATCH 0582/1378] Use zsh's default for ':completion:*:hosts'

The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009).

The best option appears to be using zsh's default configuration for
':completion:*:hosts'.

While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2) does not state why.
---
 lib/completion.zsh | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e0cdcf626..6e18e9c82 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -31,22 +31,6 @@ zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 cdpath=(.)
 
-# use /etc/hosts and known_hosts for hostname completion
-[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
-[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
-[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
-[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
-hosts=(
-  "$_ssh_config[@]"
-  "$_global_ssh_hosts[@]"
-  "$_ssh_hosts[@]"
-  "$_etc_hosts[@]"
-  "$HOST"
-  localhost
-)
-zstyle ':completion:*:hosts' hosts $hosts
-zstyle ':completion:*' users off
-
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1
 zstyle ':completion::complete:*' cache-path $ZSH/cache/

From 47b0d754ae368af16957903f203ee902c7faeec1 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 13 Mar 2014 10:15:18 -0700
Subject: [PATCH 0583/1378] Fixing a few quirks in the latest installer updates
 (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our
 twitter account after install

---
 tools/install.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 343f251ae..71e19a389 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,12 +1,10 @@
 set -e
 
-if [ ! -n $ZSH ]
-then
+if [ ! -n "$ZSH" ]; then
   ZSH=~/.oh-my-zsh
 fi
 
-if [ -d $ZSH ]
-then
+if [ -d "$ZSH" ]; then
   echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
   exit
 fi
@@ -18,8 +16,7 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh
 }
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
-if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
-then
+if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
   echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
   mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
 fi
@@ -43,9 +40,8 @@ echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m
 echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
 echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
 echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
-echo "\033[0;32m"'                        /____/                       '"\033[0m"
-
-echo "\n\n \033[0;32m....is now installed.\033[0m"
+echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
+echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
 /usr/bin/env zsh
 . ~/.zshrc

From cfe468f6f6bf7cfecb2c832c39f4bf9a065ef6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <choltje@us.ibm.com>
Date: Thu, 13 Mar 2014 14:44:58 -0400
Subject: [PATCH 0584/1378] ssh-agent: prevent environment file from flapping

On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to.  This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.

Instead, use `scutil --get ComputerName` to get something
more stable.
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index a1e64ad0f..2fb8d5462 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -27,7 +27,7 @@
 #   Florent Thoumie and Jonas Pfenniger
 #
 
-local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
+local _plugin__ssh_env
 local _plugin__forwarding
 
 function _plugin__start_agent()
@@ -42,12 +42,20 @@ function _plugin__start_agent()
   . ${_plugin__ssh_env} > /dev/null
 
   # load identies
-  zstyle -a :omz:plugins:ssh-agent identities identities 
+  zstyle -a :omz:plugins:ssh-agent identities identities
   echo starting ssh-agent...
 
   /usr/bin/ssh-add $HOME/.ssh/${^identities}
 }
 
+# Get the filename to store/lookup the environment from
+if (( $+commands[scutil] )); then
+  # It's OS X!
+  _plugin__ssh_env="$HOME/.ssh/environment-$(scutil --get ComputerName)"
+else
+  _plugin__ssh_env="$HOME/.ssh/environment-$HOST"
+fi
+
 # test if agent-forwarding is enabled
 zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
 if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then

From 9e90bf0f23ff4343954e6533ccceace883cc16dd Mon Sep 17 00:00:00 2001
From: Michael Hauser-Raspe <michael.hauser-raspe@cantab.net>
Date: Fri, 14 Mar 2014 10:14:47 +0000
Subject: [PATCH 0585/1378] Added v as a keybinding to edit-command-line

taken from [here](http://www.zsh.org/mla/users/2008/msg01013.html)
We want pressing v in command mode to take us to an editor (defined by the $VISUAL or $EDITOR variable or vi) to edit the current contents of the command line which (I believe) is a standard feature of bash vi-mode or other readline prompts (see [here](http://www.catonmat.net/download/bash-vi-editing-mode-cheat-sheet.pdf) and [here](http://www.catonmat.net/blog/bash-vi-editing-mode-cheat-sheet/) for source).
---
 plugins/vi-mode/vi-mode.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index a06100472..3ed32b3fb 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -17,9 +17,15 @@ function zle-keymap-select zle-line-init zle-line-finish {
 zle -N zle-line-init
 zle -N zle-line-finish
 zle -N zle-keymap-select
+zle -N edit-command-line
+
 
 bindkey -v
 
+# allow v to edit the command line (standard behaviour)
+autoload -Uz edit-command-line
+bindkey -M vicmd 'v' edit-command-line
+
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"

From 8f7971349b653706071bc41e2fdb953bb6f22678 Mon Sep 17 00:00:00 2001
From: Andrew vonderLuft <avonderluft@avlux.net>
Date: Fri, 7 Mar 2014 11:17:18 -0800
Subject: [PATCH 0586/1378] add option to show dirty status of current dir

---
 plugins/svn/svn.plugin.zsh | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 4f008ba4e..ef6da5bd3 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -9,7 +9,7 @@ function svn_prompt_info() {
       _DISPLAY=$(svn_get_repo_name)
     fi
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR"
     unset _DISPLAY
   fi
 }
@@ -74,3 +74,22 @@ function svn_dirty_choose() {
 function svn_dirty() {
   svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
 }
+
+function svn_dirty_choose_pwd () {
+  if in_svn; then
+    root=`pwd`
+    if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
+      # Grep exits with 0 when "One or more lines were selected", return "dirty".
+      echo $1
+    else
+      # Otherwise, no lines were found, or an error occurred. Return clean.
+      echo $2
+    fi
+  fi
+}
+
+function svn_dirty_pwd () {
+  svn_dirty_choose_pwd $ZSH_THEME_SVN_PROMPT_DIRTY_PWD $ZSH_THEME_SVN_PROMPT_CLEAN_PWD
+}
+
+

From b56e8fb47868f8433c7da809be3d4df833d9f59c Mon Sep 17 00:00:00 2001
From: Mariusz Fik <fisiu@opensuse.org>
Date: Sun, 16 Mar 2014 18:14:34 +0100
Subject: [PATCH 0587/1378] Ignore more users in ssh completion.

Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
---
 lib/completion.zsh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 6e18e9c82..c54249c52 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -37,13 +37,14 @@ zstyle ':completion::complete:*' cache-path $ZSH/cache/
 
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \
-        adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
-        dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
-        hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
-        mailman mailnull mldonkey mysql nagios \
-        named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
-        operator pcap postfix postgres privoxy pulse pvm quagga radvd \
-        rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs
+        adm amanda apache at avahi avahi-autoipd beaglidx bin cacti canna \
+        clamav daemon dbus distcache dnsmasq dovecot fax ftp games gdm \
+        gkrellmd gopher hacluster haldaemon halt hsqldb ident junkbust kdm \
+        ldap lp mail mailman mailnull man messagebus  mldonkey mysql nagios \
+        named netdump news nfsnobody nobody nscd ntp nut nx obsrun openvpn \
+        operator pcap polkitd postfix postgres privoxy pulse pvm quagga radvd \
+        rpc rpcuser rpm rtkit scard shutdown squid sshd statd svn sync tftp \
+        usbmux uucp vcsa wwwrun xfs
 
 # ... unless we really want to.
 zstyle '*' single-ignored show

From baeac5bec9cc9b2da5ac69054d91ae3838fde402 Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Sun, 16 Mar 2014 16:52:37 -0400
Subject: [PATCH 0588/1378] Remove copyright information, as per #2588

---
 plugins/rake-fast/rake-fast.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index 0c268355e..320855233 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -15,11 +15,6 @@
 # which is inspired by this Ruby on Rails trick from 2006:
 # http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
 
-# Author: Kevin Bongart
-# contact@kevinbongart.net
-# http://kevinbongart.net
-# https://github.com/KevinBongart
-
 _rake_refresh () {
   if [ -f .rake_tasks ]; then
     rm .rake_tasks

From 3be2e34d9638b7e552208596eca49fbc66c05574 Mon Sep 17 00:00:00 2001
From: Felix Laurie von Massenbach <felix@erbridge.co.uk>
Date: Wed, 5 Mar 2014 12:58:18 +0000
Subject: [PATCH 0589/1378] Don't lazy load the virtualenvwrapper.

Fix robbyrussell#2355.
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 16f32da6e..f58bda1ad 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,4 +1,4 @@
-virtualenvwrapper='virtualenvwrapper_lazy.sh'
+virtualenvwrapper='virtualenvwrapper.sh'
 if (( $+commands[$virtualenvwrapper] )); then
   source ${${virtualenvwrapper}:c}
 
@@ -17,7 +17,7 @@ if (( $+commands[$virtualenvwrapper] )); then
             # Check for virtualenv name override
             if [[ -f "$PROJECT_ROOT/.venv" ]]; then
                 ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
-            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then 
+            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
                 ENV_NAME="$PROJECT_ROOT/.venv"
             elif [[ "$PROJECT_ROOT" != "." ]]; then
                 ENV_NAME=`basename "$PROJECT_ROOT"`

From baf2ab1bf1096b954a759739cc41c587fb0cf5b2 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nicolas@synbioz.com>
Date: Mon, 17 Mar 2014 10:05:56 +0100
Subject: [PATCH 0590/1378] Don't set RBENV_ROOT to "$HOME/.rbenv" when using
 Homebrew rbenv

Hard setting RBENV_ROOT to "$HOME/.rbenv" when using Homebrew's rbenv
will breaks it. It has to be set to $(brew --prefix rbenv).
---
 plugins/rbenv/rbenv.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 57ae2ca1f..b6795b91c 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -10,9 +10,6 @@ FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
 if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
-    if [[ $RBENV_ROOT = '' ]]; then 
-      RBENV_ROOT="$HOME/.rbenv"
-    fi
 fi
 
 for rbenvdir in "${rbenvdirs[@]}" ; do

From a869ec9bc848a011a3068fbaed52b4cbd04681aa Mon Sep 17 00:00:00 2001
From: Benoit Dubertret <benoit.dubertret@iscool-e.com>
Date: Mon, 17 Mar 2014 16:07:46 +0100
Subject: [PATCH 0591/1378] Fix gwip alias in git plugin when no files to rm

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2b5983f33..9f7819df3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -149,7 +149,7 @@ function work_in_progress() {
   fi
 }
 # these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "--wip--"'
+alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
 # these alias ignore changes to file

From d3babe0d79dc7dbcce15c9285c4c5b604f595c9a Mon Sep 17 00:00:00 2001
From: Kory Prince <korylprince@gmail.com>
Date: Mon, 17 Mar 2014 11:02:47 -0500
Subject: [PATCH 0592/1378] Don't show useless '[]' when chruby_prompt_info is
 empty

---
 themes/gallois.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index 1ff86b54c..f1057a9a9 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -18,7 +18,7 @@ else
   if which rbenv &> /dev/null; then
     RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
   else
-    if which chruby_prompt_info &> /dev/null; then
+    if [[ -n `which chruby_prompt_info` && -n `chruby_prompt_info` ]]; then
       RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
     else
       RPS1='$(git_custom_status) $EPS1'

From c1c107cfb9669beeda258efed9a17cc4bddf7aa7 Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Mon, 17 Mar 2014 19:49:12 -0400
Subject: [PATCH 0593/1378] Add scd plugin for smart change of directory.

Synced with the scd-tracker branch
pavoljuhas/oh-my-zsh@2f78243cad3509058d142aa4b70a604e75ec741e.
---
 plugins/scd/README.md |   3 +-
 plugins/scd/scd       | 343 +++++++++++++++++++++---------------------
 2 files changed, 174 insertions(+), 172 deletions(-)

diff --git a/plugins/scd/README.md b/plugins/scd/README.md
index ea7c72464..197cea50a 100644
--- a/plugins/scd/README.md
+++ b/plugins/scd/README.md
@@ -111,8 +111,7 @@ SCD_MEANLIFE</dt><dd>
 
 SCD_THRESHOLD</dt><dd>
     threshold for cumulative directory likelihood.  Directories with
-    lower likelihood are excluded unless they are the only match to
-    scd patterns.
+    a lower likelihood compared to the best match are excluded (0.005).
     </dd><dt>
 
 SCD_SCRIPT</dt><dd>
diff --git a/plugins/scd/scd b/plugins/scd/scd
index 9e055eadd..1567d2736 100755
--- a/plugins/scd/scd
+++ b/plugins/scd/scd
@@ -1,10 +1,11 @@
 #!/bin/zsh -f
 
 emulate -L zsh
+local EXIT=return
 if [[ $(whence -w $0) == *:' 'command ]]; then
     emulate -R zsh
-    alias return=exit
     local RUNNING_AS_COMMAND=1
+    EXIT=exit
 fi
 
 local DOC='scd -- smart change to a recently used directory
@@ -37,8 +38,9 @@ local SCD_ALIAS=~/.scdalias.zsh
 local ICASE a d m p i tdir maxrank threshold
 local opt_help opt_add opt_unindex opt_recursive opt_verbose
 local opt_alias opt_unalias opt_list
-local -A drank dalias dkey
+local -A drank dalias
 local dmatching
+local last_directory
 
 setopt extendedhistory extendedglob noautonamedirs brace_ccl
 
@@ -56,11 +58,11 @@ zparseopts -D -- a=opt_add -add=opt_add -unindex=opt_unindex \
     r=opt_recursive -recursive=opt_recursive \
     -alias:=opt_alias -unalias=opt_unalias -list=opt_list \
     v=opt_verbose -verbose=opt_verbose h=opt_help -help=opt_help \
-    || return $?
+    || $EXIT $?
 
 if [[ -n $opt_help ]]; then
     print $DOC
-    return
+    $EXIT
 fi
 
 # load directory aliases if they exist
@@ -79,8 +81,8 @@ _scd_Y19oug_abspath() {
 # define directory alias
 if [[ -n $opt_alias ]]; then
     if [[ -n $1 && ! -d $1 ]]; then
-        print -u2 "'$1' is not a directory"
-        return 1
+        print -u2 "'$1' is not a directory."
+        $EXIT 1
     fi
     a=${opt_alias[-1]#=}
     _scd_Y19oug_abspath d ${1:-$PWD}
@@ -93,19 +95,19 @@ if [[ -n $opt_alias ]]; then
         hash -d -- $a=$d
         hash -dL >| $SCD_ALIAS
     )
-    return $?
+    $EXIT $?
 fi
 
 # undefine directory alias
 if [[ -n $opt_unalias ]]; then
     if [[ -n $1 && ! -d $1 ]]; then
-        print -u2 "'$1' is not a directory"
-        return 1
+        print -u2 "'$1' is not a directory."
+        $EXIT 1
     fi
     _scd_Y19oug_abspath a ${1:-$PWD}
     a=$(print -rD ${a})
     if [[ $a != [~][^/]## ]]; then
-        return
+        $EXIT
     fi
     a=${a#[~]}
     # unalias in the current shell, update alias file if successful
@@ -118,35 +120,39 @@ if [[ -n $opt_unalias ]]; then
             hash -dL >| $SCD_ALIAS
         )
     fi
-    return $?
+    $EXIT $?
 fi
 
-# Rewrite the history file if it is at least 20% oversized
+# Rewrite directory index if it is at least 20% oversized
 if [[ -s $SCD_HISTFILE ]] && \
 (( $(wc -l <$SCD_HISTFILE) > 1.2 * $SCD_HISTSIZE )); then
     m=( ${(f)"$(<$SCD_HISTFILE)"} )
     print -lr -- ${m[-$SCD_HISTSIZE,-1]} >| ${SCD_HISTFILE}
 fi
 
+# Determine the last recorded directory
+if [[ -s ${SCD_HISTFILE} ]]; then
+    last_directory=${"$(tail -1 ${SCD_HISTFILE})"#*;}
+fi
+
 # Internal functions are prefixed with "_scd_Y19oug_".
-# The "record" function adds a non-repeating directory to the history
-# and turns on history writing.
+# The "record" function adds its arguments to the directory index.
 _scd_Y19oug_record() {
-    while [[ -n $1 && $1 == ${history[$HISTCMD]} ]]; do
+    while [[ -n $last_directory && $1 == $last_directory ]]; do
         shift
     done
-    if [[ $# != 0 ]]; then
-        ( umask 077; : >>| $SCD_HISTFILE )
-        p=": ${EPOCHSECONDS}:0;"
-        print -lr -- ${p}${^*} >> $SCD_HISTFILE
+    if [[ $# -gt 0 ]]; then
+        ( umask 077
+          p=": ${EPOCHSECONDS}:0;"
+          print -lr -- ${p}${^*} >>| $SCD_HISTFILE )
     fi
 }
 
 if [[ -n $opt_add ]]; then
-    for a; do
-        if [[ ! -d $a ]]; then
-            print -u 2 "Directory $a does not exist"
-            return 2
+    for d; do
+        if [[ ! -d $d ]]; then
+            print -u2 "Directory '$d' does not exist."
+            $EXIT 2
         fi
     done
     _scd_Y19oug_abspath m ${*:-$PWD}
@@ -158,13 +164,13 @@ if [[ -n $opt_add ]]; then
             print "[done]"
         done
     fi
-    return
+    $EXIT
 fi
 
 # take care of removing entries from the directory index
 if [[ -n $opt_unindex ]]; then
     if [[ ! -s $SCD_HISTFILE ]]; then
-        return
+        $EXIT
     fi
     # expand existing directories in the argument list
     for i in {1..$#}; do
@@ -190,161 +196,158 @@ if [[ -n $opt_unindex ]]; then
             }
         }
         { print $0 }
-        ' $SCD_HISTFILE ${*:-$PWD} )" || return $?
+        ' $SCD_HISTFILE ${*:-$PWD} )" || $EXIT $?
     : >| ${SCD_HISTFILE}
     [[ ${#m} == 0 ]] || print -r -- $m >> ${SCD_HISTFILE}
-    return
+    $EXIT
 fi
 
 # The "action" function is called when there is just one target directory.
 _scd_Y19oug_action() {
-    if [[ -n $opt_list ]]; then
-        for d; do
-            a=${(k)dalias[(r)${d}]}
-            print -r -- "# $a"
-            print -r -- $d
-        done
-    elif [[ $# == 1 ]]; then
-        if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
-            print -u2 "Warning: running as command with SCD_SCRIPT undefined."
-        fi
-        [[ -n $SCD_SCRIPT ]] && (umask 077;
-            print -r "cd ${(q)1}" >| $SCD_SCRIPT)
-        [[ -N $SCD_HISTFILE ]] && touch -a $SCD_HISTFILE
-        cd $1
-        # record the new directory unless already done in some chpwd hook
-        [[ -N $SCD_HISTFILE ]] || _scd_Y19oug_record $PWD
+    cd $1 || return $?
+    if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
+        print -u2 "Warning: running as command with SCD_SCRIPT undefined."
+    fi
+    if [[ -n $SCD_SCRIPT ]]; then
+        print -r "cd ${(q)1}" >| $SCD_SCRIPT
     fi
 }
 
-# handle different argument scenarios ----------------------------------------
-
-## single argument that is an existing directory
-if [[ $# == 1 && -d $1 && -x $1 ]]; then
-    _scd_Y19oug_action $1
-    return $?
-## single argument that is an alias
-elif [[ $# == 1 && -d ${d::=${nameddirs[$1]}} ]]; then
-    _scd_Y19oug_action $d
-    return $?
-fi
-
-# ignore case unless there is an argument with an uppercase letter
-[[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
-
-# calculate rank of all directories in the SCD_HISTFILE and keep it as drank
-# include a dummy entry for splitting of an empty string is buggy
-[[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
-    print -l /dev/null -10
-    <$SCD_HISTFILE \
-    awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
-        BEGIN { FS = "[:;]"; }
-        length($0) < 4096 && $2 > 0 {
-            tau = 1.0 * ($2 - epochseconds) / meanlife;
-            if (tau < -4.61)  tau = -4.61;
-            prec = exp(tau);
-            sub(/^[^;]*;/, "");
-            if (NF)  ptot[$0] += prec;
-        }
-        END { for (di in ptot)  { print di; print ptot[di]; } }'
-    )"}
-)
-unset "drank[/dev/null]"
-
-# filter drank to the entries that match all arguments
-for a; do
-    p=${ICASE}"*${a}*"
-    drank=( ${(kv)drank[(I)${~p}]} )
-done
-
-# build a list of matching directories reverse-sorted by their probabilities
-dmatching=( ${(f)"$(
-    for d p in ${(kv)drank}; do
-        print -r -- "$p $d";
-    done | sort -grk1 | cut -d ' ' -f 2-
-    )"}
-)
-
-# if some directory paths match all patterns in order, discard all others
-p=${ICASE}"*${(j:*:)argv}*"
-m=( ${(M)dmatching:#${~p}} )
-[[ -d ${m[1]} ]] && dmatching=( $m )
-# if some directory names match last pattern, discard all others
-p=${ICASE}"*${(j:*:)argv}[^/]#"
-m=( ${(M)dmatching:#${~p}} )
-[[ -d ${m[1]} ]] && dmatching=( $m )
-# if some directory names match all patterns, discard all others
-m=( $dmatching )
-for a; do
-    p=${ICASE}"*/[^/]#${a}[^/]#"
-    m=( ${(M)m:#${~p}} )
-done
-[[ -d ${m[1]} ]] && dmatching=( $m )
-# if some directory names match all patterns in order, discard all others
-p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
-m=( ${(M)dmatching:#${~p}} )
-[[ -d ${m[1]} ]] && dmatching=( $m )
-
-# do not match $HOME or $PWD when run without arguments
-if [[ $# == 0 ]]; then
-    dmatching=( ${dmatching:#(${HOME}|${PWD})} )
-fi
-
-# keep at most SCD_MENUSIZE of matching and valid directories
-m=( )
-for d in $dmatching; do
-    [[ ${#m} == $SCD_MENUSIZE ]] && break
-    [[ -d $d && -x $d ]] && m+=$d
-done
-dmatching=( $m )
-
-# find the maximum rank
-maxrank=0.0
-for d in $dmatching; do
-    [[ ${drank[$d]} -lt maxrank ]] || maxrank=${drank[$d]}
-done
-
-# discard all directories below the rank threshold
-threshold=$(( maxrank * SCD_THRESHOLD ))
-dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
-
-## process whatever directories that remained
-case ${#dmatching} in
-(0)
-    print -u2 "no matching directory"
-    return 1
-    ;;
-(1)
-    _scd_Y19oug_action $dmatching
-    return $?
-    ;;
-(*)
-    # build a list of strings to be displayed in the selection menu
-    m=( ${(f)"$(print -lD ${dmatching})"} )
-    if [[ -n $opt_verbose ]]; then
-        for i in {1..${#dmatching}}; do
-            d=${dmatching[i]}
-            m[i]=$(printf "%.3g %s" ${drank[$d]} $d)
-        done
-    fi
-    # build a map of string names to actual directory paths
-    for i in {1..${#m}}; dalias[${m[i]}]=${dmatching[i]}
-    # opt_list - output matching directories and exit
-    if [[ -n $opt_list ]]; then
-        _scd_Y19oug_action ${dmatching}
+# Match and rank patterns to the index file
+# set global arrays dmatching and drank
+_scd_Y19oug_match() {
+    ## single argument that is an existing directory or directory alias
+    if [[ $# == 1 ]] && \
+        [[ -d ${d::=$1} || -d ${d::=${nameddirs[$1]}} ]] && [[ -x $d ]];
+    then
+        _scd_Y19oug_abspath dmatching $d
+        drank[${dmatching[1]}]=1
         return
     fi
-    # finally use the selection menu to get the answer
-    a=( {a-z} {A-Z} )
-    p=( )
-    for i in {1..${#m}}; do
-        [[ -n ${a[i]} ]] || break
-        dkey[${a[i]}]=${dalias[$m[i]]}
-        p+="${a[i]}) ${m[i]}"
+
+    # ignore case unless there is an argument with an uppercase letter
+    [[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
+
+    # calculate rank of all directories in the SCD_HISTFILE and keep it as drank
+    # include a dummy entry for splitting of an empty string is buggy
+    [[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
+        print -l /dev/null -10
+        <$SCD_HISTFILE \
+        awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
+            BEGIN { FS = "[:;]"; }
+            length($0) < 4096 && $2 > 0 {
+                tau = 1.0 * ($2 - epochseconds) / meanlife;
+                if (tau < -4.61)  tau = -4.61;
+                prec = exp(tau);
+                sub(/^[^;]*;/, "");
+                if (NF)  ptot[$0] += prec;
+            }
+            END { for (di in ptot)  { print di; print ptot[di]; } }'
+        )"}
+    )
+    unset "drank[/dev/null]"
+
+    # filter drank to the entries that match all arguments
+    for a; do
+        p=${ICASE}"*${a}*"
+        drank=( ${(kv)drank[(I)${~p}]} )
     done
-    print -c -r -- $p
-    if read -s -k 1 d && [[ -n ${dkey[$d]} ]]; then
-        _scd_Y19oug_action ${dkey[$d]}
+
+    # build a list of matching directories reverse-sorted by their probabilities
+    dmatching=( ${(f)"$(
+        for d p in ${(kv)drank}; do
+            print -r -- "$p $d";
+        done | sort -grk1 | cut -d ' ' -f 2-
+        )"}
+    )
+
+    # if some directory paths match all patterns in order, discard all others
+    p=${ICASE}"*${(j:*:)argv}*"
+    m=( ${(M)dmatching:#${~p}} )
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+    # if some directory names match last pattern, discard all others
+    p=${ICASE}"*${(j:*:)argv}[^/]#"
+    m=( ${(M)dmatching:#${~p}} )
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+    # if some directory names match all patterns, discard all others
+    m=( $dmatching )
+    for a; do
+        p=${ICASE}"*/[^/]#${a}[^/]#"
+        m=( ${(M)m:#${~p}} )
+    done
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+    # if some directory names match all patterns in order, discard all others
+    p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
+    m=( ${(M)dmatching:#${~p}} )
+    [[ -d ${m[1]} ]] && dmatching=( $m )
+
+    # do not match $HOME or $PWD when run without arguments
+    if [[ $# == 0 ]]; then
+        dmatching=( ${dmatching:#(${HOME}|${PWD})} )
     fi
-    return $?
-esac
+
+    # keep at most SCD_MENUSIZE of matching and valid directories
+    m=( )
+    for d in $dmatching; do
+        [[ ${#m} == $SCD_MENUSIZE ]] && break
+        [[ -d $d && -x $d ]] && m+=$d
+    done
+    dmatching=( $m )
+
+    # find the maximum rank
+    maxrank=0.0
+    for d in $dmatching; do
+        [[ ${drank[$d]} -lt maxrank ]] || maxrank=${drank[$d]}
+    done
+
+    # discard all directories below the rank threshold
+    threshold=$(( maxrank * SCD_THRESHOLD ))
+    dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
+}
+
+_scd_Y19oug_match $*
+
+## process whatever directories that remained
+if [[ ${#dmatching} == 0 ]]; then
+    print -u2 "No matching directory."
+    $EXIT 1
+fi
+
+## build formatted directory aliases for selection menu or list display
+for d in $dmatching; do
+    if [[ -n ${opt_verbose} ]]; then
+        dalias[$d]=$(printf "%.3g %s" ${drank[$d]} $d)
+    else
+        dalias[$d]=$(print -Dr -- $d)
+    fi
+done
+
+## process the --list option
+if [[ -n $opt_list ]]; then
+    for d in $dmatching; do
+        print -r -- "# ${dalias[$d]}"
+        print -r -- $d
+    done
+    $EXIT
+fi
+
+## process single directory match
+if [[ ${#dmatching} == 1 ]]; then
+    _scd_Y19oug_action $dmatching
+    $EXIT $?
+fi
+
+## here we have multiple matches - display selection menu
+a=( {a-z} {A-Z} )
+p=( )
+for i in {1..${#dmatching}}; do
+    [[ -n ${a[i]} ]] || break
+    p+="${a[i]}) ${dalias[${dmatching[i]}]}"
+done
+
+print -c -r -- $p
+
+if read -s -k 1 d && [[ ${i::=${a[(I)$d]}} -gt 0 ]]; then
+    _scd_Y19oug_action ${dmatching[i]}
+    $EXIT $?
+fi

From 645fceb38b091e1dd5c9804a444730a9837bae07 Mon Sep 17 00:00:00 2001
From: Johan Svensson <jsv@one.com>
Date: Tue, 18 Mar 2014 10:52:25 +0100
Subject: [PATCH 0594/1378] Add chef-vault knife cmd support

---
 plugins/knife/_knife | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index b44283f78..163149267 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -31,7 +31,7 @@ _knife() {
   
   case $state in
   knifecmd)
-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload windows $cloudproviders
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload vault windows $cloudproviders
   ;;
   knifesubcmd)
     case $words[2] in
@@ -65,6 +65,9 @@ _knife() {
     upload)
      _arguments '*:file or directory:_files -g "*"'
     ;;
+    vault)
+      compadd -Q "$@" create decrypt delete edit remove "rotate all keys" "rotate keys" show update
+    ;;
     windows)
       compadd "$@" bootstrap
     ;;

From fb2d6eb5679370b7e8c971ab75b85d8f57d0da1b Mon Sep 17 00:00:00 2001
From: Reed Riley <john.reed.riley@gmail.com>
Date: Mon, 17 Mar 2014 12:01:00 -0400
Subject: [PATCH 0595/1378] Fixed errors if acpitool isn't installed on linux

---
 plugins/battery/battery.plugin.zsh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index b16a75c5b..32dd4b624 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -21,7 +21,7 @@ if [[ $(uname) == "Darwin" ]] ; then
   function plugged_in() {
     [ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ Yes') -eq 1 ]
   }
-  
+
   function battery_pct_remaining() {
     if plugged_in ; then
       echo "External Power"
@@ -31,7 +31,7 @@ if [[ $(uname) == "Darwin" ]] ; then
   }
 
   function battery_time_remaining() {
-  	local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
+    local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
       timeremaining=$(echo $smart_battery_status | grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
       if [ $timeremaining -gt 720 ] ; then
@@ -59,9 +59,9 @@ if [[ $(uname) == "Darwin" ]] ; then
       echo "∞"
     fi
   }
-  
+
   function battery_is_charging() {
-	  [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
+    [[ $(ioreg -rc "AppleSmartBattery"| grep '^.*"IsCharging"\ =\ ' | sed -e 's/^.*"IsCharging"\ =\ //') == "Yes" ]]
   }
 
 elif [[ $(uname) == "Linux"  ]] ; then
@@ -71,7 +71,9 @@ elif [[ $(uname) == "Linux"  ]] ; then
   }
 
   function battery_pct() {
-    echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" 
+    if (( $+commands[acpi] )) ; then
+      echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')"
+    fi
   }
 
   function battery_pct_remaining() {
@@ -103,7 +105,7 @@ elif [[ $(uname) == "Linux"  ]] ; then
       echo "∞"
     fi
   }
-  
+
 else
   # Empty functions so we don't cause errors in prompts
   function battery_pct_remaining() {
@@ -136,7 +138,7 @@ function battery_level_gauge() {
   if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then
     local filled=$(((( $battery_remaining_percentage + $gauge_slots - 1) / $gauge_slots)));
     local empty=$(($gauge_slots - $filled));
-	
+
     if [[ $filled -gt $green_threshold ]]; then local gauge_color=$color_green;
     elif [[ $filled -gt $yellow_threshold ]]; then local gauge_color=$color_yellow;
     else local gauge_color=$color_red;
@@ -144,10 +146,9 @@ function battery_level_gauge() {
   else
     local filled=$gauge_slots;
     local empty=0;
-  	filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
+    filled_symbol=${BATTERY_UNKNOWN_SYMBOL:-'.'};
   fi
 
-  
   local charging=' ' && battery_is_charging && charging=$charging_symbol;
 
   printf ${charging_color//\%/\%\%}$charging${color_reset//\%/\%\%}${battery_prefix//\%/\%\%}${gauge_color//\%/\%\%}

From ef343eef307cf8d329240dcdf5e973f1d18d410e Mon Sep 17 00:00:00 2001
From: Antoine Dechaume <boolegue@gmail.com>
Date: Thu, 20 Mar 2014 10:43:33 +0100
Subject: [PATCH 0596/1378] Fix dirpersist plugin

This plugin did not work, I just found the same functionnality in grml, this one works.
---
 plugins/dirpersist/dirpersist.plugin.zsh | 52 ++++++++----------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
index 0f6d9f435..88d1129d4 100644
--- a/plugins/dirpersist/dirpersist.plugin.zsh
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -1,39 +1,19 @@
-#!/bin/zsh
-# 
-# Make the dirstack more persistant
-# 
-# Add dirpersist to $plugins in ~/.zshrc to load
-# 
+# Save dirstack history to .zdirs
+# adapted from:
+# github.com/grml/grml-etc-core/blob/master/etc/zsh/zshrc#L1547
 
-# $zdirstore is the file used to persist the stack
-zdirstore=~/.zdirstore
+DIRSTACKSIZE=${DIRSTACKSIZE:-20}
+dirstack_file=${dirstack_file:-${HOME}/.zdirs}
 
-dirpersistinstall () {
-    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
-    else
-        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
-            echo "# Store dirs stack\n# See $ZSH/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
-        else
-            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
-        fi
-    fi
+if [[ -f ${dirstack_file} ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then
+  dirstack=( ${(f)"$(< $dirstack_file)"} )
+  # "cd -" won't work after login by just setting $OLDPWD, so
+  [[ -d $dirstack[1] ]] && cd $dirstack[1] && cd $OLDPWD
+fi
+
+chpwd() {
+  if (( $DIRSTACKSIZE <= 0 )) || [[ -z $dirstack_file ]]; then return; fi
+  local -ax my_stack
+  my_stack=( ${PWD} ${dirstack} )
+  builtin print -l ${(u)my_stack} >! ${dirstack_file}
 }
-
-dirpersiststore () {
-    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
-}
-
-dirpersistrestore () {
-    if [ -f $zdirstore ]; then
-        source $zdirstore
-    fi
-}
-
-DIRSTACKSIZE=10
-setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
-
-dirpersistinstall
-dirpersistrestore
-
-# Make popd changes permanent without having to wait for logout
-alias popd="popd;dirpersiststore"

From e537ee9db95966af3439b550c15d8971805c73cf Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Thu, 20 Mar 2014 19:10:44 -0700
Subject: [PATCH 0597/1378] added terminfo keys verification

---
 lib/key-bindings.zsh | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 94f1842f3..33046b0f1 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -20,24 +20,40 @@ bindkey -e                                          # Use emacs key bindings
 bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
-bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
-bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
+if [[ "${terminfo[kpp]}" != "" ]]; then
+  bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
+fi
+if [[ "${terminfo[knp]}" != "" ]]; then
+  bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
+fi
 
-bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
-bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
+if [[ "${terminfo[kcuu1]}" != "" ]]; then
+  bindkey "${terminfo[kcuu1]}" up-line-or-search      # start typing + [Up-Arrow] - fuzzy find history forward
+fi
+if [[ "${terminfo[kcud1]}" != "" ]]; then
+  bindkey "${terminfo[kcud1]}" down-line-or-search    # start typing + [Down-Arrow] - fuzzy find history backward
+fi
 
-bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
-bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
+if [[ "${terminfo[khome]}" != "" ]]; then
+  bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
+fi
+if [[ "${terminfo[kend]}" != "" ]]; then
+  bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
+fi
 
 bindkey ' ' magic-space                             # [Space] - do history expansion
 
 bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
 
-bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+if [[ "${terminfo[kdch1]}" != "" ]]; then
+  bindkey "${terminfo[kdch1]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+fi
 
 bindkey '^?' backward-delete-char                   # [Backspace] - delete backward
-bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+if [[ "${terminfo[kdch1]}" != "" ]]; then
+  bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+fi
 
 # Edit the current command line in $EDITOR
 autoload -U edit-command-line

From 55a9d685fd960390a4f400ac461d901049a78beb Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Thu, 20 Mar 2014 19:29:06 -0700
Subject: [PATCH 0598/1378] Update key-bindings.zsh

Aligned comments
---
 lib/key-bindings.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 33046b0f1..49deb0587 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -15,11 +15,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
   zle -N zle-line-finish
 fi
 
-bindkey -e                                          # Use emacs key bindings
+bindkey -e                                          	# Use emacs key bindings
 
-bindkey '\ew' kill-region                           # [Esc-w] - Kill from the cursor to the mark
-bindkey -s '\el' 'ls\n'                             # [Esc-l] - run command: ls
-bindkey '^r' history-incremental-search-backward    # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey '\ew' kill-region                           	# [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                								# [Esc-l] - run command: ls
+bindkey '^r' history-incremental-search-backward    	# [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 if [[ "${terminfo[kpp]}" != "" ]]; then
   bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
 fi
@@ -41,16 +41,16 @@ if [[ "${terminfo[kend]}" != "" ]]; then
   bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 fi
 
-bindkey ' ' magic-space                             # [Space] - do history expansion
+bindkey ' ' magic-space                             	# [Space] - do history expansion
 
-bindkey '^[[1;5C' forward-word                      # [Ctrl-RightArrow] - move forward one word
-bindkey '^[[1;5D' backward-word                     # [Ctrl-LeftArrow] - move backward one word
+bindkey '^[[1;5C' forward-word                      	# [Ctrl-RightArrow] - move forward one word
+bindkey '^[[1;5D' backward-word                     	# [Ctrl-LeftArrow] - move backward one word
 
 if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+  bindkey "${terminfo[kdch1]}" reverse-menu-complete	# [Shift-Tab] - move through the completion menu backwards
 fi
 
-bindkey '^?' backward-delete-char                   # [Backspace] - delete backward
+bindkey '^?' backward-delete-char                   	# [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 fi

From c5413d7dd18cad7cd4eb32ddf1b9976863b87dfa Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Thu, 20 Mar 2014 19:34:43 -0700
Subject: [PATCH 0599/1378] Aligned comments

---
 lib/key-bindings.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 49deb0587..28af44949 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -15,11 +15,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
   zle -N zle-line-finish
 fi
 
-bindkey -e                                          	# Use emacs key bindings
+bindkey -e                                            # Use emacs key bindings
 
-bindkey '\ew' kill-region                           	# [Esc-w] - Kill from the cursor to the mark
-bindkey -s '\el' 'ls\n'                								# [Esc-l] - run command: ls
-bindkey '^r' history-incremental-search-backward    	# [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
+bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 if [[ "${terminfo[kpp]}" != "" ]]; then
   bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
 fi
@@ -41,16 +41,16 @@ if [[ "${terminfo[kend]}" != "" ]]; then
   bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
 fi
 
-bindkey ' ' magic-space                             	# [Space] - do history expansion
+bindkey ' ' magic-space                               # [Space] - do history expansion
 
-bindkey '^[[1;5C' forward-word                      	# [Ctrl-RightArrow] - move forward one word
-bindkey '^[[1;5D' backward-word                     	# [Ctrl-LeftArrow] - move backward one word
+bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
+bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
 
 if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete	# [Shift-Tab] - move through the completion menu backwards
+  bindkey "${terminfo[kdch1]}" reverse-menu-complete  # [Shift-Tab] - move through the completion menu backwards
 fi
 
-bindkey '^?' backward-delete-char                   	# [Backspace] - delete backward
+bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 fi

From 5f31190ab9fd41fd1ffe2b0878674adc02933f9b Mon Sep 17 00:00:00 2001
From: Arno Fortelny <arno.fortelny@gmail.com>
Date: Fri, 21 Mar 2014 11:49:52 -0400
Subject: [PATCH 0600/1378] atom plugin

---
 plugins/atom/atom.plugin.zsh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
index 048fd7521..9adb9031a 100644
--- a/plugins/atom/atom.plugin.zsh
+++ b/plugins/atom/atom.plugin.zsh
@@ -1,4 +1,14 @@
-#
-# Your guess is as good as mine. Let's just assume that we will need this...
-#   - For more info visit... http://atom.io/
-#
\ No newline at end of file
+local _atom_paths > /dev/null 2>&1
+_atom_paths=(
+    "$HOME/Applications/Atom.app"
+    "/Applications/Atom.app"
+)
+
+for _atom_path in $_atom_paths; do
+    if [[ -a $_atom_path ]]; then
+        alias at="open -a '$_atom_path'"
+        break
+    fi
+done
+
+alias att='at .'

From 32a7824182731081c7cbeba363be7b6f56aeb2a5 Mon Sep 17 00:00:00 2001
From: Alexei Danchenkov <adanchenkov@gmail.com>
Date: Fri, 21 Mar 2014 09:24:59 -0700
Subject: [PATCH 0601/1378] Added a forward-delete fallback to bind Delete key

Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
---
 lib/key-bindings.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 28af44949..5f3f237c7 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -53,6 +53,10 @@ fi
 bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
 if [[ "${terminfo[kdch1]}" != "" ]]; then
   bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+else
+  bindkey "^[[3~" delete-char
+  bindkey "^[3;5~" delete-char
+  bindkey "\e[3~" delete-char
 fi
 
 # Edit the current command line in $EDITOR

From 6a8f83bc5044f55e7386182683e853e6e7d2eebf Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Fri, 21 Mar 2014 14:02:26 -0400
Subject: [PATCH 0602/1378] Add new brew cask commands

---
 plugins/brew-cask/brew-cask.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/brew-cask/brew-cask.plugin.zsh b/plugins/brew-cask/brew-cask.plugin.zsh
index ef4f5208d..e0ee62293 100644
--- a/plugins/brew-cask/brew-cask.plugin.zsh
+++ b/plugins/brew-cask/brew-cask.plugin.zsh
@@ -34,14 +34,18 @@ _brew-cask()
 							"alfred:used to modify Alfred's scope to include the Caskroom"
 							'audit:verifies installability of casks'
 							'checklinks:checks for bad cask links'
+							'cleanup:cleans up cached downloads'
 							'create:creates a cask of the given name and opens it in an editor'
+							'doctor:checks for configuration issues'
 							'edit:edits the cask of the given name'
+							'fetch:downloads Cask resources to local cache'
 							'home:opens the homepage of the cask of the given name'
 							'info:displays information about the cask of the given name'
 							'install:installs the cask of the given name'
 							'list:with no args, lists installed casks; given installed casks, lists installed files'
 							'search:searches all known casks'
 							'uninstall:uninstalls the cask of the given name'
+							"update:a synonym for 'brew update'"
 						)
 						_describe -t commands "brew cask subcommand" subcommands
 					fi ;;

From c3150edad2b8d9494127afa9528519a07bf8a64a Mon Sep 17 00:00:00 2001
From: Miguel Flores Ruiz de Eguino <miguel.frde@gmail.com>
Date: Fri, 21 Mar 2014 19:18:29 -0600
Subject: [PATCH 0603/1378] Add irb to the list of bundled commands

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index df30ed7c7..447a4bbec 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma irb)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 1509ac9a0414801dbbe45060eae19ae6e6e9841c Mon Sep 17 00:00:00 2001
From: jieryn <jieryn@gmail.com>
Date: Sat, 22 Mar 2014 08:51:26 -0400
Subject: [PATCH 0604/1378] add common video formats FLV and WEBM

---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 75899ca2c..b19650fee 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -71,7 +71,7 @@ if [ ${ZSH_VERSION//\./} -ge 420 ]; then
   _image_fts=(jpg jpeg png gif mng tiff tif xpm)
   for ft in $_image_fts ; do alias -s $ft=$XIVIEWER; done
 
-  _media_fts=(avi mpg mpeg ogm mp3 wav ogg ape rm mov mkv)
+  _media_fts=(ape avi flv mkv mov mp3 mpeg mpg ogg ogm rm wav webm)
   for ft in $_media_fts ; do alias -s $ft=mplayer ; done
 
   #read documents

From 610655e827e5f4e5d081b9b0cd78129751eab272 Mon Sep 17 00:00:00 2001
From: Miguel Flores Ruiz de Eguino <miguel.frde@gmail.com>
Date: Sat, 22 Mar 2014 10:24:58 -0600
Subject: [PATCH 0605/1378] Sort bundled commands alphabetically

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 447a4bbec..e4b03e7b0 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard jekyll kitchen knife mailcatcher middleman nanoc rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails puma irb)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife mailcatcher middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From 12e30faaca13a2e931c4062fdc8a3589e8069460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 23 Mar 2014 02:03:12 +0100
Subject: [PATCH 0606/1378] Fix export syntax of $GREP_OPTIONS

Fixes #2641, #2642
---
 lib/grep.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 25345bd06..977435ee4 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -8,5 +8,6 @@ GREP_OPTIONS=
 for PATTERN in .cvs .git .hg .svn; do
     GREP_OPTIONS+="--exclude-dir=$PATTERN "
 done
-export GREP_OPTIONS+='--color=auto '
-export GREP_COLOR='1;32'
\ No newline at end of file
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
+export GREP_COLOR='1;32'

From f9ad3686bbedea0ca2adf3bc4ab19c3e90e8800a Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:39:38 +0100
Subject: [PATCH 0607/1378] suggest setting $LANG to fix #1286 and fix #1823

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c25c20e75..5e1d9b2f1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -54,6 +54,9 @@ source $ZSH/oh-my-zsh.sh
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
 # # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'

From 04c2d293985adced1bd702fca16357b858002bb8 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:45:55 +0100
Subject: [PATCH 0608/1378] mention $ZSH_CUSTOM as suggested in #2295

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5e1d9b2f1..48757ba0e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -42,6 +42,9 @@ ZSH_THEME="robbyrussell"
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 6889dfaa46858ddacc82549a57d73118c66a32b6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:47:10 +0100
Subject: [PATCH 0609/1378] $ZSH is the OMZ installation folder, not
 configuration

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 48757ba0e..7b7f1df85 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,4 +1,4 @@
-# Path to your oh-my-zsh configuration.
+# Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.

From 3bae9dd2bfc59e03a6aeded95ca45d2810058e09 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Sun, 23 Mar 2014 15:12:18 -0400
Subject: [PATCH 0610/1378] adding README.md for jsontools

---
 plugins/jsontools/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/jsontools/README.md

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
new file mode 100644
index 000000000..ed7a19d29
--- /dev/null
+++ b/plugins/jsontools/README.md
@@ -0,0 +1,17 @@
+# jsontools
+
+# Plugin name
+
+A handy command line tool for dealing with json data.
+
+## Usage
+
+```sh
+# curl json data and pretty print the results
+curl https://coderwall.com/bobwilliams.json | pp_json
+
+# pretty print the contents of an existing json file
+less data.json | pp_json
+
+# json data directly from the command line
+echo '{"b":2, "a":1}' | pp_json
\ No newline at end of file

From 1fc40c60b506bc71f20efcafc7e7350ece3a1596 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Sun, 23 Mar 2014 15:13:41 -0400
Subject: [PATCH 0611/1378] updating README.md

---
 plugins/jsontools/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index ed7a19d29..60f99c5be 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -1,7 +1,5 @@
 # jsontools
 
-# Plugin name
-
 A handy command line tool for dealing with json data.
 
 ## Usage

From 3976b93f3931a7ebc913576015ff395dcd495d95 Mon Sep 17 00:00:00 2001
From: Daniel Farrell <dfarrell07@gmail.com>
Date: Sun, 23 Mar 2014 15:59:35 -0400
Subject: [PATCH 0612/1378] Fixed which output at each new shell creation

---
 themes/gallois.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index f1057a9a9..f31d21958 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -18,7 +18,7 @@ else
   if which rbenv &> /dev/null; then
     RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
   else
-    if [[ -n `which chruby_prompt_info` && -n `chruby_prompt_info` ]]; then
+    if [[ -n `which chruby_prompt_info &> /dev/null` && -n `chruby_prompt_info` ]]; then
       RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
     else
       RPS1='$(git_custom_status) $EPS1'

From c451ff4bf317188da20bfe18021a93640d54133b Mon Sep 17 00:00:00 2001
From: Jan Ehrhardt <jan.ehrhardt@gmail.com>
Date: Mon, 24 Mar 2014 12:10:18 +0100
Subject: [PATCH 0613/1378] Add check for display list equals nil

Emacs returns either a sequence of availbale displays or nil. Checking
nil fixes this script to work as expected.
---
 plugins/emacs/emacsclient.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 38d419813..625201a16 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -3,7 +3,7 @@
 # get list of available X windows.
 x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
 
-if [ -z "$x" ] ;then
+if [ -z "$x" ] || [ "$x" = "nil" ] ;then
     # Create one if there is no X window yet.
     emacsclient --alternate-editor "" --create-frame "$@"
 else

From 8db3e6329d25ae3e7d6c4996b5a0c3a5f31d645e Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Mon, 24 Mar 2014 13:36:26 -0400
Subject: [PATCH 0614/1378] bug fix for node pp_json version

---
 plugins/jsontools/jsontools.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 7b6f8c585..ee092ff09 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -6,7 +6,7 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then

From f8890f564648d647903f5b10358a4f25f312d54a Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Mon, 24 Mar 2014 14:09:57 -0400
Subject: [PATCH 0615/1378] updated readme.md and using tab char for formatting
 with node

---
 plugins/jsontools/README.md            | 11 +++++++++--
 plugins/jsontools/jsontools.plugin.zsh |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 60f99c5be..9f07194c9 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -1,9 +1,15 @@
 # jsontools
 
-A handy command line tool for dealing with json data.
+Handy command line tools for dealing with json data.
+
+## Tools
+
+- **pp_json** - pretty prints json
 
 ## Usage
 
+##### pp_json - examples
+
 ```sh
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
@@ -12,4 +18,5 @@ curl https://coderwall.com/bobwilliams.json | pp_json
 less data.json | pp_json
 
 # json data directly from the command line
-echo '{"b":2, "a":1}' | pp_json
\ No newline at end of file
+echo '{"b":2, "a":1}' | pp_json
+```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index ee092ff09..34ff9cc75 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -6,7 +6,7 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, '\t'));"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then

From 64c3ce35e1493728c65191d9b16183841ad73ca7 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Mon, 24 Mar 2014 14:24:00 -0400
Subject: [PATCH 0616/1378] adding xargs -0 to node aliases

---
 plugins/jsontools/jsontools.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 34ff9cc75..729763c33 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -6,7 +6,7 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-    alias pp_json='node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, '\t'));"'
+	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then

From 5303793ef13b5dd3e7f52ac40f17fd37f015af44 Mon Sep 17 00:00:00 2001
From: Florian Franzen <FlorianFranzen@gmail.com>
Date: Mon, 24 Mar 2014 22:32:56 +0100
Subject: [PATCH 0617/1378] history-substring-search: bindkey now checks if
 terminfo is available first.

---
 .../history-substring-search/history-substring-search.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 405eeaade..22f03dd6d 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -164,8 +164,12 @@ zle -N history-substring-search-up
 zle -N history-substring-search-down
 
 zmodload zsh/terminfo
-bindkey "$terminfo[kcuu1]" history-substring-search-up
-bindkey "$terminfo[kcud1]" history-substring-search-down
+if [[ -n "$terminfo[kcuu1]" ]]; then
+  bindkey "$terminfo[kcuu1]" history-substring-search-up
+fi
+if [[ -n "$terminfo[kcud1]" ]]; then
+  bindkey "$terminfo[kcud1]" history-substring-search-down
+fi
 
 #-----------------------------------------------------------------------------
 # implementation details

From 5f09d0f6dd3ade4e2968a13ba93ceef4850dedee Mon Sep 17 00:00:00 2001
From: Luke Horvat <lukehorvat@gmail.com>
Date: Tue, 25 Mar 2014 01:24:04 +1100
Subject: [PATCH 0618/1378] Fixed typos + made wording more consistent in
 zshrc.zsh-template

---
 templates/zshrc.zsh-template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7b7f1df85..5b2a6cf49 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -11,34 +11,34 @@ ZSH_THEME="robbyrussell"
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 
-# Set this to use case-sensitive completion
+# Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
-# Uncomment this to disable bi-weekly auto-update checks
+# Uncomment the following line to disable bi-weekly auto-update checks.
 # DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how often to auto-update? (in days)
+# Uncomment the following line to change how often to auto-update (in days).
 # export UPDATE_ZSH_DAYS=13
 
-# Uncomment following line if you want to disable colors in ls
+# Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
 
-# Uncomment following line if you want to disable autosetting terminal title.
+# Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment following line if you want to disable command autocorrection
+# Uncomment the following line to disable command auto-correction.
 # DISABLE_CORRECTION="true"
 
-# Uncomment following line if you want red dots to be displayed while waiting for completion
+# Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"
 
-# Uncomment following line if you want to disable marking untracked files under
-# VCS as dirty. This makes repository status check for large repositories much,
-# much faster.
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Uncomment following line if you want to the command execution time stamp shown 
-# in the history command output.
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
@@ -60,7 +60,7 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
-# # Preferred editor for local and remote sessions
+# Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else

From 37e619ed9b7c3b1bda9788861a9a4c5ca4647ed0 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil@zankapfel.net>
Date: Tue, 25 Mar 2014 13:43:36 +0100
Subject: [PATCH 0619/1378] New aliases for 'apt-get' and 'aptitude' as they
 were overwritten by later aliases

---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 28dfb82a5..6e45e0521 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -21,8 +21,8 @@ fi
 # Aliases ###################################################################
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
-alias ag='apt-get'
-alias ap='aptitude'
+alias age='apt-get'
+alias api='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"

From 48f8f2809bf96033f92f95384fa51749d6985dda Mon Sep 17 00:00:00 2001
From: Leif Ringstad <leif@bitelm.com>
Date: Tue, 25 Mar 2014 16:36:39 +0100
Subject: [PATCH 0620/1378] Plugin: Rake-fast: Support both *nix and Darwin

---
 plugins/rake-fast/rake-fast.plugin.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index 320855233..f4d969c11 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -27,8 +27,13 @@ _rake_refresh () {
 _rake_does_task_list_need_generating () {
   if [ ! -f .rake_tasks ]; then return 0;
   else
-    accurate=$(stat -f%m .rake_tasks)
-    changed=$(stat -f%m Rakefile)
+    if [[ $(uname -s) == 'Darwin' ]]; then
+      accurate=$(stat -f%m .rake_tasks)
+      changed=$(stat -f%m Rakefile)
+    else
+      accurate=$(stat -c%Y .rake_tasks)
+      changed=$(stat -c%Y Rakefile)
+    fi
     return $(expr $accurate '>=' $changed)
   fi
 }

From b578eea2739e707d5ecfb79f5b072876264d8f1c Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 16 Dec 2011 14:21:45 +0100
Subject: [PATCH 0621/1378] `setopt append_history` is not necessary.

Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.
---
 lib/history.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 655945166..1d83e56e3 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -5,7 +5,6 @@ fi
 HISTSIZE=10000
 SAVEHIST=10000
 
-setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first
 setopt hist_ignore_dups # ignore duplication command history list

From 95ffb167a1f7420b37ba74a4067d33ef6a71f3c5 Mon Sep 17 00:00:00 2001
From: David Lee <davidomundo@gmail.com>
Date: Sun, 26 Feb 2012 02:29:24 -0800
Subject: [PATCH 0622/1378] Add gem build autocompletion

---
 plugins/gem/_gem | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 66c77b7d1..25967f1e7 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -56,6 +56,9 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
+  build)
+    _files -g "*.gemspec"
+    ;;
   list)
       if [[ "$state" == forms ]]; then
         _gem_installed

From c70fcd6f972473f1b0948143407656f4e58a3119 Mon Sep 17 00:00:00 2001
From: Tom Morris <tom@tommorris.org>
Date: Mon, 5 Mar 2012 11:55:30 +0000
Subject: [PATCH 0623/1378] Added link to wiki page for plugins to README.

The wiki is more readable than going to the plugins directory.
---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index c808fb5d7..4325c91eb 100644
--- a/README.textile
+++ b/README.textile
@@ -59,7 +59,7 @@ If you installed manually or changed the install location, check ZSH in ~/.zshrc
 
 h2. Usage
 
-* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
+* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
 ** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.

From 48e53fb6ede984964bfb45021212f0097c9a3637 Mon Sep 17 00:00:00 2001
From: William Ting <william.h.ting@gmail.com>
Date: Tue, 6 Mar 2012 14:31:03 -1000
Subject: [PATCH 0624/1378] fix gnzh theme to detect local rvm installations

---
 themes/gnzh.zsh-theme | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 3c6b8a409..33f187bc6 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -6,7 +6,7 @@ autoload -U colors zsh/terminfo # Used in the colour alias below
 colors
 setopt prompt_subst
 
-# make some aliases for the colours: (coud use normal escap.seq's too)
+# make some aliases for the colours: (could use normal escape sequences too)
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
   eval PR_$color='%{$fg[${(L)color}]%}'
 done
@@ -25,7 +25,7 @@ elif [[ $UID -eq 0 ]]; then # root
 fi
 
 # Check if we are on SSH or not
-if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
+if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
   eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
 else
   eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
@@ -36,12 +36,12 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
 local rvm_ruby=''
-if which rvm-prompt &> /dev/null; then
+if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
+  rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation
   rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-else
-  if which rbenv &> /dev/null; then
-    rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
-  fi
+elif which rbenv &> /dev/null; then # detect Simple Ruby Version management
+  rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
 fi
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 

From 640e5da6885ac39697f7c4ad6683af21fa1b8b96 Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Fri, 9 Mar 2012 08:53:09 -0500
Subject: [PATCH 0625/1378] added powed command to list pow urls

---
 plugins/pow/pow.plugin.zsh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 399a54cb0..c823cdb22 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -8,18 +8,18 @@
 # Supports command completion.
 #
 # If you are not already using completion you might need to enable it with
-# 
+#
 #    autoload -U compinit compinit
 #
 # Changes:
 #
-# Defaults to the current application, and will walk up the tree to find 
+# Defaults to the current application, and will walk up the tree to find
 # a config.ru file and restart the corresponding app
 #
-# Will Detect if a app does not exist in pow and print a (slightly) helpful 
+# Will Detect if a app does not exist in pow and print a (slightly) helpful
 # error message
 
-rack_root_detect(){
+rack_root(){
   setopt chaselinks
   local orgdir=$(pwd)
   local basedir=$(pwd)
@@ -32,6 +32,11 @@ rack_root_detect(){
 
   builtin cd $orgdir 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
+  echo $basedir
+}
+
+rack_root_detect(){
+  basedir=$(rack_root)
   echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
 
@@ -51,16 +56,21 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-	local basedir=$(pwd)
+  local basedir=$(pwd)
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
-	then
-		echo "pow: Symlinking your app with pow. ${vhost}"
-	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+  then
+    echo "pow: Symlinking your app with pow. ${vhost}"
+    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
     return 1
   fi
 }
 
+powed(){
+  local basedir=$(rack_root)
+  find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
+}
+
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From 8d1fa09007b3bbd67cbdcf191eb6cd6faa2af974 Mon Sep 17 00:00:00 2001
From: cmar <chris@spreecommerce.com>
Date: Wed, 4 Apr 2012 12:54:31 -0400
Subject: [PATCH 0626/1378] command to restart pow process

---
 plugins/pow/pow.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index c823cdb22..7f86c0c76 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -72,5 +72,14 @@ powed(){
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
+# Restart pow process
+# taken from http://www.matthewratzloff.com/blog/2011/12/23/restarting-pow-when-dns-stops-responding
+repow(){
+  lsof | grep 20560 | awk '{print $2}' | xargs kill -9
+  launchctl unload ~/Library/LaunchAgents/cx.pow.powd.plist
+  launchctl load ~/Library/LaunchAgents/cx.pow.powd.plist
+  echo "restarted pow"
+}
+
 # View the standard out (puts) from any pow app
 alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From cdea478f0f20545473454c069d8d6bb860555021 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 08:16:44 -0400
Subject: [PATCH 0627/1378] A plugin that makes it easier to interact with the
 (single) running instance of gvim

---
 plugins/vim-interaction/README.md             | 69 +++++++++++++++++++
 .../vim-interaction.plugin.zsh                | 67 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 plugins/vim-interaction/README.md
 create mode 100644 plugins/vim-interaction/vim-interaction.plugin.zsh

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
new file mode 100644
index 000000000..65e678b51
--- /dev/null
+++ b/plugins/vim-interaction/README.md
@@ -0,0 +1,69 @@
+# Vim Interaction #
+
+The plugin presents a function called `callvim` whose usage is:
+
+    usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+    
+      -b cmd     Run this command in GVIM before editing the first file
+      -a cmd     Run this command in GVIM after editing the first file
+      file       The file to edit
+      ... fileN  The other files to add to the argslist
+
+## Rationale ##
+
+The idea for this script is to give you some decent interaction with a running
+GVim session.  Normally you'll be running around your filesystem doing any
+number of amazing things and you'll need to load some files into GVim for
+editing, inspecting, destruction, or other bits of mayhem.  This script lets you
+do that.
+
+## Aliases ##
+
+There are a few aliases presented as well:
+
+* `v` A shorthand for `callvim`
+* `vvsp` Edits the passed in file but first makes a vertical split
+* `vhsp` Edits the passed in file but first makes a horizontal split
+
+## Examples ##
+
+This will load `/tmp/myfile.scala` into the running GVim session:
+
+    > v /tmp/myfile.scala
+
+This will load it after first doing a vertical split:
+
+    > vvsp /tmp/myfile.scala
+    or
+    > v -b':vsp' /tmp/myfile.scala
+
+This will load it after doing a horizontal split, then moving to the bottom of
+the file:
+
+    > vhsp -aG /tmp/myfile.scala
+    or
+    > v -b':sp' -aG /tmp/myfile.scala
+
+This will load the file and then copy the first line to the end (Why you would
+ever want to do this... I dunno):
+
+    > v -a':1t$' /tmp/myfile.scala
+
+And this will load all of the `*.txt` files into the args list:
+
+    > v *.txt
+
+If you want to load files into areas that are already split, use one of the
+aliases for that:
+
+    # Do a ':wincmd h' first
+    > vh /tmp/myfile.scala
+
+    # Do a ':wincmd j' first
+    > vj /tmp/myfile.scala
+
+    # Do a ':wincmd k' first
+    > vk /tmp/myfile.scala
+
+    # Do a ':wincmd l' first
+    > vl /tmp/myfile.scala
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
new file mode 100644
index 000000000..3f346dfc3
--- /dev/null
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -0,0 +1,67 @@
+#
+# See README.md
+#
+# Derek Wyatt (derek@{myfirstnamemylastname}.org
+# 
+
+function resolveFile
+{
+  if [ -f "$1" ]; then
+    echo $(readlink -f "$1")
+  else
+    echo "$1"
+  fi
+}
+
+function callvim
+{
+  if [[ $# == 0 ]]; then
+    cat <<EOH
+usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+
+  -b cmd     Run this command in GVIM before editing the first file
+  -a cmd     Run this command in GVIM after editing the first file
+  file       The file to edit
+  ... fileN  The other files to add to the argslist
+EOH
+    return 0
+  fi
+
+  local cmd=""
+  local before=""
+  local after=""
+  while getopts ":b:a:" option
+  do
+    case $option in
+      a) after="$OPTARG"
+         ;;
+      b) before="$OPTARG"
+         ;;
+    esac
+  done
+  shift $((OPTIND-1))
+  if [[ ${after#:} != $after && ${after%<cr>} == $after ]]; then
+    after="$after<cr>"
+  fi
+  if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
+    before="$before<cr>"
+  fi
+  local files=""
+  for f in $@
+  do
+    files="$files $(resolveFile $f)"
+  done
+  if [[ -n $files ]]; then
+    files=':args! '"$files<cr>"
+  fi
+  cmd="$before$files$after"
+  gvim --remote-send "$cmd"
+}
+
+alias v=callvim
+alias vvsp="callvim -b':vsp'"
+alias vhsp="callvim -b':sp'"
+alias vk="callvim -b':wincmd k'"
+alias vj="callvim -b':wincmd j'"
+alias vl="callvim -b':wincmd l'"
+alias vh="callvim -b':wincmd h'"

From 83071a10e7bcb398269be37a77dd929cb9182434 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <dwyatt@rim.com>
Date: Tue, 20 Mar 2012 09:55:25 -0400
Subject: [PATCH 0628/1378] Fixed: If you callvim on a non-existant file with a
 relative path, the CWD of the running gvim process is used, and that's not
 right.  We use the PWD explicitly instead, in this case

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 3f346dfc3..309012b34 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,8 +8,10 @@ function resolveFile
 {
   if [ -f "$1" ]; then
     echo $(readlink -f "$1")
+  elif [[ "${1#/}" == "$1" ]]; then
+    echo "$(pwd)/$1"
   else
-    echo "$1"
+    echo $1
   fi
 }
 

From 5a81fda42a48587fb27acb8c5d1e64e1d7c90b6c Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:33:06 -0400
Subject: [PATCH 0629/1378] Added an optional callout to the end of the
 interaction function. I put it in to allow me to put the window focus on
 MacVim / GVim depending on the different OS I happen to be on

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 309012b34..af7e60c88 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -58,6 +58,9 @@ EOH
   fi
   cmd="$before$files$after"
   gvim --remote-send "$cmd"
+  if typeset -f postCallVim > /dev/null; then
+    postCallVim
+  fi
 }
 
 alias v=callvim

From 46c2af396a80a4dda8ce46577249b7aa81ea0849 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Fri, 30 Mar 2012 06:39:49 -0400
Subject: [PATCH 0630/1378] Updated the README to include documentation on the
 postCallVim callout

---
 plugins/vim-interaction/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/vim-interaction/README.md b/plugins/vim-interaction/README.md
index 65e678b51..681648018 100644
--- a/plugins/vim-interaction/README.md
+++ b/plugins/vim-interaction/README.md
@@ -25,6 +25,19 @@ There are a few aliases presented as well:
 * `vvsp` Edits the passed in file but first makes a vertical split
 * `vhsp` Edits the passed in file but first makes a horizontal split
 
+## Post Callout ##
+
+At the end of the `callvim` function we invoke the `postCallVim` function if it
+exists.  If you're using MacVim, for example, you could define a function that
+brings window focus to it after the file is loaded:
+
+    function postCallVim
+    {
+      osascript -e 'tell application "MacVim" to activate'
+    }
+
+This'll be different depending on your OS / Window Manager.
+
 ## Examples ##
 
 This will load `/tmp/myfile.scala` into the running GVim session:

From ee8f9eebb5ea0c5d2df8445a46f2d31fdb16efd6 Mon Sep 17 00:00:00 2001
From: Derek Wyatt <derek@derekwyatt.org>
Date: Sun, 1 Apr 2012 15:41:39 -0400
Subject: [PATCH 0631/1378] Added an <esc> to the begining of everything. I ran
 something when I was in insert mode once and all it did was shove !args...
 into the buffer.  <esc> first.

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index af7e60c88..5142f1f9b 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -30,7 +30,7 @@ EOH
   fi
 
   local cmd=""
-  local before=""
+  local before="<esc>"
   local after=""
   while getopts ":b:a:" option
   do

From 7a94b760193306fd62c07c93e116439f2bd8059b Mon Sep 17 00:00:00 2001
From: William Roe <willroe@gmail.com>
Date: Thu, 23 Feb 2012 14:11:52 +0000
Subject: [PATCH 0632/1378] Add completion for pip install -r - so that it
 autocompletes requirements filenames

---
 plugins/pip/_pip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 7c1238db7..9892dd19c 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -59,6 +59,7 @@ case "$words[1]" in
   	_arguments \
       '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
       '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+      '(-r --requirement)'{-r,--requirement}'[Requirements file for packages to install]:File:_files' \
       '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
       '(--no-install)--no-install[only download packages]' \
       '(--no-download)--no-download[only install downloaded packages]' \

From d1323edb499d5f9fbe7641bcab402229ad773195 Mon Sep 17 00:00:00 2001
From: Peter Jaros <peter.a.jaros@gmail.com>
Date: Wed, 16 May 2012 14:51:52 -0400
Subject: [PATCH 0633/1378] Move example plugin to the custom plugins dir.

---
 .gitignore                                      | 4 ++--
 custom/{ => plugins}/example/example.plugin.zsh | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename custom/{ => plugins}/example/example.plugin.zsh (100%)

diff --git a/.gitignore b/.gitignore
index 51a5ee6c3..8fa66f02f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*
-!custom/example
+custom
+!custom/plugins/example
 !custom/example.zsh
 *.swp
 !custom/example.zshcache
diff --git a/custom/example/example.plugin.zsh b/custom/plugins/example/example.plugin.zsh
similarity index 100%
rename from custom/example/example.plugin.zsh
rename to custom/plugins/example/example.plugin.zsh

From d2a765e12d8638354b3cdc71ca535964fc379599 Mon Sep 17 00:00:00 2001
From: nXqd <nxqd.inbox@gmail.com>
Date: Thu, 14 Jun 2012 08:06:36 +0300
Subject: [PATCH 0634/1378] avoid VCS folders

---
 lib/grep.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 93c4270b6..25345bd06 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -2,5 +2,11 @@
 # Color grep results
 # Examples: http://rubyurl.com/ZXv
 #
-export GREP_OPTIONS='--color=auto'
+
+# avoid VCS folders
+GREP_OPTIONS=
+for PATTERN in .cvs .git .hg .svn; do
+    GREP_OPTIONS+="--exclude-dir=$PATTERN "
+done
+export GREP_OPTIONS+='--color=auto '
 export GREP_COLOR='1;32'
\ No newline at end of file

From 1988958a1f960fcd5911745667a682daca2d0139 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:49:32 +0200
Subject: [PATCH 0635/1378] added completion for all asadmin subcommands

---
 plugins/glassfish/_asadmin | 345 +++++++++++++++++++++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 plugins/glassfish/_asadmin

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
new file mode 100644
index 000000000..c8f62c67c
--- /dev/null
+++ b/plugins/glassfish/_asadmin
@@ -0,0 +1,345 @@
+#compdef asadmin
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+    "add-library:adds one or more library JAR files to GlassFish Server"
+    "add-resources:creates the resources specified in an XML file"
+    "apply-http-lb-changes:applies load balancer configuration changes to the load balancer"
+    "backup-domain:performs a backup on the domain"
+    "change-admin-password:changes the administrator password"
+    "change-master-broker:changes the master broker in a Message Queue cluster providing JMS services for a GlassFish Server cluster."
+    "change-master-password:changes the master password"
+    "collect-log-files:creates a ZIP archive of all available log files"
+    "configure-jms-cluster:configures the Message Queue cluster providing JMS services to a GlassFish Server cluster"
+    "configure-lb-weight:sets load balancing weights for clustered instances"
+    "configure-ldap-for-admin:configures the authentication realm named admin-realm for the given LDAP"
+    "copy-config:copies an existing named configuration to create another configuration"
+    "create-admin-object:adds the administered object with the specified JNDI name for a resource adapter"
+    "create-application-ref:creates a reference to an application"
+    "create-audit-module:adds an audit module"
+    "create-auth-realm:adds the named authentication realm"
+    "create-cluster:creates a GlassFish Server cluster"
+    "create-connector-connection-pool:adds a connection pool with the specified connection pool name"
+    "create-connector-resource:registers the connector resource with the specified JNDI name"
+    "create-connector-security-map:creates a security map for the specified connector connection pool"
+    "create-connector-work-security-map:creates a work security map for the specified resource adapter"
+    "create-custom-resource:creates a custom resource"
+    "create-domain:creates a domain"
+    "create-file-user:creates a new file user"
+    "create-http:sets HTTP parameters for a protocol"
+    "create-http-health-checker:creates a health-checker for a specified load balancer configuration"
+    "create-http-lb:creates a load balancer"
+    "create-http-lb-config:creates a configuration for the load balancer"
+    "create-http-lb-ref:adds an existing cluster or server instance to an existing load balancer configuration or load balancer"
+    "create-http-listener:adds a new HTTP network listener socket"
+    "create-http-redirect:adds a new HTTP redirect"
+    "create-iiop-listener:adds an IIOP listener"
+    "create-instance:creates a GlassFish Server instance"
+    "create-jacc-provider:enables administrators to create a JACC provider that can be used by third-party authorization modules for applications running in GlassFish Server"
+    "create-javamail-resource:creates a JavaMail session resource"
+    "create-jdbc-connection-pool:registers a JDBC connection pool"
+    "create-jdbc-resource:creates a JDBC resource with the specified JNDI name"
+    "create-jms-host:creates a JMS host"
+    "create-jms-resource:creates a JMS resource"
+    "create-jmsdest:creates a JMS physical destination"
+    "create-jndi-resource:registers a JNDI resource"
+    "create-jvm-options:creates options for the Java application launcher"
+    "create-lifecycle-module:creates a lifecycle module"
+    "create-local-instance:creates a GlassFish Server instance on the host where the subcommand is run"
+    "create-message-security-provider:enables administrators to create a message security provider, which specifies how SOAP messages will be secured."
+    "create-network-listener:adds a new network listener socket"
+    "create-node-config:creates a node that is not enabled for remote communication"
+    "create-node-dcom:creates a node that is enabled for com munication over DCOM"
+    "create-node-ssh:creates a node that is enabled for communication over SSH"
+    "create-password-alias:creates a password alias"
+    "create-profiler:creates the profiler element"
+    "create-protocol:adds a new protocol"
+    "create-protocol-filter:adds a new protocol filter"
+    "create-protocol-finder:adds a new protocol finder"
+    "create-resource-adapter-config:creates the configuration information for the connector module"
+    "create-resource-ref:creates a reference to a resource"
+    "create-service:configures the starting of a DAS or a GlassFish Server instance on an unattended boot"
+    "create-ssl:creates and configures the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "create-system-properties:adds one or more system property elements that can be referenced elsewhere in the configuration."
+    "create-threadpool:adds a thread pool"
+    "create-transport:adds a new transport"
+    "create-virtual-server:creates the named virtual server"
+    "delete-admin-object:removes the administered object with the specified JNDI name."
+    "delete-application-ref:removes a reference to an applica tion"
+    "delete-audit-module:removes the named audit-module"
+    "delete-auth-realm:removes the named authentication realm"
+    "delete-cluster:deletes a GlassFish Server cluster"
+    "delete-config:deletes an existing named configuration"
+    "delete-connector-connection-pool:removes the specified connector connection pool"
+    "delete-connector-resource:removes the connector resource with the specified JNDI name"
+    "delete-connector-security-map:deletes a security map for the specified connector connection pool"
+    "delete-connector-work-security-map:deletes a work security map for the specified resource adapter"
+    "delete-custom-resource:removes a custom resource"
+    "delete-domain:deletes a domain"
+    "delete-file-user:removes the named file user"
+    "delete-http:removes HTTP parameters from a protocol"
+    "delete-http-health-checker:deletes the health-checker for a specified load balancer configuration"
+    "delete-http-lb:deletes a load balancer"
+    "delete-http-lb-config:deletes a load balancer configuration"
+    "delete-http-lb-ref:deletes the cluster or server instance from a load balancer"
+    "delete-http-listener:removes a network listener"
+    "delete-http-redirect:removes an HTTP redirect"
+    "delete-iiop-listener:removes an IIOP listener"
+    "delete-instance:deletes a GlassFish Server instance"
+    "delete-jacc-provider:enables administrators to delete JACC providers defined for a domain"
+    "delete-javamail-resource:removes a JavaMail session resource"
+    "delete-jdbc-connection-pool:removes the specified JDBC connection pool"
+    "delete-jdbc-resource:removes a JDBC resource with the specified JNDI name"
+    "delete-jms-host:removes a JMS host"
+    "delete-jms-resource:removes a JMS resource"
+    "delete-jmsdest:removes a JMS physical destination"
+    "delete-jndi-resource:removes a JNDI resource"
+    "delete-jvm-options:removes one or more options for the Java application launcher"
+    "delete-lifecycle-module:removes the lifecycle module"
+    "delete-local-instance:deletes a GlassFish Server instance on the machine where the subcommand is run"
+    "delete-log-levels:"
+    "delete-message-security-provider:enables administrators to delete a message security provider"
+    "delete-network-listener:removes a network listener"
+    "delete-node-config:deletes a node that is not enabled for remote communication"
+    "delete-node-dcom:deletes a node that is enabled for communication over DCOM"
+    "delete-node-ssh:deletes a node that is enabled for communication over SSH"
+    "delete-password-alias:deletes a password alias"
+    "delete-profiler:removes the profiler element"
+    "delete-protocol:removes a protocol"
+    "delete-protocol-filter:removes a protocol filter"
+    "delete-protocol-finder:removes a protocol finder"
+    "delete-resource-adapter-config:deletes the resource adapter configuration"
+    "delete-resource-ref:removes a reference to a resource"
+    "delete-ssl:deletes the SSL element in the selected HTTP listener, IIOP listener, or IIOP service"
+    "delete-system-property:removes a system property of the domain, configuration, cluster, or server instance, one at a time"
+    "delete-threadpool:removes a thread pool"
+    "delete-transport:removes a transport"
+    "delete-virtual-server:removes a virtual server"
+    "deploy:deploys the specified component"
+    "deploydir:deploys an exploded format of application archive"
+    "environment variable"
+    "disable:disables the component"
+    "disable-http-lb-application:disables an application managed by a load balancer"
+    "disable-http-lb-server:disables a sever or cluster managed by a load balancer"
+    "disable-monitoring:disables monitoring for the server or for specific monitorable modules"
+    "disable-secure-admin:disables secure admin if it is already enabled."
+    "disable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to not use the specified admin user to authenticate with each other and to authorize admin operations."
+    "disable-secure-admin-principal:disables the certificate for authorizing access in secure administration."
+    "enable:enables the component"
+    "enable-http-lb-application:enables a previously-disabled application managed by a load balancer"
+    "enable-http-lb-server:enables a previously disabled sever or cluster managed by a load balancer"
+    "enable-monitoring:enables monitoring for the server or for specific monitorable modules"
+    "enable-secure-admin:enables secure admin (if it is not already enabled), optionally changing the alias used for DAS-to-instance admin messages or the alias used for instance-to-DAS admin messages."
+    "enable-secure-admin-internal-user:Instructs the GlassFish Server DAS and instances to use the specified admin user and the password associated with the password alias to authenticate with each other and to authorize admin operations."
+    "enable-secure-admin-principal:Instructs GlassFish Server, when secure admin is enabled, to accept admin requests from clients identified by the specified SSL certificate."
+    "export:marks a variable name for automatic export to the environment of subsequent commands in multimode"
+    "export-http-lb-config:exports the load balancer configuration or load balancer to a file"
+    "export-sync-bundle:exports the configuration data of a cluster or standalone instance to an archive file"
+    "flush-connection-pool:reintializes all connections established in the specified connection pool"
+    "flush-jmsdest:purges messages in a JMS destination."
+    "freeze-transaction-service:freezes the transaction subsystem"
+    "generate-domain-schema:"
+    "generate-jvm-report:shows the JVM machine statistics for a given target instance"
+    "get:gets the values of configurable or monitorable attributes"
+    "get-client-stubs:retrieves the application JAR files needed to launch the application client."
+    "get-health:provides information on the cluster health"
+    "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
+    "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
+    "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
+    "install-node-dcom:installs GlassFish Server software on specified DCOM-enabled hosts"
+    "install-node-ssh:installs GlassFish Server software on specified SSH-enabled hosts"
+    "jms-ping:checks if the JMS service is up and running"
+    "list:lists configurable or monitorable elements"
+    "list-admin-objects:gets all the administered objects"
+    "list-application-refs:lists the existing application references"
+    "list-applications:lists deployed applications"
+    "list-audit-modules:gets all audit modules and displays them"
+    "list-auth-realms:lists the authentication realms"
+    "list-backups:lists all backups"
+    "list-clusters:lists existing clusters in a domain"
+    "list-commands:lists available commands"
+    "list-components:lists deployed components"
+    "list-configs:lists named configurations"
+    "list-connector-connection-pools:lists the existing connector connection pools"
+    "list-connector-resources:lists all connector resources"
+    "list-connector-security-maps:lists the security maps belonging to the specified connector connection pool"
+    "list-connector-work-security-maps:lists the work security maps belonging to the specified resource adapter"
+    "list-containers:lists application containers"
+    "list-custom-resources:gets all custom resources"
+    "list-domains:lists the domains in the specified directory"
+    "list-file-groups:lists file groups"
+    "list-file-users:lists the file users"
+    "list-http-lb-configs:lists load balancer configurations"
+    "list-http-lbs:lists load balancers"
+    "list-http-listeners:lists the existing network listeners"
+    "list-iiop-listeners:lists the existing IIOP listeners"
+    "list-instances:lists GlassFish Server instances in a domain"
+    "list-jacc-providers:enables administrators to list JACC providers defined for a domain"
+    "list-javamail-resources:lists the existing JavaMail session resources"
+    "list-jdbc-connection-pools:lists all JDBC connection pools"
+    "list-jdbc-resources:lists all JDBC resources"
+    "list-jms-hosts:lists the existing JMS hosts"
+    "list-jms-resources:lists the JMS resources"
+    "list-jmsdest:lists the existing JMS physical destinations"
+    "list-jndi-entries:browses and queries the JNDI tree"
+    "list-jndi-resources:lists all existing JNDI resources"
+    "list-jvm-options:lists options for the Java application launcher"
+    "list-libraries:lists library JAR files on GlassFish Server"
+    "list-lifecycle-modules:lists the lifecycle modules"
+    "list-log-attributes:lists all logging attributes defined for a specified target in a domain"
+    "list-log-levels:lists the loggers and their log levels"
+    "list-message-security-providers:lists all security message providers for the given message layer"
+    "list-modules:lists GlassFish Server modules"
+    "list-network-listeners:lists the existing network listeners"
+    "list-nodes:lists all GlassFish Server nodes in a domain"
+    "list-nodes-config:lists all GlassFish Server nodes that do not support remote communication in a domain"
+    "list-nodes-dcom:lists all GlassFish Server nodes that support communication over DCOM in a domain"
+    "list-nodes-ssh:lists all GlassFish Server nodes that support communication over SSH in a domain"
+    "list-password-aliases:lists all password aliases"
+    "list-persistence-types:lists registered persistence types for HTTP sessions and SFSB instances"
+    "list-protocol-filters:lists the existing protocol filters"
+    "list-protocol-finders:lists the existing protocol finders"
+    "list-protocols:lists the existing protocols"
+    "list-resource-adapter-configs:lists the names of the current resource adapter configurations"
+    "list-resource-refs:lists existing resource references"
+    "list-secure-admin-internal-users:lists the user names that the GlassFish Server DAS and instances use to authenticate with each other and to authorize admin operations."
+    "list-secure-admin-principals:lists the certificates for which GlassFish Server accepts admin requests from clients."
+    "list-sub-components:lists EJB or servlet components in a deployed module or module of a deployed application"
+    "list-supported-cipher-suites:enables administrators to list the cipher suites that are supported and available to a specified GlassFish Server target"
+    "list-system-properties:lists the system properties of the domain, configuration, cluster, or server instance"
+    "list-threadpools:lists all the thread pools"
+    "list-timers:lists all of the persistent timers owned by server instance(s)"
+    "list-transports:lists the existing transports"
+    "list-virtual-servers:lists the existing virtual servers"
+    "list-web-context-param:lists servlet contextinitialization parameters of a deployed web application or module"
+    "list-web-env-entry:lists environment entries for a deployed web application or module"
+    "login:logs you into a domain"
+    "migrate-timers:moves EJB timers when a clustered instance was stopped or has crashed"
+    "monitor:displays monitoring data for commonly used components and services"
+    "multimode:allows multiple subcommands to be run while preserving environment settings and remaining in the asadmin utility"
+    "ping-connection-pool:tests if a connection pool is usable"
+    "ping-node-dcom:tests if a node that is enabled for communication over DCOM is usable"
+    "ping-node-ssh:tests if a node that is enabled for communication over SSH is usable"
+    "recover-transactions:manually recovers pending transactions"
+    "redeploy:redeploys the specified component"
+    "remove-library:removes one or more library JAR files from GlassFish Server"
+    "restart-domain:restarts the DAS of the specified domain"
+    "restart-instance:restarts a running GlassFish Server instance"
+    "restart-local-instance:restarts a running GlassFish Server instance on the host where the subcommand is run"
+    "restore-domain:restores files from backup"
+    "rollback-transaction:rolls back the named transaction"
+    "rotate-log:rotates the log file"
+    "set:sets the values of configurable attributes"
+    "set-log-attributes:sets the logging attributes for one or more loggers"
+    "set-log-levels:sets the log level for one or more loggers"
+    "set-web-context-param:sets a servlet context initialization parameter of a deployed web application or module"
+    "set-web-env-entry:sets an environment entry for a deployed web application or module"
+    "setup-ssh:sets up an SSH key on specified hosts"
+    "show-component-status:displays the status of the deployed component"
+    "start-cluster:starts a cluster"
+    "start-database:starts the Java DB"
+    "start-domain:starts the DAS of the specified domain"
+    "start-instance:starts a GlassFish Server instance"
+    "start-local-instance:starts a GlassFish Server instance on the host where the subcommand is run"
+    "stop-cluster:stops a GlassFish Server cluster"
+    "stop-database:stops the Java DB"
+    "stop-domain:stops the Domain Administration Server of the specified domain"
+    "stop-instance:stops a running GlassFish Server instance"
+    "stop-local-instance:stops a GlassFish Server instance on the machine where the subcommand is run"
+    "undeploy:removes a deployed component"
+    "unfreeze-transaction-service:resumes all suspended transactions"
+    "uninstall-node:uninstalls GlassFish Server software from specified hosts"
+    "uninstall-node-dcom:uninstalls GlassFish Server software from specified DCOM-enabled hosts"
+    "uninstall-node-ssh:uninstalls GlassFish Server software from specified SSH-enabled hosts"
+    "unset:removes one or more variables from the multimode environment"
+    "unset-web-context-param:unsets a servlet context initialization parameter of a deployed web application or module"
+    "unset-web-env-entry:unsets an environment entry for a deployed web application or module"
+    "update-connector-security-map:modifies a security map for the specified connector connection pool"
+    "update-connector-work-security-map:modifies a work security map for the specified resource adapter"
+    "update-file-user:updates a current file user as specified"
+    "update-node-config:updates the configuration data of anode"
+    "update-node-dcom:updates the configuration data of a node"
+    "update-node-ssh:updates the configuration data of a node"
+    "update-password-alias:updates a password alias"
+    "uptime:returns the length of time that the DAS has been running"
+    "validate-dcom:tests the connection over DCOM to a remote host"
+    "validate-multicast:validates that multicast transport is available for clusters"
+    "verify-domain-xml:verifies the content of the domain.xml file"
+    "version:displays version information forGlassFish Server"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "glassfish command" _1st_arguments
+    return
+fi
+
+local -a _command_args
+case "$words[1]" in
+    apps:info)
+        _command_args=(
+            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
+                )
+        ;;
+    apps:create)
+        _command_args=(
+            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
+                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
+                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
+                )
+        ;;
+    config)
+        _command_args=(
+            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
+                )
+        ;;
+    db:push)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
+                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
+                )
+        ;;
+    db:pull)
+        _command_args=(
+            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
+                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
+                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
+                )
+        ;;
+    keys)
+        _command_args=(
+            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
+                )
+        ;;
+    logs)
+        _command_args=(
+            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
+                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
+                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
+                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
+                )
+        ;;
+    pgbackups:capture)
+        _command_args=(
+            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
+                )
+        ;;
+    stack)
+        _command_args=(
+            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
+                )
+        ;;
+esac
+
+_arguments \
+    $_command_args \
+    &&  return 0

From 7daf2f4a623e730c837299ce709c41a50d13e458 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 10 Jul 2012 14:57:59 +0200
Subject: [PATCH 0636/1378] apparently, this file must exist for the plugin to
 load

---
 plugins/glassfish/_glassfish | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 plugins/glassfish/_glassfish

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/plugins/glassfish/_glassfish
@@ -0,0 +1 @@
+

From 4dcdd13009d288bce3ba5a6157f408c15fb351c5 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:05:33 +0200
Subject: [PATCH 0637/1378] added completions for all known arguments to all
 known commands

---
 plugins/glassfish/_asadmin | 684 +++++++++++++++++++++++++++++++++----
 1 file changed, 624 insertions(+), 60 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index c8f62c67c..08ae9d461 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -278,66 +278,630 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-    apps:info)
-        _command_args=(
-            '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
-                )
-        ;;
-    apps:create)
-        _command_args=(
-            '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
-                '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
-                '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
-                )
-        ;;
-    config)
-        _command_args=(
-            '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
-                )
-        ;;
-    db:push)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
-                '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
-                )
-        ;;
-    db:pull)
-        _command_args=(
-            '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-                '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-                '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
-                '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
-                '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-                '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
-                )
-        ;;
-    keys)
-        _command_args=(
-            '(-l|--long)'{-l,--long}'[display extended information for each key]' \
-                )
-        ;;
-    logs)
-        _command_args=(
-            '(-n|--num)'{-n,--num}'[the number of lines to display]' \
-                '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
-                '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
-                '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
-                )
-        ;;
-    pgbackups:capture)
-        _command_args=(
-            '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
-                )
-        ;;
-    stack)
-        _command_args=(
-            '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
-                )
-        ;;
+	add-library)
+		_command_args=('--type')
+	;;
+	add-resources)
+		_command_args=('--target')
+	;;
+	apply-http-lb-changes)
+		_command_args=('--ping')
+	;;
+	backup-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+	;;
+	change-admin-password)
+		_command_args=('--domain_name' '--domaindir')
+	;;
+	change-master-password)
+		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+	;;
+	collect-log-files)
+		_command_args=('--retrieve' '--target')
+	;;
+	configure-jms-cluster)
+		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+	;;
+	configure-lb-weight)
+		_command_args=('--cluster')
+	;;
+	configure-ldap-for-admin)
+		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+	;;
+	copy-config)
+		_command_args=('--systemproperties')
+	;;
+	create-admin-object)
+		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+	;;
+	create-application-ref)
+		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+	;;
+	create-audit-module)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-auth-realm)
+		_command_args=('--classname' '--property' '--target')
+	;;
+	create-connector-connection-pool)
+		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+	;;
+	create-connector-resource)
+		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+	;;
+	create-connector-security-map)
+		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+	;;
+	create-connector-work-security-map)
+		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+	;;
+	create-custom-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+	;;
+	create-domain)
+		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+	;;
+	create-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	create-http)
+		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+	;;
+	create-http-health-checker)
+		_command_args=('--config' '--interval' '--timeout' '--url')
+	;;
+	create-http-lb)
+		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+	;;
+	create-http-lb-ref)
+		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+	;;
+	create-http-listener)
+		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+	;;
+	create-http-redirect)
+		_command_args=('--redirect-port' '--secure-redirect' '--target')
+	;;
+	create-iiop-listener)
+		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+	;;
+	create-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+	;;
+	create-jacc-provider)
+		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+	;;
+	create-javamail-resource)
+		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+	;;
+	create-jdbc-connection-pool)
+		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+	;;
+	create-jdbc-resource)
+		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+	;;
+	create-jms-host)
+		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+	;;
+	create-jms-resource)
+		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+	;;
+	create-jmsdest)
+		_command_args=('--desttype' '--property' '--target')
+	;;
+	create-jndi-resource)
+		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+	;;
+	create-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	create-lifecycle-module)
+		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+	;;
+	create-local-instance)
+		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+	;;
+	create-message-security-provider)
+		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+	;;
+	create-network-listener)
+		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+	;;
+	create-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	create-node-dcom)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	create-node-ssh)
+		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	create-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	create-profiler)
+		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+	;;
+	create-protocol)
+		_command_args=('--securityenabled' '--target')
+	;;
+	create-protocol-filter)
+		_command_args=('--classname' '--protocol' '--target')
+	;;
+	create-protocol-finder)
+		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+	;;
+	create-resource-adapter-config)
+		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+	;;
+	create-resource-ref)
+		_command_args=('--enabled' '--target')
+	;;
+	create-service)
+		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+	;;
+	create-ssl)
+		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+	;;
+	create-system-properties)
+		_command_args=('--target')
+	;;
+	create-threadpool)
+		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+	;;
+	create-transport)
+		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+	;;
+	create-virtual-server)
+		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+	;;
+	delete-admin-object)
+		_command_args=('--target')
+	;;
+	delete-application-ref)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-audit-module)
+		_command_args=('--target')
+	;;
+	delete-auth-realm)
+		_command_args=('--target')
+	;;
+	delete-connector-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-connector-resource)
+		_command_args=('--target')
+	;;
+	delete-connector-security-map)
+		_command_args=('--poolname' '--target')
+	;;
+	delete-connector-work-security-map)
+		_command_args=('--raname')
+	;;
+	delete-custom-resource)
+		_command_args=('--target')
+	;;
+	delete-domain)
+		_command_args=('--domaindir')
+	;;
+	delete-file-user)
+		_command_args=('--authrealmname' '--target')
+	;;
+	delete-http)
+		_command_args=('--target')
+	;;
+	delete-http-health-checker)
+		_command_args=('--config')
+	;;
+	delete-http-lb-ref)
+		_command_args=('--config' '--force' '--lbname')
+	;;
+	delete-http-listener)
+		_command_args=('--secure' '--target')
+	;;
+	delete-http-redirect)
+		_command_args=('--target')
+	;;
+	delete-iiop-listener)
+		_command_args=('--target')
+	;;
+	delete-instance)
+		_command_args=('--terse')
+	;;
+	delete-jacc-provider)
+		_command_args=('--target')
+	;;
+	delete-javamail-resource)
+		_command_args=('--target')
+	;;
+	delete-jdbc-connection-pool)
+		_command_args=('--cascade' '--target')
+	;;
+	delete-jdbc-resource)
+		_command_args=('--target')
+	;;
+	delete-jms-host)
+		_command_args=('--target')
+	;;
+	delete-jms-resource)
+		_command_args=('--target')
+	;;
+	delete-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	delete-jndi-resource)
+		_command_args=('--target')
+	;;
+	delete-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	delete-lifecycle-module)
+		_command_args=('--target')
+	;;
+	delete-local-instance)
+		_command_args=('--node' '--nodedir')
+	;;
+	delete-log-levels)
+		_command_args=('--target')
+	;;
+	delete-message-security-provider)
+		_command_args=('--layer' '--target')
+	;;
+	delete-network-listener)
+		_command_args=('--target')
+	;;
+	delete-profiler)
+		_command_args=('--target')
+	;;
+	delete-protocol)
+		_command_args=('--target')
+	;;
+	delete-protocol-filter)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-protocol-finder)
+		_command_args=('--protocol' '--target')
+	;;
+	delete-resource-adapter-config)
+		_command_args=('--target')
+	;;
+	delete-resource-ref)
+		_command_args=('--target')
+	;;
+	delete-ssl)
+		_command_args=('--target' '--type')
+	;;
+	delete-system-property)
+		_command_args=('--target')
+	;;
+	delete-threadpool)
+		_command_args=('--target')
+	;;
+	delete-transport)
+		_command_args=('--target')
+	;;
+	delete-virtual-server)
+		_command_args=('--target')
+	;;
+	deploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	deploydir)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	disable)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	disable-http-lb-application)
+		_command_args=('--name' '--timeout')
+	;;
+	disable-http-lb-server)
+		_command_args=('--timeout')
+	;;
+	disable-monitoring)
+		_command_args=('--modules' '--target')
+	;;
+	enable)
+		_command_args=('--target')
+	;;
+	enable-http-lb-application)
+		_command_args=('--name')
+	;;
+	enable-monitoring)
+		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+	;;
+	enable-secure-admin)
+		_command_args=('--adminalias' '--instancealias')
+	;;
+	export-http-lb-config)
+		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+	;;
+	export-sync-bundle)
+		_command_args=('--retrieve' '--target')
+	;;
+	flush-connection-pool)
+		_command_args=('--appname' '--modulename')
+	;;
+	flush-jmsdest)
+		_command_args=('--desttype' '--target')
+	;;
+	freeze-transaction-service)
+		_command_args=('--target')
+	;;
+	generate-domain-schema)
+		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+	;;
+	generate-jvm-report)
+		_command_args=('--target' '--type')
+	;;
+	get)
+		_command_args=('--monitor')
+	;;
+	get-client-stubs)
+		_command_args=('--appname')
+	;;
+	import-sync-bundle)
+		_command_args=('--instance' '--node' '--nodedir')
+	;;
+	install-node-dcom)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+	;;
+	install-node-ssh)
+		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	jms-ping)
+		_command_args=('--target')
+	;;
+	list)
+		_command_args=('--monitor')
+	;;
+	list-application-refs)
+		_command_args=('--long' '--terse')
+	;;
+	list-backups)
+		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+	;;
+	list-commands)
+		_command_args=('--localonly' '--remoteonly')
+	;;
+	list-components)
+		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+	;;
+	list-connector-security-maps)
+		_command_args=('--long' '--securitymap' '--target')
+	;;
+	list-connector-work-security-maps)
+		_command_args=('--securitymap')
+	;;
+	list-custom-resources)
+		_command_args=('--target')
+	;;
+	list-domains)
+		_command_args=('--domaindir')
+	;;
+	list-file-groups)
+		_command_args=('--authrealmname' '--name')
+	;;
+	list-file-users)
+		_command_args=('--authrealmname')
+	;;
+	list-http-listeners)
+		_command_args=('--long')
+	;;
+	list-instances)
+		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+	;;
+	list-javamail-resources)
+		_command_args=('--target')
+	;;
+	list-jms-hosts)
+		_command_args=('--target')
+	;;
+	list-jms-resources)
+		_command_args=('--restype')
+	;;
+	list-jmsdest)
+		_command_args=('--desttype' '--property')
+	;;
+	list-jndi-entries)
+		_command_args=('--context')
+	;;
+	list-jndi-resources)
+		_command_args=('--target')
+	;;
+	list-jvm-options)
+		_command_args=('--profiler' '--target')
+	;;
+	list-libraries)
+		_command_args=('--type')
+	;;
+	list-lifecycle-modules)
+		_command_args=('--terse')
+	;;
+	list-message-security-providers)
+		_command_args=('--layer')
+	;;
+	list-nodes)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-config)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-dcom)
+		_command_args=('--long' '--terse')
+	;;
+	list-nodes-ssh)
+		_command_args=('--long' '--terse')
+	;;
+	list-persistence-types)
+		_command_args=('--type')
+	;;
+	list-protocol-filters)
+		_command_args=('--target')
+	;;
+	list-protocol-finders)
+		_command_args=('--target')
+	;;
+	list-resource-adapter-configs)
+		_command_args=('--long' '--raname')
+	;;
+	list-sub-components)
+		_command_args=('--appname' '--resources' '--terse' '--type')
+	;;
+	list-virtual-servers)
+		_command_args=('--target')
+	;;
+	list-web-context-param)
+		_command_args=('--name')
+	;;
+	list-web-env-entry)
+		_command_args=('--name')
+	;;
+	login)
+		_command_args=('--target')
+	;;
+	migrate-timers)
+		_command_args=('--target')
+	;;
+	monitor)
+		_command_args=('--filename' '--filter' '--interval' '--type')
+	;;
+	multimode)
+		_command_args=('--encoding' '--file' '--printprompt')
+	;;
+	ping-connection-pool)
+		_command_args=('--appname' '--modulename' '--target')
+	;;
+	recover-transactions)
+		_command_args=('--target' '--transactionlogdir')
+	;;
+	redeploy)
+		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+	;;
+	remove-library)
+		_command_args=('--type')
+	;;
+	restart-domain)
+		_command_args=('--debug' '--domaindir' '--force' '--kill')
+	;;
+	restart-instance)
+		_command_args=('--debug')
+	;;
+	restart-local-instance)
+		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+	;;
+	restore-domain)
+		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+	;;
+	rollback-transaction)
+		_command_args=('--target' '--transaction_id')
+	;;
+	rotate-log)
+		_command_args=('--target')
+	;;
+	set-log-attributes)
+		_command_args=('--target')
+	;;
+	set-log-levels)
+		_command_args=('--target')
+	;;
+	set-web-context-param)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+	;;
+	set-web-env-entry)
+		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+	;;
+	setup-ssh)
+		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+	;;
+	show-component-status)
+		_command_args=('--target')
+	;;
+	start-cluster)
+		_command_args=('--autohadboverride' '--verbose')
+	;;
+	start-database)
+		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+	;;
+	start-domain)
+		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+	;;
+	start-instance)
+		_command_args=('--debug' '--setenv' '--sync' '--terse')
+	;;
+	start-local-instance)
+		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+	;;
+	stop-cluster)
+		_command_args=('--autohadboverride' '--kill' '--verbose')
+	;;
+	stop-database)
+		_command_args=('--dbhost' '--dbport' '--dbuser')
+	;;
+	stop-domain)
+		_command_args=('--domaindir' '--force' '--kill')
+	;;
+	stop-instance)
+		_command_args=('--force' '--kill')
+	;;
+	stop-local-instance)
+		_command_args=('--force' '--kill' '--node' '--nodedir')
+	;;
+	undeploy)
+		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+	;;
+	unfreeze-transaction-service)
+		_command_args=('--target')
+	;;
+	uninstall-node-dcom)
+		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+	;;
+	uninstall-node-ssh)
+		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+	;;
+	unset-web-context-param)
+		_command_args=('--name')
+	;;
+	unset-web-env-entry)
+		_command_args=('--name')
+	;;
+	update-connector-security-map)
+		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+	;;
+	update-connector-work-security-map)
+		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+	;;
+	update-file-user)
+		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+	;;
+	update-node-config)
+		_command_args=('--installdir' '--nodedir' '--nodehost')
+	;;
+	update-node-dcom)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	update-node-ssh)
+		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+	;;
+	update-password-alias)
+		_command_args=('--aliaspassword')
+	;;
+	uptime)
+		_command_args=('--milliseconds')
+	;;
+	validate-dcom)
+		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+	;;
+	validate-multicast)
+		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+	;;
+	verify-domain-xml)
+		_command_args=('--domaindir')
+	;;
+	version)
+		_command_args=('--local' '--terse' '--verbose')
+	;;
 esac
 
 _arguments \

From f644d2eb6f6554de9f00c56b6356c306ce4c2c9f Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Thu, 12 Jul 2012 14:17:59 +0200
Subject: [PATCH 0638/1378] added alias

---
 plugins/glassfish/_glassfish           | 1 -
 plugins/glassfish/glassfish.plugin.zsh | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 plugins/glassfish/_glassfish
 create mode 100644 plugins/glassfish/glassfish.plugin.zsh

diff --git a/plugins/glassfish/_glassfish b/plugins/glassfish/_glassfish
deleted file mode 100644
index 8b1378917..000000000
--- a/plugins/glassfish/_glassfish
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
new file mode 100644
index 000000000..49ca23299
--- /dev/null
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -0,0 +1,3 @@
+# if there is a user named 'glassfish' on the system, we'll assume
+# that is the user asadmin should be run as
+grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From 9b4cf96ac0e8a5d7f490a927e40e7931fff2d3c3 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 12:08:41 +0200
Subject: [PATCH 0639/1378] completion options

---
 plugins/glassfish/_asadmin | 418 ++++++++++++++++++-------------------
 1 file changed, 209 insertions(+), 209 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 08ae9d461..f0ebea9f2 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -272,635 +272,635 @@ _1st_arguments=(
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then
-    _describe -t commands "glassfish command" _1st_arguments
+    _describe -t commands "asadmin command" _1st_arguments
     return
 fi
 
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	apply-http-lb-changes)
-		_command_args=('--ping')
+		_command_args=('--ping+:')
 	;;
 	backup-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	change-admin-password)
-		_command_args=('--domain_name' '--domaindir')
+		_command_args=('--domain_name+:' '--domaindir+:')
 	;;
 	change-master-password)
-		_command_args=('--domaindir' '--nodedir' '--savemasterpassword')
+		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
 	;;
 	collect-log-files)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	configure-jms-cluster)
-		_command_args=('--clustertype' '--configstoretype' '--dburl' '--dbuser' '--dbvendor' '--jmsdbpassword' '--messagestoretype' '--property')
+		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
 	;;
 	configure-lb-weight)
-		_command_args=('--cluster')
+		_command_args=('--cluster+:')
 	;;
 	configure-ldap-for-admin)
-		_command_args=('--basedn' '--ldap-group' '--target' '--url')
+		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
 	;;
 	copy-config)
-		_command_args=('--systemproperties')
+		_command_args=('--systemproperties+:')
 	;;
 	create-admin-object)
-		_command_args=('--classname' '--description' '--enabled' '--property' '--raname' '--restype' '--target')
+		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
 	;;
 	create-application-ref)
-		_command_args=('--enabled' '--lbenabled' '--target' '--virtualservers')
+		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
 	;;
 	create-audit-module)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-auth-realm)
-		_command_args=('--classname' '--property' '--target')
+		_command_args=('--classname+:' '--property+:' '--target+:')
 	;;
 	create-connector-connection-pool)
-		_command_args=('--associatewiththread' '--connectiondefinition' '--creationretryattempts' '--creationretryinterval' '--description' '--failconnection' '--idletimeout' '--isconnectvalidatereq' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--ping' '--pooling' '--poolresize' '--property' '--raname' '--steadypoolsize' '--target' '--transactionsupport' '--validateatmostonceperiod')
+		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
 	;;
 	create-connector-resource)
-		_command_args=('--description' '--enabled' '--objecttype' '--poolname' '--property' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
 	;;
 	create-connector-security-map)
-		_command_args=('--mappedpassword' '--mappedusername' '--poolname' '--principals' '--target' '--usergroups')
+		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
 	;;
 	create-connector-work-security-map)
-		_command_args=('--description' '--groupsmap' '--principalsmap' '--raname')
+		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
 	;;
 	create-custom-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-domain)
-		_command_args=('--adminport' '--checkports' '--domaindir' '--domainproperties' '--instanceport' '--keytooloptions' '--nopassword' '--portbase' '--profile' '--savelogin' '--savemasterpassword' '--template' '--usemasterpassword')
+		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	create-http)
-		_command_args=('--default-virtual-server' '--dns-lookup-enabled' '--max-connection' '--request-timeout-seconds' '--servername' '--target' '--timeout-seconds' '--xpowered')
+		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-health-checker)
-		_command_args=('--config' '--interval' '--timeout' '--url')
+		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
 	;;
 	create-http-lb)
-		_command_args=('--autoapplyenabled' '--devicehost' '--deviceport' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--httpsrouting' '--lbenableallapplications' '--lbenableallinstances' '--lbpolicy' '--lbpolicymodule' '--lbweight' '--monitor' '--property' '--reloadinterval' '--responsetimeout' '--routecookie' '--sslproxyhost' '--sslproxyport' '--target')
+		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
 	;;
 	create-http-lb-ref)
-		_command_args=('--config' '--healthcheckerinterval' '--healthcheckertimeout' '--healthcheckerurl' '--lbenableallapplications' '--lbenableallinstances' '--lbname' '--lbpolicy' '--lbpolicymodule' '--lbweight')
+		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
 	;;
 	create-http-listener)
-		_command_args=('--acceptorthreads' '--default-virtual-server' '--defaultvs' '--enabled' '--listeneraddress' '--listenerport' '--redirectport' '--secure' '--securityenabled' '--servername' '--target' '--xpowered')
+		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
 	;;
 	create-http-redirect)
-		_command_args=('--redirect-port' '--secure-redirect' '--target')
+		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
 	;;
 	create-iiop-listener)
-		_command_args=('--enabled' '--iiopport' '--listeneraddress' '--property' '--securityenabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--portbase' '--systemproperties' '--terse')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
 	;;
 	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass' '--policyproviderclass' '--property' '--target')
+		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
 	;;
 	create-javamail-resource)
-		_command_args=('--debug' '--description' '--enabled' '--fromaddress' '--mailhost' '--mailuser' '--property' '--storeprotocol' '--storeprotocolclass' '--target' '--transprotocol' '--transprotocolclass')
+		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
 	;;
 	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers' '--associatewiththread' '--creationretryattempts' '--creationretryinterval' '--datasourceclassname' '--description' '--driverclassname' '--failconnection' '--idletimeout' '--initsql' '--isconnectvalidatereq' '--isisolationguaranteed' '--isolationlevel' '--lazyconnectionassociation' '--lazyconnectionenlistment' '--leakreclaim' '--leaktimeout' '--matchconnections' '--maxconnectionusagecount' '--maxpoolsize' '--maxwait' '--nontransactionalconnections' '--ping' '--pooling' '--poolresize' '--property' '--restype' '--sqltracelisteners' '--statementcachesize' '--statementleakreclaim' '--statementleaktimeout' '--statementtimeout' '--steadypoolsize' '--target' '--validateatmostonceperiod' '--validationclassname' '--validationmethod' '--validationtable' '--wrapjdbcobjects')
+		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
 	;;
 	create-jdbc-resource)
-		_command_args=('--connectionpoolid' '--description' '--enabled' '--property' '--target')
+		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
 	;;
 	create-jms-host)
-		_command_args=('--mqhost' '--mqpassword' '--mqport' '--mquser' '--property' '--target')
+		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
 	;;
 	create-jms-resource)
-		_command_args=('--description' '--enabled' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jmsdest)
-		_command_args=('--desttype' '--property' '--target')
+		_command_args=('--desttype+:' '--property+:' '--target+:')
 	;;
 	create-jndi-resource)
-		_command_args=('--description' '--enabled' '--factoryclass' '--jndilookupname' '--property' '--restype' '--target')
+		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
 	;;
 	create-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	create-lifecycle-module)
-		_command_args=('--classname' '--classpath' '--description' '--enabled' '--failurefatal' '--loadorder' '--property' '--target')
+		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
 	;;
 	create-local-instance)
-		_command_args=('--checkports' '--cluster' '--config' '--lbenabled' '--node' '--nodedir' '--portbase' '--savemasterpassword' '--systemproperties' '--usemasterpassword')
+		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
 	;;
 	create-message-security-provider)
-		_command_args=('--classname' '--isdefaultprovider' '--layer' '--property' '--providertype' '--requestauthrecipient' '--requestauthsource' '--responseauthrecipient' '--responseauthsource' '--target')
+		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
 	;;
 	create-network-listener)
-		_command_args=('--address' '--enabled' '--jkenabled' '--listenerport' '--protocol' '--target' '--threadpool' '--transport')
+		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
 	;;
 	create-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	create-node-dcom)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	create-node-ssh)
-		_command_args=('--archive' '--force' '--install' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	create-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	create-profiler)
-		_command_args=('--classpath' '--enabled' '--nativelibrarypath' '--property' '--target')
+		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
 	;;
 	create-protocol)
-		_command_args=('--securityenabled' '--target')
+		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
 	;;
 	create-protocol-filter)
-		_command_args=('--classname' '--protocol' '--target')
+		_command_args=('--classname+:' '--protocol+:' '--target+:')
 	;;
 	create-protocol-finder)
-		_command_args=('--classname' '--protocol' '--target' '--targetprotocol')
+		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
 	;;
 	create-resource-adapter-config)
-		_command_args=('--objecttype' '--property' '--target' '--threadpoolid')
+		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
 	;;
 	create-resource-ref)
-		_command_args=('--enabled' '--target')
+		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir' '--dry-run' '--force' '--name' '--node' '--nodedir' '--serviceproperties' '--serviceuser')
+		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
-		_command_args=('--certname' '--clientauthenabled' '--ssl2ciphers' '--ssl2enabled' '--ssl3enabled' '--ssl3tlsciphers' '--target' '--tlsenabled' '--tlsrollbackenabled' '--type')
+		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	create-system-properties)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	create-threadpool)
-		_command_args=('--idletimeout' '--maxqueuesize' '--maxthreadpoolsize' '--minthreadpoolsize' '--target' '--workqueues')
+		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
 	;;
 	create-transport)
-		_command_args=('--acceptorthreads' '--buffersizebytes' '--bytebuffertype' '--classname' '--displayconfiguration' '--enablesnoop' '--idlekeytimeoutseconds' '--maxconnectionscount' '--readtimeoutmillis' '--selectionkeyhandler' '--selectorpolltimeoutmillis' '--target' '--tcpnodelay' '--writetimeoutmillis')
+		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
 	;;
 	create-virtual-server)
-		_command_args=('--defaultwebmodule' '--hosts' '--httplisteners' '--logfile' '--networklisteners' '--property' '--state' '--target')
+		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
 	;;
 	delete-admin-object)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-application-ref)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-audit-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-auth-realm)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-connector-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-connector-security-map)
-		_command_args=('--poolname' '--target')
+		_command_args=('--poolname+:' '--target+:')
 	;;
 	delete-connector-work-security-map)
-		_command_args=('--raname')
+		_command_args=('--raname+:')
 	;;
 	delete-custom-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-domain)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	delete-file-user)
-		_command_args=('--authrealmname' '--target')
+		_command_args=('--authrealmname+:' '--target+:')
 	;;
 	delete-http)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-http-health-checker)
-		_command_args=('--config')
+		_command_args=('--config+:')
 	;;
 	delete-http-lb-ref)
-		_command_args=('--config' '--force' '--lbname')
+		_command_args=('--config+:' '--force+:' '--lbname+:')
 	;;
 	delete-http-listener)
-		_command_args=('--secure' '--target')
+		_command_args=('--secure+:' '--target+:')
 	;;
 	delete-http-redirect)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-iiop-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-instance)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	delete-jacc-provider)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-javamail-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jdbc-connection-pool)
-		_command_args=('--cascade' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--target+:')
 	;;
 	delete-jdbc-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-host)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jms-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	delete-jndi-resource)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	delete-lifecycle-module)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-local-instance)
-		_command_args=('--node' '--nodedir')
+		_command_args=('--node+:' '--nodedir+:')
 	;;
 	delete-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-message-security-provider)
-		_command_args=('--layer' '--target')
+		_command_args=('--layer+:' '--target+:')
 	;;
 	delete-network-listener)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-profiler)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-protocol-filter)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-protocol-finder)
-		_command_args=('--protocol' '--target')
+		_command_args=('--protocol+:' '--target+:')
 	;;
 	delete-resource-adapter-config)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-resource-ref)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-ssl)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
 	;;
 	delete-system-property)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-threadpool)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-transport)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	delete-virtual-server)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--isundeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	disable-http-lb-application)
-		_command_args=('--name' '--timeout')
+		_command_args=('--name+:' '--timeout+:')
 	;;
 	disable-http-lb-server)
-		_command_args=('--timeout')
+		_command_args=('--timeout+:')
 	;;
 	disable-monitoring)
-		_command_args=('--modules' '--target')
+		_command_args=('--modules+:' '--target+:')
 	;;
 	enable)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	enable-http-lb-application)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	enable-monitoring)
-		_command_args=('--dtrace' '--mbean' '--modules' '--options' '--pid' '--target')
+		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
 	;;
 	enable-secure-admin)
-		_command_args=('--adminalias' '--instancealias')
+		_command_args=('--adminalias+:' '--instancealias+:')
 	;;
 	export-http-lb-config)
-		_command_args=('--config' '--lbname' '--lbtargets' '--property' '--retrievefile')
+		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
 	;;
 	export-sync-bundle)
-		_command_args=('--retrieve' '--target')
+		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
 	;;
 	flush-connection-pool)
-		_command_args=('--appname' '--modulename')
+		_command_args=('--appname+:' '--modulename+:')
 	;;
 	flush-jmsdest)
-		_command_args=('--desttype' '--target')
+		_command_args=('--desttype+:' '--target+:')
 	;;
 	freeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	generate-domain-schema)
-		_command_args=('--format' '--showdeprecated' '--showsubclasses')
+		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
 	;;
 	generate-jvm-report)
-		_command_args=('--target' '--type')
+		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
 	;;
 	get)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	get-client-stubs)
-		_command_args=('--appname')
+		_command_args=('--appname+:')
 	;;
 	import-sync-bundle)
-		_command_args=('--instance' '--node' '--nodedir')
+		_command_args=('--instance+:' '--node+:' '--nodedir+:')
 	;;
 	install-node-dcom)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--windowsdomain' '--windowsuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	install-node-ssh)
-		_command_args=('--archive' '--create' '--force' '--installdir' '--save' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	jms-ping)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list)
-		_command_args=('--monitor')
+		_command_args=('--monitor+:monitor:(true false)')
 	;;
 	list-application-refs)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-backups)
-		_command_args=('--backupconfig' '--backupdir' '--domaindir' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
 	;;
 	list-commands)
-		_command_args=('--localonly' '--remoteonly')
+		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
 	;;
 	list-components)
-		_command_args=('--long' '--resources' '--subcomponents' '--terse' '--type')
+		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-connector-security-maps)
-		_command_args=('--long' '--securitymap' '--target')
+		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
 	;;
 	list-connector-work-security-maps)
-		_command_args=('--securitymap')
+		_command_args=('--securitymap+:')
 	;;
 	list-custom-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-domains)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	list-file-groups)
-		_command_args=('--authrealmname' '--name')
+		_command_args=('--authrealmname+:' '--name+:')
 	;;
 	list-file-users)
-		_command_args=('--authrealmname')
+		_command_args=('--authrealmname+:')
 	;;
 	list-http-listeners)
-		_command_args=('--long')
+		_command_args=('--long+:long:(true false)')
 	;;
 	list-instances)
-		_command_args=('--long' '--nostatus' '--standaloneonly' '--timeoutmsec')
+		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
 	;;
 	list-javamail-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-hosts)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jms-resources)
-		_command_args=('--restype')
+		_command_args=('--restype+:')
 	;;
 	list-jmsdest)
-		_command_args=('--desttype' '--property')
+		_command_args=('--desttype+:' '--property+:')
 	;;
 	list-jndi-entries)
-		_command_args=('--context')
+		_command_args=('--context+:')
 	;;
 	list-jndi-resources)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-jvm-options)
-		_command_args=('--profiler' '--target')
+		_command_args=('--profiler+:profiler:(true false)' '--target+:')
 	;;
 	list-libraries)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	list-lifecycle-modules)
-		_command_args=('--terse')
+		_command_args=('--terse+:terse:(true false)')
 	;;
 	list-message-security-providers)
-		_command_args=('--layer')
+		_command_args=('--layer+:layer:(SOAP HttpServlet)')
 	;;
 	list-nodes)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-config)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-dcom)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-nodes-ssh)
-		_command_args=('--long' '--terse')
+		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
 	;;
 	list-persistence-types)
-		_command_args=('--type')
+		_command_args=('--type+:')
 	;;
 	list-protocol-filters)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-protocol-finders)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-resource-adapter-configs)
-		_command_args=('--long' '--raname')
+		_command_args=('--long+:long:(true false)' '--raname+:')
 	;;
 	list-sub-components)
-		_command_args=('--appname' '--resources' '--terse' '--type')
+		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
 	;;
 	list-virtual-servers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	list-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	list-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	login)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	migrate-timers)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename' '--filter' '--interval' '--type')
+		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding' '--file' '--printprompt')
+		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
-		_command_args=('--appname' '--modulename' '--target')
+		_command_args=('--appname+:' '--modulename+:' '--target+:')
 	;;
 	recover-transactions)
-		_command_args=('--target' '--transactionlogdir')
+		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication' '--availabilityenabled' '--contextroot' '--createtables' '--dbvendorname' '--deploymentplan' '--description' '--dropandcreatetables' '--enabled' '--force' '--generatermistubs' '--isredeploy' '--keepfailedstubs' '--keepreposdir' '--keepstate' '--lbenabled' '--libraries' '--logreportederrors' '--name' '--precompilejsp' '--properties' '--property' '--retrieve' '--target' '--type' '--uniquetablenames' '--verify' '--virtualservers')
+		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
-		_command_args=('--type')
+		_command_args=('--type+:type:(common ext app)')
 	;;
 	restart-domain)
-		_command_args=('--debug' '--domaindir' '--force' '--kill')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	restart-instance)
-		_command_args=('--debug')
+		_command_args=('--debug+:')
 	;;
 	restart-local-instance)
-		_command_args=('--debug' '--force' '--kill' '--node' '--nodedir')
+		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	restore-domain)
-		_command_args=('--backupconfig' '--backupdir' '--description' '--domaindir' '--filename' '--force' '--long')
+		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
 	;;
 	rollback-transaction)
-		_command_args=('--target' '--transaction_id')
+		_command_args=('--target+:' '--transaction_id+:')
 	;;
 	rotate-log)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-attributes)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-log-levels)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	set-web-context-param)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
 	;;
 	set-web-env-entry)
-		_command_args=('--description' '--ignoredescriptoritem' '--name' '--type' '--value')
+		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
 	;;
 	setup-ssh)
-		_command_args=('--generatekey' '--sshkeyfile' '--sshport' '--sshpublickeyfile' '--sshuser')
+		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
 	;;
 	show-component-status)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	start-cluster)
-		_command_args=('--autohadboverride' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-database)
-		_command_args=('--dbhome' '--dbhost' '--dbport' '--jvmoptions')
+		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
 	;;
 	start-domain)
-		_command_args=('--debug' '--domaindir' '--upgrade' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	start-instance)
-		_command_args=('--debug' '--setenv' '--sync' '--terse')
+		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
 	;;
 	start-local-instance)
-		_command_args=('--debug' '--node' '--nodedir' '--sync' '--verbose')
+		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
 	;;
 	stop-cluster)
-		_command_args=('--autohadboverride' '--kill' '--verbose')
+		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
 	;;
 	stop-database)
-		_command_args=('--dbhost' '--dbport' '--dbuser')
+		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
 	;;
 	stop-domain)
-		_command_args=('--domaindir' '--force' '--kill')
+		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-instance)
-		_command_args=('--force' '--kill')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
 	;;
 	stop-local-instance)
-		_command_args=('--force' '--kill' '--node' '--nodedir')
+		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
 	;;
 	undeploy)
-		_command_args=('--cascade' '--droptables' '--isredeploy' '--keepreposdir' '--keepstate' '--properties' '--target')
+		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
 	;;
 	unfreeze-transaction-service)
-		_command_args=('--target')
+		_command_args=('--target+:')
 	;;
 	uninstall-node-dcom)
-		_command_args=('--force' '--installdir' '--windowsdomain' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
 	;;
 	uninstall-node-ssh)
-		_command_args=('--force' '--installdir' '--sshkeyfile' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
 	;;
 	unset-web-context-param)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	unset-web-env-entry)
-		_command_args=('--name')
+		_command_args=('--name+:')
 	;;
 	update-connector-security-map)
-		_command_args=('--addprincipals' '--addusergroups' '--mappedpassword' '--mappedusername' '--poolname' '--removeprincipals' '--removeusergroups' '--target')
+		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
 	;;
 	update-connector-work-security-map)
-		_command_args=('--addgroups' '--addprincipals' '--raname' '--removegroups' '--removeprincipals')
+		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
 	;;
 	update-file-user)
-		_command_args=('--authrealmname' '--groups' '--target' '--userpassword')
+		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
 	;;
 	update-node-config)
-		_command_args=('--installdir' '--nodedir' '--nodehost')
+		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
 	;;
 	update-node-dcom)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	update-node-ssh)
-		_command_args=('--force' '--installdir' '--nodedir' '--nodehost' '--sshkeyfile' '--sshkeypassphrase' '--sshpassword' '--sshport' '--sshuser')
+		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
 	;;
 	update-password-alias)
-		_command_args=('--aliaspassword')
+		_command_args=('--aliaspassword+:')
 	;;
 	uptime)
-		_command_args=('--milliseconds')
+		_command_args=('--milliseconds+:milliseconds:(true false)')
 	;;
 	validate-dcom)
-		_command_args=('--remotetestdir' '--verbose' '--windowsdomain' '--windowspassword' '--windowsuser')
+		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
 	;;
 	validate-multicast)
-		_command_args=('--bindaddress' '--multicastaddress' '--multicastport' '--sendperiod' '--timeout' '--timetolive' '--verbose')
+		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
 	;;
 	verify-domain-xml)
-		_command_args=('--domaindir')
+		_command_args=('--domaindir+:')
 	;;
 	version)
-		_command_args=('--local' '--terse' '--verbose')
+		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
 	;;
 esac
 

From 95f83193dab1eab2ea6bfccec6119dc3ac412155 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 13 Jul 2012 16:24:45 +0200
Subject: [PATCH 0640/1378] added _files values for certain options

---
 plugins/glassfish/_asadmin | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index f0ebea9f2..2ae6064e9 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -279,10 +279,10 @@ fi
 local -a _command_args
 case "$words[1]" in
 	add-library)
-		_command_args=('--type+:type:(common ext app)')
+		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
 	;;
 	add-resources)
-		_command_args=('--target+:')
+		_command_args=('*:directory:_files' '--target+:')
 	;;
 	apply-http-lb-changes)
 		_command_args=('--ping+:')
@@ -438,7 +438,7 @@ case "$words[1]" in
 		_command_args=('--enabled+:enabled:(true false)' '--target+:')
 	;;
 	create-service)
-		_command_args=('--domaindir+:' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
 	;;
 	create-ssl)
 		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -585,10 +585,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	deploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	deploydir)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	disable)
 		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
@@ -765,10 +765,10 @@ case "$words[1]" in
 		_command_args=('--target+:')
 	;;
 	monitor)
-		_command_args=('--filename+:' '--filter+:' '--interval+:' '--type+:')
+		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
 	;;
 	multimode)
-		_command_args=('--encoding+:' '--file+:' '--printprompt+:printprompt:(true false)')
+		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
 	;;
 	ping-connection-pool)
 		_command_args=('--appname+:' '--modulename+:' '--target+:')
@@ -777,7 +777,7 @@ case "$words[1]" in
 		_command_args=('--target+:' '--transactionlogdir+:')
 	;;
 	redeploy)
-		_command_args=('--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
 	;;
 	remove-library)
 		_command_args=('--type+:type:(common ext app)')

From f88b6bdc5109ba09e45f4c19bc3ea14e51794cae Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 12:15:36 +0200
Subject: [PATCH 0641/1378] help command, node completion

---
 plugins/glassfish/_asadmin | 1394 ++++++++++++++++++++----------------
 1 file changed, 769 insertions(+), 625 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 2ae6064e9..b29d65d3b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -144,6 +144,7 @@ _1st_arguments=(
     "get:gets the values of configurable or monitorable attributes"
     "get-client-stubs:retrieves the application JAR files needed to launch the application client."
     "get-health:provides information on the cluster health"
+    "help"
     "asadmin:utility for performing administrative tasks for Oracle GlassFish Server"
     "import-sync-bundle:imports the configuration data of a clustered instance or standalone instance from an archive file"
     "install-node:installs GlassFish Server software on specified SSH-enabled hosts"
@@ -278,632 +279,775 @@ fi
 
 local -a _command_args
 case "$words[1]" in
-	add-library)
-		_command_args=('*:directory:_files' '--type+:type:(common ext app)')
-	;;
-	add-resources)
-		_command_args=('*:directory:_files' '--target+:')
-	;;
-	apply-http-lb-changes)
-		_command_args=('--ping+:')
-	;;
-	backup-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	change-admin-password)
-		_command_args=('--domain_name+:' '--domaindir+:')
-	;;
-	change-master-password)
-		_command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
-	;;
-	collect-log-files)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	configure-jms-cluster)
-		_command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--jmsdbpassword+:' '--messagestoretype+:' '--property+:')
-	;;
-	configure-lb-weight)
-		_command_args=('--cluster+:')
-	;;
-	configure-ldap-for-admin)
-		_command_args=('--basedn+:' '--ldap-group+:' '--target+:' '--url+:')
-	;;
-	copy-config)
-		_command_args=('--systemproperties+:')
-	;;
-	create-admin-object)
-		_command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--raname+:' '--restype+:' '--target+:')
-	;;
-	create-application-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--lbenabled+:lbenabled:(true false)' '--target+:' '--virtualservers+:')
-	;;
-	create-audit-module)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-auth-realm)
-		_command_args=('--classname+:' '--property+:' '--target+:')
-	;;
-	create-connector-connection-pool)
-		_command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
-	;;
-	create-connector-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--objecttype+:' '--poolname+:' '--property+:' '--target+:')
-	;;
-	create-connector-security-map)
-		_command_args=('--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--principals+:' '--target+:' '--usergroups+:')
-	;;
-	create-connector-work-security-map)
-		_command_args=('--description+:' '--groupsmap+:' '--principalsmap+:' '--raname+:')
-	;;
-	create-custom-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-domain)
-		_command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	create-http)
-		_command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--max-connection+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-health-checker)
-		_command_args=('--config+:' '--interval+:' '--timeout+:' '--url+:')
-	;;
-	create-http-lb)
-		_command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
-	;;
-	create-http-lb-ref)
-		_command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:')
-	;;
-	create-http-listener)
-		_command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--listeneraddress+:' '--listenerport+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
-	;;
-	create-http-redirect)
-		_command_args=('--redirect-port+:' '--secure-redirect+:' '--target+:')
-	;;
-	create-iiop-listener)
-		_command_args=('--enabled+:enabled:(true false)' '--iiopport+:' '--listeneraddress+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
-	;;
-	create-jacc-provider)
-		_command_args=('--policyconfigfactoryclass+:' '--policyproviderclass+:' '--property+:' '--target+:')
-	;;
-	create-javamail-resource)
-		_command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--mailhost+:' '--mailuser+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
-	;;
-	create-jdbc-connection-pool)
-		_command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
-	;;
-	create-jdbc-resource)
-		_command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--property+:' '--target+:')
-	;;
-	create-jms-host)
-		_command_args=('--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--property+:' '--target+:')
-	;;
-	create-jms-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jmsdest)
-		_command_args=('--desttype+:' '--property+:' '--target+:')
-	;;
-	create-jndi-resource)
-		_command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--jndilookupname+:' '--property+:' '--restype+:' '--target+:')
-	;;
-	create-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	create-lifecycle-module)
-		_command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--loadorder+:' '--property+:' '--target+:')
-	;;
-	create-local-instance)
-		_command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
-	;;
-	create-message-security-provider)
-		_command_args=('--classname+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
-	;;
-	create-network-listener)
-		_command_args=('--address+:' '--enabled+:enabled:(true false)' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
-	;;
-	create-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	create-node-dcom)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	create-node-ssh)
-		_command_args=('--archive+:' '--force+:force:(true false)' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	create-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	create-profiler)
-		_command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--nativelibrarypath+:' '--property+:' '--target+:')
-	;;
-	create-protocol)
-		_command_args=('--securityenabled+:securityenabled:(true false)' '--target+:')
-	;;
-	create-protocol-filter)
-		_command_args=('--classname+:' '--protocol+:' '--target+:')
-	;;
-	create-protocol-finder)
-		_command_args=('--classname+:' '--protocol+:' '--target+:' '--targetprotocol+:')
-	;;
-	create-resource-adapter-config)
-		_command_args=('--objecttype+:' '--property+:' '--target+:' '--threadpoolid+:')
-	;;
-	create-resource-ref)
-		_command_args=('--enabled+:enabled:(true false)' '--target+:')
-	;;
-	create-service)
-		_command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
-	;;
-	create-ssl)
-		_command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	create-system-properties)
-		_command_args=('--target+:')
-	;;
-	create-threadpool)
-		_command_args=('--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--target+:' '--workqueues+:')
-	;;
-	create-transport)
-		_command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
-	;;
-	create-virtual-server)
-		_command_args=('--defaultwebmodule+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
-	;;
-	delete-admin-object)
-		_command_args=('--target+:')
-	;;
-	delete-application-ref)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-audit-module)
-		_command_args=('--target+:')
-	;;
-	delete-auth-realm)
-		_command_args=('--target+:')
-	;;
-	delete-connector-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-connector-resource)
-		_command_args=('--target+:')
-	;;
-	delete-connector-security-map)
-		_command_args=('--poolname+:' '--target+:')
-	;;
-	delete-connector-work-security-map)
-		_command_args=('--raname+:')
-	;;
-	delete-custom-resource)
-		_command_args=('--target+:')
-	;;
-	delete-domain)
-		_command_args=('--domaindir+:')
-	;;
-	delete-file-user)
-		_command_args=('--authrealmname+:' '--target+:')
-	;;
-	delete-http)
-		_command_args=('--target+:')
-	;;
-	delete-http-health-checker)
-		_command_args=('--config+:')
-	;;
-	delete-http-lb-ref)
-		_command_args=('--config+:' '--force+:' '--lbname+:')
-	;;
-	delete-http-listener)
-		_command_args=('--secure+:' '--target+:')
-	;;
-	delete-http-redirect)
-		_command_args=('--target+:')
-	;;
-	delete-iiop-listener)
-		_command_args=('--target+:')
-	;;
-	delete-instance)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	delete-jacc-provider)
-		_command_args=('--target+:')
-	;;
-	delete-javamail-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jdbc-connection-pool)
-		_command_args=('--cascade+:cascade:(true false)' '--target+:')
-	;;
-	delete-jdbc-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jms-host)
-		_command_args=('--target+:')
-	;;
-	delete-jms-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	delete-jndi-resource)
-		_command_args=('--target+:')
-	;;
-	delete-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	delete-lifecycle-module)
-		_command_args=('--target+:')
-	;;
-	delete-local-instance)
-		_command_args=('--node+:' '--nodedir+:')
-	;;
-	delete-log-levels)
-		_command_args=('--target+:')
-	;;
-	delete-message-security-provider)
-		_command_args=('--layer+:' '--target+:')
-	;;
-	delete-network-listener)
-		_command_args=('--target+:')
-	;;
-	delete-profiler)
-		_command_args=('--target+:')
-	;;
-	delete-protocol)
-		_command_args=('--target+:')
-	;;
-	delete-protocol-filter)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-protocol-finder)
-		_command_args=('--protocol+:' '--target+:')
-	;;
-	delete-resource-adapter-config)
-		_command_args=('--target+:')
-	;;
-	delete-resource-ref)
-		_command_args=('--target+:')
-	;;
-	delete-ssl)
-		_command_args=('--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
-	;;
-	delete-system-property)
-		_command_args=('--target+:')
-	;;
-	delete-threadpool)
-		_command_args=('--target+:')
-	;;
-	delete-transport)
-		_command_args=('--target+:')
-	;;
-	delete-virtual-server)
-		_command_args=('--target+:')
-	;;
-	deploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	deploydir)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	disable)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	disable-http-lb-application)
-		_command_args=('--name+:' '--timeout+:')
-	;;
-	disable-http-lb-server)
-		_command_args=('--timeout+:')
-	;;
-	disable-monitoring)
-		_command_args=('--modules+:' '--target+:')
-	;;
-	enable)
-		_command_args=('--target+:')
-	;;
-	enable-http-lb-application)
-		_command_args=('--name+:')
-	;;
-	enable-monitoring)
-		_command_args=('--dtrace+:dtrace:(true false)' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--target+:')
-	;;
-	enable-secure-admin)
-		_command_args=('--adminalias+:' '--instancealias+:')
-	;;
-	export-http-lb-config)
-		_command_args=('--config+:' '--lbname+:' '--lbtargets+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
-	;;
-	export-sync-bundle)
-		_command_args=('--retrieve+:retrieve:(true false)' '--target+:')
-	;;
-	flush-connection-pool)
-		_command_args=('--appname+:' '--modulename+:')
-	;;
-	flush-jmsdest)
-		_command_args=('--desttype+:' '--target+:')
-	;;
-	freeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	generate-domain-schema)
-		_command_args=('--format+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
-	;;
-	generate-jvm-report)
-		_command_args=('--target+:' '--type+:type:(summary thread class memory log)')
-	;;
-	get)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	get-client-stubs)
-		_command_args=('--appname+:')
-	;;
-	import-sync-bundle)
-		_command_args=('--instance+:' '--node+:' '--nodedir+:')
-	;;
-	install-node-dcom)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	install-node-ssh)
-		_command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	jms-ping)
-		_command_args=('--target+:')
-	;;
-	list)
-		_command_args=('--monitor+:monitor:(true false)')
-	;;
-	list-application-refs)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-backups)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
-	;;
-	list-commands)
-		_command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
-	;;
-	list-components)
-		_command_args=('--long+:long:(true false)' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-connector-security-maps)
-		_command_args=('--long+:long:(true false)' '--securitymap+:' '--target+:')
-	;;
-	list-connector-work-security-maps)
-		_command_args=('--securitymap+:')
-	;;
-	list-custom-resources)
-		_command_args=('--target+:')
-	;;
-	list-domains)
-		_command_args=('--domaindir+:')
-	;;
-	list-file-groups)
-		_command_args=('--authrealmname+:' '--name+:')
-	;;
-	list-file-users)
-		_command_args=('--authrealmname+:')
-	;;
-	list-http-listeners)
-		_command_args=('--long+:long:(true false)')
-	;;
-	list-instances)
-		_command_args=('--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
-	;;
-	list-javamail-resources)
-		_command_args=('--target+:')
-	;;
-	list-jms-hosts)
-		_command_args=('--target+:')
-	;;
-	list-jms-resources)
-		_command_args=('--restype+:')
-	;;
-	list-jmsdest)
-		_command_args=('--desttype+:' '--property+:')
-	;;
-	list-jndi-entries)
-		_command_args=('--context+:')
-	;;
-	list-jndi-resources)
-		_command_args=('--target+:')
-	;;
-	list-jvm-options)
-		_command_args=('--profiler+:profiler:(true false)' '--target+:')
-	;;
-	list-libraries)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	list-lifecycle-modules)
-		_command_args=('--terse+:terse:(true false)')
-	;;
-	list-message-security-providers)
-		_command_args=('--layer+:layer:(SOAP HttpServlet)')
-	;;
-	list-nodes)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-config)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-dcom)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-nodes-ssh)
-		_command_args=('--long+:long:(true false)' '--terse+:terse:(true false)')
-	;;
-	list-persistence-types)
-		_command_args=('--type+:')
-	;;
-	list-protocol-filters)
-		_command_args=('--target+:')
-	;;
-	list-protocol-finders)
-		_command_args=('--target+:')
-	;;
-	list-resource-adapter-configs)
-		_command_args=('--long+:long:(true false)' '--raname+:')
-	;;
-	list-sub-components)
-		_command_args=('--appname+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
-	;;
-	list-virtual-servers)
-		_command_args=('--target+:')
-	;;
-	list-web-context-param)
-		_command_args=('--name+:')
-	;;
-	list-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	login)
-		_command_args=('--target+:')
-	;;
-	migrate-timers)
-		_command_args=('--target+:')
-	;;
-	monitor)
-		_command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
-	;;
-	multimode)
-		_command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
-	;;
-	ping-connection-pool)
-		_command_args=('--appname+:' '--modulename+:' '--target+:')
-	;;
-	recover-transactions)
-		_command_args=('--target+:' '--transactionlogdir+:')
-	;;
-	redeploy)
-		_command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
-	;;
-	remove-library)
-		_command_args=('--type+:type:(common ext app)')
-	;;
-	restart-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	restart-instance)
-		_command_args=('--debug+:')
-	;;
-	restart-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	restore-domain)
-		_command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
-	;;
-	rollback-transaction)
-		_command_args=('--target+:' '--transaction_id+:')
-	;;
-	rotate-log)
-		_command_args=('--target+:')
-	;;
-	set-log-attributes)
-		_command_args=('--target+:')
-	;;
-	set-log-levels)
-		_command_args=('--target+:')
-	;;
-	set-web-context-param)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--value+:')
-	;;
-	set-web-env-entry)
-		_command_args=('--description+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--type+:' '--value+:')
-	;;
-	setup-ssh)
-		_command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
-	;;
-	show-component-status)
-		_command_args=('--target+:')
-	;;
-	start-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-database)
-		_command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
-	;;
-	start-domain)
-		_command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	start-instance)
-		_command_args=('--debug+:debug:(true false)' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
-	;;
-	start-local-instance)
-		_command_args=('--debug+:debug:(true false)' '--node+:' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
-	;;
-	stop-cluster)
-		_command_args=('--autohadboverride+:autohadboverride:(true false)' '--kill+:kill:(true false)' '--verbose+:verbose:(true false)')
-	;;
-	stop-database)
-		_command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
-	;;
-	stop-domain)
-		_command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)')
-	;;
-	stop-local-instance)
-		_command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:' '--nodedir+:')
-	;;
-	undeploy)
-		_command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--properties+:' '--target+:')
-	;;
-	unfreeze-transaction-service)
-		_command_args=('--target+:')
-	;;
-	uninstall-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
-	;;
-	uninstall-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
-	;;
-	unset-web-context-param)
-		_command_args=('--name+:')
-	;;
-	unset-web-env-entry)
-		_command_args=('--name+:')
-	;;
-	update-connector-security-map)
-		_command_args=('--addprincipals+:' '--addusergroups+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
-	;;
-	update-connector-work-security-map)
-		_command_args=('--addgroups+:' '--addprincipals+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
-	;;
-	update-file-user)
-		_command_args=('--authrealmname+:' '--groups+:' '--target+:' '--userpassword+:')
-	;;
-	update-node-config)
-		_command_args=('--installdir+:' '--nodedir+:' '--nodehost+:')
-	;;
-	update-node-dcom)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	update-node-ssh)
-		_command_args=('--force+:force:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
-	;;
-	update-password-alias)
-		_command_args=('--aliaspassword+:')
-	;;
-	uptime)
-		_command_args=('--milliseconds+:milliseconds:(true false)')
-	;;
-	validate-dcom)
-		_command_args=('--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
-	;;
-	validate-multicast)
-		_command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
-	;;
-	verify-domain-xml)
-		_command_args=('--domaindir+:')
-	;;
-	version)
-		_command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
-	;;
+    add-library)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    add-resources)
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        ;;
+    apply-http-lb-changes)
+        _command_args=('--host+:' '--ping+:' '--port+:')
+        ;;
+    backup-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    change-admin-password)
+        _command_args=('--domain_name+:' '--domaindir+:')
+        ;;
+    change-master-broker)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    change-master-password)
+        _command_args=('--domaindir+:' '--nodedir+:' '--savemasterpassword+:savemasterpassword:(true false)')
+        ;;
+    collect-log-files)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    configure-jms-cluster)
+        _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
+        ;;
+    configure-lb-weight)
+        _command_args=('--cluster+:' '--host+:' '--port+:')
+        ;;
+    configure-ldap-for-admin)
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        ;;
+    copy-config)
+        _command_args=('--host+:' '--port+:' '--systemproperties+:')
+        ;;
+    create-admin-object)
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        ;;
+    create-application-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        ;;
+    create-audit-module)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-auth-realm)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-connection-pool)
+        _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
+        ;;
+    create-connector-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-connector-security-map)
+        _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
+        ;;
+    create-connector-work-security-map)
+        _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
+        ;;
+    create-custom-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-domain)
+        _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    create-http)
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
+        ;;
+    create-http-lb)
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        ;;
+    create-http-lb-ref)
+        _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
+        ;;
+    create-http-listener)
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        ;;
+    create-http-redirect)
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        ;;
+    create-iiop-listener)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        ;;
+    create-jacc-provider)
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-javamail-resource)
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        ;;
+    create-jdbc-connection-pool)
+        _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
+        ;;
+    create-jdbc-resource)
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-host)
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jms-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-jndi-resource)
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        ;;
+    create-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    create-lifecycle-module)
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-local-instance)
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        ;;
+    create-message-security-provider)
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        ;;
+    create-network-listener)
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        ;;
+    create-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    create-node-dcom)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    create-node-ssh)
+        _command_args=('--archive+:' '--force+:force:(true false)' '--host+:' '--install+:install:(true false)' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    create-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    create-profiler)
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        ;;
+    create-protocol)
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        ;;
+    create-protocol-filter)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    create-protocol-finder)
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        ;;
+    create-resource-adapter-config)
+        _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
+        ;;
+    create-resource-ref)
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    create-service)
+        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        ;;
+    create-ssl)
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    create-system-properties)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    create-threadpool)
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        ;;
+    create-transport)
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        ;;
+    create-virtual-server)
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        ;;
+    delete-admin-object)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-application-ref)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-audit-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-auth-realm)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-connector-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-security-map)
+        _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
+        ;;
+    delete-connector-work-security-map)
+        _command_args=('--host+:' '--port+:' '--raname+:')
+        ;;
+    delete-custom-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-domain)
+        _command_args=('--domaindir+:')
+        ;;
+    delete-file-user)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-http-health-checker)
+        _command_args=('--config+:' '--host+:' '--port+:')
+        ;;
+    delete-http-lb-ref)
+        _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
+        ;;
+    delete-http-listener)
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        ;;
+    delete-http-redirect)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-iiop-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-instance)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    delete-jacc-provider)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-javamail-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-connection-pool)
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jdbc-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-host)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jms-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jndi-resource)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    delete-lifecycle-module)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-local-instance)
+        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    delete-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-message-security-provider)
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        ;;
+    delete-network-listener)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-node-config)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        ;;
+    delete-password-alias)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    delete-profiler)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-protocol-filter)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-protocol-finder)
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        ;;
+    delete-resource-adapter-config)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-resource-ref)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-ssl)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        ;;
+    delete-system-property)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-threadpool)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-transport)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    delete-virtual-server)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    deploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    deploydir)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    disable)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    disable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
+        ;;
+    disable-http-lb-server)
+        _command_args=('--host+:' '--port+:' '--timeout+:')
+        ;;
+    disable-monitoring)
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        ;;
+    disable-secure-admin)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    enable-http-lb-application)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    enable-http-lb-server)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    enable-monitoring)
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        ;;
+    enable-secure-admin)
+        _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
+        ;;
+    export-http-lb-config)
+        _command_args=('--config+:' '--host+:' '--lbname+:' '--lbtargets+:' '--port+:' '--property+:' '--retrievefile+:retrievefile:(true false)')
+        ;;
+    export-sync-bundle)
+        _command_args=('--host+:' '--port+:' '--retrieve+:retrieve:(true false)' '--target+:')
+        ;;
+    flush-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
+        ;;
+    flush-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        ;;
+    freeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    generate-domain-schema)
+        _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
+        ;;
+    generate-jvm-report)
+        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        ;;
+    get)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    get-client-stubs)
+        _command_args=('--appname+:' '--host+:' '--port+:')
+        ;;
+    get-health)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    help)
+        _describe -t help-commands "asadmin help command" _1st_arguments
+    ;;
+    import-sync-bundle)
+        _command_args=('--instance+:' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    install-node)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    install-node-dcom)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    install-node-ssh)
+        _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    jms-ping)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list)
+        _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
+        ;;
+    list-admin-objects)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-application-refs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-applications)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-audit-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-auth-realms)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-backups)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
+        ;;
+    list-clusters)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-commands)
+        _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
+        ;;
+    list-components)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-connector-security-maps)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        ;;
+    list-connector-work-security-maps)
+        _command_args=('--host+:' '--port+:' '--securitymap+:')
+        ;;
+    list-containers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-custom-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-descriptors)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-domains)
+        _command_args=('--domaindir+:')
+        ;;
+    list-file-groups)
+        _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
+        ;;
+    list-file-users)
+        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        ;;
+    list-http-lb-configs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-http-listeners)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        ;;
+    list-iiop-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-instances)
+        _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
+        ;;
+    list-jacc-providers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-javamail-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jdbc-connection-pools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jdbc-resources)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-jms-hosts)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jms-resources)
+        _command_args=('--host+:' '--port+:' '--restype+:')
+        ;;
+    list-jmsdest)
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        ;;
+    list-jndi-entries)
+        _command_args=('--context+:' '--host+:' '--port+:')
+        ;;
+    list-jndi-resources)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-jvm-options)
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        ;;
+    list-libraries)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    list-lifecycle-modules)
+        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-log-attributes)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-log-levels)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-message-security-providers)
+        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        ;;
+    list-modules)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-network-listeners)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-nodes)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-config)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-dcom)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-nodes-ssh)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        ;;
+    list-password-aliases)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-persistence-types)
+        _command_args=('--host+:' '--port+:' '--type+:')
+        ;;
+    list-protocol-filters)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocol-finders)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-protocols)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-resource-adapter-configs)
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
+        ;;
+    list-resource-refs)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-sub-components)
+        _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
+        ;;
+    list-supported-cipher-suites)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-system-properties)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-threadpools)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-timers)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-transports)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    list-virtual-servers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    list-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    list-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    login)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    migrate-timers)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    monitor)
+        _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
+        ;;
+    multimode)
+        _command_args=('--encoding+:' '--file+:file:directory:_files' '--printprompt+:printprompt:(true false)')
+        ;;
+    ping-connection-pool)
+        _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
+        ;;
+    ping-node-dcom)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    ping-node-ssh)
+        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        ;;
+    recover-transactions)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        ;;
+    redeploy)
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        ;;
+    remove-library)
+        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        ;;
+    restart-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    restart-instance)
+        _command_args=('--debug+:' '--host+:' '--port+:')
+        ;;
+    restart-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    restore-domain)
+        _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
+        ;;
+    rollback-transaction)
+        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        ;;
+    rotate-log)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    set-log-attributes)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-log-levels)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    set-web-context-param)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
+        ;;
+    set-web-env-entry)
+        _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--type+:' '--value+:')
+        ;;
+    setup-ssh)
+        _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
+        ;;
+    show-component-status)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    start-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    start-database)
+        _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
+        ;;
+    start-domain)
+        _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
+        ;;
+    start-instance)
+        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        ;;
+    start-local-instance)
+        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        ;;
+    stop-cluster)
+        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        ;;
+    stop-database)
+        _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
+        ;;
+    stop-domain)
+        _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
+        ;;
+    stop-instance)
+        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        ;;
+    stop-local-instance)
+        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        ;;
+    test-upgrade)
+        _command_args=('--host+:' '--port+:')
+        ;;
+    undeploy)
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        ;;
+    unfreeze-transaction-service)
+        _command_args=('--host+:' '--port+:' '--target+:')
+        ;;
+    uninstall-node)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    uninstall-node-dcom)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--windowsdomain+:' '--windowsuser+:')
+        ;;
+    uninstall-node-ssh)
+        _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
+        ;;
+    unset-web-context-param)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    unset-web-env-entry)
+        _command_args=('--host+:' '--name+:' '--port+:')
+        ;;
+    update-connector-security-map)
+        _command_args=('--addprincipals+:' '--addusergroups+:' '--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--removeprincipals+:' '--removeusergroups+:' '--target+:')
+        ;;
+    update-connector-work-security-map)
+        _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
+        ;;
+    update-file-user)
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        ;;
+    update-node-config)
+        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        ;;
+    update-node-dcom)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    update-node-ssh)
+        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        ;;
+    update-password-alias)
+        _command_args=('--aliaspassword+:' '--host+:' '--port+:')
+        ;;
+    uptime)
+        _command_args=('--host+:' '--milliseconds+:milliseconds:(true false)' '--port+:')
+        ;;
+    validate-dcom)
+        _command_args=('--host+:' '--port+:' '--remotetestdir+:' '--verbose+:verbose:(true false)' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        ;;
+    validate-multicast)
+        _command_args=('--bindaddress+:' '--multicastaddress+:' '--multicastport+:' '--sendperiod+:' '--timeout+:' '--timetolive+:' '--verbose+:verbose:(true false)')
+        ;;
+    verify-domain-xml)
+        _command_args=('--domaindir+:')
+        ;;
+    version)
+        _command_args=('--local+:local:(true false)' '--terse+:terse:(true false)' '--verbose+:verbose:(true false)')
+        ;;
 esac
 
+
+_asadmin_instances() {
+    compadd $(command asadmin list-instances --terse --nostatus domain)
+}
+
+_asadmin_libraries() {
+    compadd $(command asadmin list-libraries --terse)
+}
+
+_asadmin_nodes() {
+    compadd $(command asadmin list-nodes --terse)
+}
+
+compadd '--help'
 _arguments \
     $_command_args \
-    &&  return 0
+    &&  return 0;

From 6d7d131a3c408e83d81b3f246abaeb9cb956e72b Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 24 Jul 2012 16:16:55 +0200
Subject: [PATCH 0642/1378] node completion

---
 plugins/glassfish/_asadmin | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index b29d65d3b..32b15b61d 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -559,13 +559,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-node-config)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
         ;;
     delete-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--port+:' '--uninstall+:uninstall:(true false)')
         ;;
     delete-password-alias)
         _command_args=('--host+:' '--port+:')
@@ -889,10 +889,10 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:' '--target+:')
         ;;
     ping-node-dcom)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     ping-node-ssh)
-        _command_args=('--host+:' '--port+:' '--validate+:validate:(true false)')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
         _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
@@ -1006,13 +1006,13 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
         ;;
     update-node-config)
-        _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
+        _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
         ;;
     update-node-dcom)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_dcom' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--windowsdomain+:' '--windowspassword+:' '--windowsuser+:')
         ;;
     update-node-ssh)
-        _command_args=('--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
+        _command_args=('*:nodes:_asadmin_nodes_ssh' '--force+:force:(true false)' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:' '--sshkeyfile+:' '--sshkeypassphrase+:' '--sshpassword+:' '--sshport+:' '--sshuser+:')
         ;;
     update-password-alias)
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
@@ -1047,6 +1047,18 @@ _asadmin_nodes() {
     compadd $(command asadmin list-nodes --terse)
 }
 
+_asadmin_nodes_config() {
+    compadd $(command asadmin list-nodes-config --terse)
+}
+
+_asadmin_nodes_dcom() {
+    compadd $(command asadmin list-nodes-dcom --terse)
+}
+
+_asadmin_nodes_ssh() {
+    compadd $(command asadmin list-nodes-ssh --terse)
+}
+
 compadd '--help'
 _arguments \
     $_command_args \

From fd3d5bfb749e30b752b887d265f5561bd54e02c2 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 15:02:12 +0200
Subject: [PATCH 0643/1378] instance and cluster completion

---
 plugins/glassfish/_asadmin | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 32b15b61d..1623cd274 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -307,7 +307,7 @@ case "$words[1]" in
         _command_args=('--clustertype+:' '--configstoretype+:' '--dburl+:' '--dbuser+:' '--dbvendor+:' '--host+:' '--jmsdbpassword+:' '--messagestoretype+:' '--port+:' '--property+:')
         ;;
     configure-lb-weight)
-        _command_args=('--cluster+:' '--host+:' '--port+:')
+        _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
         _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
@@ -370,7 +370,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
         ;;
     create-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
         _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
@@ -403,7 +403,7 @@ case "$words[1]" in
         _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
         ;;
     create-local-instance)
-        _command_args=('--checkports+:checkports:(true false)' '--cluster+:' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
+        _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
         _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
@@ -442,7 +442,7 @@ case "$words[1]" in
         _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     create-service)
-        _command_args=('--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
+        _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
         _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
@@ -514,7 +514,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-instance)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -547,7 +547,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-local-instance)
-        _command_args=('--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
         _command_args=('--host+:' '--port+:' '--target+:')
@@ -907,10 +907,10 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     restart-instance)
-        _command_args=('--debug+:' '--host+:' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:' '--host+:' '--port+:')
         ;;
     restart-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     restore-domain)
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
@@ -943,7 +943,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     start-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     start-database)
         _command_args=('--dbhome+:' '--dbhost+:' '--dbport+:' '--jvmoptions+:')
@@ -952,13 +952,13 @@ case "$words[1]" in
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--upgrade+:upgrade:(true false)' '--verbose+:verbose:(true false)')
         ;;
     start-instance)
-        _command_args=('--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--host+:' '--port+:' '--setenv+:' '--sync+:sync:(none normal full)' '--terse+:terse:(true false)')
         ;;
     start-local-instance)
-        _command_args=('--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
+        _command_args=('*:instances:_asadmin_instances' '--debug+:debug:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--sync+:sync:(none normal full)' '--verbose+:verbose:(true false)')
         ;;
     stop-cluster)
-        _command_args=('--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
+        _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:' '--verbose+:verbose:(true false)')
         ;;
     stop-database)
         _command_args=('--dbhost+:' '--dbport+:' '--dbuser+:')
@@ -967,10 +967,10 @@ case "$words[1]" in
         _command_args=('--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')
         ;;
     stop-instance)
-        _command_args=('--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--host+:' '--kill+:kill:(true false)' '--port+:')
         ;;
     stop-local-instance)
-        _command_args=('--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
+        _command_args=('*:instances:_asadmin_instances' '--force+:force:(true false)' '--kill+:kill:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     test-upgrade)
         _command_args=('--host+:' '--port+:')
@@ -1035,6 +1035,10 @@ case "$words[1]" in
 esac
 
 
+_asadmin_clusters() {
+    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }

From ee3a20a3dcd950f2959424bff9423807bf25b69e Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Tue, 31 Jul 2012 16:59:56 +0200
Subject: [PATCH 0644/1378] completion of targets

---
 plugins/glassfish/_asadmin | 323 +++++++++++++++++++++++--------------
 1 file changed, 200 insertions(+), 123 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 1623cd274..9d6b5687b 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -283,7 +283,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     add-resources)
-        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:')
+        _command_args=('*:directory:_files' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     apply-http-lb-changes)
         _command_args=('--host+:' '--ping+:' '--port+:')
@@ -310,28 +310,28 @@ case "$words[1]" in
         _command_args=('--cluster+:cluster:_asadmin_clusters' '--host+:' '--port+:')
         ;;
     configure-ldap-for-admin)
-        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:' '--url+:')
+        _command_args=('--basedn+:' '--host+:' '--ldap-group+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--url+:')
         ;;
     copy-config)
         _command_args=('--host+:' '--port+:' '--systemproperties+:')
         ;;
     create-admin-object)
-        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:')
+        _command_args=('--classname+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--raname+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-application-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:' '--virtualservers+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--lbenabled+:lbenabled:(true false)' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance' '--virtualservers+:')
         ;;
     create-audit-module)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-auth-realm)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-connector-connection-pool)
         _command_args=('--associatewiththread+:associatewiththread:(true false)' '--connectiondefinition+:' '--creationretryattempts+:' '--creationretryinterval+:' '--description+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--raname+:' '--steadypoolsize+:' '--target+:' '--transactionsupport+:transactionsupport:(XATransaction LocalTransaction NoTransaction)' '--validateatmostonceperiod+:')
         ;;
     create-connector-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--objecttype+:' '--poolname+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-connector-security-map)
         _command_args=('--host+:' '--mappedpassword+:' '--mappedusername+:' '--poolname+:' '--port+:' '--principals+:' '--target+:' '--usergroups+:')
@@ -340,76 +340,76 @@ case "$words[1]" in
         _command_args=('--description+:' '--groupsmap+:' '--host+:' '--port+:' '--principalsmap+:' '--raname+:')
         ;;
     create-custom-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-domain)
         _command_args=('--adminport+:' '--checkports+:checkports:(true false)' '--domaindir+:' '--domainproperties+:' '--instanceport+:' '--keytooloptions+:' '--nopassword+:nopassword:(true false)' '--portbase+:' '--profile+:' '--savelogin+:savelogin:(true false)' '--savemasterpassword+:savemasterpassword:(true false)' '--template+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     create-http)
-        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--default-virtual-server+:' '--dns-lookup-enabled+:dns-lookup-enabled:(true false)' '--host+:' '--max-connection+:' '--port+:' '--request-timeout-seconds+:' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--timeout-seconds+:' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-health-checker)
         _command_args=('--config+:' '--host+:' '--interval+:' '--port+:' '--timeout+:' '--url+:')
         ;;
     create-http-lb)
-        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:')
+        _command_args=('--autoapplyenabled+:autoapplyenabled:(true false)' '--devicehost+:' '--deviceport+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--httpsrouting+:httpsrouting:(true false)' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--monitor+:monitor:(true false)' '--port+:' '--property+:' '--reloadinterval+:' '--responsetimeout+:' '--routecookie+:routecookie:(true false)' '--sslproxyhost+:' '--sslproxyport+:' '--target+:target:_asadmin_targets_cluster_standalone_instance')
         ;;
     create-http-lb-ref)
         _command_args=('--config+:' '--healthcheckerinterval+:' '--healthcheckertimeout+:' '--healthcheckerurl+:' '--host+:' '--lbenableallapplications+:' '--lbenableallinstances+:' '--lbname+:' '--lbpolicy+:' '--lbpolicymodule+:' '--lbweight+:' '--port+:')
         ;;
     create-http-listener)
-        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:' '--xpowered+:xpowered:(true false)')
+        _command_args=('--acceptorthreads+:' '--default-virtual-server+:' '--defaultvs+:' '--enabled+:enabled:(true false)' '--host+:' '--listeneraddress+:' '--listenerport+:' '--port+:' '--redirectport+:' '--secure+:secure:(true false)' '--securityenabled+:securityenabled:(true false)' '--servername+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--xpowered+:xpowered:(true false)')
         ;;
     create-http-redirect)
-        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--redirect-port+:' '--secure-redirect+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-iiop-listener)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--iiopport+:' '--listeneraddress+:' '--port+:' '--property+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--host+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--port+:' '--portbase+:' '--systemproperties+:' '--terse+:terse:(true false)')
         ;;
     create-jacc-provider)
-        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--policyconfigfactoryclass+:' '--policyproviderclass+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-javamail-resource)
-        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:' '--transprotocol+:' '--transprotocolclass+:')
+        _command_args=('--debug+:debug:(true false)' '--description+:' '--enabled+:enabled:(true false)' '--fromaddress+:' '--host+:' '--mailhost+:' '--mailuser+:' '--port+:' '--property+:' '--storeprotocol+:' '--storeprotocolclass+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--transprotocol+:' '--transprotocolclass+:')
         ;;
     create-jdbc-connection-pool)
         _command_args=('--allownoncomponentcallers+:allownoncomponentcallers:(true false)' '--associatewiththread+:associatewiththread:(true false)' '--creationretryattempts+:' '--creationretryinterval+:' '--datasourceclassname+:' '--description+:' '--driverclassname+:' '--failconnection+:failconnection:(true false)' '--host+:' '--idletimeout+:' '--initsql+:' '--isconnectvalidatereq+:isconnectvalidatereq:(true false)' '--isisolationguaranteed+:isisolationguaranteed:(true false)' '--isolationlevel+:' '--lazyconnectionassociation+:lazyconnectionassociation:(true false)' '--lazyconnectionenlistment+:lazyconnectionenlistment:(true false)' '--leakreclaim+:leakreclaim:(true false)' '--leaktimeout+:' '--matchconnections+:matchconnections:(true false)' '--maxconnectionusagecount+:' '--maxpoolsize+:' '--maxwait+:' '--nontransactionalconnections+:nontransactionalconnections:(true false)' '--ping+:ping:(true false)' '--pooling+:pooling:(true false)' '--poolresize+:' '--port+:' '--property+:' '--restype+:restype:(javax.sql.DataSource javax.sql.XADataSource javax.sql.ConnectionPoolDataSource java.sql.Driver)' '--sqltracelisteners+:' '--statementcachesize+:' '--statementleakreclaim+:statementleakreclaim:(true false)' '--statementleaktimeout+:' '--statementtimeout+:' '--steadypoolsize+:' '--target+:' '--validateatmostonceperiod+:' '--validationclassname+:' '--validationmethod+:validationmethod:(auto-commit meta-data table custom-validation)' '--validationtable+:' '--wrapjdbcobjects+:wrapjdbcobjects:(true false)')
         ;;
     create-jdbc-resource)
-        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--connectionpoolid+:' '--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jms-host)
-        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--host+:' '--mqhost+:' '--mqpassword+:' '--mqport+:' '--mquser+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jms-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--host+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-jndi-resource)
-        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:')
+        _command_args=('--description+:' '--enabled+:enabled:(true false)' '--factoryclass+:' '--host+:' '--jndilookupname+:' '--port+:' '--property+:' '--restype+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-lifecycle-module)
-        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classname+:' '--classpath+:' '--description+:' '--enabled+:enabled:(true false)' '--failurefatal+:failurefatal:(true false)' '--host+:' '--loadorder+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     create-local-instance)
         _command_args=('--checkports+:checkports:(true false)' '--cluster+:cluster:_asadmin_clusters' '--config+:' '--lbenabled+:lbenabled:(true false)' '--node+:node:_asadmin_nodes' '--nodedir+:' '--portbase+:' '--savemasterpassword+:savemasterpassword:(true false)' '--systemproperties+:' '--usemasterpassword+:usemasterpassword:(true false)')
         ;;
     create-message-security-provider)
-        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--isdefaultprovider+:isdefaultprovider:(true false)' '--layer+:layer:(SOAP HttpServlet)' '--port+:' '--property+:' '--providertype+:providertype:(client server client-server)' '--requestauthrecipient+:' '--requestauthsource+:' '--responseauthrecipient+:' '--responseauthsource+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-network-listener)
-        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:' '--threadpool+:' '--transport+:')
+        _command_args=('--address+:' '--enabled+:enabled:(true false)' '--host+:' '--jkenabled+:jkenabled:(true false)' '--listenerport+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--threadpool+:' '--transport+:')
         ;;
     create-node-config)
         _command_args=('--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -424,52 +424,52 @@ case "$words[1]" in
         _command_args=('--aliaspassword+:' '--host+:' '--port+:')
         ;;
     create-profiler)
-        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:')
+        _command_args=('--classpath+:' '--enabled+:enabled:(true false)' '--host+:' '--nativelibrarypath+:' '--port+:' '--property+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol)
-        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--securityenabled+:securityenabled:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-filter)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     create-protocol-finder)
-        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:' '--targetprotocol+:')
+        _command_args=('--classname+:' '--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--targetprotocol+:')
         ;;
     create-resource-adapter-config)
         _command_args=('--host+:' '--objecttype+:' '--port+:' '--property+:' '--target+:' '--threadpoolid+:')
         ;;
     create-resource-ref)
-        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--enabled+:enabled:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     create-service)
         _command_args=('*:instances:_asadmin_instances' '--domaindir+:domaindir:directory:_files' '--dry-run+:dry-run:(true false)' '--force+:force:(true false)' '--name+:' '--node+:node:_asadmin_nodes' '--nodedir+:' '--serviceproperties+:' '--serviceuser+:')
         ;;
     create-ssl)
-        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--certname+:' '--clientauthenabled+:clientauthenabled:(true false)' '--host+:' '--port+:' '--ssl2ciphers+:' '--ssl2enabled+:ssl2enabled:(true false)' '--ssl3enabled+:ssl3enabled:(true false)' '--ssl3tlsciphers+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tlsenabled+:tlsenabled:(true false)' '--tlsrollbackenabled+:tlsrollbackenabled:(true false)' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     create-system-properties)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     create-threadpool)
-        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:' '--workqueues+:')
+        _command_args=('--host+:' '--idletimeout+:' '--maxqueuesize+:' '--maxthreadpoolsize+:' '--minthreadpoolsize+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--workqueues+:')
         ;;
     create-transport)
-        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
+        _command_args=('--acceptorthreads+:' '--buffersizebytes+:' '--bytebuffertype+:' '--classname+:' '--displayconfiguration+:displayconfiguration:(true false)' '--enablesnoop+:enablesnoop:(true false)' '--host+:' '--idlekeytimeoutseconds+:' '--maxconnectionscount+:' '--port+:' '--readtimeoutmillis+:' '--selectionkeyhandler+:' '--selectorpolltimeoutmillis+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--tcpnodelay+:tcpnodelay:(true false)' '--writetimeoutmillis+:')
         ;;
     create-virtual-server)
-        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:')
+        _command_args=('--defaultwebmodule+:' '--host+:' '--hosts+:' '--httplisteners+:' '--logfile+:' '--networklisteners+:' '--port+:' '--property+:' '--state+:state:(on off disabled)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-admin-object)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-application-ref)
-        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-audit-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-auth-realm)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-config)
         _command_args=('--host+:' '--port+:')
@@ -478,7 +478,7 @@ case "$words[1]" in
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-connector-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-connector-security-map)
         _command_args=('--host+:' '--poolname+:' '--port+:' '--target+:')
@@ -487,16 +487,16 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--raname+:')
         ;;
     delete-custom-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-domain)
         _command_args=('--domaindir+:')
         ;;
     delete-file-user)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--authrealmname+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-health-checker)
         _command_args=('--config+:' '--host+:' '--port+:')
@@ -505,58 +505,58 @@ case "$words[1]" in
         _command_args=('--config+:' '--force+:' '--host+:' '--lbname+:' '--port+:')
         ;;
     delete-http-listener)
-        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--secure+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-http-redirect)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-iiop-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-instance)
         _command_args=('*:instances:_asadmin_instances' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     delete-jacc-provider)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-javamail-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jdbc-connection-pool)
         _command_args=('--cascade+:cascade:(true false)' '--host+:' '--port+:' '--target+:')
         ;;
     delete-jdbc-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jms-host)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jms-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-jndi-resource)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-lifecycle-module)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     delete-local-instance)
         _command_args=('*:instances:_asadmin_instances' '--node+:node:_asadmin_nodes' '--nodedir+:')
         ;;
     delete-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-message-security-provider)
-        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--layer+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-network-listener)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--port+:')
@@ -571,46 +571,46 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     delete-profiler)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-filter)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-protocol-finder)
-        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--protocol+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-resource-adapter-config)
         _command_args=('--host+:' '--port+:' '--target+:')
         ;;
     delete-resource-ref)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     delete-ssl)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--type+:type:(network-listener http-listener iiop-listener iiop-service jmx-connector)')
         ;;
     delete-system-property)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance')
         ;;
     delete-threadpool)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-transport)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     delete-virtual-server)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     deploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     deploydir)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     disable)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--isundeploy+:isundeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     disable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:' '--timeout+:')
@@ -619,13 +619,13 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--timeout+:')
         ;;
     disable-monitoring)
-        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--modules+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     disable-secure-admin)
         _command_args=('--host+:' '--port+:')
         ;;
     enable)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     enable-http-lb-application)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -634,7 +634,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     enable-monitoring)
-        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:')
+        _command_args=('--dtrace+:dtrace:(true false)' '--host+:' '--mbean+:mbean:(true false)' '--modules+:' '--options+:' '--pid+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     enable-secure-admin)
         _command_args=('--adminalias+:' '--host+:' '--instancealias+:' '--port+:')
@@ -649,16 +649,16 @@ case "$words[1]" in
         _command_args=('--appname+:' '--host+:' '--modulename+:' '--port+:')
         ;;
     flush-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:')
+        _command_args=('--desttype+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     freeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     generate-domain-schema)
         _command_args=('--format+:' '--host+:' '--port+:' '--showdeprecated+:showdeprecated:(true false)' '--showsubclasses+:showsubclasses:(true false)')
         ;;
     generate-jvm-report)
-        _command_args=('--host+:' '--port+:' '--target+:' '--type+:type:(summary thread class memory log)')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--type+:type:(summary thread class memory log)')
         ;;
     get)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
@@ -685,25 +685,25 @@ case "$words[1]" in
         _command_args=('--archive+:' '--create+:create:(true false)' '--force+:force:(true false)' '--installdir+:' '--save+:save:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
         ;;
     jms-ping)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     list)
         _command_args=('--host+:' '--monitor+:monitor:(true false)' '--port+:')
         ;;
     list-admin-objects)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-application-refs)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-applications)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-audit-modules)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-auth-realms)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-backups)
         _command_args=('--backupconfig+:' '--backupdir+:' '--domaindir+:' '--long+:long:(true false)')
@@ -715,19 +715,19 @@ case "$words[1]" in
         _command_args=('--localonly+:localonly:(true false)' '--remoteonly+:remoteonly:(true false)')
         ;;
     list-components)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:' '--resources+:resources:(true false)' '--subcomponents+:subcomponents:(true false)' '--terse+:terse:(true false)' '--type+:')
         ;;
     list-configs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-connection-pools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-connector-resources)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-connector-security-maps)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:')
+        _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--securitymap+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-connector-work-security-maps)
         _command_args=('--host+:' '--port+:' '--securitymap+:')
@@ -736,7 +736,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-custom-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-descriptors)
         _command_args=('--host+:' '--port+:')
@@ -748,25 +748,25 @@ case "$words[1]" in
         _command_args=('--authrealmname+:' '--host+:' '--name+:' '--port+:')
         ;;
     list-file-users)
-        _command_args=('--authrealmname+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--authrealmname+:' '--host+:' '--port+:')
         ;;
     list-http-lb-configs)
         _command_args=('--host+:' '--port+:')
         ;;
     list-http-listeners)
-        _command_args=('--host+:' '--long+:long:(true false)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--long+:long:(true false)' '--port+:')
         ;;
     list-iiop-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-instances)
         _command_args=('--host+:' '--long+:long:(true false)' '--nostatus+:nostatus:(true false)' '--port+:' '--standaloneonly+:standaloneonly:(true false)' '--timeoutmsec+:')
         ;;
     list-jacc-providers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-javamail-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jdbc-connection-pools)
         _command_args=('--host+:' '--port+:')
@@ -775,43 +775,43 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-jms-hosts)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-jms-resources)
-        _command_args=('--host+:' '--port+:' '--restype+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--restype+:')
         ;;
     list-jmsdest)
-        _command_args=('--desttype+:' '--host+:' '--port+:' '--property+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--desttype+:' '--host+:' '--port+:' '--property+:')
         ;;
     list-jndi-entries)
-        _command_args=('--context+:' '--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--context+:' '--host+:' '--port+:')
         ;;
     list-jndi-resources)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     list-jvm-options)
-        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:')
+        _command_args=('--host+:' '--port+:' '--profiler+:profiler:(true false)' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-libraries)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     list-lifecycle-modules)
-        _command_args=('--host+:' '--port+:' '--terse+:terse:(true false)')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_domain_standalone_instance' '--host+:' '--port+:' '--terse+:terse:(true false)')
         ;;
     list-log-attributes)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-log-levels)
         _command_args=('--host+:' '--port+:')
         ;;
     list-message-security-providers)
-        _command_args=('--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance' '--host+:' '--layer+:layer:(SOAP HttpServlet)' '--port+:')
         ;;
     list-modules)
         _command_args=('--host+:' '--port+:')
         ;;
     list-network-listeners)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-nodes)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--terse+:terse:(true false)')
@@ -832,19 +832,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:' '--type+:')
         ;;
     list-protocol-filters)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocol-finders)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-protocols)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-resource-adapter-configs)
         _command_args=('--host+:' '--long+:long:(true false)' '--port+:' '--raname+:')
         ;;
     list-resource-refs)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-sub-components)
         _command_args=('--appname+:' '--host+:' '--port+:' '--resources+:resources:(true false)' '--terse+:terse:(true false)' '--type+:')
@@ -853,19 +853,19 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     list-system-properties)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance' '--host+:' '--port+:')
         ;;
     list-threadpools)
         _command_args=('--host+:' '--port+:')
         ;;
     list-timers)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-transports)
-        _command_args=('--host+:' '--port+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:')
         ;;
     list-virtual-servers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('*:targets:_asadmin_targets_cluster_config_das_standalone_instance' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     list-web-context-param)
         _command_args=('--host+:' '--name+:' '--port+:')
@@ -874,10 +874,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--name+:' '--port+:')
         ;;
     login)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_das_standalone_instance')
         ;;
     migrate-timers)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das')
         ;;
     monitor)
         _command_args=('--filename+:filename:directory:_files' '--filter+:' '--interval+:' '--type+:')
@@ -895,10 +895,10 @@ case "$words[1]" in
         _command_args=('*:nodes:_asadmin_nodes_ssh' '--host+:' '--port+:' '--validate+:validate:(true false)')
         ;;
     recover-transactions)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transactionlogdir+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transactionlogdir+:')
         ;;
     redeploy)
-        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
+        _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
         _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
@@ -916,19 +916,19 @@ case "$words[1]" in
         _command_args=('--backupconfig+:' '--backupdir+:' '--description+:' '--domaindir+:' '--filename+:' '--force+:force:(true false)' '--long+:long:(true false)')
         ;;
     rollback-transaction)
-        _command_args=('--host+:' '--port+:' '--target+:' '--transaction_id+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_clustered_instance_das_standalone_instance' '--transaction_id+:')
         ;;
     rotate-log)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_standalone_instance')
         ;;
     set)
         _command_args=('--host+:' '--port+:')
         ;;
     set-log-attributes)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-log-levels)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance')
         ;;
     set-web-context-param)
         _command_args=('--description+:' '--host+:' '--ignoredescriptoritem+:ignoredescriptoritem:(true false)' '--name+:' '--port+:' '--value+:')
@@ -940,7 +940,7 @@ case "$words[1]" in
         _command_args=('--generatekey+:generatekey:(true false)' '--sshkeyfile+:' '--sshport+:' '--sshpublickeyfile+:' '--sshuser+:')
         ;;
     show-component-status)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance')
         ;;
     start-cluster)
         _command_args=('*:clusters:_asadmin_clusters' '--autohadboverride+:autohadboverride:(true false)' '--host+:' '--port+:' '--verbose+:verbose:(true false)')
@@ -976,10 +976,10 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:')
+        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
-        _command_args=('--host+:' '--port+:' '--target+:')
+        _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
         ;;
     uninstall-node)
         _command_args=('--force+:force:(true false)' '--installdir+:' '--sshkeyfile+:' '--sshport+:' '--sshuser+:')
@@ -1003,7 +1003,7 @@ case "$words[1]" in
         _command_args=('--addgroups+:' '--addprincipals+:' '--host+:' '--port+:' '--raname+:' '--removegroups+:' '--removeprincipals+:')
         ;;
     update-file-user)
-        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:' '--userpassword+:')
+        _command_args=('--authrealmname+:' '--groups+:' '--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_config_das_standalone_instance' '--userpassword+:')
         ;;
     update-node-config)
         _command_args=('*:nodes:_asadmin_nodes_config' '--host+:' '--installdir+:' '--nodedir+:' '--nodehost+:' '--port+:')
@@ -1039,10 +1039,18 @@ _asadmin_clusters() {
     compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
 }
 
+_asadmin_configs() {
+    compadd $(command asadmin list-configs --terse)
+}
+
 _asadmin_instances() {
     compadd $(command asadmin list-instances --terse --nostatus domain)
 }
 
+_asadmin_instances_standalone() {
+    compadd $(command asadmin list-instances --terse --standaloneonly --nostatus domain)
+}
+
 _asadmin_libraries() {
     compadd $(command asadmin list-libraries --terse)
 }
@@ -1063,6 +1071,75 @@ _asadmin_nodes_ssh() {
     compadd $(command asadmin list-nodes-ssh --terse)
 }
 
+_asadmin_targets() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_domain_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_config_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    _asadmin_configs
+    compadd server
+}
+
+_asadmin_targets_cluster_das_domain_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd domain server
+}
+
+_asadmin_targets_cluster_das_standalone_instance() {
+    _asadmin_instances_standalone
+    _asadmin_clusters
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_clustered_instance_das_standalone_instance() {
+    _asadmin_instances
+    compadd server
+}
+
+_asadmin_targets_cluster_standalone_instance() {
+    _asadmin_clusters
+    _asadmin_instances_standalone
+}
+
+
 compadd '--help'
 _arguments \
     $_command_args \

From 0f3208316392d84a39a3e378968d2253f2f2429b Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:19 +0200
Subject: [PATCH 0645/1378] in hindsight, this is probably a bad idea

---
 plugins/glassfish/glassfish.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/glassfish.plugin.zsh b/plugins/glassfish/glassfish.plugin.zsh
index 49ca23299..fde2edb2a 100644
--- a/plugins/glassfish/glassfish.plugin.zsh
+++ b/plugins/glassfish/glassfish.plugin.zsh
@@ -1,3 +1,3 @@
 # if there is a user named 'glassfish' on the system, we'll assume
 # that is the user asadmin should be run as
-grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file
+# grep -e '^glassfish' /etc/passwd > /dev/null && alias asadmin='sudo -u glassfish asadmin'
\ No newline at end of file

From bc02c28b736f4f9e6af97829da21128f42a4b8ba Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:02:27 +0200
Subject: [PATCH 0646/1378] library completion

---
 plugins/glassfish/_asadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index 9d6b5687b..e5401c918 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -901,7 +901,7 @@ case "$words[1]" in
         _command_args=('*:directory:_files' '--asyncreplication+:asyncreplication:(true false)' '--availabilityenabled+:availabilityenabled:(true false)' '--contextroot+:' '--createtables+:createtables:(true false)' '--dbvendorname+:' '--deploymentplan+:deploymentplan:directory:_files' '--description+:' '--dropandcreatetables+:dropandcreatetables:(true false)' '--enabled+:enabled:(true false)' '--force+:force:(true false)' '--generatermistubs+:generatermistubs:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepfailedstubs+:keepfailedstubs:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--lbenabled+:lbenabled:(true false)' '--libraries+:' '--logreportederrors+:logreportederrors:(true false)' '--name+:' '--port+:' '--precompilejsp+:precompilejsp:(true false)' '--properties+:' '--property+:' '--retrieve+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance' '--type+:' '--uniquetablenames+:uniquetablenames:(true false)' '--verify+:verify:(true false)' '--virtualservers+:')
         ;;
     remove-library)
-        _command_args=('--host+:' '--port+:' '--type+:type:(common ext app)')
+        _command_args=('*:libraries:_asadmin_libraries' '--host+:' '--port+:' '--type+:type:(common ext app)')
         ;;
     restart-domain)
         _command_args=('--debug+:debug:(true false)' '--domaindir+:' '--force+:force:(true false)' '--kill+:kill:(true false)')

From 8194aa9554a0edf7998b1c5dabeb8e37f5807191 Mon Sep 17 00:00:00 2001
From: fred-o <fredrik.appelberg@gmail.com>
Date: Fri, 3 Aug 2012 10:15:01 +0200
Subject: [PATCH 0647/1378] application completion

---
 plugins/glassfish/_asadmin | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/glassfish/_asadmin b/plugins/glassfish/_asadmin
index e5401c918..a6a7af549 100644
--- a/plugins/glassfish/_asadmin
+++ b/plugins/glassfish/_asadmin
@@ -976,7 +976,7 @@ case "$words[1]" in
         _command_args=('--host+:' '--port+:')
         ;;
     undeploy)
-        _command_args=('--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
+        _command_args=('*:applications:_asadmin_applications' '--cascade+:cascade:(true false)' '--droptables+:droptables:(true false)' '--host+:' '--isredeploy+:isredeploy:(true false)' '--keepreposdir+:keepreposdir:(true false)' '--keepstate+:keepstate:(true false)' '--port+:' '--properties+:' '--target+:target:_asadmin_targets_cluster_das_domain_standalone_instance')
         ;;
     unfreeze-transaction-service)
         _command_args=('--host+:' '--port+:' '--target+:target:_asadmin_targets_cluster_clustered_instance_config_das_standalone_instance')
@@ -1035,8 +1035,12 @@ case "$words[1]" in
 esac
 
 
+_asadmin_applications() {
+    compadd $(command asadmin list-applications --terse | sed 's/\s.*//')
+}
+
 _asadmin_clusters() {
-    compadd $(command asadmin list-clusters --terse | sed 's/ .*//')
+    compadd $(command asadmin list-clusters --terse | sed 's/\s.*//')
 }
 
 _asadmin_configs() {

From c1ada7a938268ce39cc83b71bd6d2da0047979db Mon Sep 17 00:00:00 2001
From: cybozuty <ty_c@cybozu.co.jp>
Date: Mon, 3 Sep 2012 15:31:54 +0900
Subject: [PATCH 0648/1378] Rendering the 'vagrant box (remove|repackage)'
 completion code independant of Vagrant implementation details.

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 9af8cb036..d55ae6709 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -44,7 +44,7 @@ __task_list ()
 
 __box_list ()
 {
-    _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
+    _wanted application expl 'command' compadd $(command vagrant box list | sed -e 's/ /\\ /g')
 }
 
 __vm_list ()

From c0e3c553bcdd8e4bc74d602d239a4330ac2641e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 23 Mar 2014 02:03:12 +0100
Subject: [PATCH 0649/1378] Fix export syntax of $GREP_OPTIONS

Fixes #2641, #2642
---
 lib/grep.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 25345bd06..977435ee4 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -8,5 +8,6 @@ GREP_OPTIONS=
 for PATTERN in .cvs .git .hg .svn; do
     GREP_OPTIONS+="--exclude-dir=$PATTERN "
 done
-export GREP_OPTIONS+='--color=auto '
-export GREP_COLOR='1;32'
\ No newline at end of file
+GREP_OPTIONS+="--color=auto"
+export GREP_OPTIONS="$GREP_OPTIONS"
+export GREP_COLOR='1;32'

From ffd5cb20eee51eb6e25a8ff50af912f1a4038c03 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:39:38 +0100
Subject: [PATCH 0650/1378] suggest setting $LANG to fix #1286 and fix #1823

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c25c20e75..5e1d9b2f1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -54,6 +54,9 @@ source $ZSH/oh-my-zsh.sh
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
 # # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'

From 2697a1825724b243343f3fbf3f5cebf5d64dc00f Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:45:55 +0100
Subject: [PATCH 0651/1378] mention $ZSH_CUSTOM as suggested in #2295

---
 templates/zshrc.zsh-template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5e1d9b2f1..48757ba0e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -42,6 +42,9 @@ ZSH_THEME="robbyrussell"
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 # HIST_STAMPS="mm/dd/yyyy"
 
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 732bca071e0f1e53735645daf3c48eb8b03af71c Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 23 Mar 2014 14:47:10 +0100
Subject: [PATCH 0652/1378] $ZSH is the OMZ installation folder, not
 configuration

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 48757ba0e..7b7f1df85 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,4 +1,4 @@
-# Path to your oh-my-zsh configuration.
+# Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh
 
 # Set name of the theme to load.

From 94a5cc5c631301bbcd4ea286144099223cee6011 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Tue, 31 Dec 2013 14:54:34 +0100
Subject: [PATCH 0653/1378] Updates spectrum.zsh

---
 lib/spectrum.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 166c942fb..b683aca29 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -19,17 +19,19 @@ for color in {000..255}; do
     BG[$color]="%{[48;5;${color}m%}"
 done
 
+
+ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
+
 # Show all 256 colors with color number
 function spectrum_ls() {
   for code in {000..255}; do
-    print -P -- "$code: %F{$code}Test%f"
+    print -P -- "$code: %F{$code}$ZSH_SPECTRUM_TEXT%f"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
   for code in {000..255}; do
-    ((cc = code + 1))
-    print -P -- "$BG[$code]$code: Test %{$reset_color%}"
+    print -P -- "$BG[$code]$code: $ZSH_SPECTRUM_TEXT %{$reset_color%}"
   done
 }

From a3b357abd89c781776329253790e60d56f78b883 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Wed, 26 Feb 2014 19:35:24 -0500
Subject: [PATCH 0654/1378] Adds command line aliases useful for dealing with
 JSON

---
 plugins/jsontools/jsontools.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/jsontools/jsontools.plugin.zsh

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
new file mode 100644
index 000000000..51578b349
--- /dev/null
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -0,0 +1,14 @@
+# JSON Tools
+# Adds command line aliases useful for dealing with JSON
+
+if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
+    JSONTOOLS_METHOD=""
+fi
+
+if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+	alias pp_json='python -mjson.tool'
+elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
+	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+fi
+
+unset JSONTOOLS_METHOD
\ No newline at end of file

From 64bb1a255ae52db501fa98608f4db865a7b4811a Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Thu, 27 Feb 2014 10:56:07 -0500
Subject: [PATCH 0655/1378] adding support for node

---
 plugins/jsontools/jsontools.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 51578b349..7b6f8c585 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -5,7 +5,9 @@ if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
     JSONTOOLS_METHOD=""
 fi
 
-if [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
+if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
+    alias pp_json='node -e "console.log(JSON.stringify(process.argv[1]), null, 4)"'
+elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'

From 44467877a8eb7483cc462e679476a1ccf7c8fc18 Mon Sep 17 00:00:00 2001
From: Phil Eichinger <phil@zankapfel.net>
Date: Tue, 25 Mar 2014 13:43:36 +0100
Subject: [PATCH 0656/1378] New aliases for 'apt-get' and 'aptitude' as they
 were overwritten by later aliases

---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 28dfb82a5..6e45e0521 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -21,8 +21,8 @@ fi
 # Aliases ###################################################################
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
-alias ag='apt-get'
-alias ap='aptitude'
+alias age='apt-get'
+alias api='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"

From 9eadaf562ae403d9721ce5d9ea998769dd500cc9 Mon Sep 17 00:00:00 2001
From: Patrick Stadler <patrick.stadler@gmail.com>
Date: Tue, 25 Mar 2014 16:56:09 +0100
Subject: [PATCH 0657/1378] brew-cask plugin: use spaces instead of tabs

---
 plugins/brew-cask/brew-cask.plugin.zsh | 114 ++++++++++++-------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/plugins/brew-cask/brew-cask.plugin.zsh b/plugins/brew-cask/brew-cask.plugin.zsh
index e0ee62293..91ce0f498 100644
--- a/plugins/brew-cask/brew-cask.plugin.zsh
+++ b/plugins/brew-cask/brew-cask.plugin.zsh
@@ -9,76 +9,76 @@ compdef _brew-cask brew
 
 _brew-cask()
 {
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
 
-	_arguments -C \
-		':command:->command' \
-		':subcmd:->subcmd' \
-		'*::options:->options'
+  _arguments -C \
+    ':command:->command' \
+    ':subcmd:->subcmd' \
+    '*::options:->options'
 
-	case $state in
-		(command)
-			__call_original_brew
-			cask_commands=(
-				'cask:manage casks'
-			)
-			_describe -t commands 'brew cask command' cask_commands ;;
+  case $state in
+    (command)
+      __call_original_brew
+      cask_commands=(
+        'cask:manage casks'
+      )
+      _describe -t commands 'brew cask command' cask_commands ;;
 
-		(subcmd)
-			case "$line[1]" in
-				cask)
-					if (( CURRENT == 3 )); then
-						local -a subcommands
-						subcommands=(
-							"alfred:used to modify Alfred's scope to include the Caskroom"
-							'audit:verifies installability of casks'
-							'checklinks:checks for bad cask links'
-							'cleanup:cleans up cached downloads'
-							'create:creates a cask of the given name and opens it in an editor'
-							'doctor:checks for configuration issues'
-							'edit:edits the cask of the given name'
-							'fetch:downloads Cask resources to local cache'
-							'home:opens the homepage of the cask of the given name'
-							'info:displays information about the cask of the given name'
-							'install:installs the cask of the given name'
-							'list:with no args, lists installed casks; given installed casks, lists installed files'
-							'search:searches all known casks'
-							'uninstall:uninstalls the cask of the given name'
-							"update:a synonym for 'brew update'"
-						)
-						_describe -t commands "brew cask subcommand" subcommands
-					fi ;;
+    (subcmd)
+      case "$line[1]" in
+        cask)
+          if (( CURRENT == 3 )); then
+            local -a subcommands
+            subcommands=(
+              "alfred:used to modify Alfred's scope to include the Caskroom"
+              'audit:verifies installability of casks'
+              'checklinks:checks for bad cask links'
+              'cleanup:cleans up cached downloads'
+              'create:creates a cask of the given name and opens it in an editor'
+              'doctor:checks for configuration issues'
+              'edit:edits the cask of the given name'
+              'fetch:downloads Cask resources to local cache'
+              'home:opens the homepage of the cask of the given name'
+              'info:displays information about the cask of the given name'
+              'install:installs the cask of the given name'
+              'list:with no args, lists installed casks; given installed casks, lists installed files'
+              'search:searches all known casks'
+              'uninstall:uninstalls the cask of the given name'
+              "update:a synonym for 'brew update'"
+            )
+            _describe -t commands "brew cask subcommand" subcommands
+          fi ;;
 
-				*)
-					__call_original_brew ;;
-			esac ;;
+        *)
+          __call_original_brew ;;
+      esac ;;
 
-		(options)
-			local -a casks installed_casks
-			local expl
-			case "$line[2]" in
-				list|uninstall)
-					__brew_installed_casks
-					_wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
-				audit|edit|home|info|install)
-					__brew_all_casks
-					_wanted casks expl 'all casks' compadd -a casks ;;
-			esac ;;
-	esac
+    (options)
+      local -a casks installed_casks
+      local expl
+      case "$line[2]" in
+        list|uninstall)
+          __brew_installed_casks
+          _wanted installed_casks expl 'installed casks' compadd -a installed_casks ;;
+        audit|edit|home|info|install)
+          __brew_all_casks
+          _wanted casks expl 'all casks' compadd -a casks ;;
+      esac ;;
+  esac
 }
 
 __brew_all_casks() {
-	casks=(`brew cask search`)
+  casks=(`brew cask search`)
 }
 
 __brew_installed_casks() {
-	installed_casks=(`brew cask list`)
+  installed_casks=(`brew cask list`)
 }
 
 __call_original_brew()
 {
-	local ret=1
-	_call_function ret _brew
-	compdef _brew-cask brew
+  local ret=1
+  _call_function ret _brew
+  compdef _brew-cask brew
 }

From 015b742153654c0b127f8f158ab80e51f6ea8ec3 Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Tue, 25 Mar 2014 17:16:20 +0100
Subject: [PATCH 0658/1378] Allowing path with spaces in pow plugin

This commit allows for paths with spaces to be symlinked
in Pow.

If an application is located in a folder like `/some path/to the/app`
the powit command would fail when it shouldn't. It's not the case
anymore.
---
 plugins/pow/pow.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 7f86c0c76..d85c88777 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -21,8 +21,8 @@
 
 rack_root(){
   setopt chaselinks
-  local orgdir=$(pwd)
-  local basedir=$(pwd)
+  local orgdir="$(pwd)"
+  local basedir="$(pwd)"
 
   while [[ $basedir != '/' ]]; do
     test -e "$basedir/config.ru" && break
@@ -30,7 +30,7 @@ rack_root(){
     basedir="$(pwd)"
   done
 
-  builtin cd $orgdir 2>/dev/null
+  builtin cd "$orgdir" 2>/dev/null
   [[ ${basedir} == "/" ]] && return 1
   echo $basedir
 }
@@ -56,19 +56,19 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-  local basedir=$(pwd)
+  local basedir="$(pwd)"
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
   then
     echo "pow: Symlinking your app with pow. ${vhost}"
-    [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+    [ ! -d ~/.pow/${vhost} ] && ln -s "$basedir" ~/.pow/$vhost
     return 1
   fi
 }
 
 powed(){
-  local basedir=$(rack_root)
+  local basedir="$(rack_root)"
   find ~/.pow/ -type l -lname "*$basedir*" -exec basename {}'.dev' \;
 }
 
@@ -82,4 +82,4 @@ repow(){
 }
 
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"

From 7b08f494e3604f18e7b9b31959a6da6d97abcc65 Mon Sep 17 00:00:00 2001
From: Kevin Bongart <contact@kevinbongart.net>
Date: Tue, 25 Mar 2014 12:37:25 -0400
Subject: [PATCH 0659/1378] Add README file to rake-fast plugin

---
 plugins/rake-fast/README.md            | 23 +++++++++++++++++++++++
 plugins/rake-fast/rake-fast.plugin.zsh | 17 -----------------
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 plugins/rake-fast/README.md

diff --git a/plugins/rake-fast/README.md b/plugins/rake-fast/README.md
new file mode 100644
index 000000000..f56142f69
--- /dev/null
+++ b/plugins/rake-fast/README.md
@@ -0,0 +1,23 @@
+# rake-fast
+
+Fast rake autocompletion plugin.
+
+This script caches the output for later usage and significantly speeds it up. It generates a .rake_tasks cache file in parallel to the Rakefile. It also checks the file modification dates to see if it needs to regenerate the cache file.
+
+This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/).
+
+Think about that. 2006.
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```bash
+plugins=(foo bar rake-fast)
+```
+
+You might consider adding `.rake_tasks` to your [global .gitignore](https://help.github.com/articles/ignoring-files#global-gitignore)
+
+## Usage
+
+`rake`, then press tab
diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index 320855233..545b6c049 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -1,20 +1,3 @@
-# rake-fast
-# Fast rake autocompletion plugin for oh-my-zsh
-
-# This script caches the output for later usage and significantly speeds it up.
-# It generates a .rake_tasks file in parallel to the Rakefile.
-
-# You'll want to add `.rake_tasks` to your global .git_ignore file:
-# https://help.github.com/articles/ignoring-files#global-gitignore
-
-# You can force .rake_tasks to refresh with:
-# $ rake_refresh
-
-# This is entirely based on Ullrich Schäfer's work
-# (https://github.com/robb/.dotfiles/pull/10/),
-# which is inspired by this Ruby on Rails trick from 2006:
-# http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh/
-
 _rake_refresh () {
   if [ -f .rake_tasks ]; then
     rm .rake_tasks

From 5137e0e509ae4d6534be132d614d43ea53d8a4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 25 Mar 2014 21:01:34 +0100
Subject: [PATCH 0660/1378] Escape % in $CMD variable

Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%
---
 lib/termsupport.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 5f2fe63d4..9c0a430fb 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -26,8 +26,11 @@ function omz_termsupport_precmd {
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
-  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+
+  # cmd name only, or if this is sudo or ssh, the next cmd
+  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%}
   local LINE="${2:gs/%/%%}"
+
   title '$CMD' '%100>...>$LINE%<<'
 }
 

From 982b534ce8cdf439c96bc48ff58f890e9e350d30 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Tue, 25 Mar 2014 16:20:25 -0400
Subject: [PATCH 0661/1378] adding the is_json tool and associated readme.md
 details

---
 plugins/jsontools/README.md            | 17 +++++++++++++++--
 plugins/jsontools/jsontools.plugin.zsh | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 9f07194c9..309ce9b5f 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -5,10 +5,11 @@ Handy command line tools for dealing with json data.
 ## Tools
 
 - **pp_json** - pretty prints json
+- **is_json** - returns true if valid json; false otherwise
 
-## Usage
+## Examples
 
-##### pp_json - examples
+##### pp_json
 
 ```sh
 # curl json data and pretty print the results
@@ -19,4 +20,16 @@ less data.json | pp_json
 
 # json data directly from the command line
 echo '{"b":2, "a":1}' | pp_json
+```
+
+##### is_json
+```sh
+# curl json data and pretty print the results
+curl https://coderwall.com/bobwilliams.json | is_json
+
+# pretty print the contents of an existing json file
+less data.json | is_json
+
+# json data directly from the command line
+echo '{"b":2, "a":1}' | is_json
 ```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 729763c33..b8b558807 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -2,15 +2,26 @@
 # Adds command line aliases useful for dealing with JSON
 
 if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
-    JSONTOOLS_METHOD=""
+	JSONTOOLS_METHOD=""
 fi
 
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
 	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
+	alias is_json='python -c "
+import json, sys;
+try: 
+	json.loads(sys.stdin.read())
+except ValueError, e: 
+	print False
+else:
+	print True
+sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
 fi
 
-unset JSONTOOLS_METHOD
\ No newline at end of file
+unset JSONTOOLS_METHOD

From b2ce306c4f49ebb1ef2bde5b86d553ce6ea674aa Mon Sep 17 00:00:00 2001
From: Daniel Farrell <dfarrell07@gmail.com>
Date: Tue, 25 Mar 2014 23:37:28 -0400
Subject: [PATCH 0662/1378] Simplified gallois RPS1 setup using some helpful
 scripts

---
 themes/gallois.zsh-theme | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index f31d21958..d383ed583 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -11,19 +11,11 @@ git_custom_status() {
   fi
 }
 
-#RVM and git settings
-if [[ -s ~/.rvm/scripts/rvm ]] ; then
-  RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
-else
-  if which rbenv &> /dev/null; then
-    RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
-  else
-    if [[ -n `which chruby_prompt_info &> /dev/null` && -n `chruby_prompt_info` ]]; then
-      RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
-    else
-      RPS1='$(git_custom_status) $EPS1'
-    fi
-  fi
-fi
+# RVM component of prompt
+ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}["
+ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}"
+
+# Combine it all into a final right-side prompt
+RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
 
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '

From 9650861e56a3404313adc35cbcb1f32a7015b99d Mon Sep 17 00:00:00 2001
From: Andre Eriksson <andre.eriksson@trioptima.com>
Date: Wed, 26 Mar 2014 15:05:00 +0900
Subject: [PATCH 0663/1378] Fix broken reverse-menu-complete keybinding.

Since e537ee9, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.
---
 lib/key-bindings.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 5f3f237c7..9063c6a18 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -46,8 +46,8 @@ bindkey ' ' magic-space                               # [Space] - do history exp
 bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
 bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
 
-if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" reverse-menu-complete  # [Shift-Tab] - move through the completion menu backwards
+if [[ "${terminfo[kcbt]}" != "" ]]; then
+  bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
 fi
 
 bindkey '^?' backward-delete-char                     # [Backspace] - delete backward

From 76e1edf31f73e20487d7d7fe4a579361bb86815b Mon Sep 17 00:00:00 2001
From: Bob Maerten <bob.maerten@gmail.com>
Date: Wed, 26 Mar 2014 10:40:46 +0100
Subject: [PATCH 0664/1378] Matching autocomplete for Docker v0.9.1

Many deprecations since 0.8 and new commands.
---
 plugins/docker/_docker | 162 +++++++++++++++++++++++++++++------------
 1 file changed, 114 insertions(+), 48 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 12eee7a15..5acd19edf 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -2,7 +2,8 @@
 
 # Docker autocompletion for oh-my-zsh
 # Requires: Docker installed
-# Author : Azaan (@aeonazaan)
+# Author: Azaan (@aeonazaan)
+# Updates: Bob Maerten (@bobmaerten) for Docker v0.9+
 
 
 # ----- Helper functions
@@ -24,21 +25,30 @@ __docker_images() {
 # Seperate function for each command, makes extension easier later
 # ---------------------------
 __attach() {
+    _arguments \
+        '--no-stdin[Do not attach stdin]' \
+        '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]'
     __docker_containers
 }
 
 __build() {
     _arguments \
-        '-q=false[Suppress verbose build output]' \
-        '-t="[fuck to be applied to the resulting image in case of success]' \
+        '--no-cache[Do not use cache when building the image]' \
+        '(-q,--quiet)'{-q,--quiet}'[Suppress the verbose output generated by the containers]' \
+        '--rm[Remove intermediate containers after a successful build]' \
+        '(-t,--tag=)'{-t,--tag=}'[Repository name (and optionally a tag) to be applied to the resulting image in case of success]' \
         '*:files:_files'
 }
 
 __commit() {
     _arguments \
-        '-author="[Author]' \
-        '-m="[Commit message]' \
-        '-run="[Config automatically applied when the image is run.\n]'
+        '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \
+        '(-m,--message=)'{-m,--message=}'[Commit message]' \
+        '--run=[Config automatically applied when the image is run.]'
+    __docker_containers
+}
+
+__cp() {
     __docker_containers
 }
 
@@ -46,21 +56,29 @@ __diff() {
     __docker_containers
 }
 
+__events() {
+    _arguments \
+        '--since=[Show previously created events and then stream.]'
+}
+
 __export() {
    __docker_containers
 }
 
-
 __history() {
+    _arguments \
+        '--no-trunc=[Don''t truncate output]' \
+        '(-q,--quiet)'{-q,--quiet}'[Only show numeric IDs]'
     __docker_images
 }
 
 __images() {
     _arguments \
-        '-a[show all images]' \
-        '-notrunc[dont truncate output]' \
-        '-q[only show numeric IDs]' \
-        '-viz[output graph in graphviz format]'
+        '(-a,--all)'{-a,--all}'[Show all images (by default filter out the intermediate images used to build)]' \
+        '--no-trunc[Don''t truncate output]' \
+        '(-q,--quiet=)'{-q,--quiet=}'[Only show numeric IDs]' \
+        '(-t,--tree=)'{-t,--tree=}'[Output graph in tree format]' \
+        '(-v,--viz=)'{-v,--viz=}'[Output graph in graphviz format]'
     __docker_images
 }
 
@@ -86,14 +104,20 @@ __kill() {
     __docker_containers
 }
 
+__load() {
+    _arguments '*:files:_files'
+}
+
 __login() {
     _arguments \
-        '-e="[email]' \
-        '-p="[password]' \
-        '-u="[username]' \
+        '(-e,--email=)'{-e,-email=}'[Email]' \
+        '(-p,--password=)'{-p,-password=}'[Password]' \
+        '(-u,--username=)'{-u,-username=}'[Username]'
 }
 
 __logs() {
+    _arguments \
+        '(-f,--follow)'{-f,-follow}'[Follow log output]'
     __docker_containers
 }
 
@@ -107,77 +131,107 @@ __top() {
 
 __ps() {
     _arguments \
-        '-a[Show all containers. Only running containers are shown by default.]' \
-        '-beforeId="[Show only container created before Id, include non-running ones.]' \
-        '-l[Show only the latest created container, include non-running ones.]' \
-        '-n=[Show n last created containers, include non-running ones.]' \
-        '-notrunc[Dont truncate output]' \
-        '-q[Only display numeric IDs]' \
-        '-s[Display sizes]' \
-        '-sinceId="[Show only containers created since Id, include non-running ones.]'
+        '(-a,--all)'{-a,--all}'[Show all containers. Only running containers are shown by default.]' \
+        '--before-id=[Show only container created before Id, include non-running ones.]' \
+        '(-l,--latest)'{-l,--latest}'[Show only the latest created container, include non-running ones.]' \
+        '-n=[Show n last created containers, include non-running ones. default=-1.]' \
+        '--no-trunc[Don''t truncate output]' \
+        '(-q,--quiet)'{-q,--quiet}'[Only display numeric IDs]' \
+        '(-s,--size)'{-s,--size}'[Display sizes]' \
+        '--since-id=[Show only containers created since Id, include non-running ones.]'
 }
 
 __pull() {
-    _arguments '-t="[Download tagged image in repository]'
+    _arguments \
+        '(-t,--tag=)'{-t,--tag=}'[Download tagged image in repository]'
 }
 
 __push() {
-
+    # no arguments
 }
 
 __restart() {
-    _arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments \
+        '(-t,--time=)'{-t,--time=}'[Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default=10]'
     __docker_containers
 }
 
 __rm() {
-    _arguments '-v[Remove the volumes associated to the container]'
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force removal of running container]' \
+        '(-l,--link=)'{-l,--link=}'[Remove the specified link and not the underlying container]' \
+        '(-v,--volumes=)'{-v,--volumes=}'[Remove the volumes associated to the container]'
     __docker_containers
 }
 
 __rmi() {
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force]' \
     __docker_images
 }
 
 __run() {
     _arguments \
-        '-a=[Attach to stdin, stdout or stderr.]' \
-        '-c=[CPU shares (relative weight)]' \
-        '-d[Detached mode: leave the container running in the background]' \
-        '-dns=[Set custom dns servers]' \
-        '-e=[Set environment variables]' \
-        '-entrypoint="[Overwrite the default entrypoint of the image]' \
-        '-h="[Container host name]' \
-        '-i[Keep stdin open even if not attached]' \
-        '-m=[Memory limit (in bytes)]' \
-        '-p=[Expose a containers port to the host (use docker port to see the actual mapping)]' \
-        '-t[Allocate a pseudo-tty]' \
-        '-u="[Username or UID]' \
-        '-v=[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
-        '-volumes-from="[Mount volumes from the specified container]'
+        '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
+        '(-a,--attach=)'{-a,--attach=}'[Attach to stdin, stdout or stderr.]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}': CPU shares (relative weight)]' \
+        '--cidfile=[Write the container ID to the file]' \
+        '(-d,--detach=)'{-d,--detach=}'[Detached mode: Run container in the background, print new container id]' \
+        '--dns=[Set custom dns servers]' \
+        '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
+        '--entrypoint=[Overwrite the default entrypoint of the image]' \
+        '--expose=[Expose a port from the container without publishing it to your host]' \
+        '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
+        '(-i,--interactive=)'{-i,--interactive=}'[Keep stdin open even if not attached]' \
+        '--link=[Add link to another container (name:alias)]' \
+        '--lxc-conf=[Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"]' \
+        '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \
+        '(-n,--networking=)'{-n,--networking=}'[Enable networking for this container]' \
+        '--name=[Assign a name to the container]' \
+        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use "docker port" to see the actual mapping)]' \
+        '--privileged=[Give extended privileges to this container]' \
+        '--rm=[Automatically remove the container when it exits (incompatible with -d)]' \
+        '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \
+        '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \
+        '(-u,--user=)'{-u,--user=}'[Username or UID]' \
+        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
+        '--volumes-from=[Mount volumes from the specified container(s)]' \
+        '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]'
     __docker_images
 }
 
 __search() {
-    _arguments '-notrunc[Dont truncate output]'
+    _arguments \
+        '--no-trunc=[Don''t truncate output]' \
+        '-s,--stars=)'{-s,--stars=}'[Only displays with at least xxx stars]' \
+        '-t,--trusted=)'{-t,--trusted=}'[Only show trusted builds]'
+}
+
+__save() {
+    __docker_images
 }
 
 __start() {
+    _arguments \
+        '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \
+        '(-i,--interactive=)'{-i, --interactive=}'[Attach container''s stdin]'
     __docker_containers
 }
 
 __stop() {
-    _arguments '-t=[number of seconds to try to stop before killing]'
+    _arguments \
+        '(-t,--time=)'{-t,--time=}'[Number of seconds to wait for the container to stop before killing it.]'
     __docker_containers
 }
 
 __tag() {
-    _arguments '-f[Force]'
+    _arguments \
+        '(-f,--force=)'{-f,--force=}'[Force]'
     __docker_images
 }
 
 __version() {
-
+    # no arguments
 }
 
 __wait() {
@@ -192,7 +246,9 @@ _1st_arguments=(
     "attach":"Attach to a running container"
     "build":"Build a container from a Dockerfile"
     "commit":"Create a new image from a container's changes"
+    "cp":"Copy files/folders from the containers filesystem to the host path"
     "diff":"Inspect changes on a container's filesystem"
+    "events":"Get real time events from the server"
     "export":"Stream the contents of a container as a tar archive"
     "history":"Show the history of an image"
     "images":"List images"
@@ -201,10 +257,10 @@ _1st_arguments=(
     "insert":"Insert a file in an image"
     "inspect":"Return low-level information on a container"
     "kill":"Kill a running container"
+    "load":"Load an image from a tar archive"
     "login":"Register or Login to the docker registry server"
     "logs":"Fetch the logs of a container"
     "port":"Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"
-    "top":"Lookup the running processes of a container"
     "ps":"List containers"
     "pull":"Pull an image or a repository from the docker registry server"
     "push":"Push an image or a repository to the docker registry server"
@@ -212,10 +268,12 @@ _1st_arguments=(
     "rm":"Remove one or more containers"
     "rmi":"Remove one or more images"
     "run":"Run a command in a new container"
+    "save":"Save an image to a tar archive"
     "search":"Search for an image in the docker index"
     "start":"Start a stopped container"
     "stop":"Stop a running container"
     "tag":"Tag an image into a repository"
+    "top":"Lookup the running processes of a container"
     "version":"Show the docker version information"
     "wait":"Block until a container stops, then print its exit code"
 )
@@ -230,13 +288,17 @@ fi
 local -a _command_args
 case "$words[1]" in
     attach)
-       __docker_containers ;;
+       __attach ;;
     build)
         __build ;;
     commit)
         __commit ;;
+    cp)
+        __cp ;;
     diff)
         __diff ;;
+    events)
+        __events ;;
     export)
         __export ;;
     history)
@@ -253,14 +315,14 @@ case "$words[1]" in
         __inspect ;;
     kill)
         __kill ;;
+    load)
+        __load ;;
     login)
         __login ;;
     logs)
         __logs ;;
     port)
         __port ;;
-    top)
-        __top ;;
     ps)
         __ps ;;
     pull)
@@ -275,6 +337,8 @@ case "$words[1]" in
         __rmi ;;
     run)
         __run ;;
+    save)
+        __save ;;
     search)
         __search ;;
     start)
@@ -283,6 +347,8 @@ case "$words[1]" in
         __stop ;;
     tag)
         __tag ;;
+    top)
+        __top ;;
     version)
         __version ;;
     wait)

From 53323abdb1a18c7756ace473390ac6ca51660839 Mon Sep 17 00:00:00 2001
From: tcasparro <tcasparr@gmail.com>
Date: Thu, 20 Mar 2014 16:09:45 -0700
Subject: [PATCH 0665/1378] Added git mode support for merging, rebasing, and
 bisecting

<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
---
 themes/agnoster.zsh-theme | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 85b846cb5..2b33c48bc 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -69,7 +69,9 @@ prompt_context() {
 
 # Git: branch/detached head, dirty status
 prompt_git() {
-  local ref dirty
+  local ref dirty mode repo_path
+  repo_path=$(git rev-parse --git-dir 2>/dev/null)
+
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
@@ -79,6 +81,14 @@ prompt_git() {
       prompt_segment green black
     fi
 
+    if [[ -e "${repo_path}/BISECT_LOG" ]]; then
+      mode=" <B>"
+    elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then
+      mode=" >M<"
+    elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then
+      mode=" >R>"
+    fi
+
     setopt promptsubst
     autoload -Uz vcs_info
 
@@ -90,7 +100,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }${mode}"
   fi
 }
 

From 0605d53fa7f04c864e7bc5f9f68bd38f24fbbfd5 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Wed, 26 Mar 2014 18:47:57 -0400
Subject: [PATCH 0666/1378] adding urlencode_json and associated README.md
 details

---
 plugins/jsontools/README.md            | 20 ++++++++++----------
 plugins/jsontools/jsontools.plugin.zsh |  6 ++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 309ce9b5f..975d2bb79 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -6,7 +6,13 @@ Handy command line tools for dealing with json data.
 
 - **pp_json** - pretty prints json
 - **is_json** - returns true if valid json; false otherwise
+- **urlencode_json** - returns a url encoded string for the given json 
 
+## Usage
+Usage is simple...just take your json data and pipe it into the appropriate jsontool.
+```sh
+<json data> | <jsontools tool>
+```
 ## Examples
 
 ##### pp_json
@@ -14,22 +20,16 @@ Handy command line tools for dealing with json data.
 ```sh
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
-
-# pretty print the contents of an existing json file
-less data.json | pp_json
-
-# json data directly from the command line
-echo '{"b":2, "a":1}' | pp_json
 ```
 
 ##### is_json
 ```sh
-# curl json data and pretty print the results
-curl https://coderwall.com/bobwilliams.json | is_json
-
 # pretty print the contents of an existing json file
 less data.json | is_json
+```
 
+##### urlencode_json
+```sh
 # json data directly from the command line
-echo '{"b":2, "a":1}' | is_json
+echo '{"b":2, "a":1}' | urlencode_json
 ```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index b8b558807..8877ee62f 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -8,6 +8,7 @@ fi
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
 	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
+	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(JSON.stringify(process.argv[1])))"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 	alias is_json='python -c "
@@ -18,10 +19,15 @@ except ValueError, e:
 	print False
 else:
 	print True
+sys.exit(0)"'
+	alias urlencode_json='python -c "
+import urllib, json, sys;
+print urllib.quote_plus(json.dumps(sys.stdin.read()))
 sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
 	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
+	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
 fi
 
 unset JSONTOOLS_METHOD

From 400643ff5b20521aebe16ca36fde34bde212db89 Mon Sep 17 00:00:00 2001
From: Bob Williams <bobwilliams.ii@gmail.com>
Date: Thu, 27 Mar 2014 10:34:54 -0400
Subject: [PATCH 0667/1378] adding urldecode_json to compliment urlencode_json
 and updating readme.md; slight tweak to urlencode_json from previous commit

---
 plugins/jsontools/README.md            |  7 +++++++
 plugins/jsontools/jsontools.plugin.zsh | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 975d2bb79..4faf58b98 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -7,6 +7,7 @@ Handy command line tools for dealing with json data.
 - **pp_json** - pretty prints json
 - **is_json** - returns true if valid json; false otherwise
 - **urlencode_json** - returns a url encoded string for the given json 
+- **urldecode_json** - returns decoded json for the given url encoded string
 
 ## Usage
 Usage is simple...just take your json data and pipe it into the appropriate jsontool.
@@ -32,4 +33,10 @@ less data.json | is_json
 ```sh
 # json data directly from the command line
 echo '{"b":2, "a":1}' | urlencode_json
+```
+
+##### urldecode_json
+```sh
+# url encoded string to decode
+echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
 ```
\ No newline at end of file
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 8877ee62f..20d5eb1c9 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -8,7 +8,8 @@ fi
 if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
 	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
 	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
-	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(JSON.stringify(process.argv[1])))"'
+	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
+	alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
 elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
 	alias pp_json='python -mjson.tool'
 	alias is_json='python -c "
@@ -22,12 +23,17 @@ else:
 sys.exit(0)"'
 	alias urlencode_json='python -c "
 import urllib, json, sys;
-print urllib.quote_plus(json.dumps(sys.stdin.read()))
+print urllib.quote_plus(sys.stdin.read())
+sys.exit(0)"'
+	alias urldecode_json='python -c "
+import urllib, json, sys;
+print urllib.unquote_plus(sys.stdin.read())
 sys.exit(0)"'
 elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
 	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
 	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
 	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
+	alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
 fi
 
-unset JSONTOOLS_METHOD
+unset JSONTOOLS_METHOD
\ No newline at end of file

From b2ea7d3ec12152ab4d864c27c33d8b9396c68858 Mon Sep 17 00:00:00 2001
From: Stanislav Schultz <ixrb@ya.ru>
Date: Fri, 28 Mar 2014 20:25:13 +0300
Subject: [PATCH 0668/1378] Add Ruby 2.1.1 support to rvm plugin

---
 plugins/rvm/rvm.plugin.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 3bde154df..ad23e18d7 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -6,6 +6,7 @@ alias gemsets='rvm gemset list'
 local ruby18='ruby-1.8.7'
 local ruby19='ruby-1.9.3'
 local ruby20='ruby-2.0.0'
+local ruby21='ruby-2.1.1'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -40,6 +41,17 @@ function rb20 {
 _rb20() {compadd `ls -1 $rvm_path/gems | grep "^$ruby20@" | sed -e "s/^$ruby20@//" | awk '{print $1}'`}
 compdef _rb20 rb20
 
+function rb21 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby21"
+	else
+		rvm use "$ruby21@$1"
+	fi
+}
+
+_rb21() {compadd `ls -1 $rvm_path/gems | grep "^$ruby21@" | sed -e "s/^$ruby21@//" | awk '{print $1}'`}
+compdef _rb21 rb21
+
 function rvm-update {
 	rvm get head
 }

From f46d06dae19f691e6666d4836766e9eb69d2e51b Mon Sep 17 00:00:00 2001
From: Henrik Holm <henrik@henrikholm.com>
Date: Sat, 29 Mar 2014 10:14:37 -0400
Subject: [PATCH 0669/1378] Correct redirection of output from 'hash'

The intention of the redirection to /dev/null is to hide the output
'hash: no such command: git' since we rely on the exit status.

However, the output goes to stderr, so it's stderr that needs to be
redirected. For completeness, we redirect both stderr and stdout using
'2>&1'.

Example:

  [~]$ hash git > /dev/null
  [~]$ PATH=''
  [~]$ hash git > /dev/null
  hash: no such command: git
  [~]$ hash git > /dev/null 2>&1
  [~]$
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 71e19a389..fc7ad70cf 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
+hash git >/dev/null 2>&1 && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }

From 7d696f79b8d864e7b6afb13512bcb0f0cd519f1a Mon Sep 17 00:00:00 2001
From: DeLynn Berry <delynn@gmail.com>
Date: Fri, 4 Apr 2014 08:11:11 -0600
Subject: [PATCH 0670/1378] Remove mailcatcher

The mailcatcher gem does not work correctly when executed through Bundler.
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e4b03e7b0..3338d78be 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife mailcatcher middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From c9fbfc9f48b25c724265e06f0bce8d737c7ea13b Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Fri, 4 Apr 2014 21:20:01 -0300
Subject: [PATCH 0671/1378] Uses `shipit` instead of `xcap`

---
 plugins/capistrano/_capistrano           | 6 +++---
 plugins/capistrano/capistrano.plugin.zsh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index 7a74b3732..c181b55ca 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -1,7 +1,7 @@
-#compdef xcap cap
+#compdef shipit
 #autoload
 
-# Added `xcap` because `cap` is a reserved word. `cap` completion doesn't work.
+# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
 local curcontext="$curcontext" state line ret=1
@@ -14,7 +14,7 @@ _arguments -C \
 _cap_tasks() {
   if [[ -f config/deploy.rb || -f Capfile ]]; then
     if [[ ! -f .cap_tasks~ ]]; then
-      xcap -v --tasks | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
+      shipit -v --tasks | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
     fi
 
     OLD_IFS=$IFS
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
index 9a4a2cc34..c85eb474c 100644
--- a/plugins/capistrano/capistrano.plugin.zsh
+++ b/plugins/capistrano/capistrano.plugin.zsh
@@ -1,7 +1,7 @@
-# Added `xcap` because `cap` is a reserved word. `cap` completion doesn't work.
+# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
-func xcap() {
+func shipit() {
   if [ -f Gemfile ]
   then
     bundle exec cap $*

From 6f3cf195c67bec936b6b0799051859e1f0ddb9dc Mon Sep 17 00:00:00 2001
From: Benjamin Wong <jimini@gmail.com>
Date: Fri, 18 Apr 2014 22:43:23 +1000
Subject: [PATCH 0672/1378] Spelling correction in itunes control function.

Spelling correction in itunes control function.
---
 plugins/osx/osx.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 608ec3789..63760b5ff 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -184,7 +184,7 @@ function itunes() {
 			return 0
 			;;
 		*)
-			print "Unkonwn option: $opt"
+			print "Unknown option: $opt"
 			return 1
 			;;
 	esac

From fcfa323974985cd202c95379f893a86d6cf975fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 25 Mar 2014 22:16:36 +0100
Subject: [PATCH 0673/1378] Use cache folder inside $ZSH, delete with unaliased
 rm

---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index a435dbc8d..94945bd48 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,13 +1,12 @@
-zsh_cache=$HOME/.zsh_cache
-mkdir -p $zsh_cache
-
 # reload zshrc
 function src()
 {
   autoload -U compinit zrecompile
-  compinit -d $zsh_cache/zcomp-$HOST
-  for f in $HOME/.zshrc $zsh_cache/zcomp-$HOST; do
-    zrecompile -p $f && rm -f $f.zwc.old
+  compinit -d "$ZSH/cache/zcomp-$HOST"
+
+  for f in ~/.zshrc "$ZSH/cache/zcomp-$HOST"; do
+    zrecompile -p $f && command rm -f $f.zwc.old
   done
+
   source ~/.zshrc
-}
\ No newline at end of file
+}

From 9385b3ee0a8425ae8a2b5c16084d4fab1ebc3764 Mon Sep 17 00:00:00 2001
From: Dmitriy <me@kemko.ru>
Date: Mon, 24 Mar 2014 10:17:19 +0300
Subject: [PATCH 0674/1378] set exclude-dir or exclude grep flags only if
 available

---
 lib/grep.zsh | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 977435ee4..276fec382 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -3,11 +3,22 @@
 # Examples: http://rubyurl.com/ZXv
 #
 
-# avoid VCS folders
-GREP_OPTIONS=
-for PATTERN in .cvs .git .hg .svn; do
-    GREP_OPTIONS+="--exclude-dir=$PATTERN "
-done
-GREP_OPTIONS+="--color=auto"
+GREP_OPTIONS="--color=auto"
+
+# avoid VCS folders (if the necessary grep flags are available)
+grep-flag-available() {
+    echo | grep $1 "" >/dev/null 2>&1
+}
+if grep-flag-available --exclude-dir=.cvs; then
+    for PATTERN in .cvs .git .hg .svn; do
+        GREP_OPTIONS+=" --exclude-dir=$PATTERN"
+    done
+elif grep-flag-available --exclude=.cvs; then
+    for PATTERN in .cvs .git .hg .svn; do
+        GREP_OPTIONS+=" --exclude=$PATTERN"
+    done
+fi
+unfunction grep-flag-available
+
 export GREP_OPTIONS="$GREP_OPTIONS"
 export GREP_COLOR='1;32'

From cee52283d8f5e18ba962cdb7b0acec2627e647e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tomak?= <pawel.tomak@gmail.com>
Date: Fri, 18 Apr 2014 23:09:38 +0200
Subject: [PATCH 0675/1378] Fix for Python3

In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
---
 plugins/git-prompt/gitstatus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index ef894bff2..256841432 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -16,7 +16,7 @@ symbols = {
 }
 
 output, error = Popen(
-    ['git', 'status'], stdout=PIPE, stderr=PIPE).communicate()
+    ['git', 'status'], stdout=PIPE, stderr=PIPE, universal_newlines=True).communicate()
 
 if error:
     import sys

From 7949a1cd8d69e7a79cbf20294cf41662aff15058 Mon Sep 17 00:00:00 2001
From: Javier Tejero <jtejero@cink.es>
Date: Sun, 6 Apr 2014 13:51:18 +0200
Subject: [PATCH 0676/1378] Fix `docker rmi` tab completion

This is exactly what happens on tab completion for docker rmi. This commit
fixes that.

```sh
$ docker rmi <hit TAB>
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
```
---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 5acd19edf..c291037a3 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -166,7 +166,7 @@ __rm() {
 
 __rmi() {
     _arguments \
-        '(-f,--force=)'{-f,--force=}'[Force]' \
+        '(-f,--force=)'{-f,--force=}'[Force]'
     __docker_images
 }
 

From 6a5c8fb81b369566ed0f5e408dab7a7213354ade Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 21 Apr 2014 21:11:49 -0500
Subject: [PATCH 0677/1378] gitfast: update to upstream v1.9.2

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                | 10 +++++-
 plugins/gitfast/git-completion.bash | 47 ++++++++++++++++++++---------
 plugins/gitfast/git-prompt.sh       | 15 +++++++--
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index fac5e711e..6b7796857 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -30,10 +30,10 @@ if [ -z "$script" ]; then
 	local -a locations
 	local e
 	locations=(
+		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
 		'/etc/bash_completion.d/git' # fedora, old debian
 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
 		'/usr/share/bash-completion/git' # gentoo
-		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
 		)
 	for e in $locations; do
 		test -f $e && script="$e" && break
@@ -76,6 +76,14 @@ __gitcomp_nl ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
+__gitcomp_nl_append ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+}
+
 __gitcomp_file ()
 {
 	emulate -L zsh
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 5da920ecd..9525343fc 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -1,5 +1,3 @@
-#!bash
-#
 # bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
@@ -180,9 +178,9 @@ _get_comp_words_by_ref ()
 }
 fi
 
-__gitcompadd ()
+__gitcompappend ()
 {
-	local i=0
+	local i=${#COMPREPLY[@]}
 	for x in $1; do
 		if [[ "$x" == "$3"* ]]; then
 			COMPREPLY[i++]="$2$x$4"
@@ -190,6 +188,12 @@ __gitcompadd ()
 	done
 }
 
+__gitcompadd ()
+{
+	COMPREPLY=()
+	__gitcompappend "$@"
+}
+
 # Generates completion reply, appending a space to possible completion words,
 # if necessary.
 # It accepts 1 to 4 arguments:
@@ -220,6 +224,14 @@ __gitcomp ()
 	esac
 }
 
+# Variation of __gitcomp_nl () that appends to the existing list of
+# completion candidates, COMPREPLY.
+__gitcomp_nl_append ()
+{
+	local IFS=$'\n'
+	__gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
+}
+
 # Generates completion reply from newline-separated possible completion words
 # by appending a space to all of them.
 # It accepts 1 to 4 arguments:
@@ -231,8 +243,8 @@ __gitcomp ()
 #    appended.
 __gitcomp_nl ()
 {
-	local IFS=$'\n'
-	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
+	COMPREPLY=()
+	__gitcomp_nl_append "$@"
 }
 
 # Generates completion reply with compgen from newline-separated possible
@@ -673,7 +685,6 @@ __git_list_porcelain_commands ()
 		index-pack)       : plumbing;;
 		init-db)          : deprecated;;
 		local-fetch)      : plumbing;;
-		lost-found)       : infrequent;;
 		ls-files)         : plumbing;;
 		ls-remote)        : plumbing;;
 		ls-tree)          : plumbing;;
@@ -687,14 +698,12 @@ __git_list_porcelain_commands ()
 		pack-refs)        : plumbing;;
 		parse-remote)     : plumbing;;
 		patch-id)         : plumbing;;
-		peek-remote)      : plumbing;;
 		prune)            : plumbing;;
 		prune-packed)     : plumbing;;
 		quiltimport)      : import;;
 		read-tree)        : plumbing;;
 		receive-pack)     : plumbing;;
 		remote-*)         : transport;;
-		repo-config)      : deprecated;;
 		rerere)           : plumbing;;
 		rev-list)         : plumbing;;
 		rev-parse)        : plumbing;;
@@ -707,7 +716,6 @@ __git_list_porcelain_commands ()
 		ssh-*)            : transport;;
 		stripspace)       : plumbing;;
 		symbolic-ref)     : plumbing;;
-		tar-tree)         : deprecated;;
 		unpack-file)      : plumbing;;
 		unpack-objects)   : plumbing;;
 		update-index)     : plumbing;;
@@ -901,7 +909,7 @@ _git_add ()
 	esac
 
 	# XXX should we check for --update and --all options ?
-	__git_complete_index_file "--others --modified"
+	__git_complete_index_file "--others --modified --directory --no-empty-directory"
 }
 
 _git_archive ()
@@ -1063,7 +1071,7 @@ _git_clean ()
 	esac
 
 	# XXX should we check for -x option ?
-	__git_complete_index_file "--others"
+	__git_complete_index_file "--others --directory"
 }
 
 _git_clone ()
@@ -1188,7 +1196,7 @@ _git_diff ()
 	__git_complete_revlist_file
 }
 
-__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
+__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
 			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
 "
 
@@ -1491,6 +1499,12 @@ _git_mergetool ()
 
 _git_merge_base ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		return
+		;;
+	esac
 	__gitcomp_nl "$(__git_refs)"
 }
 
@@ -1623,7 +1637,7 @@ _git_rebase ()
 			--preserve-merges --stat --no-stat
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
-			--autosquash
+			--autosquash --fork-point --no-fork-point
 			"
 
 		return
@@ -1833,6 +1847,7 @@ _git_config ()
 	branch.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "."
+		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
 		return
 		;;
 	guitool.*.*)
@@ -1875,6 +1890,7 @@ _git_config ()
 	remote.*)
 		local pfx="${cur%.*}." cur_="${cur#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
+		__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
 		return
 		;;
 	url.*.*)
@@ -1997,6 +2013,7 @@ _git_config ()
 		fetch.unpackLimit
 		format.attach
 		format.cc
+		format.coverLetter
 		format.headers
 		format.numbered
 		format.pretty
@@ -2580,7 +2597,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then
 				--*=*|*.) ;;
 				*) c="$c " ;;
 				esac
-				array[$#array+1]="$c"
+				array[${#array[@]}+1]="$c"
 			done
 			compset -P '*[=:]'
 			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index a81ef5a48..7b732d2ae 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -60,6 +60,7 @@
 # of values:
 #
 #     verbose       show number of commits ahead/behind (+/-) upstream
+#     name          if verbose, then also show the upstream abbrev name
 #     legacy        don't use the '--count' option available in recent
 #                   versions of git-rev-list
 #     git           always compare HEAD to @{upstream}
@@ -84,13 +85,17 @@
 # the colored output of "git status -sb" and are available only when
 # using __git_ps1 for PROMPT_COMMAND or precmd.
 
+# check whether printf supports -v
+__git_printf_supports_v=
+printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1
+
 # stores the divergence from upstream in $p
 # used by GIT_PS1_SHOWUPSTREAM
 __git_ps1_show_upstream ()
 {
 	local key value
 	local svn_remote svn_url_pattern count n
-	local upstream=git legacy="" verbose=""
+	local upstream=git legacy="" verbose="" name=""
 
 	svn_remote=()
 	# get some config options from git-config
@@ -106,7 +111,7 @@ __git_ps1_show_upstream ()
 			;;
 		svn-remote.*.url)
 			svn_remote[$((${#svn_remote[@]} + 1))]="$value"
-			svn_url_pattern+="\\|$value"
+			svn_url_pattern="$svn_url_pattern\\|$value"
 			upstream=svn+git # default upstream is SVN if available, else git
 			;;
 		esac
@@ -118,6 +123,7 @@ __git_ps1_show_upstream ()
 		git|svn) upstream="$option" ;;
 		verbose) verbose=1 ;;
 		legacy)  legacy=1  ;;
+		name)    name=1 ;;
 		esac
 	done
 
@@ -200,6 +206,9 @@ __git_ps1_show_upstream ()
 		*)	    # diverged from upstream
 			p=" u+${count#*	}-${count%	*}" ;;
 		esac
+		if [[ -n "$count" && -n "$name" ]]; then
+			p="$p $(git rev-parse --abbrev-ref "$upstream" 2>/dev/null)"
+		fi
 	fi
 
 }
@@ -433,7 +442,7 @@ __git_ps1 ()
 	local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
 
 	if [ $pcmode = yes ]; then
-		if [[ -n ${ZSH_VERSION-} ]]; then
+		if [ "${__git_printf_supports_v-}" != yes ]; then
 			gitstring=$(printf -- "$printf_format" "$gitstring")
 		else
 			printf -v gitstring -- "$printf_format" "$gitstring"

From 5918d9100b294beb490cbd5f1f15fe2b064d9e62 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 21 Apr 2014 21:13:06 -0500
Subject: [PATCH 0678/1378] gitfast: back-port prompt fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/git-prompt.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 7b732d2ae..54489080f 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -259,6 +259,13 @@ __git_ps1_colorize_gitstring ()
 	r="$c_clear$r"
 }
 
+eread ()
+{
+	f="$1"
+	shift
+	test -r "$f" && read "$@" <"$f"
+}
+
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
 # when called from PS1 using command substitution
 # in this mode it prints text to add to bash PS1 prompt (includes branch name)
@@ -321,9 +328,9 @@ __git_ps1 ()
 	local step=""
 	local total=""
 	if [ -d "$g/rebase-merge" ]; then
-		read b 2>/dev/null <"$g/rebase-merge/head-name"
-		read step 2>/dev/null <"$g/rebase-merge/msgnum"
-		read total 2>/dev/null <"$g/rebase-merge/end"
+		eread "$g/rebase-merge/head-name" b
+		eread "$g/rebase-merge/msgnum" step
+		eread "$g/rebase-merge/end" total
 		if [ -f "$g/rebase-merge/interactive" ]; then
 			r="|REBASE-i"
 		else
@@ -331,10 +338,10 @@ __git_ps1 ()
 		fi
 	else
 		if [ -d "$g/rebase-apply" ]; then
-			read step 2>/dev/null <"$g/rebase-apply/next"
-			read total 2>/dev/null <"$g/rebase-apply/last"
+			eread "$g/rebase-apply/next" step
+			eread "$g/rebase-apply/last" total
 			if [ -f "$g/rebase-apply/rebasing" ]; then
-				read b 2>/dev/null <"$g/rebase-apply/head-name"
+				eread "$g/rebase-apply/head-name" b
 				r="|REBASE"
 			elif [ -f "$g/rebase-apply/applying" ]; then
 				r="|AM"
@@ -358,7 +365,7 @@ __git_ps1 ()
 			b="$(git symbolic-ref HEAD 2>/dev/null)"
 		else
 			local head=""
-			if ! read head 2>/dev/null <"$g/HEAD"; then
+			if ! eread "$g/HEAD" head; then
 				if [ $pcmode = yes ]; then
 					PS1="$ps1pc_start$ps1pc_end"
 				fi

From 73bf940c34fe359c27031a1144237ccaad7d2b9b Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <nicolas-brousse@users.noreply.github.com>
Date: Wed, 23 Apr 2014 19:44:59 +0200
Subject: [PATCH 0679/1378] Update brew.plugin.zsh

---
 plugins/brew/brew.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index c2e95884e..f9497aefb 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1 +1,2 @@
 alias brews='brew list -1'
+alias bubu="brew update && brew upgrade"

From f516b7c7f5e630ab04d31e5f7da5f443b21f173f Mon Sep 17 00:00:00 2001
From: drm00 <jasmintee@gmx.de>
Date: Fri, 25 Apr 2014 14:15:14 +0200
Subject: [PATCH 0680/1378] add check for colored ls on openbsd. (retry of
 #2225)

---
 lib/theme-and-appearance.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 0353f9db4..2c6d4912c 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -12,8 +12,11 @@ then
     # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
     gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
   elif [[ "$(uname -s)" == "OpenBSD" ]]; then
-    # On OpenBSD, test if "colorls" is installed (this one supports colors);
-    # otherwise, leave ls as is, because OpenBSD's ls doesn't support -G
+    # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base, 
+    # with color and multibyte support) are available from ports.  "colorls"  
+    # will be installed on purpose and can't be pulled in by installing 
+    # coreutils, so prefer it to "gls".
+    gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
     colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G'
   else
     ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'

From 33ef34baa5f703ee7fcc502eabed4f1ab968127e Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitch.special@gmail.com>
Date: Tue, 7 Jan 2014 12:47:58 -0800
Subject: [PATCH 0681/1378] Fix gmt compdef

Fix typo: gm -> gmt
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..c579d1e82 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -82,7 +82,7 @@ alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 
 alias gpoat='git push origin --all && git push origin --tags'
 alias gmt='git mergetool --no-prompt'
-compdef _git gm=git-mergetool
+compdef _git gmt=git-mergetool
 
 alias gg='git gui citool'
 alias gga='git gui citool --amend'

From 236c8de7f31a71878279ed2421bd2547ab3cdd03 Mon Sep 17 00:00:00 2001
From: Ingo Renner <ingo.renner@gmail.com>
Date: Tue, 6 May 2014 10:45:26 -0700
Subject: [PATCH 0682/1378] [FEATURE] Support Vagrant 1.6 version command

Vagrant 1.6 introduces a couple new commands, including the `version` command.
The `version` command shows the currently installed version information and
also checks for new updates available.
---
 plugins/vagrant/_vagrant | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 9af8cb036..f9aef0880 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -19,6 +19,7 @@ _1st_arguments=(
     'status:Shows the status of the current Vagrant environment.'
     'suspend:Suspends the currently running vagrant environment'
     'up:Creates the vagrant environment'
+    'version:Prints the currently installed Vagrant version and checks for new updates'
     '--help:[TASK] Describe available tasks or one specific task'
     '--version:Prints the Vagrant version information'
 )

From 38fe100efe9b7d4df87746818bae508c4c00d4a6 Mon Sep 17 00:00:00 2001
From: Ingo Renner <ingo.renner@gmail.com>
Date: Tue, 6 May 2014 10:46:55 -0700
Subject: [PATCH 0683/1378] [FEATURE] Support Vagrant Share

Vagrant 1.5 introduced Vagrant Share to allow remote access to a Vagrant
environment. This adds support for the `share` and `connect` commands.
---
 plugins/vagrant/_vagrant | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index f9aef0880..7bdfb0f1c 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -6,6 +6,7 @@
 local -a _1st_arguments
 _1st_arguments=(
     'box:Box commands'
+    'connect:Connects to a shared, remote Vagrant environment'
     'destroy:Destroys the vagrant environment'
     'halt:Halts the currently running vagrant environment'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
@@ -14,6 +15,7 @@ _1st_arguments=(
     'provision:Run the provisioner'
     'reload:Reload the vagrant environment'
     'resume:Resumes a suspend vagrant environment'
+    'share:Shares the Vagrant environment and allows remote access'
     'ssh:SSH into the currently running environment'
     'ssh-config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
     'status:Shows the status of the current Vagrant environment.'

From 7f8ee9aabe5f551a83babd4083ab6490cd324bda Mon Sep 17 00:00:00 2001
From: Ingo Renner <ingo.renner@gmail.com>
Date: Tue, 6 May 2014 10:48:49 -0700
Subject: [PATCH 0684/1378] [FEATURE] Support Vagrant Cloud commands

Vagrant 1.5 added Vagrant Cloud to share boxes. Some boxes
may be protected, the `login` command allows to access those
protected boxes from Vagrant Cloud.
---
 plugins/vagrant/_vagrant | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 7bdfb0f1c..a590b0621 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -10,6 +10,7 @@ _1st_arguments=(
     'destroy:Destroys the vagrant environment'
     'halt:Halts the currently running vagrant environment'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
+    'login:Authenticates against a Vagrant Cloud server to access protected boxes'
     'package:Packages a vagrant environment for distribution'
     'plugin:Plugin commands'
     'provision:Run the provisioner'

From 30d9952b6235694cb7fa370fcefebac623d48ce6 Mon Sep 17 00:00:00 2001
From: Ingo Renner <ingo.renner@gmail.com>
Date: Tue, 6 May 2014 10:53:12 -0700
Subject: [PATCH 0685/1378] [FEATURE] Support vagrant global-status

Vagrant 1.6 introduced the `global-status` command which allows
to get a quick overview of all active Vagrant environments for the
currently logged in user.
---
 plugins/vagrant/_vagrant | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index a590b0621..93d6c57b1 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -8,6 +8,7 @@ _1st_arguments=(
     'box:Box commands'
     'connect:Connects to a shared, remote Vagrant environment'
     'destroy:Destroys the vagrant environment'
+    'global-status:Reports the status of all active Vagrant environments on the system.'
     'halt:Halts the currently running vagrant environment'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
     'login:Authenticates against a Vagrant Cloud server to access protected boxes'

From 8ed800510262157adab151cad12959095a5a1b62 Mon Sep 17 00:00:00 2001
From: Ingo Renner <ingo@typo3.org>
Date: Thu, 15 May 2014 12:26:39 -0700
Subject: [PATCH 0686/1378] Improve consistency, remove dots at end of command
 descriptions

---
 plugins/vagrant/_vagrant | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 93d6c57b1..14f8b965c 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -8,7 +8,7 @@ _1st_arguments=(
     'box:Box commands'
     'connect:Connects to a shared, remote Vagrant environment'
     'destroy:Destroys the vagrant environment'
-    'global-status:Reports the status of all active Vagrant environments on the system.'
+    'global-status:Reports the status of all active Vagrant environments on the system'
     'halt:Halts the currently running vagrant environment'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
     'login:Authenticates against a Vagrant Cloud server to access protected boxes'
@@ -19,8 +19,8 @@ _1st_arguments=(
     'resume:Resumes a suspend vagrant environment'
     'share:Shares the Vagrant environment and allows remote access'
     'ssh:SSH into the currently running environment'
-    'ssh-config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
-    'status:Shows the status of the current Vagrant environment.'
+    'ssh-config:outputs .ssh/config valid syntax for connecting to this environment via ssh'
+    'status:Shows the status of the current Vagrant environment'
     'suspend:Suspends the currently running vagrant environment'
     'up:Creates the vagrant environment'
     'version:Prints the currently installed Vagrant version and checks for new updates'

From 2c19c0e59e6a3fd1f844ee6f5f883e199a3c1adc Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sat, 24 May 2014 08:31:59 +0200
Subject: [PATCH 0687/1378] typo, fixes #1806

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2fb8d5462..610ad34dc 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,7 +1,7 @@
 #
 # INSTRUCTIONS
 #
-#   To enabled agent forwarding support add the following to
+#   To enable agent forwarding support add the following to
 #   your .zshrc file:
 #
 #     zstyle :omz:plugins:ssh-agent agent-forwarding on

From 0b4bf905f50191c885315eec5536a973ea96b4cf Mon Sep 17 00:00:00 2001
From: Tony <zearin@gonk.net>
Date: Fri, 23 May 2014 22:06:30 -0400
Subject: [PATCH 0688/1378] Minor markup edits

---
 README.textile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.textile b/README.textile
index 4325c91eb..28bab6b2c 100644
--- a/README.textile
+++ b/README.textile
@@ -10,22 +10,22 @@ h2. Setup
 
 h3. The automatic installer... (do you trust me?)
 
-You can install this via the command line with either `curl` or `wget`.
+You can install this via the command line with either @curl@ or @wget@.
 
-h4. via `curl`
+h4. via @curl@
 
 @curl -L http://install.ohmyz.sh | sh@
 
-h4. via `wget`
+h4. via @wget@
 
 @wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
 
 h4. Optional: change the install directory
 
-The default location is `~/.oh-my-zsh` (hidden in your home directory).
+The default location is @~/.oh-my-zsh@ (hidden in your home directory).
 
 You can change the install directory with the ZSH environment variable, either
-by running `export ZSH=/your/path` before installing, or setting it before the
+by running @export ZSH=/your/path@ before installing, or setting it before the
 end of the install pipeline like this:
 
 @curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
@@ -37,7 +37,7 @@ h3. The manual way
 
   @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
 
-2. *OPTIONAL* Backup your existing ~/.zshrc file
+2. *OPTIONAL* Backup your existing @~/.zshrc@ file
 
   @cp ~/.zshrc ~/.zshrc.orig@
 
@@ -53,9 +53,9 @@ h3. The manual way
 
 h3. Problems?
 
-You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
+You _might_ need to modify your @PATH@ in @~/.zshrc@ if you're not able to find some commands after switching to _Oh My Zsh_.
 
-If you installed manually or changed the install location, check ZSH in ~/.zshrc
+If you installed manually or changed the install location, check ZSH in @~/.zshrc@
 
 h2. Usage
 
@@ -72,16 +72,16 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
 h3. Customization
 
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
-If you have many functions which go well together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
+If you have many functions which go well together you can put them as a @*.plugin.zsh@ file in the @custom/plugins/@ directory and then enable this plugin.
 If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
 
 h3. Updates
 
-By default you will be prompted to check for updates. If you would like oh-my-zsh to automatically update itself without prompting you, set the following in your ~/.zshrc
+By default you will be prompted to check for updates. If you would like oh-my-zsh to automatically update itself without prompting you, set the following in your @~/.zshrc@
 
 @DISABLE_UPDATE_PROMPT=true@
 
-To disable updates entirely, put this in your ~/.zshrc
+To disable updates entirely, put this in your @~/.zshrc@
 
 @DISABLE_AUTO_UPDATE=true@
 

From 8355233f7fc055d8446c7ebf50569202fa5bd1f5 Mon Sep 17 00:00:00 2001
From: Trevor Strieber <trevor@strieber.org>
Date: Thu, 8 May 2014 14:19:37 -0400
Subject: [PATCH 0689/1378] Fixing typo.

---
 plugins/colorize/colorize.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 0696607d9..dc0947d4f 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -1,4 +1,4 @@
-# Plugin for highligthing file content
+# Plugin for highlighting file content
 # Plugin highlights file content based on the filename extension.
 # If no highlighting method supported for given extension then it tries 
 # guess it by looking for file content.
@@ -25,4 +25,4 @@ colorize_via_pygmentize() {
             pygmentize -g "$FNAME"
         fi
     done
-}
\ No newline at end of file
+}

From 9590b96b3f0dc8e2f4a87b632ff59eab28a0081e Mon Sep 17 00:00:00 2001
From: Adam Luikart <me@adamluikart.com>
Date: Mon, 6 Feb 2012 12:22:07 -0600
Subject: [PATCH 0690/1378] Write the update file even if `CLOBBER` is unset.

---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 0f8c9c391..5c8ce3a50 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -5,7 +5,7 @@ function _current_epoch() {
 }
 
 function _update_zsh_update() {
-  echo "LAST_EPOCH=$(_current_epoch)" > ~/.zsh-update
+  echo "LAST_EPOCH=$(_current_epoch)" >! ~/.zsh-update
 }
 
 function _upgrade_zsh() {

From c1f5a1792be3f11f9b298a11232bc5913c8b71a2 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Thu, 13 Feb 2014 17:33:27 -0700
Subject: [PATCH 0691/1378] This is already done in
 lib/theme-and-appearance.zsh and supports Darwin/BSD/etc

---
 plugins/common-aliases/common-aliases.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index b19650fee..0ee17014b 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -3,7 +3,6 @@
 #
 
 # ls, the common ones I use a lot shortened for rapid fire usage
-alias ls='ls --color' #I like color
 alias l='ls -lFh'     #size,show type,human readable
 alias la='ls -lAFh'   #long list,show almost all,show type,human readable
 alias lr='ls -tRFh'   #sorted by date,recursive,show type,human readable

From 5e601d6515f9ee51c733aea71acf6757066943e2 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Thu, 13 Feb 2014 17:41:38 -0700
Subject: [PATCH 0692/1378] Fix dud alias. Switch --max-depth for just -d

As far as I can tell (tested on Linux & Darwin, BSD man page seems to agree), `-d` is pretty univerally accepted as the depth argument.  So instead of doing a test, we can just use -d and call it a day.
---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 0ee17014b..228a39da0 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -38,7 +38,7 @@ alias -g NE="2> /dev/null"
 alias -g NUL="> /dev/null 2>&1"
 alias -g P="2>&1| pygmentize -l pytb"
 
-alias dud='du --max-depth=1 -h'
+alias dud='du -d 1 -h'
 alias duf='du -sh *'
 alias fd='find . -type d -name'
 alias ff='find . -type f -name'

From 8d976e02b1da43ec74c1ca6f50584eed566ff73a Mon Sep 17 00:00:00 2001
From: Mark Feltner <feltner.mj@gmail.com>
Date: Tue, 14 Jan 2014 23:13:49 -0600
Subject: [PATCH 0693/1378] fix(tools/check_for_upgrade): Don't source profile

Reverts #2296, but mostly #1883.

There is no need to source ~/.profile when this script is read. oh-my-zsh writes no configuration data in ~/.profile.

If the user wishes to use data within ~/.profile, then they should source it in another place.

Fixes #2315
---
 tools/check_for_upgrade.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 5c8ce3a50..c5fd0cce1 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -20,8 +20,6 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
-[ -f ~/.profile ] && source ~/.profile
-
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update

From 4c64cf4a253608022caeda0f83b6ae73b7a8513c Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Wed, 9 Apr 2014 12:32:42 +0200
Subject: [PATCH 0694/1378] Replacing DISABLE_CORRECTION with ENABLE_CORRECTION
 in zshrc template

Since commands auto-correction must be explicitly enable with
the ENABLE_CORRECTION envvar, this commit replaces the unaccurate
example in the zshrc template.
---
 templates/zshrc.zsh-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5b2a6cf49..e08c13912 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -26,8 +26,8 @@ ZSH_THEME="robbyrussell"
 # Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment the following line to disable command auto-correction.
-# DISABLE_CORRECTION="true"
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"

From cd8d5c4410f96ee16a6349a0cf7bcac882e37604 Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Wed, 9 Apr 2014 18:13:19 +0200
Subject: [PATCH 0695/1378] Defining nocorrect aliases only when
 ENABLE_CORRECTION is "true"

This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.
---
 lib/correction.zsh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 47eb83b1d..35771474f 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,13 +1,13 @@
-alias man='nocorrect man'
-alias mv='nocorrect mv'
-alias mysql='nocorrect mysql'
-alias mkdir='nocorrect mkdir'
-alias gist='nocorrect gist'
-alias heroku='nocorrect heroku'
-alias ebuild='nocorrect ebuild'
-alias hpodder='nocorrect hpodder'
-alias sudo='nocorrect sudo'
-
 if [[ "$ENABLE_CORRECTION" == "true" ]]; then
+  alias man='nocorrect man'
+  alias mv='nocorrect mv'
+  alias mysql='nocorrect mysql'
+  alias mkdir='nocorrect mkdir'
+  alias gist='nocorrect gist'
+  alias heroku='nocorrect heroku'
+  alias ebuild='nocorrect ebuild'
+  alias hpodder='nocorrect hpodder'
+  alias sudo='nocorrect sudo'
+
   setopt correct_all
 fi

From b64e695b35db8bf0ff01433669a3adc4ee04341c Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Wed, 9 Apr 2014 18:16:57 +0200
Subject: [PATCH 0696/1378] Ordering nocorrect aliases alphabetically

---
 lib/correction.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 35771474f..3e1415a0b 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,12 +1,12 @@
 if [[ "$ENABLE_CORRECTION" == "true" ]]; then
-  alias man='nocorrect man'
-  alias mv='nocorrect mv'
-  alias mysql='nocorrect mysql'
-  alias mkdir='nocorrect mkdir'
+  alias ebuild='nocorrect ebuild'
   alias gist='nocorrect gist'
   alias heroku='nocorrect heroku'
-  alias ebuild='nocorrect ebuild'
   alias hpodder='nocorrect hpodder'
+  alias man='nocorrect man'
+  alias mkdir='nocorrect mkdir'
+  alias mv='nocorrect mv'
+  alias mysql='nocorrect mysql'
   alias sudo='nocorrect sudo'
 
   setopt correct_all

From c0b094cf859899bd78db43a4dc59a0ae6786d49d Mon Sep 17 00:00:00 2001
From: pangratz <cmueller.418@gmail.com>
Date: Mon, 3 Feb 2014 10:35:40 +0100
Subject: [PATCH 0697/1378] Fix function/alias naming clash between bower and
 bundle plugin

Since the `bower` plugin specifies a `bi` alias and `bundle` plugin
specifies a `bi` function, there is a name clash when using both
plugins, which results in the message "Can't 'bundle install' outside a
bundled project" when trying to execute `bower`.

This adresses #2486
---
 plugins/bundler/bundler.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 3338d78be..8571eeda3 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -3,6 +3,7 @@ alias bl="bundle list"
 alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
+alias bi="bundle_install"
 
 # The following is based on https://github.com/gma/bundler-exec
 
@@ -15,7 +16,7 @@ done
 
 ## Functions
 
-bi() {
+bundle_install() {
   if _bundler-installed && _within-bundled-project; then
     local bundler_version=`bundle version | cut -d' ' -f3`
     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then

From 3c485db8c73bfebf379f3e9382eb8f300b608bd8 Mon Sep 17 00:00:00 2001
From: r3dDoX <patrick@walther-online.ch>
Date: Sat, 24 May 2014 12:15:26 +0200
Subject: [PATCH 0698/1378] replaced hardcoded origin/{branch-name} with
 @{upstream} which gets the upstream branch since git 1.7.0

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 305a77aff..3eca8a6c6 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -54,7 +54,7 @@ git_remote_status() {
 
 # Checks if there are commits ahead from remote
 function git_prompt_ahead() {
-  if $(echo "$(command git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+  if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
     echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
 }

From 59c8fcc712556a4c0b612898073e212877c21d60 Mon Sep 17 00:00:00 2001
From: r3dDoX <patrick@walther-online.ch>
Date: Sat, 24 May 2014 12:19:46 +0200
Subject: [PATCH 0699/1378] added new function to get number of commits ahead
 of remote

---
 lib/git.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/git.zsh b/lib/git.zsh
index 3eca8a6c6..d6cee37c3 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -59,6 +59,13 @@ function git_prompt_ahead() {
   fi
 }
 
+# Gets the number of commits ahead from remote
+function git_commits_ahead() {
+  if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+    echo "$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')"
+  fi
+}
+
 # Formats prompt string for current git commit short SHA
 function git_prompt_short_sha() {
   SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"

From 1ad1c52797e99c1060301e55cb726e290a06d063 Mon Sep 17 00:00:00 2001
From: Sean McCann <sean@mudbugmedia.com>
Date: Fri, 16 May 2014 11:46:48 -0400
Subject: [PATCH 0700/1378] Move aliases to 'custom' section of .zshrc template

By convention, user-specific aliases are kept in each user's .zshrc
file. The .zshrc template provided by oh-my-zsh has an area for example
aliases, though these were being loaded before other aliases in libs, plugins,
and themes. As a result, personal aliases could be overwritten by these
other aliases as they are loaded. To make personal customization easier, the
sample aliases section of the .zshrc template has been moved to the area
dedicated for personal customization. This section of the configuration
is processed after all other items are loaded, preventing personal aliases
and exports from being inadvertently clobbered by oh-my-zsh.
---
 templates/zshrc.zsh-template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e08c13912..c77b54849 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -7,10 +7,6 @@ export ZSH=$HOME/.oh-my-zsh
 # time that oh-my-zsh is loaded.
 ZSH_THEME="robbyrussell"
 
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
@@ -72,3 +68,12 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # ssh
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"

From 514693125b12d4b4cd099dcb09174f7bfd9a5b0e Mon Sep 17 00:00:00 2001
From: r3dDoX <r3dDoX@users.noreply.github.com>
Date: Mon, 26 May 2014 10:47:51 +0200
Subject: [PATCH 0701/1378] added prefix/suffix variable for customizability

---
 lib/git.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index d6cee37c3..a52f82de0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -62,7 +62,8 @@ function git_prompt_ahead() {
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
   if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
-    echo "$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')"
+    COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')
+    echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
   fi
 }
 

From 6fc241b0d2f4690f7fd00f26eb91045a04c05fbd Mon Sep 17 00:00:00 2001
From: Frank Behrens <fbehrens@gmail.com>
Date: Fri, 18 Apr 2014 11:26:06 +0200
Subject: [PATCH 0702/1378] extract plugin will unzip *.sublime-package files

---
 plugins/extract/extract.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 7352e5bad..a6e16ddf7 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -52,7 +52,7 @@ function extract() {
       (*.xz) unxz "$1" ;;
       (*.lzma) unlzma "$1" ;;
       (*.Z) uncompress "$1" ;;
-      (*.zip|*.war|*.jar) unzip "$1" -d $extract_dir ;;
+      (*.zip|*.war|*.jar|*.sublime-package) unzip "$1" -d $extract_dir ;;
       (*.rar) unrar x -ad "$1" ;;
       (*.7z) 7za x "$1" ;;
       (*.deb)

From b7f51bbbdd9f0d9ff9ef59b559e91b916d53cdf1 Mon Sep 17 00:00:00 2001
From: Josh Datko <jbdatko@gmail.com>
Date: Tue, 27 May 2014 10:34:03 -0600
Subject: [PATCH 0703/1378] Adds itunes vol command.

Adds itunes vol, which takes an argument from 0 to 100 to set the
volume from the shell.
---
 plugins/osx/osx.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 63760b5ff..a63f0ee05 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -174,12 +174,16 @@ function itunes() {
 		next|previous)
 			opt="$opt track"
 			;;
+		vol)
+			opt="set sound volume to $1" #$1 Due to the shift
+			;;
 		""|-h|--help)
 			echo "Usage: itunes <option>"
 			echo "option:"
 			echo "\tlaunch|play|pause|stop|rewind|resume|quit"
 			echo "\tmute|unmute\tcontrol volume set"
 			echo "\tnext|previous\tplay next or previous track"
+			echo "\tvol\tSet the volume, takes an argument from 0 to 100"
 			echo "\thelp\tshow this message and exit"
 			return 0
 			;;
@@ -190,4 +194,3 @@ function itunes() {
 	esac
 	osascript -e "tell application \"iTunes\" to $opt"
 }
-

From 7bb42fb49a0dcbd0774a0e6efafe766fdfc82268 Mon Sep 17 00:00:00 2001
From: James Magnarelli <jmagnare@gmail.com>
Date: Sat, 29 Dec 2012 21:32:00 -0500
Subject: [PATCH 0704/1378] Corrected syntax error in github plugin's empty_gh
 function

---
 plugins/github/github.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 25b1a1e1b..bd69b1bd5 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -40,7 +40,7 @@ fi
 #
 # Use this when creating a new repo from scratch.
 empty_gh() { # [NAME_OF_REPO]
-    repo = $1
+    repo=$1
     ghuser=$(  git config github.user )
 
     mkdir "$repo"

From 80828cd0d3d415b49530c0f7e989f6d251427985 Mon Sep 17 00:00:00 2001
From: Andrey Koleshko <ka8725@gmail.com>
Date: Mon, 14 Jan 2013 12:46:01 +0300
Subject: [PATCH 0705/1378] Update plugins/rbenv/rbenv.plugin.zsh

Fix rbenv plugin for OS X latest homebrew
---
 plugins/rbenv/rbenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index b6795b91c..213e1beb0 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -7,7 +7,7 @@ _rbenv-from-homebrew-installed() {
 }
 
 FOUND_RBENV=0
-rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
+rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
 if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
 fi

From 6bf7f39345db64e5c37a5c5ac2e8189df0f8a8c6 Mon Sep 17 00:00:00 2001
From: Yuanxuan Wang <zellux@gmail.com>
Date: Fri, 25 Jan 2013 01:45:49 +0800
Subject: [PATCH 0706/1378] Steeef theme checks untracked files instead of
 directories

---
 themes/steeef.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index e0080b8a5..9d27410b8 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -81,7 +81,7 @@ add-zsh-hook chpwd steeef_chpwd
 function steeef_precmd {
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
         # check for untracked files or updated submodules, since vcs_info doesn't
-        if git ls-files --other --exclude-standard --directory 2> /dev/null | grep -q "."; then
+        if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
             PR_GIT_UPDATE=1
             FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
         else

From 97ab436f7f8823586fd9f3ef21ec1248abdc1262 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Fri, 2 Nov 2012 11:14:45 -0400
Subject: [PATCH 0707/1378] Fix path for colemak plugin

---
 plugins/colemak/colemak.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index 34d42c280..cb7cc5068 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,4 +19,4 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
-lesskey $ZSH_CUSTOM/plugins/colemak/colemak-less
+lesskey $ZSH/plugins/colemak/colemak-less

From 3fac127152e42a3149fa7174a0841de97f2fb82a Mon Sep 17 00:00:00 2001
From: MrTux <mrtux@ubuntu-vn.org>
Date: Tue, 14 Jan 2014 02:19:33 +0700
Subject: [PATCH 0708/1378] Correct wrong plugin file name

---
 plugins/systemadmin/{systemadmin.zsh => systemadmin.plugin.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/systemadmin/{systemadmin.zsh => systemadmin.plugin.zsh} (100%)

diff --git a/plugins/systemadmin/systemadmin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
similarity index 100%
rename from plugins/systemadmin/systemadmin.zsh
rename to plugins/systemadmin/systemadmin.plugin.zsh

From bce74975d055529cbd186782e2fd99e6da840460 Mon Sep 17 00:00:00 2001
From: Frank Louwers <frank@openminds.be>
Date: Wed, 28 May 2014 13:57:25 +0200
Subject: [PATCH 0709/1378] =?UTF-8?q?drop=20the=20foreach,=20make=20it=20e?=
 =?UTF-8?q?ven=20shorter.=20thanks=20Marc=20Cornell=C3=A0!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/pj/pj.plugin.zsh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
index dac561189..f9cbddf1a 100644
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
@@ -41,11 +41,8 @@ alias pjo="pj open"
 function _pj () {
     # might be possible to improve this using glob, without the basename trick
     typeset -a projects
-    foreach i ($PROJECT_PATHS/*)
-    do
-        projects+=(${i##*/})
-    done
-
+    projects=($PROJECT_PATHS/*)
+    projects=$projects:t 
     _arguments '*:file:($projects)'
 }
 

From 3c41da3172325d90397baed7b27b4c675def8a51 Mon Sep 17 00:00:00 2001
From: Christophe Bliard <christophe.bliard@trux.info>
Date: Tue, 9 Jul 2013 13:51:52 +0200
Subject: [PATCH 0710/1378] Update colorize.plugin.zsh

correctly detect when pygmentize is not installed
do not exit shell if when pygmentize is not installed
---
 plugins/colorize/colorize.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index dc0947d4f..11b58e69d 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -6,9 +6,9 @@
 alias colorize='colorize_via_pygmentize'
 
 colorize_via_pygmentize() {
-    if [ ! -x $(which pygmentize) ]; then
-        echo package \'pygmentize\' is not installed!
-        exit -1
+    if [ ! -x "$(which pygmentize)" ]; then
+        echo "package \'pygmentize\' is not installed!"
+        return -1
     fi
 
     if [ $# -eq 0 ]; then

From b5692730128f84da8cc03567099f58df2baf546b Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Sat, 29 Jun 2013 13:09:37 +0300
Subject: [PATCH 0711/1378] Removed unnecessary execute permissions for some
 plugins

---
 plugins/bower/_bower               | 0
 plugins/grails/grails.plugin.zsh   | 0
 plugins/jruby/jruby.plugin.zsh     | 0
 plugins/sublime/sublime.plugin.zsh | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/bower/_bower
 mode change 100755 => 100644 plugins/grails/grails.plugin.zsh
 mode change 100755 => 100644 plugins/jruby/jruby.plugin.zsh
 mode change 100755 => 100644 plugins/sublime/sublime.plugin.zsh

diff --git a/plugins/bower/_bower b/plugins/bower/_bower
old mode 100755
new mode 100644
diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/jruby/jruby.plugin.zsh b/plugins/jruby/jruby.plugin.zsh
old mode 100755
new mode 100644
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
old mode 100755
new mode 100644

From 76e23e62c659fd61cf43b5e2cde350fd1d434d43 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 29 May 2014 10:58:51 +0200
Subject: [PATCH 0712/1378] Fix permissions on wd plugin continuating #1923

---
 plugins/wd/wd.plugin.zsh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/wd/wd.plugin.zsh

diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
old mode 100755
new mode 100644

From ac1a321abefb73f1eeb6c9ec76dd14a062482ac6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 29 May 2014 11:06:02 +0200
Subject: [PATCH 0713/1378] add gfa alias for recursive formatting inspired
 from #2018

---
 plugins/golang/golang.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 18bcaaff2..f2be6ca9c 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -158,3 +158,6 @@ __go_tool_complete() {
 }
 
 compdef __go_tool_complete go
+
+# aliases
+alias gfa='go fmt . ./...'

From b1c97bc77ef6e6922c6aed5bb7a2a86506407efc Mon Sep 17 00:00:00 2001
From: Doug Jones <djones@squarespace.com>
Date: Mon, 5 Aug 2013 09:54:49 -0400
Subject: [PATCH 0714/1378] Fix comparison used to determine if the cache is
 outdated.

---
 plugins/gradle/gradle.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 9229512f7..97bf50b43 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -60,7 +60,7 @@ function in_gradle() {
 ############################################################################
 _gradle_does_task_list_need_generating () {
   [ ! -f .gradletasknamecache ] && return 0;
-  [ .gradletasknamecache -nt build.gradle ] && return 0;
+  [ build.gradle -nt .gradletasknamecache ] && return 0;
   return 1;
 }
 

From 3cdfdad28a1b7efbcc1cd1282e7811d80f50a730 Mon Sep 17 00:00:00 2001
From: Yachi Lo <yaachi@gmail.com>
Date: Wed, 28 May 2014 16:05:07 +0800
Subject: [PATCH 0715/1378] use ls instead of find to avoid incompatibility
 with gnu find

---
 plugins/xcode/xcode.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 4816ab0ed..e59bee8c7 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -1,6 +1,6 @@
 #xc function courtesy of http://gist.github.com/subdigital/5420709
 function xc {
-  xcode_proj=`find . -name "*.xc*" -d 1 | sort -r | head -1`
+  xcode_proj=`ls | grep "\.xc" | sort -r | head -1`
   if [[ `echo -n $xcode_proj | wc -m` == 0 ]]
   then
     echo "No xcworkspace/xcodeproj file found in the current directory."

From 7297b446b87ae26e410b54b7398111a76f1ccbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dra=C5=BEen=20Lu=C4=8Danin?= <kermit666@gmail.com>
Date: Sat, 21 Dec 2013 16:21:34 +0100
Subject: [PATCH 0716/1378] too many plugins = slow init warning

---
 templates/zshrc.zsh-template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c77b54849..a12eca2a0 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -44,6 +44,7 @@ ZSH_THEME="robbyrussell"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
 plugins=(git)
 
 source $ZSH/oh-my-zsh.sh

From e5ed07e2b5740346d2a32b3a47204612d8808723 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 4 Jun 2014 12:36:34 +0200
Subject: [PATCH 0717/1378] specify python2 in shebang as suggested in #2382

---
 plugins/git-prompt/gitstatus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 256841432..c665a9ee1 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: UTF-8 -*-
 from subprocess import Popen, PIPE
 import re

From de41dee9e462e2a04cbe4658a002812d71f9e3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Macias?= <jerome.macias@gmail.com>
Date: Tue, 10 Dec 2013 10:03:46 +0100
Subject: [PATCH 0718/1378] Add alias for container:debug task

---
 plugins/symfony2/symfony2.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 0d2bb68c3..4c07349a4 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -17,5 +17,6 @@ compdef _symfony2 sf
 alias sf='php app/console'
 alias sfcl='php app/console cache:clear'
 alias sfroute='php app/console router:debug'
+alias sfcontainer='php app/console container:debug'
 alias sfgb='php app/console generate:bundle'
 

From a9e1d9aa890c18ea3c3250442e7d9de555633237 Mon Sep 17 00:00:00 2001
From: "n.st" <git@n-st.de>
Date: Wed, 4 Jun 2014 19:26:46 +0200
Subject: [PATCH 0719/1378] Cancel upgrade if $ZSH is not writable from #2360

---
 tools/check_for_upgrade.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index c5fd0cce1..8b8ecae03 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -20,6 +20,12 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
+[ -f ~/.profile ] && source ~/.profile
+
+# Cancel upgrade if the current user doesn't have write permissions for the
+# oh-my-zsh directory.
+[[ -w "$ZSH" ]] || return 0
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update

From 12324856c6645c2e71c4dfcf5ef12313c989b387 Mon Sep 17 00:00:00 2001
From: Andrea De Pasquale <andrea@de-pasquale.name>
Date: Tue, 24 Sep 2013 11:11:35 +0200
Subject: [PATCH 0720/1378] Added ssh-like mosh window title

Display the hostname when running Mosh (http://mosh.mit.edu/).
Same thing as displaying "hostname" when running "ssh hostname".
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 9c0a430fb..30410c1fd 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,7 +28,7 @@ function omz_termsupport_preexec {
   setopt extended_glob
 
   # cmd name only, or if this is sudo or ssh, the next cmd
-  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%}
+  local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}
   local LINE="${2:gs/%/%%}"
 
   title '$CMD' '%100>...>$LINE%<<'

From fbf4a78acfd9ad7b96e8add7990d871ba50b866e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 2 Jun 2014 12:42:21 +0200
Subject: [PATCH 0721/1378] Show user prompt in gnzh theme regardless of UID

Fixes #2008.
---
 themes/gnzh.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 33f187bc6..0519fbefb 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -14,11 +14,11 @@ eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
 eval PR_BOLD="%{$terminfo[bold]%}"
 
 # Check the UID
-if [[ $UID -ge 1000 ]]; then # normal user
+if [[ $UID -ne 0 ]]; then # normal user
   eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}'
   eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
   local PR_PROMPT='$PR_NO_COLOR➤ $PR_NO_COLOR'
-elif [[ $UID -eq 0 ]]; then # root
+else # root
   eval PR_USER='${PR_RED}%n${PR_NO_COLOR}'
   eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
   local PR_PROMPT='$PR_RED➤ $PR_NO_COLOR'

From 67d74cbc2d057ef8ae2d237f739b53f52919567f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Wed, 23 Apr 2014 00:34:22 -0400
Subject: [PATCH 0722/1378] Don't override ZSH_COMPDUMP if already set.

This allows customization via .zshenv if wanted. This is helpful
for zsh developers and people who want to move it out of $HOME
---
 oh-my-zsh.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 3c0f4f8f5..c217b91bb 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -46,7 +46,9 @@ else
 fi
 
 # Save the location of the current completion dump file.
-ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+if [ -z "$ZSH_COMPDUMP" ]; then
+  ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+fi
 
 # Load and run compinit
 autoload -U compinit

From f82092a0e78985287c6eb1746234db688bb1a98f Mon Sep 17 00:00:00 2001
From: Chris Krycho <github@chriskrycho.com>
Date: Fri, 18 Oct 2013 09:23:27 -0400
Subject: [PATCH 0723/1378] Add a command to show unresolve files in merge

---
 plugins/mercurial/mercurial.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 2e99a12fb..ff95d5e40 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -16,6 +16,8 @@ alias hgs='hg status'
 alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n" '
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
+# list unresolved files (since hg does not list unmerged files in the status command)
+alias hgun='hg resolve --list'
 
 function in_hg() {
   if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then

From f7948ace66dd541e5b60666d840cce6b6d95f0e6 Mon Sep 17 00:00:00 2001
From: Tim Kelty <timkelty@gmail.com>
Date: Mon, 16 Dec 2013 10:26:18 -0500
Subject: [PATCH 0724/1378] Adding compression to rsync commands

This speeds up transfers significantly. No reason not to include it as far as I know.
---
 plugins/rsync/rsync.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/rsync/rsync.plugin.zsh b/plugins/rsync/rsync.plugin.zsh
index 33a31a5c1..1a3bb4cc3 100644
--- a/plugins/rsync/rsync.plugin.zsh
+++ b/plugins/rsync/rsync.plugin.zsh
@@ -1,4 +1,4 @@
-alias rsync-copy="rsync -av --progress -h"
-alias rsync-move="rsync -av --progress -h --remove-source-files"
-alias rsync-update="rsync -avu --progress -h"
-alias rsync-synchronize="rsync -avu --delete --progress -h"
+alias rsync-copy="rsync -avz --progress -h"
+alias rsync-move="rsync -avz --progress -h --remove-source-files"
+alias rsync-update="rsync -avzu --progress -h"
+alias rsync-synchronize="rsync -avzu --delete --progress -h"

From e04d3e0563217c2beef475b4eecf90bde4c8193a Mon Sep 17 00:00:00 2001
From: Julia Medina <a.julia.medina@gmail.com>
Date: Fri, 25 Oct 2013 20:34:23 -0300
Subject: [PATCH 0725/1378] Add startproject to django command completions

---
 plugins/django/django.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 9d898edca..aaaa7d21d 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -141,6 +141,7 @@ _managepy-sqlinitialdata(){}
 _managepy-sqlreset(){}
 _managepy-sqlsequencereset(){}
 _managepy-startapp(){}
+_managepy-startproject(){}
 
 _managepy-syncdb() {
   _arguments -s : \
@@ -198,6 +199,7 @@ _managepy-commands() {
     'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
     'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
     "startapp:Creates a Django app directory structure for the given app name in this project's directory."
+    "startproject:Creates a Django project directory structure for the given project name in this current directory."
     "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
     'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
     'testserver:Runs a development server with data from the given fixture(s).'

From 99c9dbed4722c66428323401d560aaa521c6932f Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Tue, 3 Dec 2013 10:24:32 +0100
Subject: [PATCH 0726/1378] New alias for repo: ru and rst

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 plugins/repo/repo.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/repo/repo.plugin.zsh b/plugins/repo/repo.plugin.zsh
index d690a9d22..33f4195c7 100644
--- a/plugins/repo/repo.plugin.zsh
+++ b/plugins/repo/repo.plugin.zsh
@@ -10,3 +10,9 @@ compdef _repo rs='repo sync'
 
 alias rsrra='repo sync ; repo rebase --auto-stash'
 compdef _repo rsrra='repo sync ; repo rebase --auto-stash'
+
+alias ru='repo upload'
+compdef _repo ru='repo upload'
+
+alias rst='repo status'
+compdef _repo rst='repo status'

From aee8877988e4cf2de907550e2561a4793fa00496 Mon Sep 17 00:00:00 2001
From: Menno Pruijssers <menno@wyzers.com>
Date: Mon, 9 Sep 2013 10:51:07 +0200
Subject: [PATCH 0727/1378] fixed rvm warning

---
 themes/Soliah.zsh-theme | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 237e70fda..070c54981 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -32,11 +32,12 @@ function check_git_prompt_info() {
 
 # Determine if we are using a gemset.
 function rvm_gemset() {
-    GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
-    if [[ -n $GEMSET ]]; then
-        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
-    fi 
-
+    if hash rvm 2>/dev/null; then
+        GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
+        if [[ -n $GEMSET ]]; then
+            echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
+        fi 
+    fi
 }
 
 # Determine the time since last commit. If branch is clean,

From 519d37fc389e1f2faec6fd34cb8ee64a35fa154e Mon Sep 17 00:00:00 2001
From: Pieter Kokx <pieter@kokx.nl>
Date: Fri, 8 Nov 2013 10:11:38 +0100
Subject: [PATCH 0728/1378] Vundle plugin now works with submodules.

If you are using a submodule, ~/.vim/bundle/vundle/.git is a file,
not a directory. So I changed the test for that.
---
 plugins/vundle/vundle.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 936c8d7d2..830774fe3 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -4,7 +4,7 @@ function vundle-init () {
     mkdir -p ~/.vim/bundle/vundle/
   fi
 
-  if [ ! -d ~/.vim/bundle/vundle/.git/ ]
+  if [ ! -d ~/.vim/bundle/vundle/.git ] && [ ! -f ~/.vim/bundle/vundle/.git ]
   then
     git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
     echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n"

From 50fe95a69e471345f20fb88ae62e14ada43c134a Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Fri, 25 Oct 2013 16:17:21 -0700
Subject: [PATCH 0729/1378] Autojump plugin: check user local installation
 first.

Users may install their own version of autojump to override the system
installed version.
---
 plugins/autojump/autojump.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 0aa14959d..50a694764 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,5 +1,7 @@
 if [ $commands[autojump] ]; then # check if autojump is installed
-  if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+  if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
+    . $HOME/.autojump/etc/profile.d/autojump.zsh
+  elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
     . /etc/profile.d/autojump.zsh
@@ -7,8 +9,6 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /etc/profile.d/autojump.sh
   elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
     . /usr/local/share/autojump/autojump.zsh
-  elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
-    . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew

From d3acea3965ebe13d6ed9885984ba8f5cc8ab4936 Mon Sep 17 00:00:00 2001
From: Zbigniew Siciarz <antyqjon@gmail.com>
Date: Sat, 14 Dec 2013 18:57:46 +0100
Subject: [PATCH 0730/1378] Updated cabal plugin with Cabal 1.18 commands.

---
 plugins/cabal/cabal.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index 9f76add7a..acd7f8287 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -23,6 +23,7 @@ function _cabal_commands() {
           "copy:Copy teh files into the install locations"
           "configure:Prepare to build the package"
           "fetch:Downloads packages for later installation"
+          "get:Gets a package's source code"
           "haddock:Generate HAddock HTML documentation"
           "help:Help about commands"
           "hscolour:Generate HsColour colourised code, in HTML format"
@@ -31,7 +32,10 @@ function _cabal_commands() {
           "install:Installs a list of packages"
           "list:List packages matching a search string"
           "register:Register this package with the compiler"
+          "repl:Open an interpreter session for the given target"
           "report:Upload build reports to a remote server"
+          "run:Runs the compiled executable"
+          "sandbox:Create/modify/delete a sandbox"
           "sdist:Generate a source distribution file (.tar.gz)"
           "test:Run the test suite, if any (configure with UserHooks)"
           "unpack:Unpacks packages for user inspection"

From 859a37d4f14838b20d09b8d7814f270d9b54b8e5 Mon Sep 17 00:00:00 2001
From: Zbigniew Siciarz <antyqjon@gmail.com>
Date: Sun, 8 Jun 2014 12:04:52 +0200
Subject: [PATCH 0731/1378] Fixed typo in cabal plugin.

---
 plugins/cabal/cabal.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index acd7f8287..3e611ddcc 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -20,7 +20,7 @@ function _cabal_commands() {
           "build:Make this package ready for installation"
           "check:Check the package for common mistakes"
           "clean:Clean up after a build"
-          "copy:Copy teh files into the install locations"
+          "copy:Copy the files into the install locations"
           "configure:Prepare to build the package"
           "fetch:Downloads packages for later installation"
           "get:Gets a package's source code"

From 1ab0f771bc85bbdd86d14e616281cc138c3afe91 Mon Sep 17 00:00:00 2001
From: Zbigniew Siciarz <antyqjon@gmail.com>
Date: Sun, 8 Jun 2014 12:08:02 +0200
Subject: [PATCH 0732/1378] Updated cabal commands for Cabal 1.20

---
 plugins/cabal/cabal.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index 3e611ddcc..b59438f98 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -17,14 +17,15 @@ function _cabal_commands() {
       subcommand)
         subcommands=(
           "bench:Run the benchmark, if any (configure with UserHooks)"
-          "build:Make this package ready for installation"
+          "build:Compile all targets or specific target."
           "check:Check the package for common mistakes"
           "clean:Clean up after a build"
           "copy:Copy the files into the install locations"
           "configure:Prepare to build the package"
+          "exec:Run a command with the cabal environment"
           "fetch:Downloads packages for later installation"
           "get:Gets a package's source code"
-          "haddock:Generate HAddock HTML documentation"
+          "haddock:Generate Haddock HTML documentation"
           "help:Help about commands"
           "hscolour:Generate HsColour colourised code, in HTML format"
           "info:Display detailed information about a particular package"

From 999bd355f75f699fc227af025d7f7d508685f7de Mon Sep 17 00:00:00 2001
From: Clemens Werther <cl3m3ns@gmail.com>
Date: Fri, 3 Jan 2014 14:43:31 +0100
Subject: [PATCH 0733/1378] fix root mode not working in bureau

---
 themes/bureau.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 4d9cae0cc..443d1d5ee 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -70,7 +70,7 @@ bureau_git_prompt () {
 
 _PATH="%{$fg_bold[white]%}%~%{$reset_color%}"
 
-if [[ "%#" == "#" ]]; then
+if [[ $EUID -eq 0 ]]; then
   _USERNAME="%{$fg_bold[red]%}%n"
   _LIBERTY="%{$fg[red]%}#"
 else

From eb06484d4f3124a4fa922c25540fa80885fc35b5 Mon Sep 17 00:00:00 2001
From: fallwith <fallwith@gmail.com>
Date: Sat, 18 Jan 2014 20:26:21 -0800
Subject: [PATCH 0734/1378] added emoji plugin to make it easy to display emoji
 characters in the terminal

---
 plugins/emoji/emoji.plugin.zsh | 1097 ++++++++++++++++++++++++++++++++
 1 file changed, 1097 insertions(+)
 create mode 100644 plugins/emoji/emoji.plugin.zsh

diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
new file mode 100644
index 000000000..be761871e
--- /dev/null
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -0,0 +1,1097 @@
+# Make emoji available within the ZSH terminal
+#
+# To output a specific emoji, use:
+#    $> echo $emoji[<name>]
+#    ex: $> echo $emoji[mouse_face]
+#
+# To output a random emoji, use:
+#    $> random_emoji
+#    $> random_emoji_fruit
+#    $> random_emoji_animal
+#    $> random_emoji_vehicle
+#    $> random_emoji_face
+#
+# To list all available emoji with names, use:
+#    $> display_all_emoji
+#    $> display_emoji_fruits
+#    $> display_emoji_animals
+#    $> display_emoji_vehicles
+#    $> display_emoji_faces
+#
+# To use an emoji in a prompt:
+#    PROMPT='$(echo $emoji[penguin])  > '
+#    PROMPT='$(random_emoji_fruit)  > '
+#    eval surfer=$(echo $emoji[surfer])
+#    PROMPT='$surfer  > '
+#
+# emoji codes sourced from http://apps.timwhitlock.info/emoji/tables/unicode
+
+typeset -A emoji
+emoji[grinning_face_with_smiling_eyes]='\xF0\x9F\x98\x81'
+emoji[face_with_tears_of_joy]='\xF0\x9F\x98\x82'
+emoji[smiling_face_with_open_mouth]='\xF0\x9F\x98\x83'
+emoji[smiling_face_with_open_mouth_and_smiling_eyes]='\xF0\x9F\x98\x84'
+emoji[smiling_face_with_open_mouth_and_cold_sweat]='\xF0\x9F\x98\x85'
+emoji[smiling_face_with_open_mouth_and_tightly_closed_eyes]='\xF0\x9F\x98\x86'
+emoji[winking_face]='\xF0\x9F\x98\x89'
+emoji[smiling_face_with_smiling_eyes]='\xF0\x9F\x98\x8A'
+emoji[face_savouring_delicious_food]='\xF0\x9F\x98\x8B'
+emoji[relieved_face]='\xF0\x9F\x98\x8C'
+emoji[smiling_face_with_heart_shaped_eyes]='\xF0\x9F\x98\x8D'
+emoji[smirking_face]='\xF0\x9F\x98\x8F'
+emoji[unamused_face]='\xF0\x9F\x98\x92'
+emoji[face_with_cold_sweat]='\xF0\x9F\x98\x93'
+emoji[pensive_face]='\xF0\x9F\x98\x94'
+emoji[confounded_face]='\xF0\x9F\x98\x96'
+emoji[face_throwing_a_kiss]='\xF0\x9F\x98\x98'
+emoji[kissing_face_with_closed_eyes]='\xF0\x9F\x98\x9A'
+emoji[face_with_stuck_out_tongue_and_winking_eye]='\xF0\x9F\x98\x9C'
+emoji[face_with_stuck_out_tongue_and_tightly_closed_eyes]='\xF0\x9F\x98\x9D'
+emoji[disappointed_face]='\xF0\x9F\x98\x9E'
+emoji[angry_face]='\xF0\x9F\x98\xA0'
+emoji[pouting_face]='\xF0\x9F\x98\xA1'
+emoji[crying_face]='\xF0\x9F\x98\xA2'
+emoji[persevering_face]='\xF0\x9F\x98\xA3'
+emoji[face_with_look_of_triumph]='\xF0\x9F\x98\xA4'
+emoji[disappointed_but_relieved_face]='\xF0\x9F\x98\xA5'
+emoji[fearful_face]='\xF0\x9F\x98\xA8'
+emoji[weary_face]='\xF0\x9F\x98\xA9'
+emoji[sleepy_face]='\xF0\x9F\x98\xAA'
+emoji[tired_face]='\xF0\x9F\x98\xAB'
+emoji[loudly_crying_face]='\xF0\x9F\x98\xAD'
+emoji[face_with_open_mouth_and_cold_sweat]='\xF0\x9F\x98\xB0'
+emoji[face_screaming_in_fear]='\xF0\x9F\x98\xB1'
+emoji[astonished_face]='\xF0\x9F\x98\xB2'
+emoji[flushed_face]='\xF0\x9F\x98\xB3'
+emoji[dizzy_face]='\xF0\x9F\x98\xB5'
+emoji[face_with_medical_mask]='\xF0\x9F\x98\xB7'
+emoji[grinning_cat_face_with_smiling_eyes]='\xF0\x9F\x98\xB8'
+emoji[cat_face_with_tears_of_joy]='\xF0\x9F\x98\xB9'
+emoji[smiling_cat_face_with_open_mouth]='\xF0\x9F\x98\xBA'
+emoji[smiling_cat_face_with_heart_shaped_eyes]='\xF0\x9F\x98\xBB'
+emoji[cat_face_with_wry_smile]='\xF0\x9F\x98\xBC'
+emoji[kissing_cat_face_with_closed_eyes]='\xF0\x9F\x98\xBD'
+emoji[pouting_cat_face]='\xF0\x9F\x98\xBE'
+emoji[crying_cat_face]='\xF0\x9F\x98\xBF'
+emoji[weary_cat_face]='\xF0\x9F\x99\x80'
+emoji[face_with_no_good_gesture]='\xF0\x9F\x99\x85'
+emoji[face_with_ok_gesture]='\xF0\x9F\x99\x86'
+emoji[person_bowing_deeply]='\xF0\x9F\x99\x87'
+emoji[see_no_evil_monkey]='\xF0\x9F\x99\x88'
+emoji[hear_no_evil_monkey]='\xF0\x9F\x99\x89'
+emoji[speak_no_evil_monkey]='\xF0\x9F\x99\x8A'
+emoji[happy_person_raising_one_hand]='\xF0\x9F\x99\x8B'
+emoji[person_raising_both_hands_in_celebration]='\xF0\x9F\x99\x8C'
+emoji[person_frowning]='\xF0\x9F\x99\x8D'
+emoji[person_with_pouting_face]='\xF0\x9F\x99\x8E'
+emoji[person_with_folded_hands]='\xF0\x9F\x99\x8F'
+emoji[black_scissors]='\xE2\x9C\x82'
+emoji[white_heavy_check_mark]='\xE2\x9C\x85'
+emoji[airplane]='\xE2\x9C\x88'
+emoji[envelope]='\xE2\x9C\x89'
+emoji[raised_fist]='\xE2\x9C\x8A'
+emoji[raised_hand]='\xE2\x9C\x8B'
+emoji[victory_hand]='\xE2\x9C\x8C'
+emoji[pencil]='\xE2\x9C\x8F'
+emoji[black_nib]='\xE2\x9C\x92'
+emoji[heavy_check_mark]='\xE2\x9C\x94'
+emoji[heavy_multiplication_x]='\xE2\x9C\x96'
+emoji[sparkles]='\xE2\x9C\xA8'
+emoji[eight_spoked_asterisk]='\xE2\x9C\xB3'
+emoji[eight_pointed_black_star]='\xE2\x9C\xB4'
+emoji[snowflake]='\xE2\x9D\x84'
+emoji[sparkle]='\xE2\x9D\x87'
+emoji[cross_mark]='\xE2\x9D\x8C'
+emoji[negative_squared_cross_mark]='\xE2\x9D\x8E'
+emoji[black_question_mark_ornament]='\xE2\x9D\x93'
+emoji[white_question_mark_ornament]='\xE2\x9D\x94'
+emoji[white_exclamation_mark_ornament]='\xE2\x9D\x95'
+emoji[heavy_exclamation_mark_symbol]='\xE2\x9D\x97'
+emoji[heavy_black_heart]='\xE2\x9D\xA4'
+emoji[heavy_plus_sign]='\xE2\x9E\x95'
+emoji[heavy_minus_sign]='\xE2\x9E\x96'
+emoji[heavy_division_sign]='\xE2\x9E\x97'
+emoji[black_rightwards_arrow]='\xE2\x9E\xA1'
+emoji[curly_loop]='\xE2\x9E\xB0'
+emoji[rocket]='\xF0\x9F\x9A\x80'
+emoji[railway_car]='\xF0\x9F\x9A\x83'
+emoji[high_speed_train]='\xF0\x9F\x9A\x84'
+emoji[high_speed_train_with_bullet_nose]='\xF0\x9F\x9A\x85'
+emoji[metro]='\xF0\x9F\x9A\x87'
+emoji[station]='\xF0\x9F\x9A\x89'
+emoji[bus]='\xF0\x9F\x9A\x8C'
+emoji[bus_stop]='\xF0\x9F\x9A\x8F'
+emoji[ambulance]='\xF0\x9F\x9A\x91'
+emoji[fire_engine]='\xF0\x9F\x9A\x92'
+emoji[police_car]='\xF0\x9F\x9A\x93'
+emoji[taxi]='\xF0\x9F\x9A\x95'
+emoji[automobile]='\xF0\x9F\x9A\x97'
+emoji[recreational_vehicle]='\xF0\x9F\x9A\x99'
+emoji[delivery_truck]='\xF0\x9F\x9A\x9A'
+emoji[ship]='\xF0\x9F\x9A\xA2'
+emoji[speedboat]='\xF0\x9F\x9A\xA4'
+emoji[horizontal_traffic_light]='\xF0\x9F\x9A\xA5'
+emoji[construction_sign]='\xF0\x9F\x9A\xA7'
+emoji[police_cars_revolving_light]='\xF0\x9F\x9A\xA8'
+emoji[triangular_flag_on_post]='\xF0\x9F\x9A\xA9'
+emoji[door]='\xF0\x9F\x9A\xAA'
+emoji[no_entry_sign]='\xF0\x9F\x9A\xAB'
+emoji[smoking_symbol]='\xF0\x9F\x9A\xAC'
+emoji[no_smoking_symbol]='\xF0\x9F\x9A\xAD'
+emoji[bicycle]='\xF0\x9F\x9A\xB2'
+emoji[pedestrian]='\xF0\x9F\x9A\xB6'
+emoji[mens_symbol]='\xF0\x9F\x9A\xB9'
+emoji[womens_symbol]='\xF0\x9F\x9A\xBA'
+emoji[restroom]='\xF0\x9F\x9A\xBB'
+emoji[baby_symbol]='\xF0\x9F\x9A\xBC'
+emoji[toilet]='\xF0\x9F\x9A\xBD'
+emoji[water_closet]='\xF0\x9F\x9A\xBE'
+emoji[bath]='\xF0\x9F\x9B\x80'
+emoji[circled_latin_capital_letter_m]='\xE2\x93\x82'
+emoji[negative_squared_latin_capital_letter_a]='\xF0\x9F\x85\xB0'
+emoji[negative_squared_latin_capital_letter_b]='\xF0\x9F\x85\xB1'
+emoji[negative_squared_latin_capital_letter_o]='\xF0\x9F\x85\xBE'
+emoji[negative_squared_latin_capital_letter_p]='\xF0\x9F\x85\xBF'
+emoji[negative_squared_ab]='\xF0\x9F\x86\x8E'
+emoji[squared_cl]='\xF0\x9F\x86\x91'
+emoji[squared_cool]='\xF0\x9F\x86\x92'
+emoji[squared_free]='\xF0\x9F\x86\x93'
+emoji[squared_id]='\xF0\x9F\x86\x94'
+emoji[squared_new]='\xF0\x9F\x86\x95'
+emoji[squared_ng]='\xF0\x9F\x86\x96'
+emoji[squared_ok]='\xF0\x9F\x86\x97'
+emoji[squared_sos]='\xF0\x9F\x86\x98'
+emoji[squared_up_with_exclamation_mark]='\xF0\x9F\x86\x99'
+emoji[squared_vs]='\xF0\x9F\x86\x9A'
+emoji[regional_indicator_symbol_letter_d_regional_indicator_symbol_letter_e]='\xF0\x9F\x87\xA9\xF0\x9F\x87\xAA'
+emoji[regional_indicator_symbol_letter_g_regional_indicator_symbol_letter_b]='\xF0\x9F\x87\xAC\xF0\x9F\x87\xA7'
+emoji[regional_indicator_symbol_letter_c_regional_indicator_symbol_letter_n]='\xF0\x9F\x87\xA8\xF0\x9F\x87\xB3'
+emoji[regional_indicator_symbol_letter_j_regional_indicator_symbol_letter_p]='\xF0\x9F\x87\xAF\xF0\x9F\x87\xB5'
+emoji[regional_indicator_symbol_letter_k_regional_indicator_symbol_letter_r]='\xF0\x9F\x87\xB0\xF0\x9F\x87\xB7'
+emoji[regional_indicator_symbol_letter_f_regional_indicator_symbol_letter_r]='\xF0\x9F\x87\xAB\xF0\x9F\x87\xB7'
+emoji[regional_indicator_symbol_letter_e_regional_indicator_symbol_letter_s]='\xF0\x9F\x87\xAA\xF0\x9F\x87\xB8'
+emoji[regional_indicator_symbol_letter_i_regional_indicator_symbol_letter_t]='\xF0\x9F\x87\xAE\xF0\x9F\x87\xB9'
+emoji[regional_indicator_symbol_letter_u_regional_indicator_symbol_letter_s]='\xF0\x9F\x87\xBA\xF0\x9F\x87\xB8'
+emoji[regional_indicator_symbol_letter_r_regional_indicator_symbol_letter_u]='\xF0\x9F\x87\xB7\xF0\x9F\x87\xBA'
+emoji[squared_katakana_koko]='\xF0\x9F\x88\x81'
+emoji[squared_katakana_sa]='\xF0\x9F\x88\x82'
+emoji[squared_cjk_unified_ideograph_7121]='\xF0\x9F\x88\x9A'
+emoji[squared_cjk_unified_ideograph_6307]='\xF0\x9F\x88\xAF'
+emoji[squared_cjk_unified_ideograph_7981]='\xF0\x9F\x88\xB2'
+emoji[squared_cjk_unified_ideograph_7a7a]='\xF0\x9F\x88\xB3'
+emoji[squared_cjk_unified_ideograph_5408]='\xF0\x9F\x88\xB4'
+emoji[squared_cjk_unified_ideograph_6e80]='\xF0\x9F\x88\xB5'
+emoji[squared_cjk_unified_ideograph_6709]='\xF0\x9F\x88\xB6'
+emoji[squared_cjk_unified_ideograph_6708]='\xF0\x9F\x88\xB7'
+emoji[squared_cjk_unified_ideograph_7533]='\xF0\x9F\x88\xB8'
+emoji[squared_cjk_unified_ideograph_5272]='\xF0\x9F\x88\xB9'
+emoji[squared_cjk_unified_ideograph_55b6]='\xF0\x9F\x88\xBA'
+emoji[circled_ideograph_advantage]='\xF0\x9F\x89\x90'
+emoji[circled_ideograph_accept]='\xF0\x9F\x89\x91'
+emoji[copyright_sign]='\xC2\xA9'
+emoji[registered_sign]='\xC2\xAE'
+emoji[double_exclamation_mark]='\xE2\x80\xBC'
+emoji[exclamation_question_mark]='\xE2\x81\x89'
+emoji[digit_eight_combining_enclosing_keycap]='\x38\xE2\x83\xA3'
+emoji[digit_nine_combining_enclosing_keycap]='\x39\xE2\x83\xA3'
+emoji[digit_seven_combining_enclosing_keycap]='\x37\xE2\x83\xA3'
+emoji[digit_six_combining_enclosing_keycap]='\x36\xE2\x83\xA3'
+emoji[digit_one_combining_enclosing_keycap]='\x31\xE2\x83\xA3'
+emoji[digit_zero_combining_enclosing_keycap]='\x30\xE2\x83\xA3'
+emoji[digit_two_combining_enclosing_keycap]='\x32\xE2\x83\xA3'
+emoji[digit_three_combining_enclosing_keycap]='\x33\xE2\x83\xA3'
+emoji[digit_five_combining_enclosing_keycap]='\x35\xE2\x83\xA3'
+emoji[digit_four_combining_enclosing_keycap]='\x34\xE2\x83\xA3'
+emoji[number_sign_combining_enclosing_keycap]='\x23\xE2\x83\xA3'
+emoji[trade_mark_sign]='\xE2\x84\xA2'
+emoji[information_source]='\xE2\x84\xB9'
+emoji[left_right_arrow]='\xE2\x86\x94'
+emoji[up_down_arrow]='\xE2\x86\x95'
+emoji[north_west_arrow]='\xE2\x86\x96'
+emoji[north_east_arrow]='\xE2\x86\x97'
+emoji[south_east_arrow]='\xE2\x86\x98'
+emoji[south_west_arrow]='\xE2\x86\x99'
+emoji[leftwards_arrow_with_hook]='\xE2\x86\xA9'
+emoji[rightwards_arrow_with_hook]='\xE2\x86\xAA'
+emoji[watch]='\xE2\x8C\x9A'
+emoji[hourglass]='\xE2\x8C\x9B'
+emoji[black_right_pointing_double_triangle]='\xE2\x8F\xA9'
+emoji[black_left_pointing_double_triangle]='\xE2\x8F\xAA'
+emoji[black_up_pointing_double_triangle]='\xE2\x8F\xAB'
+emoji[black_down_pointing_double_triangle]='\xE2\x8F\xAC'
+emoji[alarm_clock]='\xE2\x8F\xB0'
+emoji[hourglass_with_flowing_sand]='\xE2\x8F\xB3'
+emoji[black_small_square]='\xE2\x96\xAA'
+emoji[white_small_square]='\xE2\x96\xAB'
+emoji[black_right_pointing_triangle]='\xE2\x96\xB6'
+emoji[black_left_pointing_triangle]='\xE2\x97\x80'
+emoji[white_medium_square]='\xE2\x97\xBB'
+emoji[black_medium_square]='\xE2\x97\xBC'
+emoji[white_medium_small_square]='\xE2\x97\xBD'
+emoji[black_medium_small_square]='\xE2\x97\xBE'
+emoji[black_sun_with_rays]='\xE2\x98\x80'
+emoji[cloud]='\xE2\x98\x81'
+emoji[black_telephone]='\xE2\x98\x8E'
+emoji[ballot_box_with_check]='\xE2\x98\x91'
+emoji[umbrella_with_rain_drops]='\xE2\x98\x94'
+emoji[hot_beverage]='\xE2\x98\x95'
+emoji[white_up_pointing_index]='\xE2\x98\x9D'
+emoji[white_smiling_face]='\xE2\x98\xBA'
+emoji[aries]='\xE2\x99\x88'
+emoji[taurus]='\xE2\x99\x89'
+emoji[gemini]='\xE2\x99\x8A'
+emoji[cancer]='\xE2\x99\x8B'
+emoji[leo]='\xE2\x99\x8C'
+emoji[virgo]='\xE2\x99\x8D'
+emoji[libra]='\xE2\x99\x8E'
+emoji[scorpius]='\xE2\x99\x8F'
+emoji[sagittarius]='\xE2\x99\x90'
+emoji[capricorn]='\xE2\x99\x91'
+emoji[aquarius]='\xE2\x99\x92'
+emoji[pisces]='\xE2\x99\x93'
+emoji[black_spade_suit]='\xE2\x99\xA0'
+emoji[black_club_suit]='\xE2\x99\xA3'
+emoji[black_heart_suit]='\xE2\x99\xA5'
+emoji[black_diamond_suit]='\xE2\x99\xA6'
+emoji[hot_springs]='\xE2\x99\xA8'
+emoji[black_universal_recycling_symbol]='\xE2\x99\xBB'
+emoji[wheelchair_symbol]='\xE2\x99\xBF'
+emoji[anchor]='\xE2\x9A\x93'
+emoji[warning_sign]='\xE2\x9A\xA0'
+emoji[high_voltage_sign]='\xE2\x9A\xA1'
+emoji[medium_white_circle]='\xE2\x9A\xAA'
+emoji[medium_black_circle]='\xE2\x9A\xAB'
+emoji[soccer_ball]='\xE2\x9A\xBD'
+emoji[baseball]='\xE2\x9A\xBE'
+emoji[snowman_without_snow]='\xE2\x9B\x84'
+emoji[sun_behind_cloud]='\xE2\x9B\x85'
+emoji[ophiuchus]='\xE2\x9B\x8E'
+emoji[no_entry]='\xE2\x9B\x94'
+emoji[church]='\xE2\x9B\xAA'
+emoji[fountain]='\xE2\x9B\xB2'
+emoji[flag_in_hole]='\xE2\x9B\xB3'
+emoji[sailboat]='\xE2\x9B\xB5'
+emoji[tent]='\xE2\x9B\xBA'
+emoji[fuel_pump]='\xE2\x9B\xBD'
+emoji[arrow_pointing_rightwards_then_curving_upwards]='\xE2\xA4\xB4'
+emoji[arrow_pointing_rightwards_then_curving_downwards]='\xE2\xA4\xB5'
+emoji[leftwards_black_arrow]='\xE2\xAC\x85'
+emoji[upwards_black_arrow]='\xE2\xAC\x86'
+emoji[downwards_black_arrow]='\xE2\xAC\x87'
+emoji[black_large_square]='\xE2\xAC\x9B'
+emoji[white_large_square]='\xE2\xAC\x9C'
+emoji[white_medium_star]='\xE2\xAD\x90'
+emoji[heavy_large_circle]='\xE2\xAD\x95'
+emoji[wavy_dash]='\xE3\x80\xB0'
+emoji[part_alternation_mark]='\xE3\x80\xBD'
+emoji[circled_ideograph_congratulation]='\xE3\x8A\x97'
+emoji[circled_ideograph_secret]='\xE3\x8A\x99'
+emoji[mahjong_tile_red_dragon]='\xF0\x9F\x80\x84'
+emoji[playing_card_black_joker]='\xF0\x9F\x83\x8F'
+emoji[cyclone]='\xF0\x9F\x8C\x80'
+emoji[foggy]='\xF0\x9F\x8C\x81'
+emoji[closed_umbrella]='\xF0\x9F\x8C\x82'
+emoji[night_with_stars]='\xF0\x9F\x8C\x83'
+emoji[sunrise_over_mountains]='\xF0\x9F\x8C\x84'
+emoji[sunrise]='\xF0\x9F\x8C\x85'
+emoji[cityscape_at_dusk]='\xF0\x9F\x8C\x86'
+emoji[sunset_over_buildings]='\xF0\x9F\x8C\x87'
+emoji[rainbow]='\xF0\x9F\x8C\x88'
+emoji[bridge_at_night]='\xF0\x9F\x8C\x89'
+emoji[water_wave]='\xF0\x9F\x8C\x8A'
+emoji[volcano]='\xF0\x9F\x8C\x8B'
+emoji[milky_way]='\xF0\x9F\x8C\x8C'
+emoji[earth_globe_asia_australia]='\xF0\x9F\x8C\x8F'
+emoji[new_moon_symbol]='\xF0\x9F\x8C\x91'
+emoji[first_quarter_moon_symbol]='\xF0\x9F\x8C\x93'
+emoji[waxing_gibbous_moon_symbol]='\xF0\x9F\x8C\x94'
+emoji[full_moon_symbol]='\xF0\x9F\x8C\x95'
+emoji[crescent_moon]='\xF0\x9F\x8C\x99'
+emoji[first_quarter_moon_with_face]='\xF0\x9F\x8C\x9B'
+emoji[glowing_star]='\xF0\x9F\x8C\x9F'
+emoji[shooting_star]='\xF0\x9F\x8C\xA0'
+emoji[chestnut]='\xF0\x9F\x8C\xB0'
+emoji[seedling]='\xF0\x9F\x8C\xB1'
+emoji[palm_tree]='\xF0\x9F\x8C\xB4'
+emoji[cactus]='\xF0\x9F\x8C\xB5'
+emoji[tulip]='\xF0\x9F\x8C\xB7'
+emoji[cherry_blossom]='\xF0\x9F\x8C\xB8'
+emoji[rose]='\xF0\x9F\x8C\xB9'
+emoji[hibiscus]='\xF0\x9F\x8C\xBA'
+emoji[sunflower]='\xF0\x9F\x8C\xBB'
+emoji[blossom]='\xF0\x9F\x8C\xBC'
+emoji[ear_of_maize]='\xF0\x9F\x8C\xBD'
+emoji[ear_of_rice]='\xF0\x9F\x8C\xBE'
+emoji[herb]='\xF0\x9F\x8C\xBF'
+emoji[four_leaf_clover]='\xF0\x9F\x8D\x80'
+emoji[maple_leaf]='\xF0\x9F\x8D\x81'
+emoji[fallen_leaf]='\xF0\x9F\x8D\x82'
+emoji[leaf_fluttering_in_wind]='\xF0\x9F\x8D\x83'
+emoji[mushroom]='\xF0\x9F\x8D\x84'
+emoji[tomato]='\xF0\x9F\x8D\x85'
+emoji[aubergine]='\xF0\x9F\x8D\x86'
+emoji[grapes]='\xF0\x9F\x8D\x87'
+emoji[melon]='\xF0\x9F\x8D\x88'
+emoji[watermelon]='\xF0\x9F\x8D\x89'
+emoji[tangerine]='\xF0\x9F\x8D\x8A'
+emoji[banana]='\xF0\x9F\x8D\x8C'
+emoji[pineapple]='\xF0\x9F\x8D\x8D'
+emoji[red_apple]='\xF0\x9F\x8D\x8E'
+emoji[green_apple]='\xF0\x9F\x8D\x8F'
+emoji[peach]='\xF0\x9F\x8D\x91'
+emoji[cherries]='\xF0\x9F\x8D\x92'
+emoji[strawberry]='\xF0\x9F\x8D\x93'
+emoji[hamburger]='\xF0\x9F\x8D\x94'
+emoji[slice_of_pizza]='\xF0\x9F\x8D\x95'
+emoji[meat_on_bone]='\xF0\x9F\x8D\x96'
+emoji[poultry_leg]='\xF0\x9F\x8D\x97'
+emoji[rice_cracker]='\xF0\x9F\x8D\x98'
+emoji[rice_ball]='\xF0\x9F\x8D\x99'
+emoji[cooked_rice]='\xF0\x9F\x8D\x9A'
+emoji[curry_and_rice]='\xF0\x9F\x8D\x9B'
+emoji[steaming_bowl]='\xF0\x9F\x8D\x9C'
+emoji[spaghetti]='\xF0\x9F\x8D\x9D'
+emoji[bread]='\xF0\x9F\x8D\x9E'
+emoji[french_fries]='\xF0\x9F\x8D\x9F'
+emoji[roasted_sweet_potato]='\xF0\x9F\x8D\xA0'
+emoji[dango]='\xF0\x9F\x8D\xA1'
+emoji[oden]='\xF0\x9F\x8D\xA2'
+emoji[sushi]='\xF0\x9F\x8D\xA3'
+emoji[fried_shrimp]='\xF0\x9F\x8D\xA4'
+emoji[fish_cake_with_swirl_design]='\xF0\x9F\x8D\xA5'
+emoji[soft_ice_cream]='\xF0\x9F\x8D\xA6'
+emoji[shaved_ice]='\xF0\x9F\x8D\xA7'
+emoji[ice_cream]='\xF0\x9F\x8D\xA8'
+emoji[doughnut]='\xF0\x9F\x8D\xA9'
+emoji[cookie]='\xF0\x9F\x8D\xAA'
+emoji[chocolate_bar]='\xF0\x9F\x8D\xAB'
+emoji[candy]='\xF0\x9F\x8D\xAC'
+emoji[lollipop]='\xF0\x9F\x8D\xAD'
+emoji[custard]='\xF0\x9F\x8D\xAE'
+emoji[honey_pot]='\xF0\x9F\x8D\xAF'
+emoji[shortcake]='\xF0\x9F\x8D\xB0'
+emoji[bento_box]='\xF0\x9F\x8D\xB1'
+emoji[pot_of_food]='\xF0\x9F\x8D\xB2'
+emoji[cooking]='\xF0\x9F\x8D\xB3'
+emoji[fork_and_knife]='\xF0\x9F\x8D\xB4'
+emoji[teacup_without_handle]='\xF0\x9F\x8D\xB5'
+emoji[sake_bottle_and_cup]='\xF0\x9F\x8D\xB6'
+emoji[wine_glass]='\xF0\x9F\x8D\xB7'
+emoji[cocktail_glass]='\xF0\x9F\x8D\xB8'
+emoji[tropical_drink]='\xF0\x9F\x8D\xB9'
+emoji[beer_mug]='\xF0\x9F\x8D\xBA'
+emoji[clinking_beer_mugs]='\xF0\x9F\x8D\xBB'
+emoji[ribbon]='\xF0\x9F\x8E\x80'
+emoji[wrapped_present]='\xF0\x9F\x8E\x81'
+emoji[birthday_cake]='\xF0\x9F\x8E\x82'
+emoji[jack_o_lantern]='\xF0\x9F\x8E\x83'
+emoji[christmas_tree]='\xF0\x9F\x8E\x84'
+emoji[father_christmas]='\xF0\x9F\x8E\x85'
+emoji[fireworks]='\xF0\x9F\x8E\x86'
+emoji[firework_sparkler]='\xF0\x9F\x8E\x87'
+emoji[balloon]='\xF0\x9F\x8E\x88'
+emoji[party_popper]='\xF0\x9F\x8E\x89'
+emoji[confetti_ball]='\xF0\x9F\x8E\x8A'
+emoji[tanabata_tree]='\xF0\x9F\x8E\x8B'
+emoji[crossed_flags]='\xF0\x9F\x8E\x8C'
+emoji[pine_decoration]='\xF0\x9F\x8E\x8D'
+emoji[japanese_dolls]='\xF0\x9F\x8E\x8E'
+emoji[carp_streamer]='\xF0\x9F\x8E\x8F'
+emoji[wind_chime]='\xF0\x9F\x8E\x90'
+emoji[moon_viewing_ceremony]='\xF0\x9F\x8E\x91'
+emoji[school_satchel]='\xF0\x9F\x8E\x92'
+emoji[graduation_cap]='\xF0\x9F\x8E\x93'
+emoji[carousel_horse]='\xF0\x9F\x8E\xA0'
+emoji[ferris_wheel]='\xF0\x9F\x8E\xA1'
+emoji[roller_coaster]='\xF0\x9F\x8E\xA2'
+emoji[fishing_pole_and_fish]='\xF0\x9F\x8E\xA3'
+emoji[microphone]='\xF0\x9F\x8E\xA4'
+emoji[movie_camera]='\xF0\x9F\x8E\xA5'
+emoji[cinema]='\xF0\x9F\x8E\xA6'
+emoji[headphone]='\xF0\x9F\x8E\xA7'
+emoji[artist_palette]='\xF0\x9F\x8E\xA8'
+emoji[top_hat]='\xF0\x9F\x8E\xA9'
+emoji[circus_tent]='\xF0\x9F\x8E\xAA'
+emoji[ticket]='\xF0\x9F\x8E\xAB'
+emoji[clapper_board]='\xF0\x9F\x8E\xAC'
+emoji[performing_arts]='\xF0\x9F\x8E\xAD'
+emoji[video_game]='\xF0\x9F\x8E\xAE'
+emoji[direct_hit]='\xF0\x9F\x8E\xAF'
+emoji[slot_machine]='\xF0\x9F\x8E\xB0'
+emoji[billiards]='\xF0\x9F\x8E\xB1'
+emoji[game_die]='\xF0\x9F\x8E\xB2'
+emoji[bowling]='\xF0\x9F\x8E\xB3'
+emoji[flower_playing_cards]='\xF0\x9F\x8E\xB4'
+emoji[musical_note]='\xF0\x9F\x8E\xB5'
+emoji[multiple_musical_notes]='\xF0\x9F\x8E\xB6'
+emoji[saxophone]='\xF0\x9F\x8E\xB7'
+emoji[guitar]='\xF0\x9F\x8E\xB8'
+emoji[musical_keyboard]='\xF0\x9F\x8E\xB9'
+emoji[trumpet]='\xF0\x9F\x8E\xBA'
+emoji[violin]='\xF0\x9F\x8E\xBB'
+emoji[musical_score]='\xF0\x9F\x8E\xBC'
+emoji[running_shirt_with_sash]='\xF0\x9F\x8E\xBD'
+emoji[tennis_racquet_and_ball]='\xF0\x9F\x8E\xBE'
+emoji[ski_and_ski_boot]='\xF0\x9F\x8E\xBF'
+emoji[basketball_and_hoop]='\xF0\x9F\x8F\x80'
+emoji[chequered_flag]='\xF0\x9F\x8F\x81'
+emoji[snowboarder]='\xF0\x9F\x8F\x82'
+emoji[runner]='\xF0\x9F\x8F\x83'
+emoji[surfer]='\xF0\x9F\x8F\x84'
+emoji[trophy]='\xF0\x9F\x8F\x86'
+emoji[american_football]='\xF0\x9F\x8F\x88'
+emoji[swimmer]='\xF0\x9F\x8F\x8A'
+emoji[house_building]='\xF0\x9F\x8F\xA0'
+emoji[house_with_garden]='\xF0\x9F\x8F\xA1'
+emoji[office_building]='\xF0\x9F\x8F\xA2'
+emoji[japanese_post_office]='\xF0\x9F\x8F\xA3'
+emoji[hospital]='\xF0\x9F\x8F\xA5'
+emoji[bank]='\xF0\x9F\x8F\xA6'
+emoji[automated_teller_machine]='\xF0\x9F\x8F\xA7'
+emoji[hotel]='\xF0\x9F\x8F\xA8'
+emoji[love_hotel]='\xF0\x9F\x8F\xA9'
+emoji[convenience_store]='\xF0\x9F\x8F\xAA'
+emoji[school]='\xF0\x9F\x8F\xAB'
+emoji[department_store]='\xF0\x9F\x8F\xAC'
+emoji[factory]='\xF0\x9F\x8F\xAD'
+emoji[izakaya_lantern]='\xF0\x9F\x8F\xAE'
+emoji[japanese_castle]='\xF0\x9F\x8F\xAF'
+emoji[european_castle]='\xF0\x9F\x8F\xB0'
+emoji[snail]='\xF0\x9F\x90\x8C'
+emoji[snake]='\xF0\x9F\x90\x8D'
+emoji[horse]='\xF0\x9F\x90\x8E'
+emoji[sheep]='\xF0\x9F\x90\x91'
+emoji[monkey]='\xF0\x9F\x90\x92'
+emoji[chicken]='\xF0\x9F\x90\x94'
+emoji[boar]='\xF0\x9F\x90\x97'
+emoji[elephant]='\xF0\x9F\x90\x98'
+emoji[octopus]='\xF0\x9F\x90\x99'
+emoji[spiral_shell]='\xF0\x9F\x90\x9A'
+emoji[bug]='\xF0\x9F\x90\x9B'
+emoji[ant]='\xF0\x9F\x90\x9C'
+emoji[honeybee]='\xF0\x9F\x90\x9D'
+emoji[lady_beetle]='\xF0\x9F\x90\x9E'
+emoji[fish]='\xF0\x9F\x90\x9F'
+emoji[tropical_fish]='\xF0\x9F\x90\xA0'
+emoji[blowfish]='\xF0\x9F\x90\xA1'
+emoji[turtle]='\xF0\x9F\x90\xA2'
+emoji[hatching_chick]='\xF0\x9F\x90\xA3'
+emoji[baby_chick]='\xF0\x9F\x90\xA4'
+emoji[front_facing_baby_chick]='\xF0\x9F\x90\xA5'
+emoji[bird]='\xF0\x9F\x90\xA6'
+emoji[penguin]='\xF0\x9F\x90\xA7'
+emoji[koala]='\xF0\x9F\x90\xA8'
+emoji[poodle]='\xF0\x9F\x90\xA9'
+emoji[bactrian_camel]='\xF0\x9F\x90\xAB'
+emoji[dolphin]='\xF0\x9F\x90\xAC'
+emoji[mouse_face]='\xF0\x9F\x90\xAD'
+emoji[cow_face]='\xF0\x9F\x90\xAE'
+emoji[tiger_face]='\xF0\x9F\x90\xAF'
+emoji[rabbit_face]='\xF0\x9F\x90\xB0'
+emoji[cat_face]='\xF0\x9F\x90\xB1'
+emoji[dragon_face]='\xF0\x9F\x90\xB2'
+emoji[spouting_whale]='\xF0\x9F\x90\xB3'
+emoji[horse_face]='\xF0\x9F\x90\xB4'
+emoji[monkey_face]='\xF0\x9F\x90\xB5'
+emoji[dog_face]='\xF0\x9F\x90\xB6'
+emoji[pig_face]='\xF0\x9F\x90\xB7'
+emoji[frog_face]='\xF0\x9F\x90\xB8'
+emoji[hamster_face]='\xF0\x9F\x90\xB9'
+emoji[wolf_face]='\xF0\x9F\x90\xBA'
+emoji[bear_face]='\xF0\x9F\x90\xBB'
+emoji[panda_face]='\xF0\x9F\x90\xBC'
+emoji[pig_nose]='\xF0\x9F\x90\xBD'
+emoji[paw_prints]='\xF0\x9F\x90\xBE'
+emoji[eyes]='\xF0\x9F\x91\x80'
+emoji[ear]='\xF0\x9F\x91\x82'
+emoji[nose]='\xF0\x9F\x91\x83'
+emoji[mouth]='\xF0\x9F\x91\x84'
+emoji[tongue]='\xF0\x9F\x91\x85'
+emoji[white_up_pointing_backhand_index]='\xF0\x9F\x91\x86'
+emoji[white_down_pointing_backhand_index]='\xF0\x9F\x91\x87'
+emoji[white_left_pointing_backhand_index]='\xF0\x9F\x91\x88'
+emoji[white_right_pointing_backhand_index]='\xF0\x9F\x91\x89'
+emoji[fisted_hand_sign]='\xF0\x9F\x91\x8A'
+emoji[waving_hand_sign]='\xF0\x9F\x91\x8B'
+emoji[ok_hand_sign]='\xF0\x9F\x91\x8C'
+emoji[thumbs_up_sign]='\xF0\x9F\x91\x8D'
+emoji[thumbs_down_sign]='\xF0\x9F\x91\x8E'
+emoji[clapping_hands_sign]='\xF0\x9F\x91\x8F'
+emoji[open_hands_sign]='\xF0\x9F\x91\x90'
+emoji[crown]='\xF0\x9F\x91\x91'
+emoji[womans_hat]='\xF0\x9F\x91\x92'
+emoji[eyeglasses]='\xF0\x9F\x91\x93'
+emoji[necktie]='\xF0\x9F\x91\x94'
+emoji[t_shirt]='\xF0\x9F\x91\x95'
+emoji[jeans]='\xF0\x9F\x91\x96'
+emoji[dress]='\xF0\x9F\x91\x97'
+emoji[kimono]='\xF0\x9F\x91\x98'
+emoji[bikini]='\xF0\x9F\x91\x99'
+emoji[womans_clothes]='\xF0\x9F\x91\x9A'
+emoji[purse]='\xF0\x9F\x91\x9B'
+emoji[handbag]='\xF0\x9F\x91\x9C'
+emoji[pouch]='\xF0\x9F\x91\x9D'
+emoji[mans_shoe]='\xF0\x9F\x91\x9E'
+emoji[athletic_shoe]='\xF0\x9F\x91\x9F'
+emoji[high_heeled_shoe]='\xF0\x9F\x91\xA0'
+emoji[womans_sandal]='\xF0\x9F\x91\xA1'
+emoji[womans_boots]='\xF0\x9F\x91\xA2'
+emoji[footprints]='\xF0\x9F\x91\xA3'
+emoji[bust_in_silhouette]='\xF0\x9F\x91\xA4'
+emoji[boy]='\xF0\x9F\x91\xA6'
+emoji[girl]='\xF0\x9F\x91\xA7'
+emoji[man]='\xF0\x9F\x91\xA8'
+emoji[woman]='\xF0\x9F\x91\xA9'
+emoji[family]='\xF0\x9F\x91\xAA'
+emoji[man_and_woman_holding_hands]='\xF0\x9F\x91\xAB'
+emoji[police_officer]='\xF0\x9F\x91\xAE'
+emoji[woman_with_bunny_ears]='\xF0\x9F\x91\xAF'
+emoji[bride_with_veil]='\xF0\x9F\x91\xB0'
+emoji[person_with_blond_hair]='\xF0\x9F\x91\xB1'
+emoji[man_with_gua_pi_mao]='\xF0\x9F\x91\xB2'
+emoji[man_with_turban]='\xF0\x9F\x91\xB3'
+emoji[older_man]='\xF0\x9F\x91\xB4'
+emoji[older_woman]='\xF0\x9F\x91\xB5'
+emoji[baby]='\xF0\x9F\x91\xB6'
+emoji[construction_worker]='\xF0\x9F\x91\xB7'
+emoji[princess]='\xF0\x9F\x91\xB8'
+emoji[japanese_ogre]='\xF0\x9F\x91\xB9'
+emoji[japanese_goblin]='\xF0\x9F\x91\xBA'
+emoji[ghost]='\xF0\x9F\x91\xBB'
+emoji[baby_angel]='\xF0\x9F\x91\xBC'
+emoji[extraterrestrial_alien]='\xF0\x9F\x91\xBD'
+emoji[alien_monster]='\xF0\x9F\x91\xBE'
+emoji[imp]='\xF0\x9F\x91\xBF'
+emoji[skull]='\xF0\x9F\x92\x80'
+emoji[information_desk_person]='\xF0\x9F\x92\x81'
+emoji[guardsman]='\xF0\x9F\x92\x82'
+emoji[dancer]='\xF0\x9F\x92\x83'
+emoji[lipstick]='\xF0\x9F\x92\x84'
+emoji[nail_polish]='\xF0\x9F\x92\x85'
+emoji[face_massage]='\xF0\x9F\x92\x86'
+emoji[haircut]='\xF0\x9F\x92\x87'
+emoji[barber_pole]='\xF0\x9F\x92\x88'
+emoji[syringe]='\xF0\x9F\x92\x89'
+emoji[pill]='\xF0\x9F\x92\x8A'
+emoji[kiss_mark]='\xF0\x9F\x92\x8B'
+emoji[love_letter]='\xF0\x9F\x92\x8C'
+emoji[ring]='\xF0\x9F\x92\x8D'
+emoji[gem_stone]='\xF0\x9F\x92\x8E'
+emoji[kiss]='\xF0\x9F\x92\x8F'
+emoji[bouquet]='\xF0\x9F\x92\x90'
+emoji[couple_with_heart]='\xF0\x9F\x92\x91'
+emoji[wedding]='\xF0\x9F\x92\x92'
+emoji[beating_heart]='\xF0\x9F\x92\x93'
+emoji[broken_heart]='\xF0\x9F\x92\x94'
+emoji[two_hearts]='\xF0\x9F\x92\x95'
+emoji[sparkling_heart]='\xF0\x9F\x92\x96'
+emoji[growing_heart]='\xF0\x9F\x92\x97'
+emoji[heart_with_arrow]='\xF0\x9F\x92\x98'
+emoji[blue_heart]='\xF0\x9F\x92\x99'
+emoji[green_heart]='\xF0\x9F\x92\x9A'
+emoji[yellow_heart]='\xF0\x9F\x92\x9B'
+emoji[purple_heart]='\xF0\x9F\x92\x9C'
+emoji[heart_with_ribbon]='\xF0\x9F\x92\x9D'
+emoji[revolving_hearts]='\xF0\x9F\x92\x9E'
+emoji[heart_decoration]='\xF0\x9F\x92\x9F'
+emoji[diamond_shape_with_a_dot_inside]='\xF0\x9F\x92\xA0'
+emoji[electric_light_bulb]='\xF0\x9F\x92\xA1'
+emoji[anger_symbol]='\xF0\x9F\x92\xA2'
+emoji[bomb]='\xF0\x9F\x92\xA3'
+emoji[sleeping_symbol]='\xF0\x9F\x92\xA4'
+emoji[collision_symbol]='\xF0\x9F\x92\xA5'
+emoji[splashing_sweat_symbol]='\xF0\x9F\x92\xA6'
+emoji[droplet]='\xF0\x9F\x92\xA7'
+emoji[dash_symbol]='\xF0\x9F\x92\xA8'
+emoji[pile_of_poo]='\xF0\x9F\x92\xA9'
+emoji[flexed_biceps]='\xF0\x9F\x92\xAA'
+emoji[dizzy_symbol]='\xF0\x9F\x92\xAB'
+emoji[speech_balloon]='\xF0\x9F\x92\xAC'
+emoji[white_flower]='\xF0\x9F\x92\xAE'
+emoji[hundred_points_symbol]='\xF0\x9F\x92\xAF'
+emoji[money_bag]='\xF0\x9F\x92\xB0'
+emoji[currency_exchange]='\xF0\x9F\x92\xB1'
+emoji[heavy_dollar_sign]='\xF0\x9F\x92\xB2'
+emoji[credit_card]='\xF0\x9F\x92\xB3'
+emoji[banknote_with_yen_sign]='\xF0\x9F\x92\xB4'
+emoji[banknote_with_dollar_sign]='\xF0\x9F\x92\xB5'
+emoji[money_with_wings]='\xF0\x9F\x92\xB8'
+emoji[chart_with_upwards_trend_and_yen_sign]='\xF0\x9F\x92\xB9'
+emoji[seat]='\xF0\x9F\x92\xBA'
+emoji[personal_computer]='\xF0\x9F\x92\xBB'
+emoji[briefcase]='\xF0\x9F\x92\xBC'
+emoji[minidisc]='\xF0\x9F\x92\xBD'
+emoji[floppy_disk]='\xF0\x9F\x92\xBE'
+emoji[optical_disc]='\xF0\x9F\x92\xBF'
+emoji[dvd]='\xF0\x9F\x93\x80'
+emoji[file_folder]='\xF0\x9F\x93\x81'
+emoji[open_file_folder]='\xF0\x9F\x93\x82'
+emoji[page_with_curl]='\xF0\x9F\x93\x83'
+emoji[page_facing_up]='\xF0\x9F\x93\x84'
+emoji[calendar]='\xF0\x9F\x93\x85'
+emoji[tear_off_calendar]='\xF0\x9F\x93\x86'
+emoji[card_index]='\xF0\x9F\x93\x87'
+emoji[chart_with_upwards_trend]='\xF0\x9F\x93\x88'
+emoji[chart_with_downwards_trend]='\xF0\x9F\x93\x89'
+emoji[bar_chart]='\xF0\x9F\x93\x8A'
+emoji[clipboard]='\xF0\x9F\x93\x8B'
+emoji[pushpin]='\xF0\x9F\x93\x8C'
+emoji[round_pushpin]='\xF0\x9F\x93\x8D'
+emoji[paperclip]='\xF0\x9F\x93\x8E'
+emoji[straight_ruler]='\xF0\x9F\x93\x8F'
+emoji[triangular_ruler]='\xF0\x9F\x93\x90'
+emoji[bookmark_tabs]='\xF0\x9F\x93\x91'
+emoji[ledger]='\xF0\x9F\x93\x92'
+emoji[notebook]='\xF0\x9F\x93\x93'
+emoji[notebook_with_decorative_cover]='\xF0\x9F\x93\x94'
+emoji[closed_book]='\xF0\x9F\x93\x95'
+emoji[open_book]='\xF0\x9F\x93\x96'
+emoji[green_book]='\xF0\x9F\x93\x97'
+emoji[blue_book]='\xF0\x9F\x93\x98'
+emoji[orange_book]='\xF0\x9F\x93\x99'
+emoji[books]='\xF0\x9F\x93\x9A'
+emoji[name_badge]='\xF0\x9F\x93\x9B'
+emoji[scroll]='\xF0\x9F\x93\x9C'
+emoji[memo]='\xF0\x9F\x93\x9D'
+emoji[telephone_receiver]='\xF0\x9F\x93\x9E'
+emoji[pager]='\xF0\x9F\x93\x9F'
+emoji[fax_machine]='\xF0\x9F\x93\xA0'
+emoji[satellite_antenna]='\xF0\x9F\x93\xA1'
+emoji[public_address_loudspeaker]='\xF0\x9F\x93\xA2'
+emoji[cheering_megaphone]='\xF0\x9F\x93\xA3'
+emoji[outbox_tray]='\xF0\x9F\x93\xA4'
+emoji[inbox_tray]='\xF0\x9F\x93\xA5'
+emoji[package]='\xF0\x9F\x93\xA6'
+emoji[e_mail_symbol]='\xF0\x9F\x93\xA7'
+emoji[incoming_envelope]='\xF0\x9F\x93\xA8'
+emoji[envelope_with_downwards_arrow_above]='\xF0\x9F\x93\xA9'
+emoji[closed_mailbox_with_lowered_flag]='\xF0\x9F\x93\xAA'
+emoji[closed_mailbox_with_raised_flag]='\xF0\x9F\x93\xAB'
+emoji[postbox]='\xF0\x9F\x93\xAE'
+emoji[newspaper]='\xF0\x9F\x93\xB0'
+emoji[mobile_phone]='\xF0\x9F\x93\xB1'
+emoji[mobile_phone_with_rightwards_arrow_at_left]='\xF0\x9F\x93\xB2'
+emoji[vibration_mode]='\xF0\x9F\x93\xB3'
+emoji[mobile_phone_off]='\xF0\x9F\x93\xB4'
+emoji[antenna_with_bars]='\xF0\x9F\x93\xB6'
+emoji[camera]='\xF0\x9F\x93\xB7'
+emoji[video_camera]='\xF0\x9F\x93\xB9'
+emoji[television]='\xF0\x9F\x93\xBA'
+emoji[radio]='\xF0\x9F\x93\xBB'
+emoji[videocassette]='\xF0\x9F\x93\xBC'
+emoji[clockwise_downwards_and_upwards_open_circle_arrows]='\xF0\x9F\x94\x83'
+emoji[speaker_with_three_sound_waves]='\xF0\x9F\x94\x8A'
+emoji[battery]='\xF0\x9F\x94\x8B'
+emoji[electric_plug]='\xF0\x9F\x94\x8C'
+emoji[left_pointing_magnifying_glass]='\xF0\x9F\x94\x8D'
+emoji[right_pointing_magnifying_glass]='\xF0\x9F\x94\x8E'
+emoji[lock_with_ink_pen]='\xF0\x9F\x94\x8F'
+emoji[closed_lock_with_key]='\xF0\x9F\x94\x90'
+emoji[key]='\xF0\x9F\x94\x91'
+emoji[lock]='\xF0\x9F\x94\x92'
+emoji[open_lock]='\xF0\x9F\x94\x93'
+emoji[bell]='\xF0\x9F\x94\x94'
+emoji[bookmark]='\xF0\x9F\x94\x96'
+emoji[link_symbol]='\xF0\x9F\x94\x97'
+emoji[radio_button]='\xF0\x9F\x94\x98'
+emoji[back_with_leftwards_arrow_above]='\xF0\x9F\x94\x99'
+emoji[end_with_leftwards_arrow_above]='\xF0\x9F\x94\x9A'
+emoji[on_with_exclamation_mark_with_left_right_arrow_above]='\xF0\x9F\x94\x9B'
+emoji[soon_with_rightwards_arrow_above]='\xF0\x9F\x94\x9C'
+emoji[top_with_upwards_arrow_above]='\xF0\x9F\x94\x9D'
+emoji[no_one_under_eighteen_symbol]='\xF0\x9F\x94\x9E'
+emoji[keycap_ten]='\xF0\x9F\x94\x9F'
+emoji[input_symbol_for_latin_capital_letters]='\xF0\x9F\x94\xA0'
+emoji[input_symbol_for_latin_small_letters]='\xF0\x9F\x94\xA1'
+emoji[input_symbol_for_numbers]='\xF0\x9F\x94\xA2'
+emoji[input_symbol_for_symbols]='\xF0\x9F\x94\xA3'
+emoji[input_symbol_for_latin_letters]='\xF0\x9F\x94\xA4'
+emoji[fire]='\xF0\x9F\x94\xA5'
+emoji[electric_torch]='\xF0\x9F\x94\xA6'
+emoji[wrench]='\xF0\x9F\x94\xA7'
+emoji[hammer]='\xF0\x9F\x94\xA8'
+emoji[nut_and_bolt]='\xF0\x9F\x94\xA9'
+emoji[hocho]='\xF0\x9F\x94\xAA'
+emoji[pistol]='\xF0\x9F\x94\xAB'
+emoji[crystal_ball]='\xF0\x9F\x94\xAE'
+emoji[six_pointed_star_with_middle_dot]='\xF0\x9F\x94\xAF'
+emoji[japanese_symbol_for_beginner]='\xF0\x9F\x94\xB0'
+emoji[trident_emblem]='\xF0\x9F\x94\xB1'
+emoji[black_square_button]='\xF0\x9F\x94\xB2'
+emoji[white_square_button]='\xF0\x9F\x94\xB3'
+emoji[large_red_circle]='\xF0\x9F\x94\xB4'
+emoji[large_blue_circle]='\xF0\x9F\x94\xB5'
+emoji[large_orange_diamond]='\xF0\x9F\x94\xB6'
+emoji[large_blue_diamond]='\xF0\x9F\x94\xB7'
+emoji[small_orange_diamond]='\xF0\x9F\x94\xB8'
+emoji[small_blue_diamond]='\xF0\x9F\x94\xB9'
+emoji[up_pointing_red_triangle]='\xF0\x9F\x94\xBA'
+emoji[down_pointing_red_triangle]='\xF0\x9F\x94\xBB'
+emoji[up_pointing_small_red_triangle]='\xF0\x9F\x94\xBC'
+emoji[down_pointing_small_red_triangle]='\xF0\x9F\x94\xBD'
+emoji[clock_face_one_oclock]='\xF0\x9F\x95\x90'
+emoji[clock_face_two_oclock]='\xF0\x9F\x95\x91'
+emoji[clock_face_three_oclock]='\xF0\x9F\x95\x92'
+emoji[clock_face_four_oclock]='\xF0\x9F\x95\x93'
+emoji[clock_face_five_oclock]='\xF0\x9F\x95\x94'
+emoji[clock_face_six_oclock]='\xF0\x9F\x95\x95'
+emoji[clock_face_seven_oclock]='\xF0\x9F\x95\x96'
+emoji[clock_face_eight_oclock]='\xF0\x9F\x95\x97'
+emoji[clock_face_nine_oclock]='\xF0\x9F\x95\x98'
+emoji[clock_face_ten_oclock]='\xF0\x9F\x95\x99'
+emoji[clock_face_eleven_oclock]='\xF0\x9F\x95\x9A'
+emoji[clock_face_twelve_oclock]='\xF0\x9F\x95\x9B'
+emoji[mount_fuji]='\xF0\x9F\x97\xBB'
+emoji[tokyo_tower]='\xF0\x9F\x97\xBC'
+emoji[statue_of_liberty]='\xF0\x9F\x97\xBD'
+emoji[silhouette_of_japan]='\xF0\x9F\x97\xBE'
+emoji[moyai]='\xF0\x9F\x97\xBF'
+emoji[grinning_face]='\xF0\x9F\x98\x80'
+emoji[smiling_face_with_halo]='\xF0\x9F\x98\x87'
+emoji[smiling_face_with_horns]='\xF0\x9F\x98\x88'
+emoji[smiling_face_with_sunglasses]='\xF0\x9F\x98\x8E'
+emoji[neutral_face]='\xF0\x9F\x98\x90'
+emoji[expressionless_face]='\xF0\x9F\x98\x91'
+emoji[confused_face]='\xF0\x9F\x98\x95'
+emoji[kissing_face]='\xF0\x9F\x98\x97'
+emoji[kissing_face_with_smiling_eyes]='\xF0\x9F\x98\x99'
+emoji[face_with_stuck_out_tongue]='\xF0\x9F\x98\x9B'
+emoji[worried_face]='\xF0\x9F\x98\x9F'
+emoji[frowning_face_with_open_mouth]='\xF0\x9F\x98\xA6'
+emoji[anguished_face]='\xF0\x9F\x98\xA7'
+emoji[grimacing_face]='\xF0\x9F\x98\xAC'
+emoji[face_with_open_mouth]='\xF0\x9F\x98\xAE'
+emoji[hushed_face]='\xF0\x9F\x98\xAF'
+emoji[sleeping_face]='\xF0\x9F\x98\xB4'
+emoji[face_without_mouth]='\xF0\x9F\x98\xB6'
+emoji[helicopter]='\xF0\x9F\x9A\x81'
+emoji[steam_locomotive]='\xF0\x9F\x9A\x82'
+emoji[train]='\xF0\x9F\x9A\x86'
+emoji[light_rail]='\xF0\x9F\x9A\x88'
+emoji[tram]='\xF0\x9F\x9A\x8A'
+emoji[oncoming_bus]='\xF0\x9F\x9A\x8D'
+emoji[trolleybus]='\xF0\x9F\x9A\x8E'
+emoji[minibus]='\xF0\x9F\x9A\x90'
+emoji[oncoming_police_car]='\xF0\x9F\x9A\x94'
+emoji[oncoming_taxi]='\xF0\x9F\x9A\x96'
+emoji[oncoming_automobile]='\xF0\x9F\x9A\x98'
+emoji[articulated_lorry]='\xF0\x9F\x9A\x9B'
+emoji[tractor]='\xF0\x9F\x9A\x9C'
+emoji[monorail]='\xF0\x9F\x9A\x9D'
+emoji[mountain_railway]='\xF0\x9F\x9A\x9E'
+emoji[suspension_railway]='\xF0\x9F\x9A\x9F'
+emoji[mountain_cableway]='\xF0\x9F\x9A\xA0'
+emoji[aerial_tramway]='\xF0\x9F\x9A\xA1'
+emoji[rowboat]='\xF0\x9F\x9A\xA3'
+emoji[vertical_traffic_light]='\xF0\x9F\x9A\xA6'
+emoji[put_litter_in_its_place_symbol]='\xF0\x9F\x9A\xAE'
+emoji[do_not_litter_symbol]='\xF0\x9F\x9A\xAF'
+emoji[potable_water_symbol]='\xF0\x9F\x9A\xB0'
+emoji[non_potable_water_symbol]='\xF0\x9F\x9A\xB1'
+emoji[no_bicycles]='\xF0\x9F\x9A\xB3'
+emoji[bicyclist]='\xF0\x9F\x9A\xB4'
+emoji[mountain_bicyclist]='\xF0\x9F\x9A\xB5'
+emoji[no_pedestrians]='\xF0\x9F\x9A\xB7'
+emoji[children_crossing]='\xF0\x9F\x9A\xB8'
+emoji[shower]='\xF0\x9F\x9A\xBF'
+emoji[bathtub]='\xF0\x9F\x9B\x81'
+emoji[passport_control]='\xF0\x9F\x9B\x82'
+emoji[customs]='\xF0\x9F\x9B\x83'
+emoji[baggage_claim]='\xF0\x9F\x9B\x84'
+emoji[left_luggage]='\xF0\x9F\x9B\x85'
+emoji[earth_globe_europe_africa]='\xF0\x9F\x8C\x8D'
+emoji[earth_globe_americas]='\xF0\x9F\x8C\x8E'
+emoji[globe_with_meridians]='\xF0\x9F\x8C\x90'
+emoji[waxing_crescent_moon_symbol]='\xF0\x9F\x8C\x92'
+emoji[waning_gibbous_moon_symbol]='\xF0\x9F\x8C\x96'
+emoji[last_quarter_moon_symbol]='\xF0\x9F\x8C\x97'
+emoji[waning_crescent_moon_symbol]='\xF0\x9F\x8C\x98'
+emoji[new_moon_with_face]='\xF0\x9F\x8C\x9A'
+emoji[last_quarter_moon_with_face]='\xF0\x9F\x8C\x9C'
+emoji[full_moon_with_face]='\xF0\x9F\x8C\x9D'
+emoji[sun_with_face]='\xF0\x9F\x8C\x9E'
+emoji[evergreen_tree]='\xF0\x9F\x8C\xB2'
+emoji[deciduous_tree]='\xF0\x9F\x8C\xB3'
+emoji[lemon]='\xF0\x9F\x8D\x8B'
+emoji[pear]='\xF0\x9F\x8D\x90'
+emoji[baby_bottle]='\xF0\x9F\x8D\xBC'
+emoji[horse_racing]='\xF0\x9F\x8F\x87'
+emoji[rugby_football]='\xF0\x9F\x8F\x89'
+emoji[european_post_office]='\xF0\x9F\x8F\xA4'
+emoji[rat]='\xF0\x9F\x90\x80'
+emoji[mouse]='\xF0\x9F\x90\x81'
+emoji[ox]='\xF0\x9F\x90\x82'
+emoji[water_buffalo]='\xF0\x9F\x90\x83'
+emoji[cow]='\xF0\x9F\x90\x84'
+emoji[tiger]='\xF0\x9F\x90\x85'
+emoji[leopard]='\xF0\x9F\x90\x86'
+emoji[rabbit]='\xF0\x9F\x90\x87'
+emoji[cat]='\xF0\x9F\x90\x88'
+emoji[dragon]='\xF0\x9F\x90\x89'
+emoji[crocodile]='\xF0\x9F\x90\x8A'
+emoji[whale]='\xF0\x9F\x90\x8B'
+emoji[ram]='\xF0\x9F\x90\x8F'
+emoji[goat]='\xF0\x9F\x90\x90'
+emoji[rooster]='\xF0\x9F\x90\x93'
+emoji[dog]='\xF0\x9F\x90\x95'
+emoji[pig]='\xF0\x9F\x90\x96'
+emoji[dromedary_camel]='\xF0\x9F\x90\xAA'
+emoji[busts_in_silhouette]='\xF0\x9F\x91\xA5'
+emoji[two_men_holding_hands]='\xF0\x9F\x91\xAC'
+emoji[two_women_holding_hands]='\xF0\x9F\x91\xAD'
+emoji[thought_balloon]='\xF0\x9F\x92\xAD'
+emoji[banknote_with_euro_sign]='\xF0\x9F\x92\xB6'
+emoji[banknote_with_pound_sign]='\xF0\x9F\x92\xB7'
+emoji[open_mailbox_with_raised_flag]='\xF0\x9F\x93\xAC'
+emoji[open_mailbox_with_lowered_flag]='\xF0\x9F\x93\xAD'
+emoji[postal_horn]='\xF0\x9F\x93\xAF'
+emoji[no_mobile_phones]='\xF0\x9F\x93\xB5'
+emoji[twisted_rightwards_arrows]='\xF0\x9F\x94\x80'
+emoji[clockwise_rightwards_and_leftwards_open_circle_arrows]='\xF0\x9F\x94\x81'
+emoji[clockwise_rightwards_and_leftwards_open_circle_arrows_with_circled_one_overlay]='\xF0\x9F\x94\x82'
+emoji[anticlockwise_downwards_and_upwards_open_circle_arrows]='\xF0\x9F\x94\x84'
+emoji[low_brightness_symbol]='\xF0\x9F\x94\x85'
+emoji[high_brightness_symbol]='\xF0\x9F\x94\x86'
+emoji[speaker_with_cancellation_stroke]='\xF0\x9F\x94\x87'
+emoji[speaker_with_one_sound_wave]='\xF0\x9F\x94\x89'
+emoji[bell_with_cancellation_stroke]='\xF0\x9F\x94\x95'
+emoji[microscope]='\xF0\x9F\x94\xAC'
+emoji[telescope]='\xF0\x9F\x94\xAD'
+emoji[clock_face_one_thirty]='\xF0\x9F\x95\x9C'
+emoji[clock_face_two_thirty]='\xF0\x9F\x95\x9D'
+emoji[clock_face_three_thirty]='\xF0\x9F\x95\x9E'
+emoji[clock_face_four_thirty]='\xF0\x9F\x95\x9F'
+emoji[clock_face_five_thirty]='\xF0\x9F\x95\xA0'
+emoji[clock_face_six_thirty]='\xF0\x9F\x95\xA1'
+emoji[clock_face_seven_thirty]='\xF0\x9F\x95\xA2'
+emoji[clock_face_eight_thirty]='\xF0\x9F\x95\xA3'
+emoji[clock_face_nine_thirty]='\xF0\x9F\x95\xA4'
+emoji[clock_face_ten_thirty]='\xF0\x9F\x95\xA5'
+emoji[clock_face_eleven_thirty]='\xF0\x9F\x95\xA6'
+emoji[clock_face_twelve_thirty]='\xF0\x9F\x95\xA7'
+
+emoji_fruits=(
+  tomato
+  aubergine
+  grapes
+  melon
+  watermelon
+  tangerine
+  banana
+  pineapple
+  red_apple
+  green_apple
+  peach
+  cherries
+  strawberry
+  lemon
+  pear
+)
+
+emoji_vehicles=(
+  airplane
+  rocket
+  railway_car
+  high_speed_train
+  high_speed_train_with_bullet_nose
+  bus
+  ambulance
+  fire_engine
+  police_car
+  taxi
+  automobile
+  recreational_vehicle
+  delivery_truck
+  ship
+  speedboat
+  bicycle
+  helicopter
+  steam_locomotive
+  train
+  light_rail
+  tram
+  oncoming_bus
+  trolleybus
+  minibus
+  oncoming_police_car
+  oncoming_taxi
+  oncoming_automobile
+  articulated_lorry
+  tractor
+  monorail
+  mountain_railway
+  suspension_railway
+  mountain_cableway
+  aerial_tramway
+  rowboat
+  bicyclist
+  mountain_bicyclist
+  sailboat
+)
+
+emoji_animals=(
+  snail
+  snake
+  horse
+  sheep
+  monkey
+  chicken
+  boar
+  elephant
+  octopus
+  spiral_shell
+  bug
+  ant
+  honeybee
+  lady_beetle
+  fish
+  tropical_fish
+  blowfish
+  turtle
+  hatching_chick
+  baby_chick
+  front_facing_baby_chick
+  bird
+  penguin
+  koala
+  poodle
+  bactrian_camel
+  dolphin
+  mouse_face
+  cow_face
+  tiger_face
+  rabbit_face
+  cat_face
+  dragon_face
+  spouting_whale
+  horse_face
+  monkey_face
+  dog_face
+  pig_face
+  frog_face
+  hamster_face
+  wolf_face
+  bear_face
+  panda_face
+  rat
+  mouse
+  ox
+  water_buffalo
+  cow
+  tiger
+  leopard
+  rabbit
+  cat
+  dragon
+  crocodile
+  whale
+  ram
+  goat
+  rooster
+  dog
+  pig
+  dromedary_camel
+)
+
+emoji_faces=(
+  grinning_face_with_smiling_eyes
+  face_with_tears_of_joy
+  smiling_face_with_open_mouth
+  smiling_face_with_open_mouth_and_smiling_eyes
+  smiling_face_with_open_mouth_and_cold_sweat
+  smiling_face_with_open_mouth_and_tightly_closed_eyes
+  winking_face
+  smiling_face_with_smiling_eyes
+  face_savouring_delicious_food
+  relieved_face
+  smiling_face_with_heart_shaped_eyes
+  smirking_face
+  unamused_face
+  face_with_cold_sweat
+  pensive_face
+  confounded_face
+  face_throwing_a_kiss
+  kissing_face_with_closed_eyes
+  face_with_stuck_out_tongue_and_winking_eye
+  face_with_stuck_out_tongue_and_tightly_closed_eyes
+  disappointed_face
+  angry_face
+  pouting_face
+  crying_face
+  persevering_face
+  face_with_look_of_triumph
+  disappointed_but_relieved_face
+  fearful_face
+  weary_face
+  sleepy_face
+  tired_face
+  loudly_crying_face
+  face_with_open_mouth_and_cold_sweat
+  face_screaming_in_fear
+  astonished_face
+  flushed_face
+  dizzy_face
+  face_with_medical_mask
+)
+
+function random_emoji(){
+  local emoji_array_size=${#emoji[@]}
+  local random_element_index=$(( ( RANDOM % $emoji_array_size ) + 1 ))
+  echo ${emoji[@][$random_element_index]}
+}
+
+function random_emoji_from_list(){
+  local array_name=$1
+  local list_size=${#${(P)array_name}[@]}
+  local random_index=$(( ( RANDOM % $list_size ) + 1 ))
+  local key=${${(P)array_name}[@][$random_index]}
+  echo ${emoji[$key]}
+}
+
+function display_emoji_list(){
+  local array_name=$1
+  for i in ${${(P)array_name}[@]}; do
+    echo "${emoji[$i]}  = $i"
+  done
+}
+
+function random_emoji_fruit(){
+  random_emoji_from_list 'emoji_fruits'
+}
+
+function random_emoji_vehicle(){
+  random_emoji_from_list 'emoji_vehicles'
+}
+
+function random_emoji_animal(){
+  random_emoji_from_list 'emoji_animals'
+}
+
+function random_emoji_face(){
+  random_emoji_from_list 'emoji_faces'
+}
+
+function display_emoji_fruits(){
+  display_emoji_list 'emoji_fruits'
+}
+
+function display_emoji_vehicles(){
+  display_emoji_list 'emoji_vehicles'
+}
+
+function display_emoji_animals(){
+  display_emoji_list 'emoji_animals'
+}
+
+function display_emoji_faces(){
+  display_emoji_list 'emoji_faces'
+}
+
+function display_all_emoji(){
+  echo $emoji[@]
+  echo
+  for k in ${(k)emoji}; do
+    echo "${emoji[$k]}  = $k"
+  done
+}
+

From 1274a5e3ab23720e64cf2044cdbe6aa86d402864 Mon Sep 17 00:00:00 2001
From: Zbigniew Siciarz <antyqjon@gmail.com>
Date: Mon, 9 Jun 2014 21:03:09 +0200
Subject: [PATCH 0735/1378] Added cabal freeze subcommand.

---
 plugins/cabal/cabal.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index b59438f98..148af5ccf 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -24,6 +24,7 @@ function _cabal_commands() {
           "configure:Prepare to build the package"
           "exec:Run a command with the cabal environment"
           "fetch:Downloads packages for later installation"
+          "freeze:Freeze dependencies."
           "get:Gets a package's source code"
           "haddock:Generate Haddock HTML documentation"
           "help:Help about commands"

From 7fbbf28e6e37e604c7821a24993d32a478d857f8 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Tue, 10 Jun 2014 09:50:53 +0200
Subject: [PATCH 0736/1378] return 0 when not a git repo before, 128 was
 returned, which could display an error, but out of a git repo this should
 exit silently fixes #2226

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 305a77aff..df7722721 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -2,7 +2,7 @@
 function git_prompt_info() {
   if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
     ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
-    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
     echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
   fi
 }

From 09fdf763114fc571debff96b48c85ecfaeb7a2e4 Mon Sep 17 00:00:00 2001
From: Will Boyce <me@willboyce.com>
Date: Mon, 28 Apr 2014 23:12:49 +0100
Subject: [PATCH 0737/1378] ignore usernames beginning with underscore

---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index c54249c52..fa1d97f48 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -44,7 +44,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
         named netdump news nfsnobody nobody nscd ntp nut nx obsrun openvpn \
         operator pcap polkitd postfix postgres privoxy pulse pvm quagga radvd \
         rpc rpcuser rpm rtkit scard shutdown squid sshd statd svn sync tftp \
-        usbmux uucp vcsa wwwrun xfs
+        usbmux uucp vcsa wwwrun xfs '_*'
 
 # ... unless we really want to.
 zstyle '*' single-ignored show

From 9c11202fde61bf3db6755f4083c320d710fe3bd5 Mon Sep 17 00:00:00 2001
From: frantzmiccoli <frantz.miccoli@gmail.com>
Date: Fri, 13 Jun 2014 20:28:37 +0200
Subject: [PATCH 0738/1378] fix `-nt` usage

---
 plugins/phing/phing.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/phing.plugin.zsh
index 9af03af24..1f022047c 100644
--- a/plugins/phing/phing.plugin.zsh
+++ b/plugins/phing/phing.plugin.zsh
@@ -1,6 +1,6 @@
 _phing_does_target_list_need_generating () {
   [ ! -f .phing_targets ] && return 0;
-  [ .phing_targets -nt build.xml ] && return 0;
+  [ build.xml -nt .phing_targets ] && return 0;
   return 1;
 }
 

From 45b61297113c7c2d2cb0eeb80537c8fa944865df Mon Sep 17 00:00:00 2001
From: willmendesneto <willmendesneto@gmail.com>
Date: Thu, 19 Jun 2014 23:27:40 -0300
Subject: [PATCH 0739/1378] Add new plugin: "frontend-search"

---
 plugins/frontend-search/README.md             |  82 ++++++++++
 .../frontend-search.plugin.zsh                | 151 ++++++++++++++++++
 2 files changed, 233 insertions(+)
 create mode 100644 plugins/frontend-search/README.md
 create mode 100644 plugins/frontend-search/frontend-search.plugin.zsh

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
new file mode 100644
index 000000000..32784d03b
--- /dev/null
+++ b/plugins/frontend-search/README.md
@@ -0,0 +1,82 @@
+## Rationale ##
+
+The idea for this script is to help searches in important doc contents from frontend.
+
+## Instalation ##
+
+I will send a Pull Request with this plugin for .oh-my-zsh official repository. If accept them, it's only add in plugins list that exists in ```.zshrc``` file.
+
+For now, you can clone this repository and add in ```custom/plugins``` folder
+
+```bash
+$ git clone git://github.com/willmendesneto/frontend-search.git ~/.oh-my-zsh/custom/plugins/frontend-search
+```
+
+After this, restart your terminal and frontend-search plugin is configurated in you CLI.
+
+```bash
+...
+plugins=( <your-plugins-list>... frontend-search)
+...
+```
+
+## Commands ##
+
+All command searches are accept only in format
+
+* `frontend <search-content> <search-term>`
+
+The search content are
+
+* `jquery <api.jquery.com>`
+* `mdn <developer.mozilla.org>`
+* `compass <compass-style.org>`
+* `html5please <html5please.com>`
+* `caniuse <caniuse.com>`
+* `aurajs <aurajs.com>`
+* `dartlang <api.dartlang.org/apidocs/channels/stable/dartdoc-viewer>`
+* `lodash <search>`
+* `qunit <api.qunitjs.com>`
+* `fontello <fontello.com>`
+* `bootsnipp <bootsnipp.com>`
+* `cssflow <cssflow.com>`
+* `codepen <codepen.io>`
+* `unheap <www.unheap.com>`
+* `bem <google.com/search?as_q=<search-term>&as_sitesearch=bem.info>`
+* `smacss <google.com/search?as_q=<search-term>&as_sitesearch=smacss.com>`
+* `angularjs <google.com/search?as_q=<search-term>&as_sitesearch=angularjs.org>`
+* `reactjs <google.com/search?as_q=<search-term>&as_sitesearch=facebook.github.io/react>`
+* `emberjs <emberjs.com>`
+
+
+## Aliases ##
+
+There are a few aliases presented as well:
+
+* `jquery` A shorthand for `frontend jquery`
+* `mdn` A shorthand for `frontend mdn`
+* `compass` A shorthand for `frontend compass`
+* `html5please` A shorthand for `frontend html5please`
+* `caniuse` A shorthand for `frontend caniuse`
+* `aurajs` A shorthand for `frontend aurajs`
+* `dartlang` A shorthand for `frontend dartlang`
+* `lodash` A shorthand for `frontend lodash`
+* `qunit` A shorthand for `frontend qunit`
+* `fontello` A shorthand for `frontend fontello`
+* `bootsnipp` A shorthand for `frontend bootsnipp`
+* `cssflow` A shorthand for `frontend cssflow`
+* `codepen` A shorthand for `frontend codepen`
+* `unheap` A shorthand for `frontend unheap`
+* `bem` A shorthand for `frontend bem`
+* `smacss` A shorthand for `frontend smacss`
+* `angularjs` A shorthand for `frontend angularjs`
+* `reactjs` A shorthand for `frontend reactjs`
+* `emberjs` A shorthand for `frontend emberjs`
+
+## Author
+
+**Wilson Mendes (willmendesneto)**
++ <https://twitter.com/willmendesneto>
++ <http://github.com/willmendesneto>
+
+New features comming soon.
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
new file mode 100644
index 000000000..38b1a80ea
--- /dev/null
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -0,0 +1,151 @@
+# frontend from terminal
+
+function frontend() {
+
+  # get the open command
+  local open_cmd
+  if [[ $(uname -s) == 'Darwin' ]]; then
+    open_cmd='open'
+  else
+    open_cmd='xdg-open'
+  fi
+
+  # no keyword provided, simply show how call methods
+  if [[ $# -le 1 ]]; then
+    echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n"
+    return 1
+  fi
+
+  # check whether the search engine is supported
+  if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs)' ]];
+  then
+    echo "Search valid search content $1 not supported."
+    echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')"
+    echo "* jquery"
+    echo "* mdn"
+    echo "* compass"
+    echo "* html5please"
+    echo "* caniuse"
+    echo "* aurajs"
+    echo "* dartlang"
+    echo "* lodash"
+    echo "* qunit"
+    echo "* fontello"
+    echo "* bootsnipp"
+    echo "* cssflow"
+    echo "* codepen"
+    echo "* unheap"
+    echo "* bem"
+    echo "* smacss"
+    echo "* angularjs"
+    echo "* reactjs"
+    echo "* emberjs"
+    echo ""
+
+    return 1
+  fi
+
+  local url="http://"
+  local query=""
+
+  case "$1" in
+    "jquery")
+      url="${url}api.jquery.com"
+      url="${url}/?s=$2" ;;
+    "mdn")
+      url="${url}developer.mozilla.org"
+      url="${url}/search?q=$2" ;;
+    "compass")
+      url="${url}compass-style.org"
+      url="${url}/search?q=$2" ;;
+    "html5please")
+      url="${url}html5please.com"
+      url="${url}/#$2" ;;
+    "caniuse")
+      url="${url}caniuse.com"
+      url="${url}/#search=$2" ;;
+    "aurajs")
+      url="${url}aurajs.com"
+      url="${url}/api/#stq=$2" ;;
+    "dartlang")
+      url="${url}api.dartlang.org/apidocs/channels/stable/dartdoc-viewer"
+      url="${url}/dart-$2" ;;
+    "qunit")
+      url="${url}api.qunitjs.com"
+      url="${url}/?s=$2" ;;
+    "fontello")
+      url="${url}fontello.com"
+      url="${url}/#search=$2" ;;
+    "bootsnipp")
+      url="${url}bootsnipp.com"
+      url="${url}/search?q=$2" ;;
+    "cssflow")
+      url="${url}cssflow.com"
+      url="${url}/search?q=$2" ;;
+    "codepen")
+      url="${url}codepen.io"
+      url="${url}/search?q=$2" ;;
+    "unheap")
+      url="${url}www.unheap.com"
+      url="${url}/?s=$2" ;;
+    "bem")
+      url="${url}google.com"
+      url="${url}/search?as_q=$2&as_sitesearch=bem.info" ;;
+    "smacss")
+      url="${url}google.com"
+      url="${url}/search?as_q=$2&as_sitesearch=smacss.com" ;;
+    "angularjs")
+      url="${url}google.com"
+      url="${url}/search?as_q=$2&as_sitesearch=angularjs.org" ;;
+    "reactjs")
+      url="${url}google.com"
+      url="${url}/search?as_q=$2&as_sitesearch=facebook.github.io/react" ;;
+    "emberjs")
+      url="${url}emberjs.com"
+      url="${url}/api/#stq=$2&stp=1" ;;
+    *) echo "INVALID PARAM!"
+       return ;;
+  esac
+
+  echo "$url"
+
+  $open_cmd "$url"
+
+}
+
+# javascript
+alias jquery='frontend jquery'
+alias mdn='frontend mdn'
+
+# pre processors frameworks
+alias compass='frontend compass'
+
+# important links
+alias html5please='frontend html5please'
+alias caniuse='frontend caniuse'
+
+# components and libraries
+alias aurajs='frontend aurajs'
+alias dartlang='frontend dartlang'
+alias lodash='frontend lodash'
+
+#tests
+alias qunit='frontend qunit'
+
+#fonts
+alias fontello='frontend fontello'
+
+# snippets
+alias bootsnipp='frontend bootsnipp'
+alias cssflow='frontend cssflow'
+alias codepen='frontend codepen'
+alias unheap='frontend unheap'
+
+# css architecture
+alias bem='frontend bem'
+alias smacss='frontend smacss'
+
+# frameworks
+alias angularjs='frontend angularjs'
+alias reactjs='frontend reactjs'
+alias emberjs='frontend emberjs'

From 89a5075528f5e36a442330f13f89a0782f1c555d Mon Sep 17 00:00:00 2001
From: Fenhl <fenhl@fenhl.net>
Date: Wed, 12 Feb 2014 17:23:29 +0000
Subject: [PATCH 0740/1378] Add pip3 completion support to pip plugin

---
 plugins/pip/_pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 9892dd19c..bf0df3e41 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -1,4 +1,4 @@
-#compdef pip
+#compdef pip pip3 pip-3.2 pip-3.3 pip-3.4
 #autoload
 
 # pip zsh completion, based on homebrew completion

From 82d557a84e26ea79a3ecc5a8e975890c23099a00 Mon Sep 17 00:00:00 2001
From: Fenhl <fenhl@fenhl.net>
Date: Wed, 11 Jun 2014 19:31:24 +0000
Subject: [PATCH 0741/1378] Add pip2 and pip-2.7 support to pip plugin

---
 plugins/pip/_pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index bf0df3e41..cb155e5f4 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -1,4 +1,4 @@
-#compdef pip pip3 pip-3.2 pip-3.3 pip-3.4
+#compdef pip pip2 pip-2.7 pip3 pip-3.2 pip-3.3 pip-3.4
 #autoload
 
 # pip zsh completion, based on homebrew completion

From 340da08b9ad92654e5e9bb45a1aedc8645f78b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 16 Apr 2014 20:23:01 +0200
Subject: [PATCH 0742/1378] Add missing quotes to within-bundler-project
 function

---
 plugins/bundler/bundler.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 8571eeda3..d70e8d4da 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -40,8 +40,8 @@ _bundler-installed() {
 }
 
 _within-bundled-project() {
-  local check_dir=$PWD
-  while [ $check_dir != "/" ]; do
+  local check_dir="$PWD"
+  while [ "$check_dir" != "/" ]; do
     [ -f "$check_dir/Gemfile" ] && return
     check_dir="$(dirname $check_dir)"
   done

From 49161e78472b484015c2080f7a724e95d42b4987 Mon Sep 17 00:00:00 2001
From: "Mikhail S. Pobolovets" <styx.mp@gmail.com>
Date: Sun, 2 Feb 2014 13:24:35 +0300
Subject: [PATCH 0743/1378] Add missing `command` wrapper for git

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index df7722721..883bba25c 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,6 +1,6 @@
 # get the name of the branch we are on
 function git_prompt_info() {
-  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
     ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
     ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
     echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"

From c5d9fc996819488801864407ad1b7624acf3c26c Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <tarleb@moltkeplatz.de>
Date: Tue, 24 Jun 2014 13:01:41 +0200
Subject: [PATCH 0744/1378] git_prompt_info: ignore git-config errors

Merged from #2906

The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output.  This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).

This fixes the issue by simply ignoring the stderr output.
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 883bba25c..b0e73bf3a 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,6 +1,6 @@
 # get the name of the branch we are on
 function git_prompt_info() {
-  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
     ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
     ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
     echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"

From f2b81e2977c264713a2a0f6971c8f312f7560b52 Mon Sep 17 00:00:00 2001
From: Helge Rausch <helge@rausch.io>
Date: Mon, 16 Jun 2014 16:18:22 +0200
Subject: [PATCH 0745/1378] Add spring to bundled commands

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index d70e8d4da..20931dcef 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -7,7 +7,7 @@ alias bi="bundle_install"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork strainer tailor taps thin thor unicorn unicorn_rails)
+bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork spring strainer tailor taps thin thor unicorn unicorn_rails)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do

From bc2e3ff15a55fd21c6eabd502981e035dd5629c1 Mon Sep 17 00:00:00 2001
From: Peter Butkovic <butkovic@gmail.com>
Date: Tue, 24 Jun 2014 16:26:12 +0200
Subject: [PATCH 0746/1378] added useful mvn aliases

---
 plugins/mvn/mvn.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index ed7968534..2b7683078 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -44,19 +44,22 @@ mvn-color()
 # aliases
 alias mvncie='mvn clean install eclipse:eclipse'
 alias mvnci='mvn clean install'
+alias mvncist='mvn clean install -DskipTests'
 alias mvne='mvn eclipse:eclipse'
 alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
 alias mvnd='mvn deploy'
 alias mvnp='mvn package'
 alias mvnc='mvn clean'
 alias mvncom='mvn compile'
+alias mvnct='mvn clean test'
 alias mvnt='mvn test'
 alias mvnag='mvn archetype:generate'
 alias mvn-updates='mvn versions:display-dependency-updates'
 alias mvntc7='mvn tomcat7:run' 
 alias mvntc='mvn tomcat:run'
 alias mvnjetty='mvn jetty:run'
-
+alias mvndt='mvn dependency:tree'
+alias mvns='mvn site'
 
 function listMavenCompletions { 
      reply=(

From 75c02dd53e65357658f08bafaec99cc4b15a55ec Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Fri, 23 May 2014 10:52:37 +0200
Subject: [PATCH 0747/1378] Plugin jump: autocompletion for numbers and dots

This change fixes the autocompletion for marks which contain numbers or dots.

Fixes #2578

`\d` in sed regular expressions doesn't work (see http://stackoverflow.com/questions/14671293/why-does-d-doesnt-work-in-regular-expression-in-sed)
---
 plugins/jump/jump.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 5096879d8..1b23b5d42 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -39,7 +39,7 @@ marks() {
 
 _completemarks() {
 	if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
-		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_\da-zA-Z\-]*):$/\2/g'))
+		reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_a-zA-Z0-9\.\-]*):$/\2/g'))
 	else
 		if readlink -e "${MARKPATH}"/* &>/dev/null; then
 			reply=($(ls "${MARKPATH}"))

From dbca185b05b79cdc5308936415602d81fb444821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arandi=20L=C3=B3pez?= <arandilopez.93@gmail.com>
Date: Sat, 21 Jun 2014 20:29:05 -0500
Subject: [PATCH 0748/1378] Add /usr/bin/subl path for who has linked sublime
 text there

---
 plugins/sublime/sublime.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index a2042343a..438f386fb 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -7,6 +7,7 @@ if [[ $('uname') == 'Linux' ]]; then
         "/opt/sublime_text/sublime_text"
         "/usr/bin/sublime_text"
         "/usr/local/bin/sublime_text"
+        "/usr/bin/subl"
     )
     for _sublime_path in $_sublime_linux_paths; do
         if [[ -a $_sublime_path ]]; then

From ce9ec85c63412036163781d3501e9ed74432d391 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 1 Jun 2014 19:28:42 -0400
Subject: [PATCH 0749/1378] Add Composer's global binaries to PATH

---
 plugins/composer/composer.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 9975aaca4..86f2ca4df 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -46,3 +46,6 @@ alias cdu='composer dump-autoload'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
+
+# Add Composer's global binaries to PATH
+export PATH=$PATH:~/.composer/vendor/bin

From 08632bb1780d51f6748b5c09ef5232862313f78f Mon Sep 17 00:00:00 2001
From: fjcapdevila <fjcapdevila@gmail.com>
Date: Mon, 2 Jun 2014 12:14:57 -0300
Subject: [PATCH 0750/1378] Basic support for Docker related commands.

Add basic support for Docker related commands.
---
 plugins/vagrant/_vagrant | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index e05b16f81..9ddfa1be7 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -8,6 +8,8 @@ _1st_arguments=(
     'box:Box commands'
     'connect:Connects to a shared, remote Vagrant environment'
     'destroy:Destroys the vagrant environment'
+    'docker-logs:Shows Docker logs'
+    'docker-run:Run one-off commands against a Docker container'
     'global-status:Reports the status of all active Vagrant environments on the system'
     'halt:Halts the currently running vagrant environment'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'

From 480ca2205846426c04fa46fb37e1f7246bba2b88 Mon Sep 17 00:00:00 2001
From: Helge Rausch <helge@rausch.io>
Date: Mon, 16 Jun 2014 16:11:59 +0200
Subject: [PATCH 0751/1378] Make bundler plugin run binstubbed cmd if existing

---
 plugins/bundler/bundler.plugin.zsh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 3338d78be..fc20f91b3 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -47,9 +47,17 @@ _within-bundled-project() {
   false
 }
 
+_binstubbed() {
+  [ -f "./bin/${1}" ]
+}
+
 _run-with-bundler() {
   if _bundler-installed && _within-bundled-project; then
-    bundle exec $@
+    if _binstubbed $1; then
+      bundle exec "./bin/$@"
+    else
+      bundle exec $@
+    fi
   else
     $@
   fi

From 14ebcc83bec267859e2948f36f48cc69f5150def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ben=20Z=C3=B6rb?= <ben@sommerlaune.com>
Date: Sat, 28 Jun 2014 00:03:10 +0200
Subject: [PATCH 0752/1378] #2893 generalized symfony2 console directory

---
 plugins/symfony2/symfony2.plugin.zsh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 4c07349a4..26210acfd 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,22 +1,22 @@
 # Symfony2 basic command completion
 
 _symfony2_get_command_list () {
-	php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+	php $(find . -maxdepth 2 -mindepth 1 -name 'console')  --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony2 () {
-  if [ -f app/console ]; then
+  if [ -f $(find . -maxdepth 2 -mindepth 1 -name 'console')  ]; then
     compadd `_symfony2_get_command_list`
   fi
 }
 
-compdef _symfony2 app/console
+compdef _symfony2 $(find . -maxdepth 2 -mindepth 1 -name 'console')
 compdef _symfony2 sf
 
 #Alias
-alias sf='php app/console'
-alias sfcl='php app/console cache:clear'
-alias sfroute='php app/console router:debug'
-alias sfcontainer='php app/console container:debug'
-alias sfgb='php app/console generate:bundle'
+alias sf='php $(find . -maxdepth 2 -mindepth 1 -name 'console') '
+alias sfcl='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  cache:clear'
+alias sfroute='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  router:debug'
+alias sfcontainer='php $(find . -maxdepth 2 -mindepth 1 -name 'console') container:debug'
+alias sfgb='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  generate:bundle'
 

From 676fb4e4203eae0f3755a729a6582eb32fe9834f Mon Sep 17 00:00:00 2001
From: Simon Buchan <simon.buchan@skilitics.com>
Date: Thu, 3 Jul 2014 13:14:02 +1200
Subject: [PATCH 0753/1378] Fix parse_git_dirty() when status.branch is set.

---
 lib/git.zsh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index b0e73bf3a..8742a857a 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -10,23 +10,20 @@ function git_prompt_info() {
 
 # Checks if working tree is dirty
 parse_git_dirty() {
-  local SUBMODULE_SYNTAX=''
-  local GIT_STATUS=''
-  local CLEAN_MESSAGE='nothing to commit (working directory clean)'
+  local STATUS=''
+  local FLAGS
+  FLAGS=('--porcelain')
   if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
-          SUBMODULE_SYNTAX="--ignore-submodules=dirty"
+      FLAGS+='--ignore-submodules=dirty'
     fi
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
-        GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
-    else
-        GIT_STATUS=$(command git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
-    fi
-    if [[ -n $GIT_STATUS ]]; then
-      echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
-    else
-      echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
+      FLAGS+='--untracked-files=no'
     fi
+    STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
+  fi
+  if [[ -n $STATUS ]]; then
+    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi

From 2927ce37141d52a8b4e2ca1e60d0cf0688125781 Mon Sep 17 00:00:00 2001
From: Simon Buchan <simon.buchan@skilitics.com>
Date: Thu, 3 Jul 2014 14:45:49 +1200
Subject: [PATCH 0754/1378] Fix POST_1_7_2_GIT check for parse_git_dirty
 submodules.

---
 lib/git.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 8742a857a..55ed94a3d 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -124,12 +124,16 @@ function git_compare_version() {
   INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
 
   for i in {1..3}; do
+    if [[ $INSTALLED_GIT_VERSION[$i] -gt $INPUT_GIT_VERSION[$i] ]]; then
+      echo 1
+      return 0
+    fi
     if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then
       echo -1
       return 0
     fi
   done
-  echo 1
+  echo 0
 }
 
 #this is unlikely to change so make it all statically assigned

From 8d762e46f7c276ec81c1d0e1eda3dda250913689 Mon Sep 17 00:00:00 2001
From: kubamarchwicki <kuba@marchwicki.pl>
Date: Mon, 7 Jul 2014 15:12:47 +0200
Subject: [PATCH 0755/1378] Spring boot autocomplete

---
 plugins/mvn/mvn.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 2b7683078..a70625fcf 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -129,6 +129,8 @@ function listMavenCompletions {
         tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
         # tomcat7
         tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
+        # spring-boot
+        spring-boot:run spring-boot:repackage
         # exec
         exec:exec exec:java
         # versions

From aa82bd7400d2c604987236f8f65c353143d56324 Mon Sep 17 00:00:00 2001
From: Andy Hayden <andyhayden1@gmail.com>
Date: Tue, 8 Jul 2014 21:51:48 -0700
Subject: [PATCH 0756/1378] terminal party show exit status with color

---
 themes/terminalparty.zsh-theme | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/terminalparty.zsh-theme b/themes/terminalparty.zsh-theme
index 216ce37eb..cd7370bba 100644
--- a/themes/terminalparty.zsh-theme
+++ b/themes/terminalparty.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg[green]%} %% '
+PROMPT='%(?,%{$fg[green]%},%{$fg[red]%}) %% '
 # RPS1='%{$fg[blue]%}%~%{$reset_color%} '
 RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}'
 
@@ -6,4 +6,3 @@ ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ⚡%{$fg[yellow]%}"
-

From 5e328e3a9c0784521ae4170f7958183c352bae83 Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Fri, 11 Jul 2014 18:41:49 +0530
Subject: [PATCH 0757/1378] Solaris portability tweaks.

---
 lib/completion.zsh                         |  7 ++++++-
 oh-my-zsh.sh                               |  1 +
 plugins/colored-man/colored-man.plugin.zsh | 21 +++++++++++++++++++++
 tools/check_for_upgrade.sh                 |  8 +++++++-
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index fa1d97f48..faea36118 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -25,7 +25,12 @@ bindkey -M menuselect '^o' accept-and-infer-next-history
 
 zstyle ':completion:*:*:*:*:*' menu select
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
-zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
+if [ "$PLAT" = "SunOS" ]
+then
+  zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm"
+else
+  zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
+fi
 
 # disable named-directories autocompletion
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c217b91bb..4683c2bc0 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,4 @@
+PLAT=`uname -s`
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
diff --git a/plugins/colored-man/colored-man.plugin.zsh b/plugins/colored-man/colored-man.plugin.zsh
index 56056284a..4956f4346 100644
--- a/plugins/colored-man/colored-man.plugin.zsh
+++ b/plugins/colored-man/colored-man.plugin.zsh
@@ -1,3 +1,21 @@
+if [ "${PLAT}" = "SunOS" ]
+then
+	if [ ! -x ${HOME}/bin/nroff ]
+	then
+		mkdir -p ${HOME}/bin
+		cat > ${HOME}/bin/nroff <<EOF
+#!/bin/sh
+if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then
+	shift
+	exec /usr/bin/nroff -u\${_NROFF_U} "\$@"
+fi
+#-- Some other invocation of nroff
+exec /usr/bin/nroff "\$@"
+EOF
+	chmod +x ${HOME}/bin/nroff
+	fi
+fi
+
 man() {
       env \
       	  LESS_TERMCAP_mb=$(printf "\e[1;31m") \
@@ -7,5 +25,8 @@ man() {
 	  LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
 	  LESS_TERMCAP_ue=$(printf "\e[0m") \
 	  LESS_TERMCAP_us=$(printf "\e[1;32m") \
+	  PAGER=/usr/bin/less \
+	  _NROFF_U=1 \
+	  PATH=${HOME}/bin:${PATH} \
 	  			   man "$@"
 }
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 8b8ecae03..1aba9a272 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -1,7 +1,13 @@
 #!/bin/sh
 
+PLAT=`uname -s`
 function _current_epoch() {
-  echo $(($(date +%s) / 60 / 60 / 24))
+  if [ "$PLAT" = "SunOS" ]
+  then
+    echo $(($(perl -e 'print time') / 60 / 60 / 24))
+  else
+    echo $(($(date +%s) / 60 / 60 / 24))
+  fi
 }
 
 function _update_zsh_update() {

From 6b3a723c370e9867feb68f13f5bbb7adfd000e63 Mon Sep 17 00:00:00 2001
From: Josh Comer <jcomer@liveops.com>
Date: Mon, 14 Jul 2014 16:41:57 -0700
Subject: [PATCH 0758/1378] Fix typo in docker plugin

---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index c291037a3..28568a6e5 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -214,7 +214,7 @@ __save() {
 __start() {
     _arguments \
         '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \
-        '(-i,--interactive=)'{-i, --interactive=}'[Attach container''s stdin]'
+        '(-i,--interactive=)'{-i,--interactive=}'[Attach container''s stdin]'
     __docker_containers
 }
 

From 392af393e81a4f2bc3405bfd9e1f98675f0bd886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ben=20Z=C3=B6rb?= <ben@sommerlaune.com>
Date: Tue, 15 Jul 2014 15:13:13 +0200
Subject: [PATCH 0759/1378] added cache:warmup alias

---
 plugins/symfony2/symfony2.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 26210acfd..1d5177e6d 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -16,6 +16,7 @@ compdef _symfony2 sf
 #Alias
 alias sf='php $(find . -maxdepth 2 -mindepth 1 -name 'console') '
 alias sfcl='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  cache:clear'
+alias sfcw='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  cache:warmup'
 alias sfroute='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  router:debug'
 alias sfcontainer='php $(find . -maxdepth 2 -mindepth 1 -name 'console') container:debug'
 alias sfgb='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  generate:bundle'

From 6adc89131c1cf9fe79c3eaa3df1cd65a292bfc4d Mon Sep 17 00:00:00 2001
From: Simon Frost <sfrost007@gmail.com>
Date: Tue, 15 Jul 2014 14:20:39 +0100
Subject: [PATCH 0760/1378] Fix typo in warp directory plugin

---
 plugins/wd/wd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 96a3426fc..9ebad6808 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -58,7 +58,7 @@ wd_warp()
         #wd_print_msg $BLUE "Warping..."
         cd ${points[$1]}
     else
-        wd_print_msg $RED "Unkown warp point '$1'"
+        wd_print_msg $RED "Unknown warp point '$1'"
     fi
 }
 

From 9d76784b3ed85115e1830d48d91b3a08236a6538 Mon Sep 17 00:00:00 2001
From: Simon Frost <sfrost007@gmail.com>
Date: Tue, 15 Jul 2014 14:22:24 +0100
Subject: [PATCH 0761/1378] Add support for jira-prefix configuration file

---
 plugins/jira/jira.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 739ee7142..3d510e430 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -29,15 +29,23 @@ open_jira_issue () {
     return 0
   fi
 
+  if [ -f .jira-prefix ]; then
+    jira_prefix=$(cat .jira-prefix)
+  elif [ -f ~/.jira-prefix ]; then
+    jira_prefix=$(cat ~/.jira-prefix)
+  else
+    jira_prefix=""
+  fi
+
   if [ -z "$1" ]; then
     echo "Opening new issue"
     $open_cmd "$jira_url/secure/CreateIssue!default.jspa"
   else
     echo "Opening issue #$1"
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
-      $open_cmd  "$jira_url/issues/$1"
+      $open_cmd  "$jira_url/issues/$jira_prefix$1"
     else
-      $open_cmd  "$jira_url/browse/$1"
+      $open_cmd  "$jira_url/browse/$jira_prefix$1"
     fi
   fi
 }

From d29c53cb101d6949f9d2c341e511533046568b86 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Wed, 2 Jul 2014 12:22:33 +0200
Subject: [PATCH 0762/1378] split bundler-commands into seperate lines

This makes adding, deleting and merging a lot easier.
---
 plugins/bundler/bundler.plugin.zsh | 37 ++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fbdbc0244..12f516f14 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -5,9 +5,39 @@ alias bo="bundle open"
 alias bu="bundle update"
 alias bi="bundle_install"
 
-# The following is based on https://github.com/gma/bundler-exec
-
-bundled_commands=(annotate berks cap capify cucumber foodcritic foreman guard irb jekyll kitchen knife middleman nanoc puma rackup rainbows rake rspec ruby shotgun spec spin spork spring strainer tailor taps thin thor unicorn unicorn_rails)
+bundled_commands=(
+  annotate
+  berks
+  cap
+  capify
+  cucumber
+  foodcritic
+  foreman
+  guard
+  irb
+  jekyll
+  kitchen
+  knife
+  middleman
+  nanoc
+  puma
+  rackup
+  rainbows
+  rake
+  rspec
+  ruby
+  shotgun
+  spec
+  spin
+  spork
+  strainer
+  tailor
+  taps
+  thin
+  thor
+  unicorn
+  unicorn_rails
+)
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
 for cmd in $UNBUNDLED_COMMANDS; do
@@ -74,4 +104,3 @@ for cmd in $bundled_commands; do
         compdef _$cmd bundled_$cmd=$cmd
   fi
 done
-

From c4eec0b1349168a0c23819d153401ce7e802260c Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Wed, 2 Jul 2014 20:35:49 +0200
Subject: [PATCH 0763/1378] add sidekiq to bundler-commands

closes #2779
---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 12f516f14..57fb20bea 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -27,6 +27,7 @@ bundled_commands=(
   rspec
   ruby
   shotgun
+  sidekiq
   spec
   spin
   spork

From a22e0256a35e6e3378f253090029abfaf917a81c Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Wed, 2 Jul 2014 20:36:16 +0200
Subject: [PATCH 0764/1378] remove foreman from bundler-commands

closes #1825
---
 plugins/bundler/bundler.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 57fb20bea..0c981c924 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -12,7 +12,6 @@ bundled_commands=(
   capify
   cucumber
   foodcritic
-  foreman
   guard
   irb
   jekyll

From f5e69c6cab20f1ac6dbb67f0cd7b49d079e0a76c Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Wed, 2 Jul 2014 20:36:33 +0200
Subject: [PATCH 0765/1378] remove spin from bundler-commands

closes #1817
---
 plugins/bundler/bundler.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 0c981c924..22f59db4f 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -28,7 +28,6 @@ bundled_commands=(
   shotgun
   sidekiq
   spec
-  spin
   spork
   strainer
   tailor

From fdbfd410907c30c28184a339323fd5703cbd2309 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Fri, 4 Jul 2014 14:29:16 +0200
Subject: [PATCH 0766/1378] remove ruby from bundler-commands

related to #1587
closes #2200
closes #2561
---
 plugins/bundler/bundler.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 22f59db4f..cd54ad6fa 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -24,7 +24,6 @@ bundled_commands=(
   rainbows
   rake
   rspec
-  ruby
   shotgun
   sidekiq
   spec

From f8ea9270ebcb012aee8e0691e5ab2fc700e56492 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Fri, 4 Jul 2014 14:33:24 +0200
Subject: [PATCH 0767/1378] remove berkshelf from bundler-commands

fixes #2076
---
 plugins/bundler/bundler.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index cd54ad6fa..fd65ad568 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -7,7 +7,6 @@ alias bi="bundle_install"
 
 bundled_commands=(
   annotate
-  berks
   cap
   capify
   cucumber

From 20c84eaafc0bddc8584902898c245dbe1a7b0f8f Mon Sep 17 00:00:00 2001
From: toooooooby <toby.net.info.mail+git@gmail.com>
Date: Wed, 15 May 2013 02:15:13 +0900
Subject: [PATCH 0768/1378] Add 'outdated' and 'platform' completions to
 bundler plugin

---
 plugins/bundler/_bundler | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/bundler/_bundler b/plugins/bundler/_bundler
index 2ec3a5f9c..ba647ab80 100644
--- a/plugins/bundler/_bundler
+++ b/plugins/bundler/_bundler
@@ -18,11 +18,13 @@ case $state in
 			"check[Determine whether the requirements for your application are installed]" \
 			"list[Show all of the gems in the current bundle]" \
 			"show[Show the source location of a particular gem in the bundle]" \
+			"outdated[Show all of the outdated gems in the current bundle]" \
 			"console[Start an IRB session in the context of the current bundle]" \
 			"open[Open an installed gem in the editor]" \
 			"viz[Generate a visual representation of your dependencies]" \
 			"init[Generate a simple Gemfile, placed in the current directory]" \
 			"gem[Create a simple gem, suitable for development with bundler]" \
+			"platform[Displays platform compatibility information]" \
 			"clean[Cleans up unused gems in your bundler directory]" \
 			"help[Describe available tasks or one specific task]"
 		ret=0
@@ -39,11 +41,13 @@ case $state in
                     'check' \
                     'list' \
                     'show' \
+                    'outdated' \
                     'console' \
                     'open' \
                     'viz' \
                     'init' \
                     'gem' \
+                    'platform' \
                     'help' && ret=0
 				;;
 			install)
@@ -71,6 +75,15 @@ case $state in
 					'(--verbose)--verbose[Enable verbose output mode]'
 				ret=0
 				;;
+			outdated)
+				_arguments \
+					'(--pre)--pre[Check for newer pre-release gems]' \
+					'(--source)--source[Check against a specific source]' \
+					'(--local)--local[Do not attempt to fetch gems remotely and use the gem cache instead]' \
+					'(--no-color)--no-color[Disable colorization in output]' \
+					'(--verbose)--verbose[Enable verbose output mode]'
+				ret=0
+				;;
 			(open|show)
 				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
 				if [[ $_gems != "" ]]; then

From cfc98d3f8c234b48d34961ce18274ad365ebb97b Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Fri, 4 Jul 2014 14:56:44 +0200
Subject: [PATCH 0769/1378] remove double bundle exec

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fd65ad568..254e0a364 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -82,7 +82,7 @@ _binstubbed() {
 _run-with-bundler() {
   if _bundler-installed && _within-bundled-project; then
     if _binstubbed $1; then
-      bundle exec "./bin/$@"
+      ./bin/$@
     else
       bundle exec $@
     fi

From 11f0d273b5849275909d5fcf37e4771e0449f897 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Fri, 4 Jul 2014 15:16:29 +0200
Subject: [PATCH 0770/1378] add spring to bundler-commands

---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 254e0a364..fe098d854 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -27,6 +27,7 @@ bundled_commands=(
   sidekiq
   spec
   spork
+  spring
   strainer
   tailor
   taps

From b007fee187bb111c13c0c95b39763b28dc3f8ca0 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Fri, 4 Jul 2014 15:17:02 +0200
Subject: [PATCH 0771/1378] add pry to bundler-commands

---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fe098d854..4f9eea922 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -18,6 +18,7 @@ bundled_commands=(
   knife
   middleman
   nanoc
+  pry
   puma
   rackup
   rainbows

From 34bc91e79d8cbb7b889402746770f1671d9b5872 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Mon, 7 Jul 2014 14:23:37 +0200
Subject: [PATCH 0772/1378] added Bundler readme file

---
 plugins/bundler/README.md          | 49 ++++++++++++++++++++++++++++++
 plugins/bundler/bundler.plugin.zsh |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 plugins/bundler/README.md

diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md
new file mode 100644
index 000000000..56f0c7176
--- /dev/null
+++ b/plugins/bundler/README.md
@@ -0,0 +1,49 @@
+# Bundler
+
+- adds completion for basic bundler commands
+- adds short aliases for common bundler commands
+  - `be` aliased to `bundle exec`
+  - `bl` aliased to `bundle list`
+  - `bp` aliased to `bundle package`
+  - `bo` aliased to `bundle open`
+  - `bu` aliased to `bundle update`
+  - `bi` aliased to `bundle install --jobs=<cpu core count>` (only for bundler `>= 1.4.0`)
+- adds a wrapper for common gems:
+  - looks for a binstub under `./bin/` and executes it (if present)
+  - calls `bundle exec <gem executable>` otherwise
+
+For a full list of *common gems* being wrapped by default please look at the `bundler.plugin.zsh` file.
+
+## Configuration
+
+Please use the exact name of the executable and not the gem name.
+
+### Add additional gems to be wrapped
+
+Add this before the plugin-list in your `.zshrc`:
+```sh
+BUNDLED_COMMANDS=(rubocop)
+plugins=(... bundler ...)
+```
+This will add the wrapper for the `rubocop` gem (i.e. the executable).
+
+
+### Exclude gems from being wrapped
+
+Add this before the plugin-list in your `.zshrc`:
+```sh
+UNBUNDLED_COMMANDS=(foreman spin)
+plugins=(... bundler ...)
+```
+This will exclude the `foreman` and `spin` gems (i.e. their executable) from being wrapped.
+
+## Excluded gems
+
+These gems should not be called with `bundle exec`. Please see the Issues on GitHub for clarification.
+
+`berks`
+`foreman`
+`mailcatcher`
+`rails`
+`ruby`
+`spin`
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 4f9eea922..9c920aa1f 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -100,6 +100,6 @@ for cmd in $bundled_commands; do
   alias $cmd=bundled_$cmd
 
   if which _$cmd > /dev/null 2>&1; then
-        compdef _$cmd bundled_$cmd=$cmd
+    compdef _$cmd bundled_$cmd=$cmd
   fi
 done

From 4b997429b3785aefa929732d7dbf431e7884bc4d Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <kriechbaumer@gmail.com>
Date: Mon, 7 Jul 2014 20:07:02 +0200
Subject: [PATCH 0773/1378] add BUNDLED_COMMANDS functionality to bundler
 plugin

---
 plugins/bundler/bundler.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 9c920aa1f..617dcde71 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -43,6 +43,11 @@ for cmd in $UNBUNDLED_COMMANDS; do
   bundled_commands=(${bundled_commands#$cmd});
 done
 
+# Add $BUNDLED_COMMANDS to the bundled_commands list
+for cmd in $BUNDLED_COMMANDS; do
+  bundled_commands+=($cmd);
+done
+
 ## Functions
 
 bundle_install() {

From 346f6b7d24d6021efa8c5167088f98c10f00ad3f Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mafaer@gmail.com>
Date: Tue, 15 Jul 2014 17:42:30 +0200
Subject: [PATCH 0774/1378] [wd] v0.3.1: Improved completion and bug fixes

---
 plugins/wd/README.md     |  28 +++----
 plugins/wd/_wd.sh        |  15 +---
 plugins/wd/wd.plugin.zsh |   4 +-
 plugins/wd/wd.sh         | 159 +++++++++++++++++++++++----------------
 4 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
index f9f4e7ac1..bc0ebe334 100644
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md
@@ -2,37 +2,39 @@
 
 **Maintainer:** [mfaerevaag](https://github.com/mfaerevaag)
 
-`wd` (warp directory) lets you jump to custom directories in zsh, without using cd. Why? Because cd seems ineffecient when the folder is frequently visited or has a long path. [Source](https://github.com/mfaerevaag/wd)
+`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems ineffecient when the folder is frequently visited or has a long path. [Source](https://github.com/mfaerevaag/wd)
 
 ### Usage
 
  * Add warp point to current working directory:
 
-        wd add test
+        $ wd add foo
 
     If a warp point with the same name exists, use `add!` to overwrite it.
 
- * From an other directory, warp to test with:
+    Note, a warp point cannot contain colons, or only consist of only spaces and dots. The first will conflict in how `wd` stores the warp points, and the second will conflict other features, as below.
 
-        wd test
+ * From an other directory (not necessarily), warp to `foo` with:
 
- * You can warp back to previous directory, and so on, with the puncticulation syntax:
+        $ wd foo
 
-        wd ..
-        wd ...
+ * You can warp back to previous directory, and so on, with this dot syntax:
+
+        $ wd ..
+        $ wd ...
 
     This is a wrapper for the zsh `dirs` function.
 
  * Remove warp point test point:
 
-        wd rm test
-
- * List warp points to current directory (stored in `~/.warprc`):
-
-        wd show
+        $ wd rm foo
 
  * List all warp points (stored in `~/.warprc`):
 
-        wd ls
+        $ wd ls
+
+ * List warp points to current directory
+
+        $ wd show
 
  * Print usage with no opts or the `help` argument.
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 29df63520..0b03d8fff 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -5,23 +5,16 @@ zstyle ':completion::complete:wd:*:commands' group-name commands
 zstyle ':completion::complete:wd:*:warp_points' group-name warp_points
 zstyle ':completion::complete:wd::' list-grouped
 
-# Call `_wd()` when when trying to complete the command `wd`
-
 zmodload zsh/mapfile
+
 function _wd() {
-  local ret=1
   local CONFIG=$HOME/.warprc
-
-  # Stolen from
-  # http://stackoverflow.com/questions/9000698/completion-when-program-has-sub-commands
-
-  # local curcontext="$curcontext" state line
-  # typeset -A opt_args
+  local ret=1
 
   local -a commands
   local -a warp_points
-  warp_points=( "${(f)mapfile[$CONFIG]}" )
-  # LIST="${mapfile[$FNAME]}" # Not required unless stuff uses it
+
+  warp_points=( "${(f)mapfile[$CONFIG]//$HOME/~}" )
 
   commands=(
     'add:Adds the current working directory to your warp points'
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index 9800335fc..c0559293d 100644
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -1,7 +1,7 @@
 #!/bin/zsh
 
-# WARP
-# ====
+# WARP DIRECTORY
+# ==============
 # oh-my-zsh plugin
 #
 # @github.com/mfaerevaag/wd
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 9ebad6808..dfb9ad89a 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -1,7 +1,7 @@
 #!/bin/zsh
 
-# WARP
-# ====
+# WARP DIRECTORY
+# ==============
 # Jump to custom directories in terminal
 # because `cd` takes too long...
 #
@@ -9,26 +9,28 @@
 
 
 ## variables
-CONFIG=$HOME/.warprc
+readonly CONFIG=$HOME/.warprc
 
-## colors
-BLUE="\033[96m"
-GREEN="\033[92m"
-YELLOW="\033[93m"
-RED="\033[91m"
-NOC="\033[m"
+# colors
+readonly BLUE="\033[96m"
+readonly GREEN="\033[92m"
+readonly YELLOW="\033[93m"
+readonly RED="\033[91m"
+readonly NOC="\033[m"
 
 
+## init
+
 # check if config file exists
-if [[ ! -a $CONFIG ]]
+if [ ! -e $CONFIG ]
 then
-  # if not: create config file
-  touch $CONFIG
+    # if not, create config file
+    touch $CONFIG
 fi
 
-## load warp points
+# load warp points
 typeset -A points
-while read line
+while read -r line
 do
     arr=(${(s,:,)line})
     key=${arr[1]}
@@ -39,72 +41,78 @@ done < $CONFIG
 
 
 ## functions
-# prepended wd_ to not conflict with your environment (no sub shell)
 
 wd_warp()
 {
-    if [[ $1 =~ "^\.+$" ]]
+    local point=$1
+
+    if [[ $point =~ "^\.+$" ]]
     then
-        if [[ $#1 < 2 ]]
+        if [ $#1 < 2 ]
         then
             wd_print_msg $YELLOW "Warping to current directory?"
         else
             (( n = $#1 - 1 ))
-            #wd_print_msg $BLUE "Warping..."
             cd -$n > /dev/null
         fi
-    elif [[ ${points[$1]} != "" ]]
+    elif [[ ${points[$point]} != "" ]]
     then
-        #wd_print_msg $BLUE "Warping..."
-        cd ${points[$1]}
+        cd ${points[$point]}
     else
-        wd_print_msg $RED "Unknown warp point '$1'"
+        wd_print_msg $RED "Unknown warp point '${point}'"
     fi
 }
 
 wd_add()
 {
-    if [[ $2 =~ "^\.+$" || $2 =~ "^\s*$" ]]
+    local force=$1
+    local point=$2
+
+    if [[ $point =~ "^[\.]+$" ]]
     then
-        wd_print_msg $RED "Illegal warp point (see README)."
-    elif [[ ${points[$2]} == "" ]] || $1
+        wd_print_msg $RED "Warp point cannot be just dots"
+    elif [[ $point =~ "(\s|\ )+" ]]
     then
-        wd_remove $2 > /dev/null
-        print "$2:$PWD" >> $CONFIG
+        wd_print_msg $RED "Warp point should not contain whitespace"
+    elif [[ $point == *:* ]]
+    then
+        wd_print_msg $RED "Warp point cannot contain colons"
+    elif [[ $point == "" ]]
+    then
+        wd_print_msg $RED "Warp point cannot be empty"
+    elif [[ ${points[$2]} == "" ]] || $force
+    then
+        wd_remove $point > /dev/null
+        printf "%q:%q\n" "${point}" "${PWD}" >> $CONFIG
+
         wd_print_msg $GREEN "Warp point added"
     else
-        wd_print_msg $YELLOW "Warp point '$2' already exists. Use 'add!' to overwrite."
+        wd_print_msg $YELLOW "Warp point '${point}' already exists. Use 'add!' to overwrite."
     fi
 }
 
 wd_remove()
 {
-    if [[ ${points[$1]} != "" ]]
+    local point=$1
+
+    if [[ ${points[$point]} != "" ]]
     then
-        if wd_tmp=`sed "/^$1:/d" $CONFIG`
+        if sed -i.bak "s,^${point}:.*$,,g" $CONFIG
         then
-            # `>!` forces overwrite
-            # we need this if people use `setopt NO_CLOBBER`
-            echo $wd_tmp >! $CONFIG
             wd_print_msg $GREEN "Warp point removed"
         else
-            wd_print_msg $RED "Warp point unsuccessfully removed. Sorry!"
+            wd_print_msg $RED "Something bad happened! Sorry."
         fi
     else
         wd_print_msg $RED "Warp point was not found"
     fi
 }
 
-wd_show()
-{
-    wd_print_msg $BLUE "Warp points to current directory:"
-    wd_list_all | grep $PWD$
-}
-
 wd_list_all()
 {
     wd_print_msg $BLUE "All warp points:"
-    while read line
+
+    while IFS= read -r line
     do
         if [[ $line != "" ]]
         then
@@ -112,38 +120,52 @@ wd_list_all()
             key=${arr[1]}
             val=${arr[2]}
 
-            print "\t" $key "\t -> \t" $val
+            printf "%20s  ->  %s\n" $key $val
         fi
-    done < $CONFIG
+    done <<< $(sed "s:${HOME}:~:g" $CONFIG)
+}
+
+wd_show()
+{
+    local cwd=$(print $PWD | sed "s:^${HOME}:~:")
+
+    wd_print_msg $BLUE "Warp points to current directory:"
+    wd_list_all | grep -e "${cwd}$"
 }
 
 wd_print_msg()
 {
-    if [[ $1 == "" || $2 == "" ]]
+    local color=$1
+    local msg=$2
+
+    if [[ $color == "" || $msg == "" ]]
     then
-        print " $RED*$NOC Could not print message. Sorry!"
+        print " ${RED}*${NOC} Could not print message. Sorry!"
     else
-        print " $1*$NOC $2"
+        print " ${color}*${NOC} ${msg}"
     fi
 }
 
 wd_print_usage()
 {
-    print "Usage: wd [add|-a|--add] [rm|-r|--remove] [ls|-l|--list] <point>"
-    print "\nCommands:"
-    print "\t add \t Adds the current working directory to your warp points"
-    print "\t add! \t Overwrites existing warp point"
-    print "\t rm \t  Removes the given warp point"
-    print "\t show \t Outputs warp points to current directory"
-    print "\t ls \t Outputs all stored warp points"
-    print "\t help \t Show this extremely helpful text"
+    cat <<- EOF
+Usage: wd [add|-a|--add] [rm|-r|--remove] <point>
+
+Commands:
+	add	Adds the current working directory to your warp points
+	add!	Overwrites existing warp point
+	rm	Removes the given warp point
+	show	Outputs warp points to current directory
+	ls	Outputs all stored warp points
+	help	Show this extremely helpful text
+EOF
 }
 
 
 ## run
 
 # get opts
-args=`getopt -o a:r:lhs -l add:,rm:,ls,help,show -- $*`
+args=$(getopt -o a:r:lhs -l add:,rm:,ls,help,show -- $*)
 
 # check if no arguments were given
 if [[ $? -ne 0 || $#* -eq 0 ]]
@@ -151,19 +173,16 @@ then
     wd_print_usage
 
 # check if config file is writeable
-elif [[ ! -w $CONFIG ]]
+elif [ ! -w $CONFIG ]
 then
-    wd_print_msg $RED "\'$CONFIG\' is not writeable."
-    # do nothing => exit
+    # do nothing
     # can't run `exit`, as this would exit the executing shell
-    # i.e. your terminal
+    wd_print_msg $RED "\'$CONFIG\' is not writeable."
 
 else
-    #set -- $args # WTF
-
-    for i
+    for o
     do
-        case "$i"
+        case "$o"
             in
             -a|--add|add)
                 wd_add false $2
@@ -190,7 +209,7 @@ else
                 break
                 ;;
             *)
-                wd_warp $i
+                wd_warp $o
                 break
                 ;;
             --)
@@ -200,10 +219,18 @@ else
     done
 fi
 
-
 ## garbage collection
 # if not, next time warp will pick up variables from this run
 # remember, there's no sub shell
-unset points
+
+unset wd_warp
+unset wd_add
+unset wd_remove
+unset wd_show
+unset wd_list_all
+unset wd_print_msg
+unset wd_print_usage
+
 unset args
+unset points
 unset val &> /dev/null # fixes issue #1

From bf134e9cb390c7ff464c1278782084bef2fae141 Mon Sep 17 00:00:00 2001
From: Christopher Kochan <ckochan@groupon.com>
Date: Tue, 15 Jul 2014 12:37:53 -0700
Subject: [PATCH 0775/1378] Fix for recusion limit hit for _rake_command alias

---
 plugins/rails/rails.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index fb46cdcf0..824658e44 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -6,7 +6,7 @@ function _rails_command () {
   elif [ -e "script/server" ]; then
     ruby script/$@
   else
-    rails $@
+    command rails $@
   fi
 }
 
@@ -14,7 +14,7 @@ function _rake_command () {
   if [ -e "bin/rake" ]; then
     bin/rake $@
   else
-    rake $@
+    command rake $@
   fi
 }
 

From a6b655fae9640873c1629abe7ba25f4823f4b714 Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mf@bitblueprint.com>
Date: Fri, 30 May 2014 10:21:16 +0200
Subject: [PATCH 0776/1378] [wd] v0.2.2: Added MIT-License

---
 plugins/wd/LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/wd/LICENSE

diff --git a/plugins/wd/LICENSE b/plugins/wd/LICENSE
new file mode 100644
index 000000000..8caa6c6ce
--- /dev/null
+++ b/plugins/wd/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Markus Færevaag
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file

From 5756ea0101dc60f5c5d3874a4a5baf58647aec9d Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Tue, 8 Jul 2014 16:49:05 +0200
Subject: [PATCH 0777/1378] Revert "specify python2 in shebang"

"/usr/bin/python2" does not exist on Mac OSX (see #2382), so fuck people who have
"python" symlinked to "python3"

This reverts commit e5ed07e2b5740346d2a32b3a47204612d8808723
---
 plugins/git-prompt/gitstatus.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index c665a9ee1..256841432 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 from subprocess import Popen, PIPE
 import re

From 7478b754a1e53a6c058d7807700869474b68bb21 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Fri, 25 Apr 2014 00:48:37 +0200
Subject: [PATCH 0778/1378] make sure cache dir exists, just like log dir

---
 cache/.easter-egg                        | 4 ++++
 plugins/zsh_reload/zsh_reload.plugin.zsh | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 cache/.easter-egg

diff --git a/cache/.easter-egg b/cache/.easter-egg
new file mode 100644
index 000000000..4b6164edb
--- /dev/null
+++ b/cache/.easter-egg
@@ -0,0 +1,4 @@
+This file is only here so that Git will keep a cache directory as .gitignore is ignoring all the files within it.
+
+Feel free to add love notes for people here.
+
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index 94945bd48..3f44b99c6 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,10 +1,11 @@
 # reload zshrc
 function src()
 {
+  local cache="$ZSH/cache"
   autoload -U compinit zrecompile
-  compinit -d "$ZSH/cache/zcomp-$HOST"
+  compinit -d "$cache/zcomp-$HOST"
 
-  for f in ~/.zshrc "$ZSH/cache/zcomp-$HOST"; do
+  for f in ~/.zshrc "$cache/zcomp-$HOST"; do
     zrecompile -p $f && command rm -f $f.zwc.old
   done
 

From 39a1e2a083872ccca63fcc9ead44834627c176cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6stlin?= <christian.koestlin@esrlabs.com>
Date: Wed, 11 Jul 2012 14:29:54 +0200
Subject: [PATCH 0779/1378] gem plugin: added _files to install command

is useful if you want to install a local gem from the filesystem
---
 plugins/gem/_gem | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/gem/_gem b/plugins/gem/_gem
index 25967f1e7..92feebe95 100644
--- a/plugins/gem/_gem
+++ b/plugins/gem/_gem
@@ -59,6 +59,8 @@ case "$words[1]" in
   build)
     _files -g "*.gemspec"
     ;;
+  install)
+    _files ;;
   list)
       if [[ "$state" == forms ]]; then
         _gem_installed

From bb928b59c409feacc660a64e800ce9129c058104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ben=20Z=C3=B6rb?= <ben@sommerlaune.com>
Date: Thu, 17 Jul 2014 11:27:00 +0200
Subject: [PATCH 0780/1378] #2914 fixed symfony2 autocomplete

---
 plugins/symfony2/symfony2.plugin.zsh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 1d5177e6d..c8c102eee 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,23 +1,24 @@
 # Symfony2 basic command completion
 
+_symfony_console () {
+  echo "php $(find . -maxdepth 2 -mindepth 1 -name 'console')"
+}
+
 _symfony2_get_command_list () {
-	php $(find . -maxdepth 2 -mindepth 1 -name 'console')  --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony2 () {
-  if [ -f $(find . -maxdepth 2 -mindepth 1 -name 'console')  ]; then
-    compadd `_symfony2_get_command_list`
-  fi
+   compadd `_symfony2_get_command_list`
 }
 
-compdef _symfony2 $(find . -maxdepth 2 -mindepth 1 -name 'console')
+compdef _symfony2 '`_symfony_console`'
 compdef _symfony2 sf
 
 #Alias
-alias sf='php $(find . -maxdepth 2 -mindepth 1 -name 'console') '
-alias sfcl='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  cache:clear'
-alias sfcw='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  cache:warmup'
-alias sfroute='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  router:debug'
-alias sfcontainer='php $(find . -maxdepth 2 -mindepth 1 -name 'console') container:debug'
-alias sfgb='php $(find . -maxdepth 2 -mindepth 1 -name 'console')  generate:bundle'
-
+alias sf='`_symfony_console`'
+alias sfcl='sf cache:clear'
+alias sfcw='sf cache:warmup'
+alias sfroute='sf router:debug'
+alias sfcontainer='sf container:debug'
+alias sfgb='sf generate:bundle'
\ No newline at end of file

From 877d55ce9213b668cf206c49ba3e38ab3b8ef7fd Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <nicolas-brousse@users.noreply.github.com>
Date: Sun, 20 Jul 2014 13:33:26 +0200
Subject: [PATCH 0781/1378] Update brew.plugin.zsh

Add `brew cleanup` command to `bubu` alias
---
 plugins/brew/brew.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index f9497aefb..42fb80c9a 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,2 +1,2 @@
 alias brews='brew list -1'
-alias bubu="brew update && brew upgrade"
+alias bubu="brew update && brew upgrade && brew cleanup"

From 73212ded4ee70c010a92eb7a126daa20c7453cba Mon Sep 17 00:00:00 2001
From: Elliott Williams <e@elliottwillia.ms>
Date: Mon, 21 Jul 2014 11:15:09 -0400
Subject: [PATCH 0782/1378] Fix osx function: "not valid in this context"

I have been continually having problems with the "trash" function provided by the osx plugin, getting this error:

    trash:local:2: not valid in this context:

It seems like adding quotes around the assignment in [osx.plugin.zsh#L142](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/osx/osx.plugin.zsh#L142) fixed my problem.

Does this look good to you? Thanks!
---
 plugins/osx/osx.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index a63f0ee05..2eea0d8ef 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -139,7 +139,7 @@ function man-preview() {
 
 function trash() {
   local trash_dir="${HOME}/.Trash"
-  local temp_ifs=$IFS
+  local temp_ifs="$IFS"
   IFS=$'\n'
   for item in "$@"; do
     if [[ -e "$item" ]]; then

From 0e00f0b0342cc088c1c3d4163787efb8433b8ea1 Mon Sep 17 00:00:00 2001
From: Shammel Lee <shammel.lee@gmail.com>
Date: Tue, 22 Jul 2014 13:25:04 -0400
Subject: [PATCH 0783/1378] typo

line 1: of => or
---
 plugins/forklift/forklift.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/forklift/forklift.plugin.zsh b/plugins/forklift/forklift.plugin.zsh
index b0e60a434..692ca5790 100644
--- a/plugins/forklift/forklift.plugin.zsh
+++ b/plugins/forklift/forklift.plugin.zsh
@@ -1,4 +1,4 @@
-# Open folder in ForkLift.app of ForkLift2.app from console
+# Open folder in ForkLift.app or ForkLift2.app from console
 # Author: Adam Strzelecki nanoant.com, modified by Bodo Tasche bitboxer.de
 #         Updated to support ForkLift2 by Johan Kaving
 #

From 00b21d5ac322178b9b9e397b0b6178a3d7f4e9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <choltje@us.ibm.com>
Date: Wed, 23 Apr 2014 09:41:09 -0400
Subject: [PATCH 0784/1378] Trust but verify 'scutil' to return ComputerName

Apparently, it is possible to set up a Mac such that
`scutil --get ComputerName` hasn't been set.

This change checks if that fails and falls back to the original
mechanism.

Closes #2155
Closes #2183
---
 oh-my-zsh.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c217b91bb..8ce29ff38 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -38,9 +38,9 @@ for plugin ($plugins); do
 done
 
 # Figure out the SHORT hostname
-if [ -n "$commands[scutil]" ]; then
-  # OS X
-  SHORT_HOST=$(scutil --get ComputerName)
+if [[ "$OSTYPE" = darwin* ]]; then
+  # OS X's $HOST changes with dhcp, etc. Use ComputerName if possible.
+  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/}
 else
   SHORT_HOST=${HOST/.*/}
 fi

From 63bae2aba9c43a70bbb374fc46e287d7bc46cc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <choltje@us.ibm.com>
Date: Wed, 23 Apr 2014 10:13:26 -0400
Subject: [PATCH 0785/1378] Use $OSTYPE instead of uname to speed things up

The $OSTYPE variable is set at ZSH compile time and can be safely used
to determine the OS of the system. e.g. darwin (os x)
---
 plugins/battery/battery.plugin.zsh       | 2 +-
 plugins/bundler/bundler.plugin.zsh       | 2 +-
 plugins/jira/jira.plugin.zsh             | 2 +-
 plugins/node/node.plugin.zsh             | 2 +-
 plugins/rake-fast/rake-fast.plugin.zsh   | 2 +-
 plugins/sublime/sublime.plugin.zsh       | 2 +-
 plugins/web-search/web-search.plugin.zsh | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 32dd4b624..014bb15dd 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -8,7 +8,7 @@
 # Modified to add support for Apple Mac   #
 ###########################################
 
-if [[ $(uname) == "Darwin" ]] ; then
+if [[ "$OSTYPE" = darwin* ]] ; then
 
   function battery_pct() {
     local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 617dcde71..ba3d3f623 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -54,7 +54,7 @@ bundle_install() {
   if _bundler-installed && _within-bundled-project; then
     local bundler_version=`bundle version | cut -d' ' -f3`
     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-      if [[ "$(uname)" == 'Darwin' ]]
+      if [[ "$OSTYPE" = darwin* ]]
       then
         local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
       else
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 3d510e430..e4881151e 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -12,7 +12,7 @@
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {
   local open_cmd
-  if [[ $(uname -s) == 'Darwin' ]]; then
+  if [[ "$OSTYPE" = darwin* ]]; then
     open_cmd='open'
   else
     open_cmd='xdg-open'
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 2d78f2b4c..39d8b10d9 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -3,7 +3,7 @@
 function node-docs {
   # get the open command
   local open_cmd
-  if [[ $(uname -s) == 'Darwin' ]]; then
+  if [[ "$OSTYPE" = darwin* ]]; then
     open_cmd='open'
   else
     open_cmd='xdg-open'
diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index cb84f69a1..cfc9a079f 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -10,7 +10,7 @@ _rake_refresh () {
 _rake_does_task_list_need_generating () {
   if [ ! -f .rake_tasks ]; then return 0;
   else
-    if [[ $(uname -s) == 'Darwin' ]]; then
+    if [[ "$OSTYPE" = darwin* ]]; then
       accurate=$(stat -f%m .rake_tasks)
       changed=$(stat -f%m Rakefile)
     else
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 438f386fb..5acc75cc7 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -17,7 +17,7 @@ if [[ $('uname') == 'Linux' ]]; then
         fi
     done
 
-elif  [[ $('uname') == 'Darwin' ]]; then
+elif  [[ "$OSTYPE" = darwin* ]]; then
     local _sublime_darwin_paths > /dev/null 2>&1
     _sublime_darwin_paths=(
         "/usr/local/bin/subl"
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 8eedb90ee..f056e38e8 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -4,7 +4,7 @@ function web_search() {
 
   # get the open command
   local open_cmd
-  if [[ $(uname -s) == 'Darwin' ]]; then
+  if [[ "$OSTYPE" = darwin* ]]; then
     open_cmd='open'
   else
     open_cmd='xdg-open'

From db3dd6d755776daf19b55f6a1cae080ae684030a Mon Sep 17 00:00:00 2001
From: Guerki <pol.guerkinger@gmail.com>
Date: Tue, 29 Jul 2014 09:21:10 +0200
Subject: [PATCH 0786/1378] Run Web-search as a Background Process with Nohup

---
 plugins/web-search/web-search.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 8eedb90ee..e157a389d 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -1,7 +1,6 @@
 # web_search from terminal
 
 function web_search() {
-
   # get the open command
   local open_cmd
   if [[ $(uname -s) == 'Darwin' ]]; then
@@ -38,8 +37,8 @@ function web_search() {
   done
 
   url="${url%?}" # remove the last '+'
-  
-  $open_cmd "$url"
+  nohup $open_cmd "$url" 
+ 	rm nohup.out	
 }
 
 

From 0174feef0d57ac4110d2603ce2a25a5de4739414 Mon Sep 17 00:00:00 2001
From: Abhas Mittal <mittalabhas1@gmail.com>
Date: Thu, 31 Jul 2014 18:24:01 +0530
Subject: [PATCH 0787/1378] Update README.textile

Added instructions for installing zsh (due to the problems with first time zsh users)
---
 README.textile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.textile b/README.textile
index 28bab6b2c..143e87cab 100644
--- a/README.textile
+++ b/README.textile
@@ -7,6 +7,7 @@ bq. "OH MY ZSHELL!"
 h2. Setup
 
 @oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
+You can install zsh using the command: @sudo apt-get install zsh@.
 
 h3. The automatic installer... (do you trust me?)
 

From fbdacbfb1ae586af1008fe561bc3962d78a5973f Mon Sep 17 00:00:00 2001
From: Abhas Mittal <mittalabhas1@gmail.com>
Date: Thu, 31 Jul 2014 18:32:57 +0530
Subject: [PATCH 0788/1378] Update README.textile

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 143e87cab..5900c95d8 100644
--- a/README.textile
+++ b/README.textile
@@ -7,7 +7,7 @@ bq. "OH MY ZSHELL!"
 h2. Setup
 
 @oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
-You can install zsh using the command: @sudo apt-get install zsh@.
+If not already, install zsh using the command line first.
 
 h3. The automatic installer... (do you trust me?)
 

From e5ac5009a4c5efbc1b9916d74d082ffc32761a4c Mon Sep 17 00:00:00 2001
From: Adam Poskitt <admpsktt@gmail.com>
Date: Thu, 31 Jul 2014 21:30:15 +0100
Subject: [PATCH 0789/1378] Update rvm.plugin.zsh

Ruby 2.1.1 -> Ruby 2.1.2.
---
 plugins/rvm/rvm.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ad23e18d7..234ac1642 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -6,7 +6,7 @@ alias gemsets='rvm gemset list'
 local ruby18='ruby-1.8.7'
 local ruby19='ruby-1.9.3'
 local ruby20='ruby-2.0.0'
-local ruby21='ruby-2.1.1'
+local ruby21='ruby-2.1.2'
 
 function rb18 {
 	if [ -z "$1" ]; then

From 80323ec4c3497e49c8294752e96b033426ae09db Mon Sep 17 00:00:00 2001
From: Josh Medeski <josh@medeskidesign.com>
Date: Thu, 31 Jul 2014 19:37:22 -0500
Subject: [PATCH 0790/1378] WP-CLI plugin init

---
 plugins/wp-cli/wp-cli.plugin.zsh | 138 +++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 plugins/wp-cli/wp-cli.plugin.zsh

diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
new file mode 100644
index 000000000..5d9551e24
--- /dev/null
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -0,0 +1,138 @@
+# WP-CLI
+# A command line interface for WordPress
+# http://wp-cli.org/
+
+# Cache
+
+# Cap
+
+# CLI
+
+# Comment
+
+# Core
+alias wpcc='wp core config'
+alias wpcd='wp core download'
+alias wpci='wp core install'
+alias wpcii='wp core is-installed'
+alias wpcmc='wp core multisite-convert'
+alias wpcmi='wp core multisite-install'
+alias wpcu='wp core update'
+alias wpcudb='wp core update-db'
+alias wpcvc='wp core verify-checksums'
+
+# Cron
+alias wpcre='wp cron event'
+alias wpcrs='wp cron schedule'
+alias wpcrt='wp cron test'
+
+# Db
+
+# Eval
+
+# Eval-File
+
+# Export
+
+# Help
+
+# Import
+
+# Media
+
+# Menu
+alias wpmc='wp menu create'
+alias wpmd='wp menu delete'
+alias wpmi='wp menu item'
+alias wpml='wp menu list'
+alias wpmlo='wp menu location'
+
+# Network
+
+# Option
+
+# Plugin
+alias wppa='activate'
+alias wppda='deactivate'
+alias wppd='delete'
+alias wppg='get'
+alias wppi='install'
+alias wppis='is-installed'
+alias wppl='list'
+alias wppp='path'
+alias wpps='search'
+alias wppst='status'
+alias wppt='toggle'
+alias wppu='uninstall'
+alias wppu='update'
+
+# Post
+alias wppoc='wp post create'
+alias wppod='wp post delete'
+alias wppoe='wp post edit'
+alias wppogen='wp post generate'
+alias wppog='wp post get'
+alias wppol='wp post list'
+alias wppom='wp post meta'
+alias wppou='wp post update'
+alias wppou='wp post url'
+
+# Rewrite
+
+# Role
+
+# Scaffold
+
+# Search-Replace
+
+# Shell
+
+# Sidebar
+alias wpsbl='wp sidebar list'
+
+# Site
+
+# Super-Admin
+
+# Term
+
+# Theme
+alias wpta='wp theme activate'
+alias wptd='wp theme delete'
+alias wptdis='wp theme disable'
+alias wpte='wp theme enable'
+alias wptg='wp theme get'
+alias wpti='wp theme install'
+alias wptis='wp theme is-installed'
+alias wptl='wp theme list'
+alias wptm='wp theme mod'
+alias wptp='wp theme path'
+alias wpts='wp theme search'
+alias wptst='wp theme status'
+alias wptu='wp theme updatet'
+
+# Transient
+
+# User
+alias wpuac='wp user add-cap'
+alias wpuar='wp user add-role'
+alias wpuc='wp user create'
+alias wpud='wp user delete'
+alias wpugen='wp user generate'
+alias wpug='wp user get'
+alias wpui='wp user import-csv'
+alias wpul='wp user list'
+alias wpulc='wp user list-caps'
+alias wpum='wp user meta'
+alias wpurc='wp user remove-cap'
+alias wpurr='wp user remove-role'
+alias wpusr='wp user set-role'
+alias wpuu='wp user update'
+
+# Widget
+alias wpwa='wp widget add'
+alias wpwda='wp widget deactivate'
+alias wpwd='wp widget delete'
+alias wpwl='wp widget list'
+alias wpwm='wp widget move'
+alias wpwu='wp widget update'

From 961ca143b81fe5d15f67bd3a61fe174e41e155b5 Mon Sep 17 00:00:00 2001
From: Carlos Chacin <cchacin@groupon.com>
Date: Fri, 1 Aug 2014 01:59:45 -0400
Subject: [PATCH 0791/1378] TomEE maven plugin + integration-test in common
 life-cycle

---
 plugins/mvn/mvn.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index a70625fcf..0c4f77162 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -64,7 +64,7 @@ alias mvns='mvn site'
 function listMavenCompletions { 
      reply=(
         # common lifecycle
-        clean process-resources compile process-test-resources test-compile test package verify install deploy site
+        clean process-resources compile process-test-resources test-compile test integration-test package verify install deploy site
         
         # common plugins
         deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
@@ -129,6 +129,8 @@ function listMavenCompletions {
         tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
         # tomcat7
         tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
+	# tomee
+        tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy	
         # spring-boot
         spring-boot:run spring-boot:repackage
         # exec

From 8a43d358c1d433c32fd940d3ff19cfa2f3fcf20c Mon Sep 17 00:00:00 2001
From: Nico Revin <whois@nicorevin.ru>
Date: Fri, 1 Aug 2014 23:32:38 +0400
Subject: [PATCH 0792/1378] fix paclist() for non-english locales

---
 plugins/archlinux/archlinux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index bffe9657a..82c8d8a23 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -55,7 +55,7 @@ alias pacmir='sudo pacman -Syy'                # Force refresh of all package li
 
 # https://bbs.archlinux.org/viewtopic.php?id=93683
 paclist() {
-  sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
+  LC_ALL=C pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
 }
 
 alias paclsorphans='sudo pacman -Qdt'

From 4f1ee6c1eed04345c458458006a15381d35d8080 Mon Sep 17 00:00:00 2001
From: Jim Remsik <jim@adorable.io>
Date: Fri, 1 Aug 2014 20:16:33 -0500
Subject: [PATCH 0793/1378] Add gap (git add --patch)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..44c4617fb 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -70,6 +70,7 @@ alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'
 compdef _git ga=git-add
+alias gap='git add --patch'
 alias gm='git merge'
 compdef _git gm=git-merge
 alias grh='git reset HEAD'

From 397a9f7b7bfd88678c5b10d2c3e96c0768677434 Mon Sep 17 00:00:00 2001
From: Adam Poskitt <admpsktt@gmail.com>
Date: Sat, 2 Aug 2014 11:43:32 +0100
Subject: [PATCH 0794/1378] Update README.textile

---
 README.textile | 84 +++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/README.textile b/README.textile
index 5900c95d8..09cff2135 100644
--- a/README.textile
+++ b/README.textile
@@ -1,111 +1,111 @@
 !https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png!
 
-oh-my-zsh is an open source, community-driven framework for managing your ZSH configuration. It comes bundled with a ton of helpful functions, helpers, plugins, themes, and few things that make you shout...
+@oh-my-zsh@ is an open source, community-driven framework for managing your "Zsh":http://www.zsh.org/ configuration.
+
+It comes bundled with a ton of helpful functions, helpers, plugins, themes, and a few things that make you shout…
 
 bq. "OH MY ZSHELL!"
 
 h2. Setup
 
-@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
-If not already, install zsh using the command line first.
+@oh-my-zsh@ should work with any recent release of "Zsh":http://www.zsh.org/. The minimum recommended version is *4.3.9*.
 
-h3. The automatic installer... (do you trust me?)
+If not already installed, you can install "Zsh":http://www.zsh.org/ using the command-line.
 
-You can install this via the command line with either @curl@ or @wget@.
+h3. The automatic installer… do you trust me?
 
-h4. via @curl@
+You can install this via the command-line with either @curl@ or @wget@.
+
+h4. via @curl@:
 
 @curl -L http://install.ohmyz.sh | sh@
 
-h4. via @wget@
+h4. via @wget@:
 
 @wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
 
-h4. Optional: change the install directory
+h4. *Optionally*, change the install directory:
 
 The default location is @~/.oh-my-zsh@ (hidden in your home directory).
 
-You can change the install directory with the ZSH environment variable, either
-by running @export ZSH=/your/path@ before installing, or setting it before the
-end of the install pipeline like this:
+You can change the install directory with the @ZSH@ environment variable, either by running @export ZSH=/your/path@ before installing, or by setting it before the end of the install pipeline like this:
 
 @curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
 
-
 h3. The manual way
 
-1. Clone the repository
+1. Clone the repository:
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+@git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
 
-2. *OPTIONAL* Backup your existing @~/.zshrc@ file
+2. *Optionally*, backup your existing @~/.zshrc@ file:
 
-  @cp ~/.zshrc ~/.zshrc.orig@
+@cp ~/.zshrc ~/.zshrc.orig@
 
-3. Create a new zsh config by copying the zsh template we've provided.
+3. Create a new "Zsh":http://www.zsh.org/ config file by copying the "Zsh":http://www.zsh.org/ template we've provided:
 
-  @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
+@cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
 
-4. Set zsh as your default shell:
+4. Set "Zsh":http://www.zsh.org/ as your default shell:
 
-  @chsh -s /bin/zsh@
+@chsh -s /bin/zsh@
 
-5. Start / restart zsh (open a new terminal is easy enough...)
+5. Start or restart "Zsh":http://www.zsh.org/ by opening a new command-line window.
 
 h3. Problems?
 
-You _might_ need to modify your @PATH@ in @~/.zshrc@ if you're not able to find some commands after switching to _Oh My Zsh_.
+You _might_ need to modify your @PATH@ in @~/.zshrc@ if you're not able to find some commands after switching to @oh-my-zsh@.
 
-If you installed manually or changed the install location, check ZSH in @~/.zshrc@
+If you installed manually or changed the install location, check the @ZSH@ environment variable in @~/.zshrc@.
 
 h2. Usage
 
-* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's possible)
+* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's available)
 ** example: @plugins=(git osx ruby)@
-* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
-* much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
+* theme support: change the @ZSH_THEME@ environment variable in @~/.zshrc@
+** take a look at the @themes/@ directory and the "wiki":https://wiki.github.com/robbyrussell/oh-my-zsh/themes to see what comes bundled with @oh-my-zsh@
+* & much, much more… take a look at the @lib/@ directory to see what @oh-my-zsh@ has to offer…
 
 h2. Useful
 
-the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty for tips.
+The "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty useful for tips.
 
 h3. Customization
 
-If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
-If you have many functions which go well together you can put them as a @*.plugin.zsh@ file in the @custom/plugins/@ directory and then enable this plugin.
-If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
+If you want to override any of the default behaviors, just add a new file (ending in @.zsh@) in the @custom/@ directory.
+
+If you have many functions that go well together, you can put them as a @*.plugin.zsh@ file in the @custom/plugins/@ directory and then enable this plugin (see '"Usage":https://github.com/robbyrussell/oh-my-zsh#usage' above).
+
+If you would like to override the functionality of a plugin distributed with @oh-my-zsh@, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
 
 h3. Updates
 
-By default you will be prompted to check for updates. If you would like oh-my-zsh to automatically update itself without prompting you, set the following in your @~/.zshrc@
+By default you will be prompted to check for upgrades. If you would like @oh-my-zsh@ to automatically upgrade itself without prompting you, set the following in your @~/.zshrc@:
 
 @DISABLE_UPDATE_PROMPT=true@
 
-To disable updates entirely, put this in your @~/.zshrc@
+To disable upgrades entirely, set the following in your @~/.zshrc@:
 
 @DISABLE_AUTO_UPDATE=true@
 
-To upgrade directly from the command line, just run @upgrade_oh_my_zsh@
+To upgrade directly from the command-line, just run @upgrade_oh_my_zsh@.
 
 h3. Uninstalling
 
-If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).
+If you want to uninstall @oh-my-zsh@, just run @uninstall_oh_my_zsh@ from the command-line and it'll remove itself and revert you to @bash@ (or your previous "Zsh":http://www.zsh.org/ configuration).
 
 h2. Help out!
 
-I'm far from being a zsh-expert and suspect there are many ways to improve. If you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
+I'm far from being a "Zsh":http://www.zsh.org/ expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
 
-h3. (Don't) Send us your theme! (for now)
+h3. (Don't) send us your theme (for now)!
 
--I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.-
+-I'm hoping to collect a bunch of themes – you can see existing ones in the @themes/@ directory.-
 
-We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there.
+We have enough themes for the time being. Please fork the project and add on in there – you can let people know how to grab it from there.
 
 h2. Contributors
 
-This project wouldn't exist without all of our awesome users and contributors.
-
-* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
+This project wouldn't exist without all of our awesome users and contributors: "view our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
 
 Thank you so much!

From fdb30392b15ef0b7edd6d670340d1ba390f4a7b8 Mon Sep 17 00:00:00 2001
From: Adam Poskitt <admpsktt@gmail.com>
Date: Mon, 4 Aug 2014 15:10:11 +0100
Subject: [PATCH 0795/1378] Update half-life.zsh-theme

Add spaces before bullet-points to more easily distinguish them from one another and the rest of the prompt when using smaller font-sizes and do not add a blank line prior to prompt output; if there's a desire for spacing, one can use their terminal's line-height to achieve this.
---
 themes/half-life.zsh-theme | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index c8d09ce47..1bf4c7432 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -51,8 +51,8 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 PR_RST="%{${reset_color}%}"
 FMT_BRANCH=" on %{$turquoise%}%b%u%c${PR_RST}"
 FMT_ACTION=" performing a %{$limegreen%}%a${PR_RST}"
-FMT_UNSTAGED="%{$orange%}●"
-FMT_STAGED="%{$limegreen%}●"
+FMT_UNSTAGED="%{$orange%} ●"
+FMT_STAGED="%{$limegreen%} ●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -83,7 +83,7 @@ function steeef_precmd {
         # check for untracked files or updated submodules, since vcs_info doesn't
         if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
             PR_GIT_UPDATE=1
-            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST}"
+            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c%{$hotpink%} ●${PR_RST}"
         else
             FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c${PR_RST}"
         fi
@@ -95,5 +95,4 @@ function steeef_precmd {
 }
 add-zsh-hook precmd steeef_precmd
 
-PROMPT=$'
-%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(rvm-prompt " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '
+PROMPT=$'%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(rvm-prompt " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '

From 89f1d94a3052e2eabd3e86b856eada8e51fc65b4 Mon Sep 17 00:00:00 2001
From: Frederik Mogensen <sodiaf@gmail.com>
Date: Sun, 7 Aug 2011 21:43:32 +0200
Subject: [PATCH 0796/1378] Added autocompleting plugin for Android Debug
 Bridge (adb).

---
 plugins/adb/_adb | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 plugins/adb/_adb

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
new file mode 100644
index 000000000..1efcb9eb0
--- /dev/null
+++ b/plugins/adb/_adb
@@ -0,0 +1,37 @@
+#compdef adb
+#autoload
+
+# in order to make this work, you will need to have the android adb tools
+
+# adb zsh completion, based on homebrew completion
+
+local -a _1st_arguments
+_1st_arguments=(
+'bugreport:return all information from the device that should be included in a bug report.'
+'connect:connect to a device via TCP/IP Port 5555 is default.'
+'devices:list all connected devices'
+'disconnect:disconnect from a TCP/IP device. Port 5555 is default.'
+'emu:run emulator console command'
+'forward:forward socket connections'
+'help:show the help message'
+'install:push this package file to the device and install it'
+'jdwp:list PIDs of processes hosting a JDWP transport'
+'logcat:View device log'
+'pull:copy file/dir from device'
+'push:copy file/dir to device'
+'shell:run remote shell interactively'
+'sync:copy host->device only if changed (-l means list but dont copy)'
+'uninstall:remove this app package from the device'
+'version:show version num'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+	'*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+	_describe -t commands "adb subcommand" _1st_arguments
+	return
+fi

From 8ad9122ba49bb0a41ca7dbad03cf5438477cc283 Mon Sep 17 00:00:00 2001
From: Frederik Mogensen <sodiaf@gmail.com>
Date: Tue, 3 Jan 2012 17:12:22 +0100
Subject: [PATCH 0797/1378] Added _files to complete all arguments following
 the first as files

---
 plugins/adb/_adb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 1efcb9eb0..4c998172d 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -35,3 +35,5 @@ if (( CURRENT == 1 )); then
 	_describe -t commands "adb subcommand" _1st_arguments
 	return
 fi
+
+_files

From 78a7c0c6aebc6415040464c704f64bce0c72d049 Mon Sep 17 00:00:00 2001
From: Celso Miranda <contacto@celsomiranda.net>
Date: Sat, 9 Aug 2014 01:04:28 +0100
Subject: [PATCH 0798/1378] Add support for local aur databases

With these simple changes the plugin checks for the local AUR database and updates the aliases so it can update it when you issue a `pacupd` or `yaupd`.
---
 plugins/archlinux/archlinux.plugin.zsh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index bffe9657a..22d9f0970 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -21,10 +21,14 @@ if [[ -x `which yaourt` ]]; then
   alias yalst='yaourt -Qe'         # List installed packages, even those installed from AUR (they're tagged as "local")
   alias yaorph='yaourt -Qtd'       # Remove orphans using yaourt
   # Additional yaourt alias examples
-  if [[ -x `which abs` ]]; then
+  if [[ -x `which abs` && -x `which aur` '']]; then
+    alias yaupd='yaourt -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
+  elif [[ -x `which abs` ]]; then
     alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories
+  elif [[ -x `which aur` ]]; then
+    alias yaupd='yaourt -Sy && sudo aur'   # Update and refresh the local package and AUR databases against repositories
   else
-    alias yaupd='yaourt -Sy'               # Update and refresh the local package and ABS databases against repositories
+    alias yaupd='yaourt -Sy'               # Update and refresh the local package database against repositories
   fi
   alias yainsd='yaourt -S --asdeps'        # Install given package(s) as dependencies of another package
   alias yamir='yaourt -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
@@ -45,10 +49,14 @@ alias pacreps='pacman -Ss'             # Search for package(s) in the repositori
 alias pacloc='pacman -Qi'              # Display information about a given package in the local database
 alias paclocs='pacman -Qs'             # Search for package(s) in the local database
 # Additional pacman alias examples
-if [[ -x `which abs` ]]; then
-  alias pacupd='sudo pacman -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+if [[ -x `which abs` && -x `which aur` ]]; then
+  alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
+elif [[ -x `which abs` ]]; then
+  alias pacupd='sudo pacman -Sy && sudo abs'              # Update and refresh the local package and ABS databases against repositories
+elif [[ -x `which aur` ]]; then
+  alias pacupd='sudo pacman -Sy && sudo aur'              # Update and refresh the local package and AUR databases against repositories
 else
-  alias pacupd='sudo pacman -Sy'     # Update and refresh the local package and ABS databases against repositories
+  alias pacupd='sudo pacman -Sy'     # Update and refresh the local package database against repositories
 fi
 alias pacinsd='sudo pacman -S --asdeps'        # Install given package(s) as dependencies of another package
 alias pacmir='sudo pacman -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist

From 7d208be2a147657d6d8e936e3f03c26b3a936ac8 Mon Sep 17 00:00:00 2001
From: Celso Miranda <contacto@celsomiranda.net>
Date: Sat, 9 Aug 2014 01:09:06 +0100
Subject: [PATCH 0799/1378] bugfix: two wild apostrophes

oops
---
 plugins/archlinux/archlinux.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 22d9f0970..059884c27 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -21,7 +21,7 @@ if [[ -x `which yaourt` ]]; then
   alias yalst='yaourt -Qe'         # List installed packages, even those installed from AUR (they're tagged as "local")
   alias yaorph='yaourt -Qtd'       # Remove orphans using yaourt
   # Additional yaourt alias examples
-  if [[ -x `which abs` && -x `which aur` '']]; then
+  if [[ -x `which abs` && -x `which aur` ]]; then
     alias yaupd='yaourt -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
   elif [[ -x `which abs` ]]; then
     alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories

From 99e74b04981b2eb66714bf68245115520bcd25f0 Mon Sep 17 00:00:00 2001
From: Cherry NG <cherry92@gmail.com>
Date: Sat, 9 Aug 2014 21:40:56 +0800
Subject: [PATCH 0800/1378] rounding to emoji clock

---
 plugins/emoji-clock/emoji-clock.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/emoji-clock/emoji-clock.plugin.zsh b/plugins/emoji-clock/emoji-clock.plugin.zsh
index 7351a02ec..a69446e3c 100644
--- a/plugins/emoji-clock/emoji-clock.plugin.zsh
+++ b/plugins/emoji-clock/emoji-clock.plugin.zsh
@@ -8,8 +8,8 @@
 # -----------------------------------------------------------------------------
 
 function emoji-clock() {
-  hour=$(date '+%I')
-  minutes=$(date '+%M')
+  hour=$(date -v '+15M' '+%I')
+  minutes=$(date -v '+15M' '+%M')
   case $hour in
     01) clock="🕐"; [ $minutes -ge 30 ] && clock="🕜";;
     02) clock="🕑"; [ $minutes -ge 30 ] && clock="🕝";;

From 45abe764e55a6c201acb3bf8e602f53e5d5574f0 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@abstractj.org>
Date: Sat, 9 Aug 2014 12:26:35 -0300
Subject: [PATCH 0801/1378] Inclusion of aliases for sign git commits and tags

---
 plugins/git/git.plugin.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..51a09a053 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -77,6 +77,18 @@ alias grhh='git reset HEAD --hard'
 alias gclean='git reset --hard && git clean -dfx'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 
+# Sign and verify commits with GPG
+alias gcs='git commit -S'
+compdef _git gcs=git-commit
+alias gsps='git show --pretty=short --show-signature'
+compdef _git gsps=git-show
+
+# Sign and verify tags with GPG
+alias gts='git tag -s'
+compdef _git gts=git-tag
+alias gvt='git verify-tag'
+compdef _git gvt=git verify-tag
+
 #remove the gf alias
 #alias gf='git ls-files | grep'
 

From 9a0196dbf72521319a0fa0db4ae84603c2c79868 Mon Sep 17 00:00:00 2001
From: lundberg <allister@livrobo.com>
Date: Sun, 10 Aug 2014 12:01:47 -0700
Subject: [PATCH 0802/1378] New alias for git plugin: gbr == git branch
 --remote

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..cef7926db 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -51,6 +51,7 @@ alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef _git gba=git-branch
+alias gbr='git branch --remote'
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcl='git config --list'

From 49e10ae449d2e5570542e4f9011ea4e2fb14a348 Mon Sep 17 00:00:00 2001
From: Daniel Oaks <daniel@danieloaks.net>
Date: Thu, 14 Aug 2014 00:01:35 +1000
Subject: [PATCH 0803/1378] Make 'ys' theme use hg repo info too

---
 themes/ys.zsh-theme | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index a44f295f4..9332b677a 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -14,12 +14,35 @@ function box_name {
 # Directory info.
 local current_dir='${PWD/#$HOME/~}'
 
+# VCS
+YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} "
+YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
+YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
+YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
+YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o"
+
 # Git info.
 local git_info='$(git_prompt_info)'
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
+ZSH_THEME_GIT_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}git${YS_VCS_PROMPT_PREFIX2}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
+ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
+ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
+
+# HG info
+local hg_info='$(ys_hg_prompt_info)'
+ys_hg_prompt_info() {
+	# make sure this is a hg dir
+	if [ -d '.hg' ]; then
+		echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}"
+		echo -n $(hg branch 2>/dev/null)
+		if [ -n "$(hg status 2>/dev/null)" ]; then
+			echo -n "$YS_VCS_PROMPT_DIRTY"
+		else
+			echo -n "$YS_VCS_PROMPT_CLEAN"
+		fi
+		echo -n "$YS_VCS_PROMPT_SUFFIX"
+	fi
+}
 
 # Prompt format: \n # USER at MACHINE in DIRECTORY on git:BRANCH STATE [TIME] \n $ 
 PROMPT="
@@ -29,6 +52,7 @@ PROMPT="
 %{$fg[green]%}$(box_name) \
 %{$fg[white]%}in \
 %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
+${hg_info}\
 ${git_info} \
 %{$fg[white]%}[%*]
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
@@ -41,6 +65,7 @@ PROMPT="
 %{$fg[green]%}$(box_name) \
 %{$fg[white]%}in \
 %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
+${hg_info}\
 ${git_info} \
 %{$fg[white]%}[%*]
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From df1b0b328983dba57b4cea123b5a05c24493ae8f Mon Sep 17 00:00:00 2001
From: Tom Cammann <tom.cammann@hp.com>
Date: Tue, 19 Aug 2014 15:42:39 +0100
Subject: [PATCH 0804/1378] Update jira plugin to allow lookup of issues

Plugin now supports lookup of tickets by assignee and reporter
---
 plugins/jira/jira.plugin.zsh | 41 ++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 3d510e430..a6d08410f 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -26,7 +26,7 @@ open_jira_issue () {
     jira_url=$JIRA_URL
   else
     echo "JIRA url is not specified anywhere."
-    return 0
+    return 1
   fi
 
   if [ -f .jira-prefix ]; then
@@ -39,7 +39,9 @@ open_jira_issue () {
 
   if [ -z "$1" ]; then
     echo "Opening new issue"
-    $open_cmd "$jira_url/secure/CreateIssue!default.jspa"
+    $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
+  elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
+    jira_query $@
   else
     echo "Opening issue #$1"
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
@@ -50,4 +52,39 @@ open_jira_issue () {
   fi
 }
 
+jira_name () {
+  if [[ -z "$1" ]]; then
+    if [[ "x${JIRA_NAME}" != "x" ]]; then
+      jira_name=${JIRA_NAME}
+    else
+      echo "JIRA_NAME not specified"
+      return 1
+    fi
+  else
+    jira_name=$@
+  fi
+}
+
+jira_query () {
+    verb="$1"
+    if [[ "${verb}" = "reported" ]]; then
+      lookup=reporter
+      preposition=by
+    elif [[ "${verb}" = "assigned" ]]; then
+      lookup=assignee
+      preposition=to
+    else
+      echo "not a valid lookup $verb"
+      return 1
+    fi
+    shift 1
+    jira_name $@
+    if [[ $? = 1 ]]; then
+        return 1
+    fi
+    echo "Browsing issues ${verb} ${preposition} ${jira_name}"
+    $open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
+}
+
 alias jira='open_jira_issue'
+

From eee7345f1f01df5f66151bc5bf34d8e2110224aa Mon Sep 17 00:00:00 2001
From: Alex Shadrin <alex@shdlabs.com>
Date: Wed, 20 Aug 2014 13:57:28 +0300
Subject: [PATCH 0805/1378] Resets the font colour to original

---
 themes/fino.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 35e6e02c1..411dec9b9 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -35,7 +35,7 @@ local prompt_char='$(prompt_char)'
 
 
 PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env}
-╰─${prompt_char} "
+╰─${prompt_char}%{$reset_color%} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From dac2a6e27a23071226495bfee54b390135cb20b6 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 20 Aug 2014 23:52:05 +0200
Subject: [PATCH 0806/1378] Replace /usr/bin/env with env

Some environments (such as Android) does not have /usr/bin.
---
 lib/functions.zsh          | 4 ++--
 oh-my-zsh.sh               | 2 +-
 tools/check_for_upgrade.sh | 2 +-
 tools/install.sh           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index fda84a953..17f5f9cbf 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -3,11 +3,11 @@ function zsh_stats() {
 }
 
 function uninstall_oh_my_zsh() {
-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
+  env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
 }
 
 function upgrade_oh_my_zsh() {
-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
+  env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
 }
 
 function take() {
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c217b91bb..a90b3e98a 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,6 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
+  env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 8b8ecae03..35e074297 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -9,7 +9,7 @@ function _update_zsh_update() {
 }
 
 function _upgrade_zsh() {
-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
+  env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
   # update the zsh file
   _update_zsh_update
 }
diff --git a/tools/install.sh b/tools/install.sh
index fc7ad70cf..7efab10b9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null 2>&1 && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
+hash git >/dev/null 2>&1 && env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }
@@ -43,5 +43,5 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
 echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
-/usr/bin/env zsh
+env zsh
 . ~/.zshrc

From 91ba6d98875c70d0736fd3eecd0ee4aae52cdc74 Mon Sep 17 00:00:00 2001
From: Mathieu Comandon <strycore@gmail.com>
Date: Thu, 21 Aug 2014 12:47:48 +0200
Subject: [PATCH 0807/1378] Don't try running chsh if user already runs zsh

---
 tools/install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index fc7ad70cf..fc0a9fa64 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -32,8 +32,10 @@ sed -i -e "/export PATH=/ c\\
 export PATH=\"$PATH\"
 " ~/.zshrc
 
-echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
-chsh -s `which zsh`
+if [ "$SHELL" != "$(which zsh)" ]; then
+    echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
+    chsh -s `which zsh`
+fi
 
 echo "\033[0;32m"'         __                                     __   '"\033[0m"
 echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"

From 5d6c73d7d38930443bdc4357c337e0baf7d5b5fb Mon Sep 17 00:00:00 2001
From: DariusPHP <darius.grigalevicius@nfq.lt>
Date: Fri, 22 Aug 2014 10:21:38 +0300
Subject: [PATCH 0808/1378] #git plugin git diff-tree --name-only added

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..a76bb1cdf 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -7,6 +7,8 @@ alias gd='git diff'
 compdef _git gd=git-diff
 alias gdc='git diff --cached'
 compdef _git gdc=git-diff
+alias gdt='git diff-tree --no-commit-id --name-only -r'
+compdef _git gdc=git diff-tree --no-commit-id --name-only -r
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git pull --rebase'

From dc9e1764cfd0987f104f57bac0b974e0941f1e42 Mon Sep 17 00:00:00 2001
From: Jingwen Owen Ou <jingweno@gmail.com>
Date: Fri, 22 Aug 2014 15:59:17 -0700
Subject: [PATCH 0809/1378] Fix missing add-zsh-hook

In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.
---
 lib/termsupport.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 9c0a430fb..9d6681603 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -34,6 +34,5 @@ function omz_termsupport_preexec {
   title '$CMD' '%100>...>$LINE%<<'
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd  omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+precmd_functions+=(omz_termsupport_precmd)
+preexec_functions+=(omz_termsupport_preexec)

From ac053f4211ef2da6b66bd148a930cfdddd12991f Mon Sep 17 00:00:00 2001
From: sachin21 <sachin21dev@gmail.com>
Date: Sun, 24 Aug 2014 00:50:02 +0900
Subject: [PATCH 0810/1378] This alias is conflict cause

---
 lib/aliases.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 3044c9660..aae865046 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -30,7 +30,6 @@ alias lsa='ls -lah'
 alias l='ls -lah'
 alias ll='ls -lh'
 alias la='ls -lAh'
-alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
 

From ee33cee83e78b53ca200b5647b024bcd93f8ee3d Mon Sep 17 00:00:00 2001
From: Igor Zoriy <gh@igorzoriy.com>
Date: Tue, 26 Aug 2014 01:05:13 +0700
Subject: [PATCH 0811/1378] Added 'uninstall' command to brew completion

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index 9eb3bb557..40442a1d3 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -50,6 +50,7 @@ _1st_arguments=(
   'server:start a local web app that lets you browse formulae (requires Sinatra)'
   'services:small wrapper around `launchctl` for supported formulae'
   'tap:tap a new formula repository from GitHub, or list existing taps'
+  'uninstall:uninstall a formula'
   'unlink:unlink a formula'
   'unpin:unpin specified formulae'
   'untap:remove a tapped repository'

From e20ce81c6663e354f9ef29618e7149800b9a3b26 Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Tue, 26 Aug 2014 08:34:17 -0500
Subject: [PATCH 0812/1378] Adding BBEdit plugin

---
 plugins/bbedit/bbedit.plugin.zsh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/bbedit/bbedit.plugin.zsh

diff --git a/plugins/bbedit/bbedit.plugin.zsh b/plugins/bbedit/bbedit.plugin.zsh
new file mode 100644
index 000000000..6eec10f21
--- /dev/null
+++ b/plugins/bbedit/bbedit.plugin.zsh
@@ -0,0 +1,21 @@
+alias bbpb='pbpaste | bbedit --clean --view-top'
+
+alias bbd=bbdiff
+
+#
+# If the bb command is called without an argument, launch BBEdit
+# If bb is passed a directory, cd to it and open it in BBEdit
+# If bb is passed a file, open it in BBEdit
+#
+function bb() {
+    if [[ -z $1 ]]
+    then
+        bbedit --launch
+    else
+        bbedit $1
+        if [[ -d $1 ]]
+        then
+            cd $1
+        fi
+    fi
+}

From 9eb2118c556b81e4eb0965d3e4bc024e35687aba Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Tue, 26 Aug 2014 08:36:16 -0500
Subject: [PATCH 0813/1378] Adding Marked 2 plugin

---
 plugins/marked/marked.plugin.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 plugins/marked/marked.plugin.zsh

diff --git a/plugins/marked/marked.plugin.zsh b/plugins/marked/marked.plugin.zsh
new file mode 100644
index 000000000..8c014372b
--- /dev/null
+++ b/plugins/marked/marked.plugin.zsh
@@ -0,0 +1,12 @@
+#
+# If marked is called without an argument, open Marked
+# If marked is passed a file, open it in Marked
+#
+function marked() {
+    if [ $1 ]
+    then
+        open -a "marked 2.app" $1
+    else
+        open -a "marked 2.app"
+    fi
+}

From 325c18736e82d0688f7437cefff23910ebd7cedd Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Tue, 26 Aug 2014 08:37:04 -0500
Subject: [PATCH 0814/1378] Adding Textastic plugin

---
 plugins/textastic/textastic.plugin.zsh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/textastic/textastic.plugin.zsh

diff --git a/plugins/textastic/textastic.plugin.zsh b/plugins/textastic/textastic.plugin.zsh
new file mode 100644
index 000000000..c34162139
--- /dev/null
+++ b/plugins/textastic/textastic.plugin.zsh
@@ -0,0 +1,17 @@
+#
+# If the tt command is called without an argument, launch Textastic
+# If tt is passed a directory, cd to it and open it in Textastic
+# If tt is passed a file, open it in Textastic
+#
+function tt() {
+    if [[ -z $1 ]]
+    then
+        open -a "textastic.app"
+    else
+        open -a "textastic.app" $1
+        if [[ -d $1 ]]
+        then
+            cd $1
+        fi
+    fi
+}

From 362f2a56d276aebfb8da4e3244994f69899bbdbd Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Wed, 27 Aug 2014 08:27:31 -0500
Subject: [PATCH 0815/1378] Adding quotes around $1

---
 plugins/textastic/textastic.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/textastic/textastic.plugin.zsh b/plugins/textastic/textastic.plugin.zsh
index c34162139..f5901eae2 100644
--- a/plugins/textastic/textastic.plugin.zsh
+++ b/plugins/textastic/textastic.plugin.zsh
@@ -4,14 +4,14 @@
 # If tt is passed a file, open it in Textastic
 #
 function tt() {
-    if [[ -z $1 ]]
+    if [[ -z "$1" ]]
     then
         open -a "textastic.app"
     else
-        open -a "textastic.app" $1
-        if [[ -d $1 ]]
+        open -a "textastic.app" "$1"
+        if [[ -d "$1" ]]
         then
-            cd $1
+            cd "$1"
         fi
     fi
 }

From 9be81015d0fcb7864be9cdfe550aeee20c52bf7a Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Wed, 27 Aug 2014 08:31:18 -0500
Subject: [PATCH 0816/1378] Adding quotes around $1

---
 plugins/marked/marked.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/marked/marked.plugin.zsh b/plugins/marked/marked.plugin.zsh
index 8c014372b..56863ade5 100644
--- a/plugins/marked/marked.plugin.zsh
+++ b/plugins/marked/marked.plugin.zsh
@@ -3,9 +3,9 @@
 # If marked is passed a file, open it in Marked
 #
 function marked() {
-    if [ $1 ]
+    if [ "$1" ]
     then
-        open -a "marked 2.app" $1
+        open -a "marked 2.app" "$1"
     else
         open -a "marked 2.app"
     fi

From 1b4d4266131eb760fc0cc25aab847a9c08d1c6de Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Wed, 27 Aug 2014 08:34:17 -0500
Subject: [PATCH 0817/1378] Adding quotes around $1

---
 plugins/bbedit/bbedit.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/bbedit/bbedit.plugin.zsh b/plugins/bbedit/bbedit.plugin.zsh
index 6eec10f21..fe9e72c65 100644
--- a/plugins/bbedit/bbedit.plugin.zsh
+++ b/plugins/bbedit/bbedit.plugin.zsh
@@ -8,14 +8,14 @@ alias bbd=bbdiff
 # If bb is passed a file, open it in BBEdit
 #
 function bb() {
-    if [[ -z $1 ]]
+    if [[ -z "$1" ]]
     then
         bbedit --launch
     else
-        bbedit $1
-        if [[ -d $1 ]]
+        bbedit "$1"
+        if [[ -d "$1" ]]
         then
-            cd $1
+            cd "$1"
         fi
     fi
 }

From 1aadd63cfc98987c42033aeb4d7b826abf1f49ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 17 Jul 2014 13:46:06 +0200
Subject: [PATCH 0818/1378] Add CONTRIBUTING.md file general structure

---
 CONTRIBUTING.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..ae8865b35
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,26 @@
+# CONTRIBUTING GUIDELINE
+
+1. [Luke, use the search](#luke-use-the-search)
+2. [You have a problem](#you-have-a-problem)
+3. [You have a solution](#you-have-a-solution)
+
+**BONUS:** [You have free time to volunteer](#you-have-free-time-to-volunteer)
+
+## LUKE, USE THE SEARCH
+
+May the experiences of other people be with you
+
+
+## YOU HAVE A PROBLEM
+
+See point 1, then look at FAQ or Troubleshooting wiki pages (first we'll have to make them)
+
+
+## YOU HAVE A SOLUTION
+
+See point 1, then go ahead (unless your solution is yet another theme)
+
+
+## YOU HAVE FREE TIME TO VOLUNTEER
+
+Cool!

From 1e2abe5d4e1cbf29b1630292ec3eb32cb993f49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 4 Aug 2014 23:04:53 +0200
Subject: [PATCH 0819/1378] Categories of issues in oh-my-zsh
 (work-in-progress)

---
 CONTRIBUTING.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ae8865b35..9964c380d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,4 +23,20 @@ See point 1, then go ahead (unless your solution is yet another theme)
 
 ## YOU HAVE FREE TIME TO VOLUNTEER
 
-Cool!
+Cool! Please have a look at the list below to understand how oh-my-zsh categorizes its issues.
+
+Classification of issues and
+
+- Bugs, which may be:
+  - Specific of zsh \*
+  - Regressions, in which we should summon the author of the offending commit once it is located
+
+- Feature requests
+
+- Helpdesk, which may be:
+  - Specific of zsh \*
+  - Everything else
+
+\* In the case of bugs, I see the benefit in going through the trouble of responding to that. After all, oh-my-zsh should be the missing link that makes zsh perfect, and hunting down an upstream bug can lead to a submitted PR.
+In the case of helpdesk, minimal response should be done. That is, provide a link to the wiki with the relevant information, or
+add it to the FAQ of the wiki and point to it afterwards.

From 25a3244353076cbffc8ddb2ee592b94b17383694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Borraz=C3=A1s?= <sanbor@gmail.com>
Date: Sat, 8 Dec 2012 15:31:13 -0300
Subject: [PATCH 0820/1378] Added a link to the file's license and added the
 commiter as plugin maintaner.

---
 plugins/pass/_pass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index d8ec38828..f03aa0169 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -4,10 +4,13 @@
 # Copyright (C) 2012:
 #    Johan Venant <jvenant@invicem.pro>
 #    Brian Mattern <rephorm@rephorm.com>
-#    Jason A. Donenfeld <Jason@zx2c4.com>.
-#    Santiago Borrazás <sanbor@gmail.com>
+#    Jason A. Donenfeld <Jason@zx2c4.com>
 # All Rights Reserved.
-# This file is licensed under the GPLv2+. Please see COPYING for more information.
+#
+# This file is licensed under the GPLv2+.
+# Please visit http://git.zx2c4.com/password-store/tree/COPYING for more information.
+#
+# Oh my zsh plugin maintainer: Santiago Borrazás <sanbor@gmail.com>
 
 
 _pass () {

From 17dd5792b4a34e65311fda6ab469b98f31cf30df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Jul 2014 23:23:13 +0200
Subject: [PATCH 0821/1378] Update pass completion to upstream

Conflicts:
	plugins/pass/_pass
---
 plugins/pass/_pass | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index f03aa0169..9c4b669bd 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -1,10 +1,10 @@
 #compdef pass
 #autoload
 
-# Copyright (C) 2012:
+# Copyright (C) 2012 - 2014:
 #    Johan Venant <jvenant@invicem.pro>
 #    Brian Mattern <rephorm@rephorm.com>
-#    Jason A. Donenfeld <Jason@zx2c4.com>
+#    Jason A. Donenfeld <Jason@zx2c4.com>.
 # All Rights Reserved.
 #
 # This file is licensed under the GPLv2+.
@@ -26,8 +26,8 @@ _pass () {
 		case "${cmd}" in
 			init)
 				_arguments : \
-					"-r[re-encrypt existing passwords]" \
-					"--reencrypt[re-encrypt existing passwords]"
+					"-p[gpg-id will only be applied to this subfolder]" \
+					"--path[gpg-id will only be applied to this subfolder]"
 				_pass_complete_keys
 				;;
 			ls|list|edit)
@@ -46,9 +46,19 @@ _pass () {
 					"-n[don't include symbols in password]" \
 					"--no-symbols[don't include symbols in password]" \
 					"-c[copy password to the clipboard]" \
-					"--clip[copy password to the clipboard]"
+					"--clip[copy password to the clipboard]" \
+					"-f[force overwrite]" \
+					"--force[force overwrite]" \
+					"-i[replace first line]" \
+					"--in-place[replace first line]"
 				_pass_complete_entries_with_subdirs
 				;;
+			cp|copy|mv|rename)
+				_arguments : \
+					"-f[force rename]" \
+					"--force[force rename]"
+					_pass_complete_entries_with_subdirs
+				;;
 			rm)
 				_arguments : \
 					"-f[force deletion]" \
@@ -78,10 +88,14 @@ _pass () {
 		subcommands=(
 			"init:Initialize new password storage"
 			"ls:List passwords"
+			"find:Find password files or directories based on pattern"
+			"grep:Search inside decrypted password files for matching pattern"
 			"show:Decrypt and print a password"
 			"insert:Insert a new password"
 			"generate:Generate a new password using pwgen"
 			"edit:Edit a password with \$EDITOR"
+			"mv:Rename the password"
+			"cp:Copy the password"
 			"rm:Remove the password"
 			"git:Call git on the password store"
 			"version:Output version information"
@@ -104,7 +118,7 @@ _pass_cmd_show () {
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
+	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort)
 }
 
 _pass_complete_entries_with_subdirs () {

From 142a6c7fd5bcda6c45c25aca582972a7d4e1da85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Jul 2014 23:26:12 +0200
Subject: [PATCH 0822/1378] Fix pass zsh completion and autoloading

When autocompleting from `pass <TAB>', sometimes the following errors
appear:

  _values:compvalues:10: not enough arguments
  find: `/home/user/.password-store': No such file or directory
  _values:compvalues:10: not enough arguments
  find: `/home/user/.password-store': No such file or directory

The `_values' error happens when there is no password-store folder *or*
there are no passwords in pass; the `find' error only when there is no
password-store folder.

We can trace it back to line 108, which contains the only `_values'
statement that is executed when we autocomplete from pass. We confirm
this by following the trail of execution, which is

  _pass -> _pass_cmd_show -> _pass_complete_entries ->
        -> _pass_complete_entries_helper

If we try running the command inside `$()' on line 104, we see that it
returns nothing and the output is blank. This means that `_values' only
receives 1 of its 2 mandatory parameters, therefore the above error is
triggered (not enough arguments).

That is unless we don't have a password-store folder, in which case the
`find: [...] no such file or directory' error is *also* triggered.

We solve the first error by supplying a default value of "" if the
command outputs nothing, using the zsh construct ${var:-else}.

We solve the second error by redirecting the find command's stderr output
to /dev/null, so the error is effectively suppressed.

* * * *

This patch also fixes the first tab completion, which currently only
loads the completion function definition.

We do this by adding a `_pass' statement at the end of the file, which
runs the `_pass' completion function after loading its definition.
This is the standard way an autoloaded function works; for other examples
look at zsh's official completion files.
---
 plugins/pass/_pass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index 9c4b669bd..7a9b1f955 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -118,7 +118,7 @@ _pass_cmd_show () {
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' $(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort)
+	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort):-""}
 }
 
 _pass_complete_entries_with_subdirs () {
@@ -134,3 +134,5 @@ _pass_complete_keys () {
 	# Extract names and email addresses from gpg --list-keys
 	_values 'gpg keys' $(gpg2 --list-secret-keys --with-colons | cut -d : -f 10 | sort -u | sed '/^$/d')
 }
+
+_pass

From cd98283a92a5b2726e3164653e6b8c674eeedb92 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote
 <eduardo.san-martin-morote@ensimag.grenoble-inp.fr>
Date: Fri, 29 Aug 2014 10:40:08 +0200
Subject: [PATCH 0823/1378] tmuxinator completion update: Current completion
 plugin isn't up to date and #2075 PR, which is also the completion plugin on
 the official tmuxinator repository, doesn't work. Thus this should do the
 trick for the moment. Also suppressed an error when no completion is
 available

---
 plugins/tmuxinator/_tmuxinator | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index cd227b7df..e4f8b6ce0 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -11,10 +11,12 @@ _arguments -C \
 case $state in
   cmds)
     _values "tmuxinator command" \
+        "new[create a new project file and open it in your editor]" \
         "start[start a tmux session using project's tmuxinator config]" \
         "open[create a new project file and open it in your editor]" \
         "copy[copy source_project project file to a new project called new_project]" \
         "delete[deletes the project called project_name]" \
+        "debug[output the shell commands generated by a projet]" \
         "implode[deletes all existing projects!]" \
         "list[list all existing projects]" \
         "doctor[look for problems in your configuration]" \
@@ -24,9 +26,9 @@ case $state in
     ;;
   args)
     case $line[1] in
-      start|open|copy|delete)
+      start|open|copy|delete|debug)
         _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
-        _values 'configs' $_configs
+        [[ -n "$_configs" ]] && _values 'configs' $_configs
         ret=0
         ;;
     esac

From f49220732904ed254400f14e621ea5ebe9e4a5f5 Mon Sep 17 00:00:00 2001
From: "Douglas S.D. Hall" <doug.hall@gmail.com>
Date: Sat, 30 Aug 2014 17:20:28 +0100
Subject: [PATCH 0824/1378] Amended to source the original aws_zsh_completer.sh
 rather than the mangled version installed into $(brew-prefix)/bin if using
 homebrew installed awscli on OSX.

This was discussed here - https://github.com/Homebrew/homebrew/issues/30268
---
 plugins/aws/aws.plugin.zsh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 3f7fb1995..8b57d7db1 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -1,3 +1,11 @@
+_homebrew-installed() {
+  type brew &> /dev/null
+}
+
+_awscli-homebrew-installed() {
+  brew --prefix awscli &> /dev/null
+}
+
 export AWS_HOME=~/.aws
 
 function agp {
@@ -14,4 +22,9 @@ function aws_profiles {
 }
 
 compctl -K aws_profiles asp
-source `which aws_zsh_completer.sh`
+
+if _homebrew-installed && _awscli-homebrew-installed ; then
+  source $(brew --prefix)/opt/awscli/libexec/bin/aws_zsh_completer.sh
+else
+  source `which aws_zsh_completer.sh`
+fi

From 14f055d0bb737520edf6dfcf27d3e3d6e3aaa863 Mon Sep 17 00:00:00 2001
From: nervo <nervo@nervo.net>
Date: Sun, 31 Aug 2014 15:41:02 +0200
Subject: [PATCH 0825/1378] Add Composer's local binaries to PATH

---
 plugins/composer/composer.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 86f2ca4df..2243dd3c1 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -47,5 +47,5 @@ alias cdu='composer dump-autoload'
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
 
-# Add Composer's global binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin
+# Add Composer's global & local binaries to PATH
+export PATH=$PATH:~/.composer/vendor/bin:./bin

From a8dad6fa87867ff2629a55e26f78175635a0ad06 Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Sun, 31 Aug 2014 12:55:46 -0500
Subject: [PATCH 0826/1378] Adding README.md

---
 plugins/textastic/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/textastic/README.md

diff --git a/plugins/textastic/README.md b/plugins/textastic/README.md
new file mode 100644
index 000000000..369c2c137
--- /dev/null
+++ b/plugins/textastic/README.md
@@ -0,0 +1,15 @@
+## textastic
+
+Plugin for Textastic, a text and code editor for Mac OS X 
+
+### Requirements
+
+ * [Textastic](http://www.textasticapp.com/mac.html)
+
+### Usage
+
+ * If `tt` command is called without an argument, launch Textastic
+
+ * If `tt` is passed a directory, cd to it and open it in Textastic
+
+ * If `tt` is passed a file, open it in Textastic

From d7f77f818d3f094f42e02554b3c697c0f3d26ed6 Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Sun, 31 Aug 2014 12:56:23 -0500
Subject: [PATCH 0827/1378] Adding README.md

---
 plugins/bbedit/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 plugins/bbedit/README.md

diff --git a/plugins/bbedit/README.md b/plugins/bbedit/README.md
new file mode 100644
index 000000000..ec2b743d6
--- /dev/null
+++ b/plugins/bbedit/README.md
@@ -0,0 +1,20 @@
+## bbedit
+
+Plugin for BBEdit, an HTML and text editor for Mac OS X 
+
+### Requirements
+
+ * [BBEdit](http://www.barebones.com/products/bbedit/)
+ * [BBEdit Command-Line Tools](http://www.barebones.com/support/bbedit/cmd-line-tools.html)
+
+### Usage
+
+ * If the `bb` command is called without an argument, launch BBEdit
+
+ * If `bb` is passed a directory, cd to it and open it in BBEdit
+
+ * If `bb` is passed a file, open it in BBEdit
+
+ * If `bbpb` create a new BBEdit document with the contents of the clipboard
+
+ * If `bbd` alias for BBEdit diff tool

From 9bf5b90c81ce2cbde321c3d6d97d5ff6d561b83c Mon Sep 17 00:00:00 2001
From: Chris Smith <csmith@bloomhealthco.com>
Date: Sun, 31 Aug 2014 12:57:58 -0500
Subject: [PATCH 0828/1378] Adding README.md and renaming plugin

---
 plugins/marked2/README.md                           | 13 +++++++++++++
 .../marked2.plugin.zsh}                             |  0
 2 files changed, 13 insertions(+)
 create mode 100644 plugins/marked2/README.md
 rename plugins/{marked/marked.plugin.zsh => marked2/marked2.plugin.zsh} (100%)

diff --git a/plugins/marked2/README.md b/plugins/marked2/README.md
new file mode 100644
index 000000000..101343abb
--- /dev/null
+++ b/plugins/marked2/README.md
@@ -0,0 +1,13 @@
+## marked2
+
+Plugin for Marked 2, a previewer for Markdown files on Mac OS X 
+
+### Requirements
+
+ * [Marked 2](http://marked2app.com)
+
+### Usage
+
+ * If `marked` is called without an argument, open Marked
+
+ * If `marked` is passed a file, open it in Marked
diff --git a/plugins/marked/marked.plugin.zsh b/plugins/marked2/marked2.plugin.zsh
similarity index 100%
rename from plugins/marked/marked.plugin.zsh
rename to plugins/marked2/marked2.plugin.zsh

From 9f8d7d85c2cacce54a5839d90b93e90b22228624 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 31 Aug 2014 11:30:30 -0700
Subject: [PATCH 0829/1378] Adding link to the store for swag in upgrade
 process

---
 tools/upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 9a8497d96..5f0a81f1d 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -9,8 +9,8 @@ then
   printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
   printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
   printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
-  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh'
+  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest news and updates, follow us on twitter: ' 'http://twitter.com/ohmyzsh'
+  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'Get your Oh My Zsh swag at: ' 'http://shop.planetargon.com/'
 else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
 fi
-

From 671bd0cf4f0face60883a2b476e75e6364d0154e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 31 Aug 2014 11:32:07 -0700
Subject: [PATCH 0830/1378] Link to swag in installer... shameless profiting

---
 tools/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/install.sh b/tools/install.sh
index 7efab10b9..3ff897a01 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -43,5 +43,6 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
 echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
+echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
 env zsh
 . ~/.zshrc

From 65f97a66c7fa2979ba454e9bcc578854912721d9 Mon Sep 17 00:00:00 2001
From: Tobias Preuss <tobias.preuss@googlemail.com>
Date: Sun, 31 Aug 2014 21:42:49 +0200
Subject: [PATCH 0831/1378] Add README.md for adb-autocompletion plugin.

---
 plugins/adb/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 plugins/adb/README.md

diff --git a/plugins/adb/README.md b/plugins/adb/README.md
new file mode 100644
index 000000000..075beec0e
--- /dev/null
+++ b/plugins/adb/README.md
@@ -0,0 +1,8 @@
+# adb autocomplete plugin
+
+* Adds autocomplete options for all adb commands.
+
+
+## Requirements
+
+In order to make this work, you will need to have the Android adb tools set up in your path.

From e7fdb028b52505947c7c3eb088586590f5b0b8cd Mon Sep 17 00:00:00 2001
From: Michael Stucki <michael.stucki@typo3.org>
Date: Sun, 31 Aug 2014 23:50:59 +0200
Subject: [PATCH 0832/1378] Improve support for Vagrant VM definitions

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 9ddfa1be7..f842b4fbb 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -56,7 +56,7 @@ __box_list ()
 
 __vm_list ()
 {
-    _wanted application expl 'command' compadd $(command grep Vagrantfile -oe '^[^#]*\.vm\.define *:\([a-zA-Z0-9]\+\)' 2>/dev/null | cut -d: -f2)
+    _wanted application expl 'command' compadd $(command grep Vagrantfile -oe '^[^#]*\.vm\.define *[:"]\([a-zA-Z0-9_-]\+\)' 2>/dev/null | awk '{print substr($2, 2)}')
 }
 
 __vagrant-box ()

From 2b83accbf8d8668f4b46e449087317dc90a43873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C3=96zg=C3=BCr?= <halil.ozgur@gmail.com>
Date: Mon, 1 Sep 2014 04:14:03 +0300
Subject: [PATCH 0833/1378] Use the library function for ruby prompt

Not everyone uses rvm and the library has already got a function for this.
---
 themes/half-life.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index 1bf4c7432..942affa94 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -95,4 +95,4 @@ function steeef_precmd {
 }
 add-zsh-hook precmd steeef_precmd
 
-PROMPT=$'%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(rvm-prompt " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '
+PROMPT=$'%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(ruby_prompt_info " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '

From 9c1255d358fa98397ce20370fa3843199c663990 Mon Sep 17 00:00:00 2001
From: Letian Zhang <zlthooray@gmail.com>
Date: Mon, 1 Sep 2014 09:49:31 +0800
Subject: [PATCH 0834/1378] fix missing add-zsh-hook in pygmalion.zsh-theme

Fix "command not found: add-zsh-hook" since #3053 removes `autoload -U add-zsh-hook`
---
 themes/pygmalion.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index 654e0fc37..5f5fe7f9a 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -12,7 +12,7 @@ prompt_setup_pygmalion(){
   base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
   post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
 
-  add-zsh-hook precmd prompt_pygmalion_precmd
+  precmd_functions+=(prompt_pygmalion_precmd)
 }
 
 prompt_pygmalion_precmd(){

From f0d5cfdc33561a16e26e9db2b2dbb9141eabe5c1 Mon Sep 17 00:00:00 2001
From: AJ Henriques <aj@10beat.com>
Date: Sun, 31 Aug 2014 20:30:42 -0700
Subject: [PATCH 0835/1378] add git difftool alias (gdt)

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 4b5ddf44c..bb1978f78 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -18,6 +18,7 @@ compdef _git gp=git-push
 alias gd='git diff'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
+alias gdt='git difftool'
 alias gc='git commit -v'
 compdef _git gc=git-commit
 alias gc!='git commit -v --amend'

From b8e10ca16d1caa55e3e6759b9130e32629986d98 Mon Sep 17 00:00:00 2001
From: Joshua Medeski <josh.medeski@gmail.com>
Date: Sun, 31 Aug 2014 23:33:43 -0500
Subject: [PATCH 0836/1378] add wp-cli plugin readme

---
 plugins/wp-cli/README.md | 105 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 plugins/wp-cli/README.md

diff --git a/plugins/wp-cli/README.md b/plugins/wp-cli/README.md
new file mode 100644
index 000000000..6dda07d17
--- /dev/null
+++ b/plugins/wp-cli/README.md
@@ -0,0 +1,105 @@
+# WP-CLI
+
+**Maintainer:** [joshmedeski](https://github.com/joshmedeski)
+
+WordPress Command Line Interface (http://wp-cli.org/)
+
+WP-CLI is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite installs and much more, without using a web browser. 
+
+## List of Aliases
+
+### Core
+- wpcc='wp core config'
+- wpcd='wp core download'
+- wpci='wp core install'
+- wpcii='wp core is-installed'
+- wpcmc='wp core multisite-convert'
+- wpcmi='wp core multisite-install'
+- wpcu='wp core update'
+- wpcudb='wp core update-db'
+- wpcvc='wp core verify-checksums'
+
+### Cron
+- wpcre='wp cron event'
+- wpcrs='wp cron schedule'
+- wpcrt='wp cron test'
+
+### Menu
+- wpmc='wp menu create'
+- wpmd='wp menu delete'
+- wpmi='wp menu item'
+- wpml='wp menu list'
+- wpmlo='wp menu location'
+
+### Plugin
+- wppa='activate'
+- wppda='deactivate'
+- wppd='delete'
+- wppg='get'
+- wppi='install'
+- wppis='is-installed'
+- wppl='list'
+- wppp='path'
+- wpps='search'
+- wppst='status'
+- wppt='toggle'
+- wppu='uninstall'
+- wppu='update'
+
+### Post
+- wppoc='wp post create'
+- wppod='wp post delete'
+- wppoe='wp post edit'
+- wppogen='wp post generate'
+- wppog='wp post get'
+- wppol='wp post list'
+- wppom='wp post meta'
+- wppou='wp post update'
+- wppou='wp post url'
+
+### Sidebar
+- wpsbl='wp sidebar list'
+
+### Theme
+- wpta='wp theme activate'
+- wptd='wp theme delete'
+- wptdis='wp theme disable'
+- wpte='wp theme enable'
+- wptg='wp theme get'
+- wpti='wp theme install'
+- wptis='wp theme is-installed'
+- wptl='wp theme list'
+- wptm='wp theme mod'
+- wptp='wp theme path'
+- wpts='wp theme search'
+- wptst='wp theme status'
+- wptu='wp theme updatet'
+
+### User
+- wpuac='wp user add-cap'
+- wpuar='wp user add-role'
+- wpuc='wp user create'
+- wpud='wp user delete'
+- wpugen='wp user generate'
+- wpug='wp user get'
+- wpui='wp user import-csv'
+- wpul='wp user list'
+- wpulc='wp user list-caps'
+- wpum='wp user meta'
+- wpurc='wp user remove-cap'
+- wpurr='wp user remove-role'
+- wpusr='wp user set-role'
+- wpuu='wp user update'
+
+### Widget
+- wpwa='wp widget add'
+- wpwda='wp widget deactivate'
+- wpwd='wp widget delete'
+- wpwl='wp widget list'
+- wpwm='wp widget move'
+- wpwu='wp widget update'
+
+The entire list of wp-cli commands can be found here: http://wp-cli.org/commands/
+
+I only included the commands that are most used. Please feel free to contribute to this project if you want more commands.
+

From 39fb6c9d35a555674de36ea02a4ae4c226c387a4 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 1 Sep 2014 12:59:47 +0200
Subject: [PATCH 0837/1378] Revert "Add a CONTRIBUTING file to instruct people
 on issues and pull requests"

---
 CONTRIBUTING.md | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 9964c380d..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# CONTRIBUTING GUIDELINE
-
-1. [Luke, use the search](#luke-use-the-search)
-2. [You have a problem](#you-have-a-problem)
-3. [You have a solution](#you-have-a-solution)
-
-**BONUS:** [You have free time to volunteer](#you-have-free-time-to-volunteer)
-
-## LUKE, USE THE SEARCH
-
-May the experiences of other people be with you
-
-
-## YOU HAVE A PROBLEM
-
-See point 1, then look at FAQ or Troubleshooting wiki pages (first we'll have to make them)
-
-
-## YOU HAVE A SOLUTION
-
-See point 1, then go ahead (unless your solution is yet another theme)
-
-
-## YOU HAVE FREE TIME TO VOLUNTEER
-
-Cool! Please have a look at the list below to understand how oh-my-zsh categorizes its issues.
-
-Classification of issues and
-
-- Bugs, which may be:
-  - Specific of zsh \*
-  - Regressions, in which we should summon the author of the offending commit once it is located
-
-- Feature requests
-
-- Helpdesk, which may be:
-  - Specific of zsh \*
-  - Everything else
-
-\* In the case of bugs, I see the benefit in going through the trouble of responding to that. After all, oh-my-zsh should be the missing link that makes zsh perfect, and hunting down an upstream bug can lead to a submitted PR.
-In the case of helpdesk, minimal response should be done. That is, provide a link to the wiki with the relevant information, or
-add it to the FAQ of the wiki and point to it afterwards.

From a910aef0c4e33868d25e3410f1e8f8c9844b55c8 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 1 Sep 2014 13:01:01 +0200
Subject: [PATCH 0838/1378] Revert "Add Composer's local binaries to PATH"

---
 plugins/composer/composer.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 2243dd3c1..86f2ca4df 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -47,5 +47,5 @@ alias cdu='composer dump-autoload'
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
 
-# Add Composer's global & local binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin:./bin
+# Add Composer's global binaries to PATH
+export PATH=$PATH:~/.composer/vendor/bin

From 20edd5f6de221dcf4ae818c0fa91c5121afbbf0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20K=C3=B6nig?= <andre.koenig@posteo.de>
Date: Mon, 1 Sep 2014 15:12:36 +0200
Subject: [PATCH 0839/1378] gulp.js plugin

---
 gulp/gulp.plugin.zsh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 gulp/gulp.plugin.zsh

diff --git a/gulp/gulp.plugin.zsh b/gulp/gulp.plugin.zsh
new file mode 100644
index 000000000..6017c7b60
--- /dev/null
+++ b/gulp/gulp.plugin.zsh
@@ -0,0 +1,29 @@
+#!/usr/bin/env zsh
+
+#
+# gulp-autocompletion-zsh
+# 
+# Autocompletion for your gulp.js tasks
+#
+# Copyright(c) 2014 André König <andre.koenig@posteo.de>
+# MIT Licensed
+# 
+
+#
+# André König
+# Github: https://github.com/akoenig
+# Twitter: https://twitter.com/caiifr
+#
+
+#
+# Grabs all available tasks from the `gulpfile.js`
+# in the current directory.
+#
+function $$gulp_completion() {
+    compls=$(grep -Eo "gulp.task\(('(([a-zA-Z0-9]|-)*)',)" gulpfile.js 2>/dev/null | grep -Eo "'(([a-zA-Z0-9]|-)*)'" | sed s/"'"//g | sort)
+
+    completions=(${=compls})
+    compadd -- $completions
+}
+
+compdef $$gulp_completion gulp
\ No newline at end of file

From ed6c2c9106cdaf570da6f7a260c41ca1c4b4ed2a Mon Sep 17 00:00:00 2001
From: Philipp Wahala <philipp.wahala@gmail.com>
Date: Wed, 3 Sep 2014 11:13:21 +0200
Subject: [PATCH 0840/1378] Symfony2 plugin use first console found

---
 plugins/symfony2/symfony2.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index c8c102eee..fcb811fa5 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,7 +1,7 @@
 # Symfony2 basic command completion
 
 _symfony_console () {
-  echo "php $(find . -maxdepth 2 -mindepth 1 -name 'console')"
+  echo "php $(find . -maxdepth 2 -mindepth 1 -name 'console' | head -n 1)"
 }
 
 _symfony2_get_command_list () {

From 677d8b1a21c4b1d8cffef4cbfa259797a11f338a Mon Sep 17 00:00:00 2001
From: Philipp Wahala <philipp.wahala@gmail.com>
Date: Wed, 3 Sep 2014 11:36:22 +0200
Subject: [PATCH 0841/1378] Symfony2 plugin look for files only

---
 plugins/symfony2/symfony2.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index fcb811fa5..2783cd387 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,7 +1,7 @@
 # Symfony2 basic command completion
 
 _symfony_console () {
-  echo "php $(find . -maxdepth 2 -mindepth 1 -name 'console' | head -n 1)"
+  echo "php $(find . -maxdepth 2 -mindepth 1 -name 'console' -type f | head -n 1)"
 }
 
 _symfony2_get_command_list () {

From 8d2dd8cc6a530e79ffdf307d444cb15430004efa Mon Sep 17 00:00:00 2001
From: Philipp Wahala <philipp.wahala@gmail.com>
Date: Wed, 3 Sep 2014 11:58:52 +0200
Subject: [PATCH 0842/1378] Symfony2 plugin autocomplete for app/console and
 bin/console

---
 plugins/symfony2/symfony2.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 2783cd387..8df22e9ad 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -13,6 +13,8 @@ _symfony2 () {
 }
 
 compdef _symfony2 '`_symfony_console`'
+compdef _symfony2 'app/console'
+compdef _symfony2 'bin/console'
 compdef _symfony2 sf
 
 #Alias

From ae901fa0d5163728de3dde787071df0e2fcf47d5 Mon Sep 17 00:00:00 2001
From: Michael Stucki <michael.stucki@typo3.org>
Date: Tue, 11 Jun 2013 13:51:17 +0200
Subject: [PATCH 0843/1378] Support dynamically defined Vagrant machines

---
 plugins/vagrant/_vagrant | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index f842b4fbb..0c82acd42 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -57,6 +57,7 @@ __box_list ()
 __vm_list ()
 {
     _wanted application expl 'command' compadd $(command grep Vagrantfile -oe '^[^#]*\.vm\.define *[:"]\([a-zA-Z0-9_-]\+\)' 2>/dev/null | awk '{print substr($2, 2)}')
+    _wanted application expl 'command' compadd $(command ls .vagrant/machines/ 2>/dev/null)
 }
 
 __vagrant-box ()

From 87fb118dd252d7e9b658c66c51b5e3cb905f10fb Mon Sep 17 00:00:00 2001
From: Matt Walker <matt@suckerfish.net>
Date: Wed, 3 Sep 2014 12:01:29 -0700
Subject: [PATCH 0844/1378] Changed brew cmd to properly report if awscli is
 installed via homebrew

---
 plugins/aws/aws.plugin.zsh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 8b57d7db1..de786725f 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -3,19 +3,17 @@ _homebrew-installed() {
 }
 
 _awscli-homebrew-installed() {
-  brew --prefix awscli &> /dev/null
+  brew list awscli &> /dev/null
 }
 
 export AWS_HOME=~/.aws
 
 function agp {
   echo $AWS_DEFAULT_PROFILE
-  
 }
 function asp {
   export AWS_DEFAULT_PROFILE=$1
-    export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>"
-    
+  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>"
 }
 function aws_profiles {
   reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))

From 5e2591317810dba5d61f085faaf4e3050f90559c Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 4 Sep 2014 12:53:43 +0200
Subject: [PATCH 0845/1378] Revert "Exit early from git plugin if not in git
 repo."

---
 plugins/git/git.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bb1978f78..bf7cd1ac9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -125,14 +125,12 @@ alias gsd='git svn dcommit'
 # Usage example: git pull origin $(current_branch)
 #
 function current_branch() {
-  if [ ! -d .git ]; then return; fi
   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
   echo ${ref#refs/heads/}
 }
 
 function current_repository() {
-  if [ ! -d .git ]; then return; fi
   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
   echo $(git remote -v | cut -d':' -f 2)

From 6855dd4727a395bfe8bd471c939819d907cb6c27 Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mafaer@gmail.com>
Date: Sun, 7 Sep 2014 21:56:34 +0200
Subject: [PATCH 0846/1378] [wd] New minor version (v0.4)

---
 plugins/wd/README.md | 110 ++++++++++-
 plugins/wd/_wd.sh    |   6 +-
 plugins/wd/wd.sh     | 460 +++++++++++++++++++++++++++++--------------
 3 files changed, 426 insertions(+), 150 deletions(-)

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
index bc0ebe334..bcfeab684 100644
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md
@@ -1,8 +1,60 @@
-## wd
+wd
+==
+
+[![Build Status](https://travis-ci.org/mfaerevaag/wd.png?branch=master)](https://travis-ci.org/mfaerevaag/wd)
+
+`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems ineffecient when the folder is frequently visited or has a long path.
+
+
+### Setup
+
+### oh-my-zsh
+
+`wd` comes bundles with [oh-my-zshell](https://github.com/robbyrussell/oh-my-zsh)!
+
+Just add the plugin in your `~/.zshrc` file:
+
+    plugins=(... wd)
+
+
+#### Automatic
+
+Run either in terminal:
+
+ * `curl -L https://github.com/mfaerevaag/wd/raw/master/install.sh | sh`
+
+ * `wget --no-check-certificate https://github.com/mfaerevaag/wd/raw/master/install.sh -O - | sh`
+
+
+#### Manual
+
+ * Clone this repo to your liking
+
+ * Add `wd` function to `.zshrc` (or `.profile` etc.):
+
+        wd() {
+            . ~/paht/to/wd/wd.sh
+        }
+
+ * Install manpage. From `wd`'s base directory (requires root permissions):
+
+        # cp wd.1 /usr/share/man/man1/wd.1
+        # chmod 644 /usr/share/man/man1/wd.1
+
+    Note, when pulling and updating `wd`, you'll need to do this again in case of changes to the manpage.
+
+
+#### Completion
+
+If you're NOT using [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) and you want to utelize the zsh-completion feature, you will also need to add the path to your `wd` installation (`~/bin/wd` if you used the automatic installer) to your `fpath`. E.g. in your `~/.zshrc`:
+
+    fpath=(~/path/to/wd $fpath)
+
+Also, you may have to force a rebuild of `zcompdump` by running:
+
+    $ rm -f ~/.zcompdump; compinit
 
-**Maintainer:** [mfaerevaag](https://github.com/mfaerevaag)
 
-`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems ineffecient when the folder is frequently visited or has a long path. [Source](https://github.com/mfaerevaag/wd)
 
 ### Usage
 
@@ -24,6 +76,7 @@
         $ wd ...
 
     This is a wrapper for the zsh `dirs` function.
+    (You might need `setopt AUTO_PUSHD` in your `.zshrc` if you hare not using [oh-my-zshell](https://github.com/robbyrussell/oh-my-zsh)).
 
  * Remove warp point test point:
 
@@ -33,8 +86,55 @@
 
         $ wd ls
 
- * List warp points to current directory
+ * List warp points to current directory, or optionally, path to given warp point:
 
         $ wd show
 
- * Print usage with no opts or the `help` argument.
+ * Remove warp points to non-existent directories.
+
+        $ wd clean
+
+    Use `clean!` to not be prompted with confirmation (force).
+
+ * Print usage with no opts or the `help` argument:
+
+        $ wd help
+
+ * Print the running version of `wd`:
+
+        $ wd --version
+
+ * Specifically set the config file (default `~/.warprc`), which is useful when testing:
+
+        $ wd --config ./file <action>
+
+ * Force `exit` with return code after running. This is not default, as it will *exit your terminal*, though required when testing/debugging.
+
+        $ wd --debug <action>
+
+ * Silence all output:
+
+        $ wd --quiet <action>
+
+
+### Testing
+
+`wd` comes with a small test suite, run with [shunit2](https://code.google.com/p/shunit2/). This can be used to confirm that things are working as it should on your setup, or to demonstrate an issue.
+
+To run, simply `cd` into the `test` directory and run the `tests.sh`.
+
+    $ ./tests.sh
+
+
+### License
+
+The project is licensed under the [MIT-license](https://github.com/mfaerevaag/wd/blob/master/LICENSE).
+
+
+### Finally
+
+If you have issues, feedback or improvements, don't hesitate to report it or submit a pull-request. In the case of an issue, we would much appreciate if you would include a failing test in `test/tests.sh`. Explanation on how to run the tests, read the section "Testing" in this README.
+
+Credit to [altschuler](https://github.com/altschuler) for awesome idea.
+
+Hope you enjoy!
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 0b03d8fff..2bb58dd31 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -21,7 +21,8 @@ function _wd() {
     'add!:Overwrites existing warp point'
     'rm:Removes the given warp point'
     'ls:Outputs all stored warp points'
-    'show:Outputs all warp points that point to the current directory'
+    'show:Outputs all warp points that point to the current directory or shows a specific target directory for a point'
+    'show:Outputs all warp points that point to the current directory or shows a specific target directory for a point'
     'help:Show this extremely helpful text'
     '..:Go back to last directory'
   )
@@ -43,6 +44,9 @@ function _wd() {
         add)
           _message 'Write the name of your warp point' && ret=0
           ;;
+        show)
+          _describe -t points "Warp points" warp_points && ret=0
+          ;;
       esac
       ;;
   esac
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index dfb9ad89a..4e45b48e1 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -7,25 +7,301 @@
 #
 # @github.com/mfaerevaag/wd
 
-
-## variables
-readonly CONFIG=$HOME/.warprc
+# version
+readonly WD_VERSION=0.4
 
 # colors
-readonly BLUE="\033[96m"
-readonly GREEN="\033[92m"
-readonly YELLOW="\033[93m"
-readonly RED="\033[91m"
-readonly NOC="\033[m"
+readonly WD_BLUE="\033[96m"
+readonly WD_GREEN="\033[92m"
+readonly WD_YELLOW="\033[93m"
+readonly WD_RED="\033[91m"
+readonly WD_NOC="\033[m"
 
+## functions
 
-## init
+# helpers
+wd_yesorno()
+{
+    # variables
+    local question="${1}"
+    local prompt="${question} "
+    local yes_RETVAL="0"
+    local no_RETVAL="3"
+    local RETVAL=""
+    local answer=""
+
+    # read-eval loop
+    while true ; do
+        printf $prompt
+        read -r answer
+
+        case ${answer:=${default}} in
+            Y|y|YES|yes|Yes )
+                RETVAL=${yes_RETVAL} && \
+                    break
+                ;;
+            N|n|NO|no|No )
+                RETVAL=${no_RETVAL} && \
+                    break
+                ;;
+            * )
+                echo "Please provide a valid answer (y or n)"
+                ;;
+        esac
+    done
+
+    return ${RETVAL}
+}
+
+wd_print_msg()
+{
+    if [[ -z $wd_quiet_mode ]]
+    then
+        local color=$1
+        local msg=$2
+
+        if [[ $color == "" || $msg == "" ]]
+        then
+            print " ${WD_RED}*${WD_NOC} Could not print message. Sorry!"
+        else
+            print " ${color}*${WD_NOC} ${msg}"
+        fi
+    fi
+}
+
+wd_print_usage()
+{
+    cat <<- EOF
+Usage: wd [command] <point>
+
+Commands:
+	add <point>	Adds the current working directory to your warp points
+	add! <point>	Overwrites existing warp point
+	rm <point>	Removes the given warp point
+	show		Print warp points to current directory
+	show <point>	Print path to given warp point
+	ls		Print all stored warp points
+	clean!		Remove points warping to nonexistent directories
+
+	-v | --version	Print version
+	-d | --debug	Exit after execution with exit codes (for testing)
+	-c | --config	Specify config file (default ~/.warprc)
+	-q | --quiet	Suppress all output
+
+	help		Show this extremely helpful text
+EOF
+}
+
+wd_exit_fail()
+{
+    local msg=$1
+
+    wd_print_msg $WD_RED $1
+    WD_EXIT_CODE=1
+}
+
+wd_exit_warn()
+{
+    local msg=$1
+
+    wd_print_msg $WD_YELLOW $msg
+    WD_EXIT_CODE=1
+}
+
+# core
+
+wd_warp()
+{
+    local point=$1
+
+    if [[ $point =~ "^\.+$" ]]
+    then
+        if [ $#1 < 2 ]
+        then
+            wd_exit_warn "Warping to current directory?"
+        else
+            (( n = $#1 - 1 ))
+            cd -$n > /dev/null
+        fi
+    elif [[ ${points[$point]} != "" ]]
+    then
+        cd ${points[$point]}
+    else
+        wd_exit_fail "Unknown warp point '${point}'"
+    fi
+}
+
+wd_add()
+{
+    local force=$1
+    local point=$2
+
+    if [[ $point =~ "^[\.]+$" ]]
+    then
+        wd_exit_fail "Warp point cannot be just dots"
+    elif [[ $point =~ "(\s|\ )+" ]]
+    then
+        wd_exit_fail "Warp point should not contain whitespace"
+    elif [[ $point == *:* ]]
+    then
+        wd_exit_fail "Warp point cannot contain colons"
+    elif [[ $point == "" ]]
+    then
+        wd_exit_fail "Warp point cannot be empty"
+    elif [[ ${points[$2]} == "" ]] || $force
+    then
+        wd_remove $point > /dev/null
+        printf "%q:%q\n" "${point}" "${PWD}" >> $WD_CONFIG
+
+        wd_print_msg $WD_GREEN "Warp point added"
+
+        # override exit code in case wd_remove did not remove any points
+        # TODO: we should handle this kind of logic better
+        WD_EXIT_CODE=0
+    else
+        wd_exit_warn "Warp point '${point}' already exists. Use 'add!' to overwrite."
+    fi
+}
+
+wd_remove()
+{
+    local point=$1
+
+    if [[ ${points[$point]} != "" ]]
+    then
+        local config_tmp=$WD_CONFIG.tmp
+        if sed -n "/^${point}:.*$/!p" $WD_CONFIG > $config_tmp && mv $config_tmp $WD_CONFIG
+        then
+            wd_print_msg $WD_GREEN "Warp point removed"
+        else
+            wd_exit_fail "Something bad happened! Sorry."
+        fi
+    else
+        wd_exit_fail "Warp point was not found"
+    fi
+}
+
+wd_list_all()
+{
+    wd_print_msg $WD_BLUE "All warp points:"
+
+    while IFS= read -r line
+    do
+        if [[ $line != "" ]]
+        then
+            arr=(${(s,:,)line})
+            key=${arr[1]}
+            val=${arr[2]}
+
+            if [[ -z $wd_quiet_mode ]]
+            then
+                printf "%20s  ->  %s\n" $key $val
+            fi
+        fi
+    done <<< $(sed "s:${HOME}:~:g" $WD_CONFIG)
+}
+
+wd_show()
+{
+    local name_arg=$1
+    # if there's an argument we look up the value
+    if [[ ! -z $name_arg ]]
+    then
+        if [[ -z $points[$name_arg] ]]
+        then
+            wd_print_msg $WD_BLUE "No warp point named $name_arg"
+        else
+            wd_print_msg $WD_GREEN "Warp point: ${WD_GREEN}$name_arg${WD_NOC} -> $points[$name_arg]"
+        fi
+    else
+        # hax to create a local empty array
+        local wd_matches
+        wd_matches=()
+        # do a reverse lookup to check whether PWD is in $points
+        if [[ ${points[(r)$PWD]} == $PWD ]]
+        then
+            for name in ${(k)points}
+            do
+                if [[ $points[$name] == $PWD ]]
+                then
+                    wd_matches[$(($#wd_matches+1))]=$name
+                fi
+            done
+
+            wd_print_msg $WD_BLUE "$#wd_matches warp point(s) to current directory: ${WD_GREEN}$wd_matches${WD_NOC}"
+        else
+            wd_print_msg $WD_BLUE "No warp points to $cwd"
+        fi
+    fi
+}
+
+wd_clean() {
+    local force=$1
+    local count=0
+    local wd_tmp=""
+
+    while read line
+    do
+        if [[ $line != "" ]]
+        then
+            arr=(${(s,:,)line})
+            key=${arr[1]}
+            val=${arr[2]}
+
+            if [ -d "$val" ]
+            then
+                wd_tmp=$wd_tmp"\n"`echo $line`
+            else
+                wd_print_msg $WD_YELLOW "Nonexistent directory: ${key} -> ${val}"
+                count=$((count+1))
+            fi
+        fi
+    done < $WD_CONFIG
+
+    if [[ $count -eq 0 ]]
+    then
+        wd_print_msg $WD_BLUE "No warp points to clean, carry on!"
+    else
+        if $force || wd_yesorno "Removing ${count} warp points. Continue? (Y/n)"
+        then
+            echo $wd_tmp >! $WD_CONFIG
+            wd_print_msg $WD_GREEN "Cleanup complete. ${count} warp point(s) removed"
+        else
+            wd_print_msg $WD_BLUE "Cleanup aborted"
+        fi
+    fi
+}
+
+local WD_CONFIG=$HOME/.warprc
+local WD_QUIET=0
+local WD_EXIT_CODE=0
+local WD_DEBUG=0
+
+# Parse 'meta' options first to avoid the need to have them before
+# other commands. The `-D` flag consumes recognized options so that
+# the actual command parsing won't be affected.
+
+zparseopts -D -E \
+    c:=wd_alt_config -config:=wd_alt_config \
+    q=wd_quiet_mode -quiet=wd_quiet_mode \
+    v=wd_print_version -version=wd_print_version \
+    d=wd_debug_mode -debug=wd_debug_mode
+
+if [[ ! -z $wd_print_version ]]
+then
+    echo "wd version $WD_VERSION"
+fi
+
+if [[ ! -z $wd_alt_config ]]
+then
+    WD_CONFIG=$wd_alt_config[2]
+fi
 
 # check if config file exists
-if [ ! -e $CONFIG ]
+if [ ! -e $WD_CONFIG ]
 then
     # if not, create config file
-    touch $CONFIG
+    touch $WD_CONFIG
 fi
 
 # load warp points
@@ -37,149 +313,26 @@ do
     val=${arr[2]}
 
     points[$key]=$val
-done < $CONFIG
-
-
-## functions
-
-wd_warp()
-{
-    local point=$1
-
-    if [[ $point =~ "^\.+$" ]]
-    then
-        if [ $#1 < 2 ]
-        then
-            wd_print_msg $YELLOW "Warping to current directory?"
-        else
-            (( n = $#1 - 1 ))
-            cd -$n > /dev/null
-        fi
-    elif [[ ${points[$point]} != "" ]]
-    then
-        cd ${points[$point]}
-    else
-        wd_print_msg $RED "Unknown warp point '${point}'"
-    fi
-}
-
-wd_add()
-{
-    local force=$1
-    local point=$2
-
-    if [[ $point =~ "^[\.]+$" ]]
-    then
-        wd_print_msg $RED "Warp point cannot be just dots"
-    elif [[ $point =~ "(\s|\ )+" ]]
-    then
-        wd_print_msg $RED "Warp point should not contain whitespace"
-    elif [[ $point == *:* ]]
-    then
-        wd_print_msg $RED "Warp point cannot contain colons"
-    elif [[ $point == "" ]]
-    then
-        wd_print_msg $RED "Warp point cannot be empty"
-    elif [[ ${points[$2]} == "" ]] || $force
-    then
-        wd_remove $point > /dev/null
-        printf "%q:%q\n" "${point}" "${PWD}" >> $CONFIG
-
-        wd_print_msg $GREEN "Warp point added"
-    else
-        wd_print_msg $YELLOW "Warp point '${point}' already exists. Use 'add!' to overwrite."
-    fi
-}
-
-wd_remove()
-{
-    local point=$1
-
-    if [[ ${points[$point]} != "" ]]
-    then
-        if sed -i.bak "s,^${point}:.*$,,g" $CONFIG
-        then
-            wd_print_msg $GREEN "Warp point removed"
-        else
-            wd_print_msg $RED "Something bad happened! Sorry."
-        fi
-    else
-        wd_print_msg $RED "Warp point was not found"
-    fi
-}
-
-wd_list_all()
-{
-    wd_print_msg $BLUE "All warp points:"
-
-    while IFS= read -r line
-    do
-        if [[ $line != "" ]]
-        then
-            arr=(${(s,:,)line})
-            key=${arr[1]}
-            val=${arr[2]}
-
-            printf "%20s  ->  %s\n" $key $val
-        fi
-    done <<< $(sed "s:${HOME}:~:g" $CONFIG)
-}
-
-wd_show()
-{
-    local cwd=$(print $PWD | sed "s:^${HOME}:~:")
-
-    wd_print_msg $BLUE "Warp points to current directory:"
-    wd_list_all | grep -e "${cwd}$"
-}
-
-wd_print_msg()
-{
-    local color=$1
-    local msg=$2
-
-    if [[ $color == "" || $msg == "" ]]
-    then
-        print " ${RED}*${NOC} Could not print message. Sorry!"
-    else
-        print " ${color}*${NOC} ${msg}"
-    fi
-}
-
-wd_print_usage()
-{
-    cat <<- EOF
-Usage: wd [add|-a|--add] [rm|-r|--remove] <point>
-
-Commands:
-	add	Adds the current working directory to your warp points
-	add!	Overwrites existing warp point
-	rm	Removes the given warp point
-	show	Outputs warp points to current directory
-	ls	Outputs all stored warp points
-	help	Show this extremely helpful text
-EOF
-}
-
-
-## run
+done < $WD_CONFIG
 
 # get opts
-args=$(getopt -o a:r:lhs -l add:,rm:,ls,help,show -- $*)
+args=$(getopt -o a:r:c:lhs -l add:,rm:,clean\!,ls,help,show -- $*)
 
-# check if no arguments were given
-if [[ $? -ne 0 || $#* -eq 0 ]]
+# check if no arguments were given, and that version is not set
+if [[ ($? -ne 0 || $#* -eq 0) && -z $wd_print_version ]]
 then
     wd_print_usage
 
-# check if config file is writeable
-elif [ ! -w $CONFIG ]
+    # check if config file is writeable
+elif [ ! -w $WD_CONFIG ]
 then
     # do nothing
     # can't run `exit`, as this would exit the executing shell
-    wd_print_msg $RED "\'$CONFIG\' is not writeable."
+    wd_exit_fail "\'$WD_CONFIG\' is not writeable."
 
 else
+
+    # parse rest of options
     for o
     do
         case "$o"
@@ -205,7 +358,15 @@ else
                 break
                 ;;
             -s|--show|show)
-                wd_show
+                wd_show $2
+                break
+                ;;
+            -c|--clean|clean)
+                wd_clean false
+                break
+                ;;
+            -c!|--clean!|clean!)
+                wd_clean true
                 break
                 ;;
             *)
@@ -229,8 +390,19 @@ unset wd_remove
 unset wd_show
 unset wd_list_all
 unset wd_print_msg
+unset wd_yesorno
 unset wd_print_usage
+unset wd_alt_config
+unset wd_quiet_mode
+unset wd_print_version
 
 unset args
 unset points
 unset val &> /dev/null # fixes issue #1
+
+if [[ ! -z $wd_debug_mode ]]
+then
+    exit $WD_EXIT_CODE
+else
+    unset wd_debug_mode
+fi

From b5093859af472c04dfca33adfeba49bfbe417c9d Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mafaer@gmail.com>
Date: Mon, 8 Sep 2014 09:09:44 +0200
Subject: [PATCH 0847/1378] [wd] Minor bug fix in show command

---
 plugins/wd/wd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 4e45b48e1..d63e92472 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -230,7 +230,7 @@ wd_show()
 
             wd_print_msg $WD_BLUE "$#wd_matches warp point(s) to current directory: ${WD_GREEN}$wd_matches${WD_NOC}"
         else
-            wd_print_msg $WD_BLUE "No warp points to $cwd"
+            wd_print_msg $WD_YELLOW "No warp point to $(echo $PWD | sed "s:$HOME:~:")"
         fi
     fi
 }

From 7a5d68c96332b5f50969f75384f67694639dbce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C3=96zg=C3=BCr?= <halil.ozgur@gmail.com>
Date: Sat, 13 Sep 2014 10:30:16 +0300
Subject: [PATCH 0848/1378] Remove j alias for autojump

j alias conflicts with autojump's j() function. Fixes #2989
---
 plugins/common-aliases/common-aliases.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 228a39da0..90d59910c 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -46,7 +46,6 @@ alias ff='find . -type f -name'
 alias h='history'
 alias hgrep="fc -El 0 | grep"
 alias help='man'
-alias j='jobs'
 alias p='ps -f'
 alias sortnr='sort -n -r'
 alias unexport='unset'

From 1e7c6743a7b221cb2069a84c70890014597672d8 Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel.van.schijndel@sioux.eu>
Date: Mon, 15 Sep 2014 15:36:34 +0200
Subject: [PATCH 0849/1378] sudo: maintain cursor position

I.e. when prefixing the current command-line with 'sudo ' maintain the
current cursor position instead of jumping to the end of the line.
---
 plugins/sudo/sudo.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index d12e06853..e3ba39918 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -13,9 +13,8 @@
 # ------------------------------------------------------------------------------
 
 sudo-command-line() {
-[[ -z $BUFFER ]] && zle up-history
-[[ $BUFFER != sudo\ * ]] && BUFFER="sudo $BUFFER"
-zle end-of-line 
+    [[ -z $BUFFER ]] && zle up-history
+    [[ $BUFFER != sudo\ * ]] && LBUFFER="sudo $LBUFFER"
 }
 zle -N sudo-command-line
 # Defined shortcut keys: [Esc] [Esc]

From eb0549750fccde126584d6be59df8d2d62882750 Mon Sep 17 00:00:00 2001
From: Peter Butkovic <butkovic@gmail.com>
Date: Tue, 16 Sep 2014 10:35:43 +0200
Subject: [PATCH 0850/1378] additional tmux aliases

---
 plugins/tmux/tmux.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 626c41f3d..bc32c8907 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -5,6 +5,8 @@
 alias ta='tmux attach -t'
 alias ts='tmux new-session -s'
 alias tl='tmux list-sessions'
+alias tksv='tmux kill-server'
+alias tkss='tmux kill-session -t'
 
 # Only run if tmux is actually installed
 if which tmux &> /dev/null

From b0013ceb29e4214a76c92bfbdc0d87354c374277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
 <decipher.hk@gmail.com>
Date: Mon, 15 Sep 2014 12:13:43 -0300
Subject: [PATCH 0851/1378] remove path not found for linuxonly theme

---
 themes/linuxonly.zsh-theme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/linuxonly.zsh-theme b/themes/linuxonly.zsh-theme
index a11b80d7f..f9e0aa07d 100644
--- a/themes/linuxonly.zsh-theme
+++ b/themes/linuxonly.zsh-theme
@@ -13,7 +13,6 @@ local c7=$(printf "\033[38;5;149m")
 local c8=$(printf "\033[38;5;126m")
 local c9=$(printf "\033[38;5;162m")
 
-local foopath=$(perl /home/scp1/bin/foopath)
 
 if [ "$TERM" = "linux" ]; then
     c1=$(printf "\033[34;1m")

From 5f38a537cef0d79c9d53c01e8f88d150e985c70a Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Tue, 16 Sep 2014 22:29:52 +0530
Subject: [PATCH 0852/1378] Update Solaris changes to use OSTYPE and zsh
 datetime  module.

---
 lib/completion.zsh                         |  2 +-
 oh-my-zsh.sh                               |  1 -
 plugins/colored-man/colored-man.plugin.zsh |  2 +-
 tools/check_for_upgrade.sh                 | 12 ++++--------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index faea36118..83b6efb66 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -25,7 +25,7 @@ bindkey -M menuselect '^o' accept-and-infer-next-history
 
 zstyle ':completion:*:*:*:*:*' menu select
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
-if [ "$PLAT" = "SunOS" ]
+if [ "$OSTYPE[0,7]" = "solaris" ]
 then
   zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm"
 else
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 4683c2bc0..c217b91bb 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,4 +1,3 @@
-PLAT=`uname -s`
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
diff --git a/plugins/colored-man/colored-man.plugin.zsh b/plugins/colored-man/colored-man.plugin.zsh
index 4956f4346..5c613f49d 100644
--- a/plugins/colored-man/colored-man.plugin.zsh
+++ b/plugins/colored-man/colored-man.plugin.zsh
@@ -1,4 +1,4 @@
-if [ "${PLAT}" = "SunOS" ]
+if [ "$OSTYPE[0,7]" = "solaris" ]
 then
 	if [ ! -x ${HOME}/bin/nroff ]
 	then
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 1aba9a272..0e8845ab4 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -1,13 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env zsh
+
+zmodload zsh/datetime
 
-PLAT=`uname -s`
 function _current_epoch() {
-  if [ "$PLAT" = "SunOS" ]
-  then
-    echo $(($(perl -e 'print time') / 60 / 60 / 24))
-  else
-    echo $(($(date +%s) / 60 / 60 / 24))
-  fi
+  echo $EPOCHSECONDS
 }
 
 function _update_zsh_update() {

From 90762eee49efcdfd6b92ad5d5d9e5f43d113ae0b Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Wed, 17 Sep 2014 11:11:48 +0530
Subject: [PATCH 0853/1378] Convert epoch_target from days to seconds.

---
 tools/check_for_upgrade.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 0e8845ab4..f49bb151f 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -22,6 +22,8 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
+epoch_target_seconds=$((epoch_target * 86400))
+
 [ -f ~/.profile ] && source ~/.profile
 
 # Cancel upgrade if the current user doesn't have write permissions for the
@@ -37,7 +39,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt $epoch_target ]
+  if [ $epoch_diff -gt $epoch_target_seconds ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then

From 8f9a72aa7b6d23f82b027a28ffe3f3f6cec8c863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20K=C3=B6nig?= <andre.koenig@posteo.de>
Date: Thu, 18 Sep 2014 19:55:44 +0200
Subject: [PATCH 0854/1378] Moved plugin.

---
 {gulp => plugins/gulp}/gulp.plugin.zsh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {gulp => plugins/gulp}/gulp.plugin.zsh (100%)

diff --git a/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh
similarity index 100%
rename from gulp/gulp.plugin.zsh
rename to plugins/gulp/gulp.plugin.zsh

From 3a3973284534c318e2cb987a0db1121302d04e10 Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Tue, 14 Oct 2014 12:05:01 +0530
Subject: [PATCH 0855/1378] Change to epoch target in days instead of seconds.

---
 tools/check_for_upgrade.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index f49bb151f..a8ba4820c 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -3,7 +3,7 @@
 zmodload zsh/datetime
 
 function _current_epoch() {
-  echo $EPOCHSECONDS
+  echo $(( $EPOCHSECONDS / 60 / 60 / 24 ))
 }
 
 function _update_zsh_update() {
@@ -22,8 +22,6 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
-epoch_target_seconds=$((epoch_target * 86400))
-
 [ -f ~/.profile ] && source ~/.profile
 
 # Cancel upgrade if the current user doesn't have write permissions for the
@@ -39,7 +37,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt $epoch_target_seconds ]
+  if [ $epoch_diff -gt $epoch_target ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then

From 71ee0d7b2bc717e815cddc9ee8e062f84587d2c4 Mon Sep 17 00:00:00 2001
From: Nikhil Gupta <me@nikhgupta.com>
Date: Sun, 12 Oct 2014 08:30:08 +0530
Subject: [PATCH 0856/1378] added support for GNU version of `date`

---
 plugins/emoji-clock/emoji-clock.plugin.zsh | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/plugins/emoji-clock/emoji-clock.plugin.zsh b/plugins/emoji-clock/emoji-clock.plugin.zsh
index a69446e3c..0a55528f0 100644
--- a/plugins/emoji-clock/emoji-clock.plugin.zsh
+++ b/plugins/emoji-clock/emoji-clock.plugin.zsh
@@ -8,21 +8,25 @@
 # -----------------------------------------------------------------------------
 
 function emoji-clock() {
-  hour=$(date -v '+15M' '+%I')
-  minutes=$(date -v '+15M' '+%M')
+  # Add 15 minutes to the current time and save the value as $minutes.
+  (( minutes = $(date '+%M') + 15 ))
+  (( hour = $(date '+%I') + minutes / 60 ))
+  # make sure minutes and hours don't exceed 60 nor 12 respectively
+  (( minutes %= 60 )); (( hour %= 12 ))
+
   case $hour in
-    01) clock="🕐"; [ $minutes -ge 30 ] && clock="🕜";;
-    02) clock="🕑"; [ $minutes -ge 30 ] && clock="🕝";;
-    03) clock="🕒"; [ $minutes -ge 30 ] && clock="🕞";;
-    04) clock="🕓"; [ $minutes -ge 30 ] && clock="🕟";;
-    05) clock="🕔"; [ $minutes -ge 30 ] && clock="🕠";;
-    06) clock="🕕"; [ $minutes -ge 30 ] && clock="🕡";;
-    07) clock="🕖"; [ $minutes -ge 30 ] && clock="🕢";;
-    08) clock="🕗"; [ $minutes -ge 30 ] && clock="🕣";;
-    09) clock="🕘"; [ $minutes -ge 30 ] && clock="🕤";;
+     0) clock="🕛"; [ $minutes -ge 30 ] && clock="🕧";;
+     1) clock="🕐"; [ $minutes -ge 30 ] && clock="🕜";;
+     2) clock="🕑"; [ $minutes -ge 30 ] && clock="🕝";;
+     3) clock="🕒"; [ $minutes -ge 30 ] && clock="🕞";;
+     4) clock="🕓"; [ $minutes -ge 30 ] && clock="🕟";;
+     5) clock="🕔"; [ $minutes -ge 30 ] && clock="🕠";;
+     6) clock="🕕"; [ $minutes -ge 30 ] && clock="🕡";;
+     7) clock="🕖"; [ $minutes -ge 30 ] && clock="🕢";;
+     8) clock="🕗"; [ $minutes -ge 30 ] && clock="🕣";;
+     9) clock="🕘"; [ $minutes -ge 30 ] && clock="🕤";;
     10) clock="🕙"; [ $minutes -ge 30 ] && clock="🕥";;
     11) clock="🕚"; [ $minutes -ge 30 ] && clock="🕦";;
-    12) clock="🕛"; [ $minutes -ge 30 ] && clock="🕧";;
      *) clock="⌛";;
   esac
   echo $clock

From d794a502f6e551c2ccb1479fc68dbae352c839f5 Mon Sep 17 00:00:00 2001
From: Neal <neal@ineal.me>
Date: Tue, 14 Oct 2014 13:57:02 -0500
Subject: [PATCH 0857/1378] Update path for the iOS simulator.

---
 plugins/xcode/xcode.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index e59bee8c7..3d7781bf9 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -16,4 +16,4 @@ function xcsel {
 
 alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
-alias simulator='open $(xcode-select  -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'
+alias simulator='open $(xcode-select -p)/Applications/iOS\ Simulator.app'

From 6f1eb081e343208f881b19d1c9499e6e93b29e4b Mon Sep 17 00:00:00 2001
From: willmendesneto <willmendesneto@gmail.com>
Date: Thu, 16 Oct 2014 23:32:42 -0300
Subject: [PATCH 0858/1378] Fix error using compass search alias

---
 plugins/frontend-search/frontend-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 38b1a80ea..f1d45b0d1 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -118,7 +118,7 @@ alias jquery='frontend jquery'
 alias mdn='frontend mdn'
 
 # pre processors frameworks
-alias compass='frontend compass'
+alias compassdoc='frontend compass'
 
 # important links
 alias html5please='frontend html5please'

From 9f801ff48d46847e3c91e58b2ba2f5b61f6dcef8 Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <mafaer@gmail.com>
Date: Tue, 21 Oct 2014 09:51:13 +0200
Subject: [PATCH 0859/1378] [wd] fix space in path

---
 plugins/wd/wd.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index d63e92472..5ecbdc503 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -139,7 +139,7 @@ wd_add()
     if [[ $point =~ "^[\.]+$" ]]
     then
         wd_exit_fail "Warp point cannot be just dots"
-    elif [[ $point =~ "(\s|\ )+" ]]
+    elif [[ $point =~ "[[:space:]]+" ]]
     then
         wd_exit_fail "Warp point should not contain whitespace"
     elif [[ $point == *:* ]]
@@ -151,7 +151,7 @@ wd_add()
     elif [[ ${points[$2]} == "" ]] || $force
     then
         wd_remove $point > /dev/null
-        printf "%q:%q\n" "${point}" "${PWD}" >> $WD_CONFIG
+        printf "%q:%s\n" "${point}" "${PWD}" >> $WD_CONFIG
 
         wd_print_msg $WD_GREEN "Warp point added"
 

From 36e05e95adf6218eb8c154706a5a101b687d6368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 22 Oct 2014 15:16:15 +0200
Subject: [PATCH 0860/1378] Don't set auto_name_dirs because it messes up
 prompts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4

> AUTO_NAME_DIRS
> Any parameter that is set to the absolute name of a directory immediately
> becomes a name for that directory, that will be used by the ‘%~’ and
> related prompt sequences, and will be available when completion is performed
> on a word starting with ‘~’.
> (Otherwise, the parameter must be used in the form ‘~param’ first.)

Explained in more detail in
https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194

Related issues:
https://github.com/robbyrussell/oh-my-zsh/issues/2857
https://github.com/robbyrussell/oh-my-zsh/issues/3238
https://github.com/wayneeseguin/rvm/issues/3091
---
 lib/directories.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 1896945f4..02743e0c7 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -1,5 +1,4 @@
 # Changing/making/removing directory
-setopt auto_name_dirs
 setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus

From b9a11b16fec80c5d68f8a215565da3624748197f Mon Sep 17 00:00:00 2001
From: Andrii Kostenko <andrey@kostenko.name>
Date: Sat, 6 Sep 2014 22:44:18 +0300
Subject: [PATCH 0861/1378] fixed URL on github.io

github.io moved to https and http returns 301 redirect
---
 plugins/gitignore/gitignore.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index be037d87a..5bf302452 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
-function gi() { curl http://www.gitignore.io/api/$@ ;}
+function gi() { curl https://www.gitignore.io/api/$@ ;}
 
 _gitignireio_get_command_list() {
-  curl -s http://www.gitignore.io/api/list | tr "," "\n"
+  curl -s https://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignireio () {

From 69a0b280c7939406c930082469756e217d1bd789 Mon Sep 17 00:00:00 2001
From: Alex Shaindlin <ashaindlin@gmail.com>
Date: Wed, 15 Oct 2014 09:33:49 -0400
Subject: [PATCH 0862/1378] Fix misspellings in gitignore plugin

---
 plugins/gitignore/gitignore.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index 5bf302452..3f2a6dec1 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,12 +1,12 @@
 function gi() { curl https://www.gitignore.io/api/$@ ;}
 
-_gitignireio_get_command_list() {
+_gitignoreio_get_command_list() {
   curl -s https://www.gitignore.io/api/list | tr "," "\n"
 }
 
-_gitignireio () {
+_gitignoreio () {
   compset -P '*,'
-  compadd -S '' `_gitignireio_get_command_list`
+  compadd -S '' `_gitignoreio_get_command_list`
 }
 
-compdef _gitignireio gi
+compdef _gitignoreio gi

From 04d1428fcbda05a96d54396679c6c74c7006b032 Mon Sep 17 00:00:00 2001
From: WooParadog <guohaochuan@gmail.com>
Date: Thu, 9 Oct 2014 13:17:35 +0800
Subject: [PATCH 0863/1378] Fix gitignore curl, should follow redirects

---
 plugins/gitignore/gitignore.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index 3f2a6dec1..484c6a699 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,4 +1,4 @@
-function gi() { curl https://www.gitignore.io/api/$@ ;}
+function gi() { curl -L https://www.gitignore.io/api/$@ ;}
 
 _gitignoreio_get_command_list() {
   curl -s https://www.gitignore.io/api/list | tr "," "\n"

From b452cafb163cde6619ac741027251bed2709f78e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 15 Oct 2014 17:17:04 +0200
Subject: [PATCH 0864/1378] Follow-redirect and silent mode curl throughout
 gitignore

This commit completes previous efforts and standardizes both curl commands
into using silent mode and following redirects in case the URL changes
again in the future.
---
 plugins/gitignore/gitignore.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index 484c6a699..481d487ba 100644
--- a/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
@@ -1,7 +1,7 @@
-function gi() { curl -L https://www.gitignore.io/api/$@ ;}
+function gi() { curl -sL https://www.gitignore.io/api/$@ ;}
 
 _gitignoreio_get_command_list() {
-  curl -s https://www.gitignore.io/api/list | tr "," "\n"
+  curl -sL https://www.gitignore.io/api/list | tr "," "\n"
 }
 
 _gitignoreio () {

From 071de5fb39ff951bffe75a4d6f590d85f25871f3 Mon Sep 17 00:00:00 2001
From: Neal <neal@ineal.me>
Date: Mon, 27 Oct 2014 22:17:11 -0500
Subject: [PATCH 0865/1378] Make the simulator alias work with older Xcode
 versions as well.

---
 plugins/xcode/xcode.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 3d7781bf9..b7b75cf93 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -16,4 +16,9 @@ function xcsel {
 
 alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
-alias simulator='open $(xcode-select -p)/Applications/iOS\ Simulator.app'
+
+if [[ -d $(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app ]]; then
+  alias simulator='open $(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'
+else
+  alias simulator='open $(xcode-select -p)/Applications/iOS\ Simulator.app'
+fi

From b6012bc2c32a124183d7c5713edee4e2341e1d3f Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Wed, 2 Apr 2014 19:25:47 -0400
Subject: [PATCH 0866/1378] Update to the upstream smart-change-directory.

Synced with the master branch
pavoljuhas/smart-change-directory@20b5a80cf05f72c07e88a9b166593f52517029e4.
---
 plugins/scd/README.md |  15 +++---
 plugins/scd/scd       | 119 +++++++++++++++++++++++++++---------------
 2 files changed, 86 insertions(+), 48 deletions(-)

diff --git a/plugins/scd/README.md b/plugins/scd/README.md
index 197cea50a..86ab67203 100644
--- a/plugins/scd/README.md
+++ b/plugins/scd/README.md
@@ -11,12 +11,9 @@ the index.  A selection menu is displayed in case of several matches, with a
 preference given to recently visited paths.  `scd` can create permanent
 directory aliases, which appear as named directories in zsh session.
 
-## INSTALLATION
+## INSTALLATION NOTES
 
-For oh-my-zsh, add `scd` to the `plugins` array in the ~/.zshrc file as in the
-[template file](../../templates/zshrc.zsh-template#L45).
-
-Besides zsh, `scd` can be used with *bash*, *dash* or *tcsh*
+Besides oh-my-zsh, `scd` can be used with *bash*, *dash* or *tcsh*
 shells and is also available as [Vim](http://www.vim.org/) plugin and
 [IPython](http://ipython.org/) extension.  For installation details, see
 https://github.com/pavoljuhas/smart-change-directory.
@@ -34,7 +31,7 @@ scd [options] [pattern1 pattern2 ...]
   add specified directories to the directory index.</dd><dt>
 
 --unindex</dt><dd>
-  remove specified directories from the index.</dd><dt>
+  remove current or specified directories from the index.</dd><dt>
 
 -r, --recursive</dt><dd>
   apply options <em>--add</em> or <em>--unindex</em> recursively.</dd><dt>
@@ -47,6 +44,10 @@ scd [options] [pattern1 pattern2 ...]
   remove ALIAS definition for the current or specified directory from
   <em>~/.scdalias.zsh</em>.</dd><dt>
 
+-A, --all</dt><dd>
+  include all matching directories.  Disregard matching by directory
+  alias and filtering of less likely paths.</dd><dt>
+
 --list</dt><dd>
   show matching directories and exit.</dd><dt>
 
@@ -70,7 +71,7 @@ scd doc
 scd a b c
 
 # Change to a directory path that ends with "ts"
-scd "ts(#e)"
+scd "ts$"
 
 # Show selection menu and ranking of 20 most likely directories
 scd -v
diff --git a/plugins/scd/scd b/plugins/scd/scd
index 1567d2736..39b28237d 100755
--- a/plugins/scd/scd
+++ b/plugins/scd/scd
@@ -11,20 +11,22 @@ fi
 local DOC='scd -- smart change to a recently used directory
 usage: scd [options] [pattern1 pattern2 ...]
 Go to a directory path that contains all fixed string patterns.  Prefer
-recently visited directories and directories with patterns in their tail
-component.  Display a selection menu in case of multiple matches.
+recent or frequently visited directories as found in the directory index.
+Display a selection menu in case of multiple matches.
 
 Options:
-  -a, --add         add specified directories to the directory index
-  --unindex         remove specified directories from the index
-  -r, --recursive   apply options --add or --unindex recursively
+  -a, --add         add specified directories to the directory index.
+  --unindex         remove current or specified directories from the index.
+  -r, --recursive   apply options --add or --unindex recursively.
   --alias=ALIAS     create alias for the current or specified directory and
-                    store it in ~/.scdalias.zsh
+                    store it in ~/.scdalias.zsh.
   --unalias         remove ALIAS definition for the current or specified
-                    directory from ~/.scdalias.zsh
-  --list            show matching directories and exit
-  -v, --verbose     display directory rank in the selection menu
-  -h, --help        display this message and exit
+                    directory from ~/.scdalias.zsh.
+  -A, --all         include all matching directories.  Disregard matching by
+                    directory alias and filtering of less likely paths.
+  --list            show matching directories and exit.
+  -v, --verbose     display directory rank in the selection menu.
+  -h, --help        display this message and exit.
 '
 
 local SCD_HISTFILE=${SCD_HISTFILE:-${HOME}/.scdhistory}
@@ -35,9 +37,9 @@ local SCD_THRESHOLD=${SCD_THRESHOLD:-0.005}
 local SCD_SCRIPT=${RUNNING_AS_COMMAND:+$SCD_SCRIPT}
 local SCD_ALIAS=~/.scdalias.zsh
 
-local ICASE a d m p i tdir maxrank threshold
+local ICASE a d m p i maxrank threshold
 local opt_help opt_add opt_unindex opt_recursive opt_verbose
-local opt_alias opt_unalias opt_list
+local opt_alias opt_unalias opt_all opt_list
 local -A drank dalias
 local dmatching
 local last_directory
@@ -56,7 +58,8 @@ zmodload -i zsh/zutil
 zmodload -i zsh/datetime
 zparseopts -D -- a=opt_add -add=opt_add -unindex=opt_unindex \
     r=opt_recursive -recursive=opt_recursive \
-    -alias:=opt_alias -unalias=opt_unalias -list=opt_list \
+    -alias:=opt_alias -unalias=opt_unalias \
+    A=opt_all -all=opt_all -list=opt_list \
     v=opt_verbose -verbose=opt_verbose h=opt_help -help=opt_help \
     || $EXIT $?
 
@@ -68,6 +71,11 @@ fi
 # load directory aliases if they exist
 [[ -r $SCD_ALIAS ]] && source $SCD_ALIAS
 
+# Private internal functions are prefixed with _scd_Y19oug_.
+# Clean them up when the scd function returns.
+setopt localtraps
+trap 'unfunction -m "_scd_Y19oug_*"' EXIT
+
 # works faster than the (:a) modifier and is compatible with zsh 4.2.6
 _scd_Y19oug_abspath() {
     set -A $1 ${(ps:\0:)"$(
@@ -123,11 +131,52 @@ if [[ -n $opt_unalias ]]; then
     $EXIT $?
 fi
 
+# The "compress" function collapses repeated directories to
+# one entry with a time stamp that gives equivalent-probability.
+_scd_Y19oug_compress() {
+    awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
+        BEGIN { FS = "[:;]"; }
+        length($0) < 4096 && $2 > 0 {
+            tau = 1.0 * ($2 - epochseconds) / meanlife;
+            if (tau < -6.9078)  tau = -6.9078;
+            prob = exp(tau);
+            sub(/^[^;]*;/, "");
+            if (NF)  {
+                dlist[last[$0]] = "";
+                dlist[NR] = $0;
+                last[$0] = NR;
+                ptot[$0] += prob;
+            }
+        }
+        END {
+            for (i = 1; i <= NR; ++i) {
+                d = dlist[i];
+                if (d) {
+                    ts = log(ptot[d]) * meanlife + epochseconds;
+                    printf(": %.0f:0;%s\n", ts, d);
+                }
+            }
+        }
+    ' $*
+}
+
 # Rewrite directory index if it is at least 20% oversized
 if [[ -s $SCD_HISTFILE ]] && \
 (( $(wc -l <$SCD_HISTFILE) > 1.2 * $SCD_HISTSIZE )); then
-    m=( ${(f)"$(<$SCD_HISTFILE)"} )
-    print -lr -- ${m[-$SCD_HISTSIZE,-1]} >| ${SCD_HISTFILE}
+    # compress repeated entries
+    m=( ${(f)"$(_scd_Y19oug_compress $SCD_HISTFILE)"} )
+    # purge non-existent directories
+    m=( ${(f)"$(
+        for a in $m; do
+            if [[ -d ${a#*;} ]]; then print -r -- $a; fi
+        done
+        )"}
+    )
+    # cut old entries if still oversized
+    if [[ $#m -gt $SCD_HISTSIZE ]]; then
+        m=( ${m[-$SCD_HISTSIZE,-1]} )
+    fi
+    print -lr -- $m >| ${SCD_HISTFILE}
 fi
 
 # Determine the last recorded directory
@@ -135,7 +184,6 @@ if [[ -s ${SCD_HISTFILE} ]]; then
     last_directory=${"$(tail -1 ${SCD_HISTFILE})"#*;}
 fi
 
-# Internal functions are prefixed with "_scd_Y19oug_".
 # The "record" function adds its arguments to the directory index.
 _scd_Y19oug_record() {
     while [[ -n $last_directory && $1 == $last_directory ]]; do
@@ -217,7 +265,7 @@ _scd_Y19oug_action() {
 # set global arrays dmatching and drank
 _scd_Y19oug_match() {
     ## single argument that is an existing directory or directory alias
-    if [[ $# == 1 ]] && \
+    if [[ -z $opt_all && $# == 1 ]] && \
         [[ -d ${d::=$1} || -d ${d::=${nameddirs[$1]}} ]] && [[ -x $d ]];
     then
         _scd_Y19oug_abspath dmatching $d
@@ -227,6 +275,8 @@ _scd_Y19oug_match() {
 
     # ignore case unless there is an argument with an uppercase letter
     [[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
+    # support "$" as an anchor for the directory name ending
+    argv=( ${argv/(#m)?[$](#e)/${MATCH[1]}(#e)} )
 
     # calculate rank of all directories in the SCD_HISTFILE and keep it as drank
     # include a dummy entry for splitting of an empty string is buggy
@@ -237,10 +287,10 @@ _scd_Y19oug_match() {
             BEGIN { FS = "[:;]"; }
             length($0) < 4096 && $2 > 0 {
                 tau = 1.0 * ($2 - epochseconds) / meanlife;
-                if (tau < -4.61)  tau = -4.61;
-                prec = exp(tau);
+                if (tau < -6.9078)  tau = -6.9078;
+                prob = exp(tau);
                 sub(/^[^;]*;/, "");
-                if (NF)  ptot[$0] += prec;
+                if (NF)  ptot[$0] += prob;
             }
             END { for (di in ptot)  { print di; print ptot[di]; } }'
         )"}
@@ -249,9 +299,12 @@ _scd_Y19oug_match() {
 
     # filter drank to the entries that match all arguments
     for a; do
-        p=${ICASE}"*${a}*"
+        p=${ICASE}"*(${a})*"
         drank=( ${(kv)drank[(I)${~p}]} )
     done
+    # require at least one argument matches the directory name
+    p=${ICASE}"*(${(j:|:)argv})[^/]#"
+    drank=( ${(kv)drank[(I)${~p}]} )
 
     # build a list of matching directories reverse-sorted by their probabilities
     dmatching=( ${(f)"$(
@@ -261,26 +314,6 @@ _scd_Y19oug_match() {
         )"}
     )
 
-    # if some directory paths match all patterns in order, discard all others
-    p=${ICASE}"*${(j:*:)argv}*"
-    m=( ${(M)dmatching:#${~p}} )
-    [[ -d ${m[1]} ]] && dmatching=( $m )
-    # if some directory names match last pattern, discard all others
-    p=${ICASE}"*${(j:*:)argv}[^/]#"
-    m=( ${(M)dmatching:#${~p}} )
-    [[ -d ${m[1]} ]] && dmatching=( $m )
-    # if some directory names match all patterns, discard all others
-    m=( $dmatching )
-    for a; do
-        p=${ICASE}"*/[^/]#${a}[^/]#"
-        m=( ${(M)m:#${~p}} )
-    done
-    [[ -d ${m[1]} ]] && dmatching=( $m )
-    # if some directory names match all patterns in order, discard all others
-    p=${ICASE}"/*${(j:[^/]#:)argv}[^/]#"
-    m=( ${(M)dmatching:#${~p}} )
-    [[ -d ${m[1]} ]] && dmatching=( $m )
-
     # do not match $HOME or $PWD when run without arguments
     if [[ $# == 0 ]]; then
         dmatching=( ${dmatching:#(${HOME}|${PWD})} )
@@ -302,6 +335,9 @@ _scd_Y19oug_match() {
 
     # discard all directories below the rank threshold
     threshold=$(( maxrank * SCD_THRESHOLD ))
+    if [[ -n ${opt_all} ]]; then
+        threshold=0
+    fi
     dmatching=( ${^dmatching}(Ne:'(( ${drank[$REPLY]} >= threshold ))':) )
 }
 
@@ -339,6 +375,7 @@ fi
 
 ## here we have multiple matches - display selection menu
 a=( {a-z} {A-Z} )
+a=( ${a[1,${#dmatching}]} )
 p=( )
 for i in {1..${#dmatching}}; do
     [[ -n ${a[i]} ]] || break

From eae70054d15948cc6ddb3d8d4f252ff2c7cf6ad5 Mon Sep 17 00:00:00 2001
From: Jaap Broekhuizen <jaapz.b@gmail.com>
Date: Mon, 3 Nov 2014 12:29:19 +0100
Subject: [PATCH 0867/1378] Added VIRTUAL_ENV_DISABLE_PROMPT to
 steeef.zsh-theme

This stops the virtual env name from being printed before it is actually being
used in the zsh prompt.
---
 themes/steeef.zsh-theme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 9d27410b8..e38188d35 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -7,6 +7,8 @@
 # git untracked files modification from Brian Carper:
 # http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
+export VIRTUAL_ENV_DISABLE_PROMPT=1
+
 function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('$fg[blue]`basename $VIRTUAL_ENV`%{$reset_color%}') '
 }

From 74177c5320b2a1b2f8c4c695c05984b57fd7c6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 9 Oct 2014 13:44:54 +0200
Subject: [PATCH 0868/1378] Change all whoami calls for $USER variable

This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
---
 lib/completion.zsh                         | 4 ++--
 plugins/systemadmin/systemadmin.plugin.zsh | 2 +-
 themes/adben.zsh-theme                     | 5 ++---
 themes/agnoster.zsh-theme                  | 6 ++----
 themes/flazz.zsh-theme                     | 2 +-
 themes/obraun.zsh-theme                    | 2 +-
 themes/re5et.zsh-theme                     | 2 +-
 themes/sunrise.zsh-theme                   | 2 +-
 themes/ys.zsh-theme                        | 2 +-
 9 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 83b6efb66..3a19a4eba 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -27,9 +27,9 @@ zstyle ':completion:*:*:*:*:*' menu select
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 if [ "$OSTYPE[0,7]" = "solaris" ]
 then
-  zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm"
 else
-  zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
 fi
 
 # disable named-directories autocompletion
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index f5e44c66f..e0b1773ad 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -30,7 +30,7 @@ function retlog() {
 }
 
 alias ping='ping -c 5'
-alias clr='clear;echo "Currently logged in on $(tty), as $(whoami) in directory $(pwd)."'
+alias clr='clear;echo "Currently logged in on $(tty), as $USER in directory $(pwd)."'
 alias path='echo -e ${PATH//:/\\n}'
 alias mkdir='mkdir -pv'
 # get top process eating memory
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index aa3093f64..6869c8a20 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -89,9 +89,8 @@ function precmd {
 
 # Context: user@directory or just directory
 prompt_context () {
-    local user=`whoami`
-    if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-        echo -n "${PR_RESET}${PR_RED}$user@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+        echo -n "${PR_RESET}${PR_RED}$USER@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
     else
         echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
     fi
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 2b33c48bc..7a62bd860 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -60,10 +60,8 @@ prompt_end() {
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
-  local user=`whoami`
-
-  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    prompt_segment black default "%(!.%{%F{yellow}%}.)$user@%m"
+  if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+    prompt_segment black default "%(!.%{%F{yellow}%}.)$USER@%m"
   fi
 }
 
diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
index 280794f2b..c0a7fb5d0 100644
--- a/themes/flazz.zsh-theme
+++ b/themes/flazz.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]
+if [ "$USER" = "root" ]
 then CARETCOLOR="red"
 else CARETCOLOR="blue"
 fi
diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
index 08d137665..7af44056f 100644
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
diff --git a/themes/re5et.zsh-theme b/themes/re5et.zsh-theme
index 5bded76a3..95af1e2ee 100644
--- a/themes/re5et.zsh-theme
+++ b/themes/re5et.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
+if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
 
 local return_code="%(?..%{$fg_bold[red]%}:( %?%{$reset_color%})"
 
diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 4bea20a1b..28befd01b 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -10,7 +10,7 @@ Y=$fg_no_bold[yellow]
 B=$fg_no_bold[blue]
 RESET=$reset_color
 
-if [ "$(whoami)" = "root" ]; then
+if [ "$USER" = "root" ]; then
     PROMPTCOLOR="%{$R%}" PREFIX="-!-";
 else
     PROMPTCOLOR="" PREFIX="---";
diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index a44f295f4..65448964d 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -33,7 +33,7 @@ ${git_info} \
 %{$fg[white]%}[%*]
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
 
-if [[ "$(whoami)" == "root" ]]; then
+if [[ "$USER" == "root" ]]; then
 PROMPT="
 %{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
 %{$bg[yellow]%}%{$fg[cyan]%}%n%{$reset_color%} \

From 4310a15de5d0587ef135f9e12857620c4788dec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 9 Oct 2014 13:55:50 +0200
Subject: [PATCH 0869/1378] Change all pwd calls for $PWD variable

This avoids spawning additional processes as $PWD **always** contains
the current working directory.
---
 plugins/dirhistory/dirhistory.plugin.zsh           | 6 +++---
 plugins/jump/jump.plugin.zsh                       | 6 +++---
 plugins/pow/pow.plugin.zsh                         | 8 ++++----
 plugins/svn/svn.plugin.zsh                         | 2 +-
 plugins/systemadmin/systemadmin.plugin.zsh         | 2 +-
 plugins/vim-interaction/vim-interaction.plugin.zsh | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 504d7ec14..d101cfcae 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -3,7 +3,7 @@
 #   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
 # 
 
-dirhistory_past=(`pwd`)
+dirhistory_past=($PWD)
 dirhistory_future=()
 export dirhistory_past
 export dirhistory_future
@@ -50,7 +50,7 @@ function push_future() {
 
 # Called by zsh when directory changes
 function chpwd() {
-  push_past `pwd`
+  push_past $PWD
   # If DIRHISTORY_CD is not set...
   if [[ -z "${DIRHISTORY_CD+x}" ]]; then
     # ... clear future.
@@ -73,7 +73,7 @@ function dirhistory_back() {
   pop_past cw 
   if [[ "" == "$cw" ]]; then
     # Someone overwrote our variable. Recover it.
-    dirhistory_past=(`pwd`)
+    dirhistory_past=($PWD)
     return
   fi
 
diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index 1b23b5d42..b16814fe4 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -14,12 +14,12 @@ jump() {
 
 mark() {
 	if (( $# == 0 )); then
-		MARK=$(basename "$(pwd)")
+		MARK=$(basename "$PWD")
 	else
 		MARK="$1"
 	fi
-	if read -q \?"Mark $(pwd) as ${MARK}? (y/n) "; then
-		mkdir -p "$MARKPATH"; ln -s "$(pwd)" "$MARKPATH/$MARK"
+	if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
+		mkdir -p "$MARKPATH"; ln -s "$PWD" "$MARKPATH/$MARK"
 	fi
 }
 
diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index d85c88777..ded3336a7 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -21,13 +21,13 @@
 
 rack_root(){
   setopt chaselinks
-  local orgdir="$(pwd)"
-  local basedir="$(pwd)"
+  local orgdir="$PWD"
+  local basedir="$PWD"
 
   while [[ $basedir != '/' ]]; do
     test -e "$basedir/config.ru" && break
     builtin cd ".." 2>/dev/null
-    basedir="$(pwd)"
+    basedir="$PWD"
   done
 
   builtin cd "$orgdir" 2>/dev/null
@@ -56,7 +56,7 @@ kapow(){
 compctl -W ~/.pow -/ kapow
 
 powit(){
-  local basedir="$(pwd)"
+  local basedir="$PWD"
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
   if [ ! -h ~/.pow/$vhost ]
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index ef6da5bd3..ba281d790 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -77,7 +77,7 @@ function svn_dirty() {
 
 function svn_dirty_choose_pwd () {
   if in_svn; then
-    root=`pwd`
+    root=$PWD
     if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index e0b1773ad..4ae70dfa7 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -30,7 +30,7 @@ function retlog() {
 }
 
 alias ping='ping -c 5'
-alias clr='clear;echo "Currently logged in on $(tty), as $USER in directory $(pwd)."'
+alias clr='clear;echo "Currently logged in on $(tty), as $USER in directory $PWD."'
 alias path='echo -e ${PATH//:/\\n}'
 alias mkdir='mkdir -pv'
 # get top process eating memory
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 5142f1f9b..b0b9414cd 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -9,7 +9,7 @@ function resolveFile
   if [ -f "$1" ]; then
     echo $(readlink -f "$1")
   elif [[ "${1#/}" == "$1" ]]; then
-    echo "$(pwd)/$1"
+    echo "$PWD/$1"
   else
     echo $1
   fi

From 95d795e8cad7d1a754dfad520309d7a41b69275f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 9 Oct 2014 17:05:48 +0200
Subject: [PATCH 0870/1378] Change all hostname calls for $HOST or $SHORT_HOST

---
 plugins/profiles/profiles.plugin.zsh | 2 +-
 themes/candy-kingdom.zsh-theme       | 2 +-
 themes/dieter.zsh-theme              | 2 +-
 themes/fino-time.zsh-theme           | 2 +-
 themes/fino.zsh-theme                | 2 +-
 themes/kardan.zsh-theme              | 2 +-
 themes/michelebologna.zsh-theme      | 2 +-
 themes/ys.zsh-theme                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/profiles/profiles.plugin.zsh b/plugins/profiles/profiles.plugin.zsh
index 8faae6b53..4b3d6a852 100644
--- a/plugins/profiles/profiles.plugin.zsh
+++ b/plugins/profiles/profiles.plugin.zsh
@@ -2,7 +2,7 @@
 
 # This will look for a custom profile for the local machine and each domain or
 # subdomain it belongs to. (e.g. com, example.com and foo.example.com)
-parts=(${(s:.:)$(hostname)})
+parts=(${(s:.:)$HOST})
 for i in {${#parts}..1}; do
   profile=${(j:.:)${parts[$i,${#parts}]}}
   file=$ZSH_CUSTOM/profiles/$profile
diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index 718977d90..889128758 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -13,7 +13,7 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+    [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST
 }
 
 PROMPT='
diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
index 0a5e9265b..58d9f88a9 100644
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@@ -21,7 +21,7 @@ local user="%(!.%{$fg[blue]%}.%{$fg[blue]%})%n%{$reset_color%}"
 
 # Hostname part.  compressed and colorcoded per host_repr array
 # if not found, regular hostname in default color
-local host="@${host_repr[$(hostname)]:-$(hostname)}%{$reset_color%}"
+local host="@${host_repr[$HOST]:-$HOST}%{$reset_color%}"
 
 # Compacted $PWD
 local pwd="%{$fg[blue]%}%c%{$reset_color%}"
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 901c4d99f..67b6b6e08 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -21,7 +21,7 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+    [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST
 }
 
 
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 411dec9b9..50d41e899 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -17,7 +17,7 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+    [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST
 }
 
 local ruby_env=''
diff --git a/themes/kardan.zsh-theme b/themes/kardan.zsh-theme
index fd6586a9d..9a3d59109 100644
--- a/themes/kardan.zsh-theme
+++ b/themes/kardan.zsh-theme
@@ -1,7 +1,7 @@
 # Simple theme based on my old zsh settings.
 
 function get_host {
-	echo '@'`hostname`''
+	echo '@'$HOST
 }
 
 PROMPT='> '
diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index ef4c6d740..a7599c8f5 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -17,7 +17,7 @@ USERNAME_NORMAL_COLOR=$WHITE
 USERNAME_ROOT_COLOR=$RED
 HOSTNAME_NORMAL_COLOR=$BLUE
 # uncomment next line if you want auto-generated hostname color
-#for i in `hostname`; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
+#for i in $HOST; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
 HOSTNAME_ROOT_COLOR=$RED
 HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR)
 CURRENT_DIR_COLOR=$CYAN
diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 65448964d..017139100 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -8,7 +8,7 @@
 
 # Machine name.
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname
+    [ -f ~/.box-name ] && cat ~/.box-name || echo $HOST
 }
 
 # Directory info.

From e16d3e45d30fbf981f503b4d078d84c71a070a1d Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Thu, 6 Nov 2014 10:34:26 -0800
Subject: [PATCH 0871/1378] Add bgnotify plugin, a cross-platform background
 notifier!

---
 plugins/bgnotify/README.md           | 39 +++++++++++++++++
 plugins/bgnotify/bgnotify.plugin.zsh | 65 ++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 plugins/bgnotify/README.md
 create mode 100755 plugins/bgnotify/bgnotify.plugin.zsh

diff --git a/plugins/bgnotify/README.md b/plugins/bgnotify/README.md
new file mode 100644
index 000000000..bf4b1fd09
--- /dev/null
+++ b/plugins/bgnotify/README.md
@@ -0,0 +1,39 @@
+# bgnotify zsh plugin
+
+cross-platform background notifications for long running commands! Supports OSX and Ubuntu linux.
+
+Standalone homepage: [t413/zsh-background-notify](https://github.com/t413/zsh-background-notify)
+
+----------------------------------
+
+## How to use!
+
+Just add bgnotify to your plugins list in your `.zshrc`
+
+- On OS X you'll need [terminal-notifer](https://github.com/alloy/terminal-notifier)
+  * `brew install terminal-notifier` (or `gem install terminal-notifier`)
+- On ubuntu you're already all set!
+
+
+## Configuration
+
+One can configure a few things:
+
+- `bgnotify_threshold` sets the notification threshold time (default 6 seconds)
+- `function bgnotify_formatted` lets you change the notification
+
+Use these by adding a function definition before the your call to source. Example:
+
+~~~ sh
+bgnotify_threshold=4  ## set your own notification threshold
+
+function bgnotify_formatted {
+  ## $1=exit_status, $2=command, $3=elapsed_time
+  [ $1 -eq 0 ] && title="Holy Smokes Batman!" || title="Holy Graf Zeppelin!"
+  bgnotify "$title -- after $3 s" "$2";
+}
+
+plugins=(git bgnotify)  ## add to plugins list
+source $ZSH/oh-my-zsh.sh  ## existing source call
+~~~
+
diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
new file mode 100755
index 000000000..f204d9dc8
--- /dev/null
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -0,0 +1,65 @@
+#!/usr/bin/env zsh
+
+
+## setup ##
+
+[[ -o interactive ]] || return #interactive only!
+zmodload zsh/datetime || { print "can't load zsh/datetime"; return } # faster than date()
+autoload -Uz add-zsh-hook || { print "can't add zsh hook!"; return }
+
+(( ${+bgnotify_threshold} )) || bgnotify_threshold=5 #default 10 seconds
+
+
+## definitions ##
+
+if ! (type notify_formatted | grep -q 'function'); then
+  echo "using default notify_formatted"
+  function bgnotify_formatted {
+    ## exit_status, command, elapsed_time
+    [ $1 -eq 0 ] && title="#win (took $3 s)" || title="#fail (took $3 s)"
+    bgnotify "$title" "$2"
+  }
+fi
+
+currentWindowId () {
+  if hash notify-send 2>/dev/null; then #ubuntu!
+    xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
+  elif hash osascript 2>/dev/null; then #osx
+    osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null
+  fi
+}
+
+bgnotify () {
+  if hash notify-send 2>/dev/null; then #ubuntu!
+    notify-send $1 $2
+  elif hash terminal-notifier 2>/dev/null; then #osx
+    terminal-notifier -message $2 -title $1
+  elif hash growlnotify 2>/dev/null; then #osx growl
+    growlnotify -m $1 $2
+  fi
+}
+
+
+## Zsh hooks ##
+
+bgnotify_begin() {
+  bgnotify_timestamp=$EPOCHSECONDS
+  bgnotify_lastcmd=$1
+  bgnotify_windowid=$(currentWindowId)
+}
+
+bgnotify_end() {
+  didexit=$?
+  elapsed=$(( $EPOCHSECONDS - $bgnotify_timestamp ))
+  past_threshold=$(( $elapsed >= $bgnotify_threshold ))
+  if (( bgnotify_timestamp > 0 )) && (( past_threshold )); then
+    if [ $(currentWindowId) != "$bgnotify_windowid" ]; then
+      print -n "\a"
+      bgnotify_formatted "$didexit" "$bgnotify_lastcmd" "$elapsed"
+    fi
+  fi
+  bgnotify_timestamp=0 #reset it to 0!
+}
+
+add-zsh-hook preexec bgnotify_begin
+add-zsh-hook precmd bgnotify_end

From 0b0cc2cdea1e3b3e4af78d8d4a9992be468031eb Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Thu, 6 Nov 2014 10:31:27 -0800
Subject: [PATCH 0872/1378] Fixed math on linux, removed debug echo.

---
 plugins/bgnotify/bgnotify.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index f204d9dc8..b5fb76f7e 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -13,7 +13,6 @@ autoload -Uz add-zsh-hook || { print "can't add zsh hook!"; return }
 ## definitions ##
 
 if ! (type notify_formatted | grep -q 'function'); then
-  echo "using default notify_formatted"
   function bgnotify_formatted {
     ## exit_status, command, elapsed_time
     [ $1 -eq 0 ] && title="#win (took $3 s)" || title="#fail (took $3 s)"
@@ -50,8 +49,8 @@ bgnotify_begin() {
 
 bgnotify_end() {
   didexit=$?
-  elapsed=$(( $EPOCHSECONDS - $bgnotify_timestamp ))
-  past_threshold=$(( $elapsed >= $bgnotify_threshold ))
+  elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))
+  past_threshold=$(( elapsed >= bgnotify_threshold ))
   if (( bgnotify_timestamp > 0 )) && (( past_threshold )); then
     if [ $(currentWindowId) != "$bgnotify_windowid" ]; then
       print -n "\a"

From adafe271f02ab767c29f80f5657f448d593cdaf6 Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Thu, 6 Nov 2014 10:32:29 -0800
Subject: [PATCH 0873/1378] add cygwin windows support with notifu, add to
 readme

---
 plugins/bgnotify/README.md           | 2 +-
 plugins/bgnotify/bgnotify.plugin.zsh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/bgnotify/README.md b/plugins/bgnotify/README.md
index bf4b1fd09..68fa7529e 100644
--- a/plugins/bgnotify/README.md
+++ b/plugins/bgnotify/README.md
@@ -13,6 +13,7 @@ Just add bgnotify to your plugins list in your `.zshrc`
 - On OS X you'll need [terminal-notifer](https://github.com/alloy/terminal-notifier)
   * `brew install terminal-notifier` (or `gem install terminal-notifier`)
 - On ubuntu you're already all set!
+- On windows you can use [notifu](http://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
 
 
 ## Configuration
@@ -36,4 +37,3 @@ function bgnotify_formatted {
 plugins=(git bgnotify)  ## add to plugins list
 source $ZSH/oh-my-zsh.sh  ## existing source call
 ~~~
-
diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index b5fb76f7e..42129bd06 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -35,6 +35,8 @@ bgnotify () {
     terminal-notifier -message $2 -title $1
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m $1 $2
+  elif hash notifu 2>/dev/null; then #cygwyn support!
+    notifu /m "$2" /p "$1"
   fi
 }
 

From 11253336cfc771537f63268fd03d466cd27936a0 Mon Sep 17 00:00:00 2001
From: Benjamin Stier <ben@unpatched.de>
Date: Fri, 7 Nov 2014 10:47:27 +0100
Subject: [PATCH 0874/1378] Fixes the profiles-plugin

An error was introduced with 7f75bb9, which uses special vars. This is the
fix.
---
 plugins/profiles/profiles.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/profiles/profiles.plugin.zsh b/plugins/profiles/profiles.plugin.zsh
index 4b3d6a852..5bc56cea0 100644
--- a/plugins/profiles/profiles.plugin.zsh
+++ b/plugins/profiles/profiles.plugin.zsh
@@ -2,7 +2,7 @@
 
 # This will look for a custom profile for the local machine and each domain or
 # subdomain it belongs to. (e.g. com, example.com and foo.example.com)
-parts=(${(s:.:)$HOST})
+parts=(${(s:.:)HOST})
 for i in {${#parts}..1}; do
   profile=${(j:.:)${parts[$i,${#parts}]}}
   file=$ZSH_CUSTOM/profiles/$profile

From 3d376bbd5b0a230e9e1a2d5497623d92ec94615e Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Fri, 7 Nov 2014 08:35:31 -0800
Subject: [PATCH 0875/1378] Fix renamed method issue.

---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index 42129bd06..722213734 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -12,7 +12,7 @@ autoload -Uz add-zsh-hook || { print "can't add zsh hook!"; return }
 
 ## definitions ##
 
-if ! (type notify_formatted | grep -q 'function'); then
+if ! (type bgnotify_formatted | grep -q 'function'); then
   function bgnotify_formatted {
     ## exit_status, command, elapsed_time
     [ $1 -eq 0 ] && title="#win (took $3 s)" || title="#fail (took $3 s)"

From cbec1d77b2b238eadcdad5d926339d4a034240e9 Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Fri, 7 Nov 2014 10:57:02 -0800
Subject: [PATCH 0876/1378] Add window ID fallback for windows.

- maybe someday use GetForegroundWindow() from User32.lib ...
---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index 722213734..f3cf0e3b8 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -25,6 +25,8 @@ currentWindowId () {
     xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
   elif hash osascript 2>/dev/null; then #osx
     osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null
+  else
+    echo $EPOCHSECONDS #fallback for windows
   fi
 }
 

From 8bd8597e12d25ada4a288bffef946ac62b9f9de4 Mon Sep 17 00:00:00 2001
From: Ian Lancaster <ilancaster@gmail.com>
Date: Sat, 8 Nov 2014 04:58:52 -0500
Subject: [PATCH 0877/1378] Remove deprecated brew commands, update core
 commands

`brew services` and `brew server` were moved to homebrew-boneyard.
---
 plugins/brew/_brew | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index 40442a1d3..d11aa245d 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -19,21 +19,18 @@ _brew_outdated_formulae() {
   outdated_formulae=(`brew outdated`)
 }
 
-_brew_running_services() {
-  running_services=(`brew services list | awk '{print $1}'`)
-}
-
 local -a _1st_arguments
 _1st_arguments=(
   'audit:check formulae for Homebrew coding style'
-  'bundle:look for a Brewfile and run each line as a brew command'
   'cat:display formula file for a formula'
   'cleanup:uninstall unused and old versions of packages'
   'commands:show a list of commands'
   'create:create a new formula'
-  'deps:list dependencies and dependants of a formula'
+  'deps:list dependencies of a formula'
   'doctor:audits your installation for common issues'
   'edit:edit a formula'
+  'fetch:download formula resources to the cache'
+  'gist-logs:generate a gist of the full build logs'
   'home:visit the homepage of a formula or the brew project'
   'info:information about a formula'
   'install:install a formula'
@@ -44,32 +41,24 @@ _1st_arguments=(
   'missing:check all installed formuale for missing dependencies.'
   'outdated:list formulae for which a newer version is available'
   'pin:pin specified formulae'
+  'postinstall:perform post_install for a given formula'
   'prune:remove dead links'
   'remove:remove a formula'
   'search:search for a formula (/regex/ or string)'
-  'server:start a local web app that lets you browse formulae (requires Sinatra)'
-  'services:small wrapper around `launchctl` for supported formulae'
+  'switch:switch linkage between installed versions of a formula'
   'tap:tap a new formula repository from GitHub, or list existing taps'
+  'test-bot:test a formula and build a bottle'
   'uninstall:uninstall a formula'
   'unlink:unlink a formula'
   'unpin:unpin specified formulae'
   'untap:remove a tapped repository'
-  'update:freshen up links'
+  'update:pull latest repository'
   'upgrade:upgrade outdated formulae'
   'uses:show formulae which depend on a formula'
 )
 
-local -a _service_arguments
-_service_arguments=(
-  'cleanup:get rid of stale services and unused plists'
-  'list:list all services managed by `brew services`'
-  'restart:gracefully restart selected service'
-  'start:start selected service'
-  'stop:stop selected service'
-)
-
 local expl
-local -a formulae installed_formulae installed_taps outdated_formulae running_services
+local -a formulae installed_formulae installed_taps outdated_formulae
 
 _arguments \
   '(-v)-v[verbose]' \
@@ -80,6 +69,7 @@ _arguments \
   '(--version)--version[version information]' \
   '(--prefix)--prefix[where brew lives on this system]' \
   '(--cache)--cache[brew cache]' \
+  '(--force)--force[brew force]' \
   '*:: :->subcmds' && return 0
 
 if (( CURRENT == 1 )); then
@@ -109,16 +99,6 @@ case "$words[1]" in
     _arguments \
       '(--macports)--macports[search the macports repository]' \
       '(--fink)--fink[search the fink repository]' ;;
-  services)
-    if [[ -n "$words[2]" ]]; then
-      case "$words[2]" in
-        restart|start|stop)
-          _brew_running_services
-          _wanted running_services expl 'running services' compadd -a running_services ;;
-      esac
-    else
-      _describe -t commands "brew services subcommand" _service_arguments
-    fi ;;
   untap)
     _brew_installed_taps
     _wanted installed_taps expl 'installed taps' compadd -a installed_taps ;;

From 98fc8dd91adb5e8754b857127c4d121871d5fadb Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Sat, 8 Nov 2014 14:16:56 -0800
Subject: [PATCH 0878/1378] Fix for OS X when no window id is returned (like on
 the desktop)

---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index f3cf0e3b8..259d27424 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -24,7 +24,7 @@ currentWindowId () {
   if hash notify-send 2>/dev/null; then #ubuntu!
     xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
   elif hash osascript 2>/dev/null; then #osx
-    osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null
+    osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
   else
     echo $EPOCHSECONDS #fallback for windows
   fi

From fd69c34e0ccb8b7754b05e6f0c797abddb00f920 Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Sat, 8 Nov 2014 14:20:37 -0800
Subject: [PATCH 0879/1378] Add screenshots to readme

---
 plugins/bgnotify/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/plugins/bgnotify/README.md b/plugins/bgnotify/README.md
index 68fa7529e..b154916d6 100644
--- a/plugins/bgnotify/README.md
+++ b/plugins/bgnotify/README.md
@@ -16,6 +16,21 @@ Just add bgnotify to your plugins list in your `.zshrc`
 - On windows you can use [notifu](http://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
 
 
+## Screenshots
+
+**Linux**
+
+![screenshot from 2014-11-07 15 58 36](https://cloud.githubusercontent.com/assets/326829/4962187/256b465c-66da-11e4-927d-cc2fc105e31f.png)
+
+**OS X**
+
+![screenshot 2014-11-08 14 15 12](https://cloud.githubusercontent.com/assets/326829/4965780/19fa3eac-6795-11e4-8ed6-0355711123a9.png)
+
+**Windows**
+
+![screenshot from 2014-11-07 15 55 00](https://cloud.githubusercontent.com/assets/326829/4962159/a2625ca0-66d9-11e4-9e91-c5834913190e.png)
+
+
 ## Configuration
 
 One can configure a few things:

From d0f3fb3a4fdce51e1f59bdf4817c7adec80b0784 Mon Sep 17 00:00:00 2001
From: Jarin Udom <jarin@robotmodehq.com>
Date: Tue, 10 Jun 2014 07:24:38 -0700
Subject: [PATCH 0880/1378] Merge simplified superjarin theme

---
 themes/superjarin.zsh-theme | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
index 2920d17a2..86fa9c706 100644
--- a/themes/superjarin.zsh-theme
+++ b/themes/superjarin.zsh-theme
@@ -1,11 +1,5 @@
-# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
-if [ -e ~/.rvm/bin/rvm-prompt ]; then
-  JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
-else
-  if which rbenv &> /dev/null; then
-    JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}"
-  fi
-fi
+# Grab the current version of ruby in use: [ruby-1.8.7]
+JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(ruby_prompt_info)%{$fg[white]%}]%{$reset_color%}"
 
 # Grab the current filepath, use shortcuts: ~/Desktop
 # Append the current git branch, if in a git repository

From 95d5f2c641d698b479dc8817ed1a85dcbc965fb6 Mon Sep 17 00:00:00 2001
From: Manfred Touron <m@42.am>
Date: Thu, 13 Nov 2014 18:59:04 +0100
Subject: [PATCH 0881/1378] [boot2docker plugin] Initial version

---
 plugins/boot2docker/README.md    |  6 +++
 plugins/boot2docker/_boot2docker | 70 ++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 plugins/boot2docker/README.md
 create mode 100644 plugins/boot2docker/_boot2docker

diff --git a/plugins/boot2docker/README.md b/plugins/boot2docker/README.md
new file mode 100644
index 000000000..9551e2351
--- /dev/null
+++ b/plugins/boot2docker/README.md
@@ -0,0 +1,6 @@
+## Boot2docker autocomplete plugin
+
+- Adds autocomplete options for all boot2docker commands.
+
+
+Maintainer : Manfred Touron ([@moul](https://github.com/moul))
diff --git a/plugins/boot2docker/_boot2docker b/plugins/boot2docker/_boot2docker
new file mode 100644
index 000000000..baa08b26d
--- /dev/null
+++ b/plugins/boot2docker/_boot2docker
@@ -0,0 +1,70 @@
+#compdef boot2docker
+
+# Boot2docker autocompletion for oh-my-zsh
+# Requires: Boot2docker installed
+# Author: Manfred Touron (@moul)
+
+local -a _1st_arguments
+_1st_arguments=(
+   "init":"Create a new Boot2Docker VM."
+   "up":"Start VM from any states."
+   "start":"Start VM from any states."
+   "boot":"Start VM from any states."
+   "ssh":"[ssh-command] Login to VM via SSH."
+   "save":"Suspend VM and save state to disk."
+   "suspend":"Suspend VM and save state to disk."
+   "down":"Gracefully shutdown the VM."
+   "stop":"Gracefully shutdown the VM."
+   "halt":"Gracefully shutdown the VM."
+   "restart":"Gracefully reboot the VM."
+   "poweroff":"Forcefully power off the VM (may corrupt disk image)."
+   "reset":"Forcefully power cycle the VM (may corrupt disk image)."
+   "delete":"Delete Boot2Docker VM and its disk image."
+   "destroy":"Delete Boot2Docker VM and its disk image."
+   "config":"Show selected profile file settings."
+   "cfg":"Show selected profile file settings."
+   "info":"Display detailed information of VM."
+   "ip":"Display the IP address of the VM's Host-only network."
+   "socket":"Display the DOCKER_HOST socket to connect to."
+   "shellinit":"Display the shell command to set up the Docker client."
+   "status":"Display current state of VM."
+   "download":"Download Boot2Docker ISO image."
+   "upgrade":"Upgrade the Boot2Docker ISO image (restart if running)."
+   "version":"Display version information."
+)
+
+_arguments \
+  '(--basevmdk)--basevmdk[Path to VMDK to use as base for persistent partition]' \
+  '(--dhcp)--dhcp[enable VirtualBox host-only network DHCP.]' \
+  '(--dhcpip)--dhcpip[VirtualBox host-only network DHCP server address.]' \
+  '(-s --disksize)'{-s,--disksize}'[boot2docker disk image size (in MB).]' \
+  '(--dockerport)--dockerport[host Docker port (forward to port 2376 in VM). (deprecated - use with care)]' \
+  '(--driver)--driver[hypervisor driver.]' \
+  '(--hostip)--hostip[VirtualBox host-only network IP address.]' \
+  '(--iso)--iso[path to boot2docker ISO image.]' \
+  '(--iso-url)--iso-url[/api.github.com/repos/boot2docker/boot2docker/releases": source URL to provision the boot2docker ISO image.]' \
+  '(--lowerip)--lowerip[VirtualBox host-only network DHCP lower bound.]' \
+  '(--memory)'{-m,--memory}'[virtual machine memory size (in MB).]' \
+  '(--netmask)--netmask[VirtualBox host-only network mask.]' \
+  '(--no-dummy)--no-dummy[Example parameter for the dummy driver.]' \
+  '(--retries)--retries[number of port knocking retries during 'start']' \
+  '(--serial)--serial[try serial console to get IP address (experimental)]' \
+  '(--serialfile)--serialfile[path to the serial socket/pipe.]' \
+  '(--ssh)--ssh[path to SSH client utility.]' \
+  '(--ssh-keygen)--ssh-keygen[path to ssh-keygen utility.]' \
+  '(--sshkey)--sshkey[path to SSH key to use.]' \
+  '(--sshport)--sshport[host SSH port (forward to port 22 in VM).]' \
+  '(--upperip)--upperip[VirtualBox host-only network DHCP upper bound.]' \
+  '(--vbm)--vbm[path to VirtualBox management utility.]' \
+  '(--vbox-share)--vbox-share[(defaults to "/Users=Users" if no shares are specified; use "disable" to explicitly prevent any shares from being created) List of directories to share during "up|start|boot" via VirtualBox Guest Additions, with optional labels]' \
+  '(--verbose)'{-v,--verbose}'[display verbose command invocations.]' \
+  '(--vm)--vm[virtual machine name.]' \
+  '(--waittime)--waittime[Time in milliseconds to wait between port knocking retries during 'start']' \
+  '*:: :->subcmds' && return 0
+
+#_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+    _describe -t commands "boot2docker command" _1st_arguments
+    return
+fi

From 923d2c85b40e14ea90d4342be1e1905bb238ea0b Mon Sep 17 00:00:00 2001
From: Geoffrey Washburn <geoffrey.washburn@logicblox.com>
Date: Sun, 19 Jan 2014 14:10:16 -0500
Subject: [PATCH 0882/1378] Fix autojump script to support Nix installations

---
 plugins/autojump/autojump.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 50a694764..652d22696 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,6 +1,8 @@
 if [ $commands[autojump] ]; then # check if autojump is installed
   if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
     . $HOME/.autojump/etc/profile.d/autojump.zsh
+  elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.zsh ]; then # nix installation
+    . $HOME/.nix-profile/etc/profile.d/autojump.zsh
   elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation

From 00ec11d3c0a2b2b7413ad84940ddec299aafbb04 Mon Sep 17 00:00:00 2001
From: DanielFGray <DanielFGray@gmail.com>
Date: Sun, 16 Nov 2014 02:47:35 -0600
Subject: [PATCH 0883/1378] ignore any grep aliases that might be defined

---
 lib/git.zsh                                    |  2 +-
 plugins/mercurial/mercurial.plugin.zsh         |  2 +-
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 12 ++++++------
 plugins/svn/svn.plugin.zsh                     |  4 ++--
 themes/agnoster.zsh-theme                      |  4 ++--
 themes/bureau.zsh-theme                        |  2 +-
 themes/mortalscumbag.zsh-theme                 |  6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index aba095422..913a642b3 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -78,7 +78,7 @@ function git_prompt_long_sha() {
 git_prompt_status() {
   INDEX=$(command git status --porcelain -b 2> /dev/null)
   STATUS=""
-  if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
+  if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index ff95d5e40..ed4d23713 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -42,7 +42,7 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_SU
 
 function hg_dirty_choose {
   if [ $(in_hg) ]; then
-    hg status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
+    hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
     if [ $pipestatus[-1] -eq 0 ]; then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index ea19bcea0..9ea7f641d 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -63,11 +63,11 @@ function svn_current_revision() {
 function svn_status_info() {
   local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
   local svn_status="$(svn status 2> /dev/null)";
-  if grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
-  if grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
-  if grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
-  if grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
-  if grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
-  if grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi
+  if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
+  if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
+  if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
+  if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
+  if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
+  if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi
   echo $svn_status_string
 }
diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index ba281d790..9f7a4c6eb 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -61,7 +61,7 @@ function svn_get_rev_nr() {
 function svn_dirty_choose() {
   if in_svn; then
     root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
-    if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
+    if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
     else
@@ -78,7 +78,7 @@ function svn_dirty() {
 function svn_dirty_choose_pwd () {
   if in_svn; then
     root=$PWD
-    if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
+    if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
     else
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 7a62bd860..8c7be6e01 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -123,10 +123,10 @@ prompt_hg() {
       st=""
       rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
       branch=$(hg id -b 2>/dev/null)
-      if `hg st | grep -Eq "^\?"`; then
+      if `hg st | grep -q "^\?"`; then
         prompt_segment red black
         st='±'
-      elif `hg st | grep -Eq "^(M|A)"`; then
+      elif `hg st | grep -q "^(M|A)"`; then
         prompt_segment yellow black
         st='±'
       else
diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 443d1d5ee..148abec10 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -31,7 +31,7 @@ bureau_git_status () {
   if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
     _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
   fi
-  if $(echo "$_INDEX" | grep -E '^\?\? ' &> /dev/null); then
+  if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
     _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
   fi
   if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme
index 5dbf2e4f6..ccce4197a 100644
--- a/themes/mortalscumbag.zsh-theme
+++ b/themes/mortalscumbag.zsh-theme
@@ -10,12 +10,12 @@ function my_git_prompt() {
   fi
 
   # is anything staged?
-  if $(echo "$INDEX" | grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then
+  if $(echo "$INDEX" | command grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then
     STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
   fi
 
   # is anything unstaged?
-  if $(echo "$INDEX" | grep -E -e '^[ MARC][MD] ' &> /dev/null); then
+  if $(echo "$INDEX" | command grep -E -e '^[ MARC][MD] ' &> /dev/null); then
     STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
   fi
 
@@ -25,7 +25,7 @@ function my_git_prompt() {
   fi
 
   # is anything unmerged?
-  if $(echo "$INDEX" | grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then
+  if $(echo "$INDEX" | command grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then
     STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
   fi
 

From 0c04470f6370c329ce8252371fe617673b515d45 Mon Sep 17 00:00:00 2001
From: "Kravchuk S.V" <alfss.obsd@gmail.com>
Date: Fri, 14 Nov 2014 13:05:11 +0300
Subject: [PATCH 0884/1378] [~] fix plugin pj

https://github.com/robbyrussell/oh-my-zsh/commit/bce74975d055529cbd186782e2fd99e6da840460
---
 plugins/pj/pj.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
index f9cbddf1a..1572e9363 100644
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
@@ -42,8 +42,8 @@ function _pj () {
     # might be possible to improve this using glob, without the basename trick
     typeset -a projects
     projects=($PROJECT_PATHS/*)
-    projects=$projects:t 
-    _arguments '*:file:($projects)'
+    projects=$projects:t
+    _arguments "*:file:($projects)"
 }
 
 compdef _pj pj

From a301f567e3a7ac2eb0b1f77d6ff97f50d63ba864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 19 Nov 2014 18:33:00 +0100
Subject: [PATCH 0885/1378] Switch back to oh-my-zsh.hide-dirty setting again

Commit 81004dfaba509ff62a13ba303ab941938d619326 reverted the change
in 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index aba095422..748520a6f 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -13,7 +13,7 @@ parse_git_dirty() {
   local STATUS=''
   local FLAGS
   FLAGS=('--porcelain')
-  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
       FLAGS+='--ignore-submodules=dirty'
     fi

From b6b1dd3cd713751c5295b8346af071b420a99f87 Mon Sep 17 00:00:00 2001
From: Doan Truong Thi <t@thi.im>
Date: Fri, 21 Nov 2014 10:07:23 +0900
Subject: [PATCH 0886/1378] Fix Yosemite broken zsh where $PATH var does not
 get appended correctly.

Sourcing oh-my-zsh immediately after export PATH.
---
 templates/zshrc.zsh-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index a12eca2a0..763288dfd 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -47,13 +47,13 @@ ZSH_THEME="robbyrussell"
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(git)
 
-source $ZSH/oh-my-zsh.sh
-
 # User configuration
 
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 # export MANPATH="/usr/local/man:$MANPATH"
 
+source $ZSH/oh-my-zsh.sh
+
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 

From 1dfadc734cb10c5512be4ec1dbe329a3e362ab20 Mon Sep 17 00:00:00 2001
From: Eric Ripa <eric@ripa.io>
Date: Mon, 24 Nov 2014 09:54:50 +0100
Subject: [PATCH 0887/1378] Fix chruby plugin to not complain if chruby is
 *not* installed

---
 plugins/chruby/chruby.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 2a2c80cf6..b461b0c9b 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -24,7 +24,7 @@ _homebrew-installed() {
 }
 
 _chruby-from-homebrew-installed() {
-    brew --prefix chruby &> /dev/null
+  [ -r $(brew --prefix chruby)] &> /dev/null
 }
 
 _ruby-build_installed() {
@@ -45,11 +45,11 @@ _source_from_omz_settings() {
     zstyle -s :omz:plugins:chruby path _chruby_path
     zstyle -s :omz:plugins:chruby auto _chruby_auto
 
-    if _chruby_path && [[ -r _chruby_path ]]; then
+    if ${_chruby_path} && [[ -r ${_chruby_path} ]]; then
         source ${_chruby_path}
     fi
 
-    if _chruby_auto && [[ -r _chruby_auto ]]; then
+    if ${_chruby_auto} && [[ -r ${_chruby_auto} ]]; then
         source ${_chruby_auto}
     fi
 }

From 663d43241cd890c2fa78040a612c6d424674c5f9 Mon Sep 17 00:00:00 2001
From: Christopher Harrison <github@acc.xoph.co>
Date: Mon, 24 Nov 2014 09:56:47 +0000
Subject: [PATCH 0888/1378] Minor cosmetic fix to minimal theme

Set the closing square-brace's FG colour to white, to match the opening brace, when the repo directory is dirty.
---
 themes/minimal.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index a2a16031f..fbd620225 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -1,6 +1,6 @@
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[white]%}]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
 ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
 ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
@@ -15,4 +15,4 @@ vcs_status() {
     fi
 }
 
-PROMPT='%2~ $(vcs_status)»%b '
\ No newline at end of file
+PROMPT='%2~ $(vcs_status)»%b '

From db8eacf6fd0570c8e49e59a44c214bd927479861 Mon Sep 17 00:00:00 2001
From: Will Boyce <me@willboyce.com>
Date: Mon, 9 Jun 2014 18:04:16 +0100
Subject: [PATCH 0889/1378] use pigz if available in extract plugin

---
 plugins/extract/extract.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index a6e16ddf7..898d3d36e 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -38,7 +38,7 @@ function extract() {
     file_name="$( basename "$1" )"
     extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
     case "$1" in
-      (*.tar.gz|*.tgz) tar xvzf "$1" ;;
+      (*.tar.gz|*.tgz) [ -z $commands[pigz] ] && tar zxvf "$1" || pigz -dc "$1" | tar xv ;;
       (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
       (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
         && tar --xz -xvf "$1" \
@@ -47,7 +47,7 @@ function extract() {
         && tar --lzma -xvf "$1" \
         || lzcat "$1" | tar xvf - ;;
       (*.tar) tar xvf "$1" ;;
-      (*.gz) gunzip "$1" ;;
+      (*.gz) [ -z $commands[pigz] ] && gunzip "$1" || pigz -d "$1" ;;
       (*.bz2) bunzip2 "$1" ;;
       (*.xz) unxz "$1" ;;
       (*.lzma) unlzma "$1" ;;

From 4b05e548d0b56238521b07dac1969e8cd2dcf608 Mon Sep 17 00:00:00 2001
From: benjaoming <benjaoming@gmail.com>
Date: Fri, 22 Nov 2013 11:48:13 +0100
Subject: [PATCH 0890/1378] Throw an error message when $WORKON_HOME is not set

Took me a while to figure this one out, and I have a default installation of virtualenvwrapper -- this is a soft fix, just put an error message. But perhaps the fix should be to use the default value `~/.virtualenvs`.
---
 .../virtualenvwrapper.plugin.zsh              | 100 ++++++++++--------
 1 file changed, 53 insertions(+), 47 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index f58bda1ad..52e02d3e0 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,57 +1,63 @@
 virtualenvwrapper='virtualenvwrapper.sh'
 if (( $+commands[$virtualenvwrapper] )); then
+
   source ${${virtualenvwrapper}:c}
 
-  if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-    # Automatically activate Git projects's virtual environments based on the
-    # directory name of the project. Virtual environment name can be overridden
-    # by placing a .venv file in the project root with a virtualenv name in it
-    function workon_cwd {
-        if [ ! $WORKON_CWD ]; then
-            WORKON_CWD=1
-            # Check if this is a Git repo
-            PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
-            if (( $? != 0 )); then
-                PROJECT_ROOT="."
-            fi
-            # Check for virtualenv name override
-            if [[ -f "$PROJECT_ROOT/.venv" ]]; then
-                ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
-            elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
-                ENV_NAME="$PROJECT_ROOT/.venv"
-            elif [[ "$PROJECT_ROOT" != "." ]]; then
-                ENV_NAME=`basename "$PROJECT_ROOT"`
-            else
-                ENV_NAME=""
-            fi
-            if [[ "$ENV_NAME" != "" ]]; then
-                # Activate the environment only if it is not already active
-                if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
-                    if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
-                        workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
-                    elif [[ -e "$ENV_NAME/bin/activate" ]]; then
-                        source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
-                    fi
-                fi
-            elif [ $CD_VIRTUAL_ENV ]; then
-                # We've just left the repo, deactivate the environment
-                # Note: this only happens if the virtualenv was activated automatically
-                deactivate && unset CD_VIRTUAL_ENV
-            fi
-            unset PROJECT_ROOT
-            unset WORKON_CWD
-        fi
-    }
+  if [[ "$WORKON_HOME" == "" ]]; then
+    echo "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work"
+  else
 
-    # Append workon_cwd to the chpwd_functions array, so it will be called on cd
-    # http://zsh.sourceforge.net/Doc/Release/Functions.html
-    # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
-    if (( ${+chpwd_functions} )); then
-        if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
-            set -A chpwd_functions $chpwd_functions workon_cwd
+    if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
+      # Automatically activate Git projects's virtual environments based on the
+      # directory name of the project. Virtual environment name can be overridden
+      # by placing a .venv file in the project root with a virtualenv name in it
+      function workon_cwd {
+        if [ ! $WORKON_CWD ]; then
+          WORKON_CWD=1
+          # Check if this is a Git repo
+          PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
+          if (( $? != 0 )); then
+            PROJECT_ROOT="."
+          fi
+          # Check for virtualenv name override
+          if [[ -f "$PROJECT_ROOT/.venv" ]]; then
+            ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+          elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
+            ENV_NAME="$PROJECT_ROOT/.venv"
+          elif [[ "$PROJECT_ROOT" != "." ]]; then
+            ENV_NAME=`basename "$PROJECT_ROOT"`
+          else
+            ENV_NAME=""
+          fi
+          if [[ "$ENV_NAME" != "" ]]; then
+            # Activate the environment only if it is not already active
+            if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+              if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+                workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+              elif [[ -e "$ENV_NAME/bin/activate" ]]; then
+                source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
+              fi
+            fi
+          elif [ $CD_VIRTUAL_ENV ]; then
+            # We've just left the repo, deactivate the environment
+            # Note: this only happens if the virtualenv was activated automatically
+            deactivate && unset CD_VIRTUAL_ENV
+          fi
+          unset PROJECT_ROOT
+          unset WORKON_CWD
         fi
-    else
+      }
+
+      # Append workon_cwd to the chpwd_functions array, so it will be called on cd
+      # http://zsh.sourceforge.net/Doc/Release/Functions.html
+      # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
+      if (( ${+chpwd_functions} )); then
+        if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
+          set -A chpwd_functions $chpwd_functions workon_cwd
+        fi
+      else
         set -A chpwd_functions workon_cwd
+      fi
     fi
   fi
 else

From c6a8b2ea6d80e33716ce5590f4c4aff96776f06e Mon Sep 17 00:00:00 2001
From: mizabrik <myxabrik@users.noreply.github.com>
Date: Fri, 28 Nov 2014 19:40:56 +0300
Subject: [PATCH 0891/1378] Save ZSH path in newly created .zshrc

---
 tools/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index a53ac48ab..35548005a 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -23,8 +23,8 @@ fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
 cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
-sed -i -e "/^ZSH=/ c\\
-ZSH=$ZSH
+sed -i -e "/^export ZSH=/ c\\
+export ZSH=$ZSH
 " ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"

From 1ebc98b9ede5ad5084b3e504e4fc8c01cb93be71 Mon Sep 17 00:00:00 2001
From: Joe Block <jpb@unixorn.net>
Date: Sun, 30 Nov 2014 17:37:47 -0800
Subject: [PATCH 0892/1378] Don't clobber HISTSIZE or SAVEHIST if they're
 already set

---
 lib/history.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 1d83e56e3..12dbcf4ee 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -1,9 +1,13 @@
 ## Command history configuration
-if [ -z $HISTFILE ]; then
+if [ -z "$HISTFILE" ]; then
     HISTFILE=$HOME/.zsh_history
 fi
-HISTSIZE=10000
-SAVEHIST=10000
+if [ -z "$HISTSIZE" ]; then
+	HISTSIZE=10000
+fi
+if [ -z "$SAVEHIST" ]; then
+	SAVEHIST=10000
+fi
 
 setopt extended_history
 setopt hist_expire_dups_first

From 5bf715787a4483cafd70461417cb9a1bf8d1509f Mon Sep 17 00:00:00 2001
From: Joe Block <jpb@unixorn.net>
Date: Sun, 30 Nov 2014 17:39:21 -0800
Subject: [PATCH 0893/1378] Existing code indents with spaces, not tabs,
 conform.

---
 lib/history.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 12dbcf4ee..179c22848 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -3,10 +3,10 @@ if [ -z "$HISTFILE" ]; then
     HISTFILE=$HOME/.zsh_history
 fi
 if [ -z "$HISTSIZE" ]; then
-	HISTSIZE=10000
+    HISTSIZE=10000
 fi
 if [ -z "$SAVEHIST" ]; then
-	SAVEHIST=10000
+    SAVEHIST=10000
 fi
 
 setopt extended_history

From 575bb91b5f2e1220e566385e2982ca4f72521819 Mon Sep 17 00:00:00 2001
From: Emil Marashliev <Emil.Marashliev@paddypower.com>
Date: Mon, 1 Dec 2014 13:34:18 +0200
Subject: [PATCH 0894/1378] Added Xcode alias for deleting Derived Data.

---
 plugins/xcode/xcode.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index b7b75cf93..1d1205b80 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -16,6 +16,7 @@ function xcsel {
 
 alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
+alias xcdd='rm -rf ~/Library/Developer/Xcode/DerivedData/*'
 
 if [[ -d $(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app ]]; then
   alias simulator='open $(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'

From 011f25d492ab23b0f1dd50ea0f406892810e781e Mon Sep 17 00:00:00 2001
From: Ion Marusic <ion.marusic@gmail.com>
Date: Tue, 2 Dec 2014 20:10:47 +0200
Subject: [PATCH 0895/1378] Fixed command autocomplete for Symfony 2.6.x

---
 plugins/symfony2/symfony2.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 8df22e9ad..7a19cbdd3 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -5,7 +5,7 @@ _symfony_console () {
 }
 
 _symfony2_get_command_list () {
-   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  ?[a-z]+/ { print $1 }'
 }
 
 _symfony2 () {
@@ -23,4 +23,4 @@ alias sfcl='sf cache:clear'
 alias sfcw='sf cache:warmup'
 alias sfroute='sf router:debug'
 alias sfcontainer='sf container:debug'
-alias sfgb='sf generate:bundle'
\ No newline at end of file
+alias sfgb='sf generate:bundle'

From a19d1d1f05281fc286991ff85010d6d431ae1d58 Mon Sep 17 00:00:00 2001
From: ZHANG Biao <bbbiao@gmail.com>
Date: Thu, 4 Dec 2014 11:38:37 +0800
Subject: [PATCH 0896/1378] autojump installed from github has mv the
 autojump.zsh to $HOME/.autojump/share/autojump/autojump.zsh

---
 plugins/autojump/autojump.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 652d22696..4cf036401 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,6 +1,8 @@
 if [ $commands[autojump] ]; then # check if autojump is installed
   if [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
     . $HOME/.autojump/etc/profile.d/autojump.zsh
+  elif [ -f $HOME/.autojump/share/autojump/autojump.zsh ]; then # another manual user-local installation
+    . $HOME/.autojump/share/autojump/autojump.zsh
   elif [ -f $HOME/.nix-profile/etc/profile.d/autojump.zsh ]; then # nix installation
     . $HOME/.nix-profile/etc/profile.d/autojump.zsh
   elif [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package

From ed029f18010ea10c7bc4a2a90f75111503e613d9 Mon Sep 17 00:00:00 2001
From: Will Boyce <me@willboyce.com>
Date: Tue, 29 Apr 2014 14:38:48 +0100
Subject: [PATCH 0897/1378] allow overriding lib/*.zsh in custom/lib

---
 oh-my-zsh.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index d0e89f31b..d75b521c7 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -8,18 +8,20 @@ fi
 # add a function path
 fpath=($ZSH/functions $ZSH/completions $fpath)
 
-# Load all of the config files in ~/oh-my-zsh that end in .zsh
-# TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/lib/*.zsh); do
-  source $config_file
-done
-
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
 if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
+# Load all of the config files in ~/oh-my-zsh that end in .zsh
+# TIP: Add files you don't want in git to .gitignore
+for config_file ($ZSH/lib/*.zsh); do
+  custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}"
+  [ -f "${custom_config_file}" ] && config_file=${custom_config_file}
+  source $config_file
+done
+
 
 is_plugin() {
   local base_dir=$1

From 9bab8ccb89466be8bc8c579264f51b194aa89612 Mon Sep 17 00:00:00 2001
From: Anatoly Bubenkov <bubenkoff@gmail.com>
Date: Wed, 10 Dec 2014 13:40:34 +0100
Subject: [PATCH 0898/1378] add current bookmark to rkj-repos theme

---
 themes/rkj-repos.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 6289427c2..eed084f15 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -4,7 +4,7 @@
 
 function hg_prompt_info {
     hg prompt --angle-brackets "\
-<hg:%{$fg[magenta]%}<branch>%{$reset_color%}>\
+<hg:%{$fg[magenta]%}<branch>%{$reset_color%}><:%{$fg[magenta]%}<bookmark>%{$reset_color%}>\
 </%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
 %{$fg[red]%}<status|modified|unknown><update>%{$reset_color%}<
 patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null

From 6f70d288cc4625142413227109bf1eeac7e2a180 Mon Sep 17 00:00:00 2001
From: zghember <zghpku@gmail.com>
Date: Thu, 11 Dec 2014 19:47:29 +0800
Subject: [PATCH 0899/1378] Update theme "jispwoso" to support ret status and
 git

---
 themes/jispwoso.zsh-theme | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/themes/jispwoso.zsh-theme b/themes/jispwoso.zsh-theme
index cdfef3871..748430573 100644
--- a/themes/jispwoso.zsh-theme
+++ b/themes/jispwoso.zsh-theme
@@ -1,4 +1,10 @@
-PROMPT=$'%{$fg[green]%}%n@%m: %{$reset_color%}%{$fg[blue]%}%/%{$reset_color%}
-%{$fg_bold[red]%}➜ %{$reset_color%} '
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT=$'%{$fg[green]%}%n@%m: %{$reset_color%}%{$fg[blue]%}%/ %{$reset_color%}%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}
+${ret_status} %{$reset_color%} '
 
 PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From 9677cfb34e896a59896c4cc747108ca8e3d20e86 Mon Sep 17 00:00:00 2001
From: Rotem Yaari <vmalloc@gmail.com>
Date: Thu, 11 Dec 2014 23:41:47 +0200
Subject: [PATCH 0900/1378] Fix dircycle plugin

dircycle right did not behave as expected and was fixed
---
 plugins/dircycle/dircycle.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 46a0ab268..c6b6ba785 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -5,6 +5,6 @@
 eval "insert-cycledleft () { zle push-line; LBUFFER='pushd -q +1'; zle accept-line }"
 zle -N insert-cycledleft
 bindkey "\e[1;6D" insert-cycledleft
-eval "insert-cycledright () { zle push-line; LBUFFER='pushd -q -0'; zle accept-line }"
+eval "insert-cycledright () { zle push-line; LBUFFER='pushd -q +0'; zle accept-line }"
 zle -N insert-cycledright
 bindkey "\e[1;6C" insert-cycledright

From 1d2c1e8ab80922fb673a08440a8e2b33b9231de1 Mon Sep 17 00:00:00 2001
From: "Pete \"Peteches\" McCabe" <peteches@petemccabe.gb.net>
Date: Fri, 12 Dec 2014 17:37:35 +0000
Subject: [PATCH 0901/1378] Fixed output issues webith websearch plugin.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- if user has rm set as an alias to 'rm -i' user is prompted to whether to
  remove the nohup.out file.

 $ ddg fools
	nohup: ignoring input and appending output to ‘nohup.out’
	rm: remove regular empty file ‘nohup.out’?

- if output redirected to a file nohup will not create nohup.out and rm is
  unecessary.
---
 plugins/web-search/web-search.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 371e3a303..28559deb9 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -37,8 +37,7 @@ function web_search() {
   done
 
   url="${url%?}" # remove the last '+'
-  nohup $open_cmd "$url" 
- 	rm nohup.out	
+  nohup $open_cmd "$url" >/dev/null 2&>1
 }
 
 

From 43a2e24c25531c27e502313d23c44bd5d7e0c405 Mon Sep 17 00:00:00 2001
From: Ryan Robeson <ryan.robeson@gmail.com>
Date: Fri, 12 Dec 2014 15:56:59 -0500
Subject: [PATCH 0902/1378] Add itunes shuffle command to OSX plugin.

Added shuffle functionality to the itunes command in the OSX plugin.
iTunes 12 doesn't support setting the "shuffle" property on the playlist
from what I've read, so this simulates the user interacting with the
iTunes interface. The toggle option "clicks" the shuffle button in the
Now Playing area. This has the effect of toggling the shuffle setting on
whatever is currently playing. The on and off options use the Shuffle
menu bar items.

Usage: itunes shuffle [on|off|toggle]
---
 plugins/osx/osx.plugin.zsh | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 2eea0d8ef..d366f1fc8 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -177,12 +177,43 @@ function itunes() {
 		vol)
 			opt="set sound volume to $1" #$1 Due to the shift
 			;;
+		shuf|shuff|shuffle)
+			# The shuffle property of current playlist can't be changed in iTunes 12,
+			# so this workaround uses AppleScript to simulate user input instead.
+			# Defaults to toggling when no options are given.
+			# The toggle option depends on the shuffle button being visible in the Now playing area.
+			# On and off use the menu bar items.
+			local state=$1
+
+			if [[ -n "$state" && ! "$state" =~ "^(on|off|toggle)$" ]]
+			then
+				print "Usage: itunes shuffle [on|off|toggle]. Invalid option."
+				return 1
+			fi
+
+			case "$state" in
+				on|off)
+					# Inspired by: http://stackoverflow.com/a/14675583
+					osascript 1>/dev/null 2>&1 <<-EOF
+					tell application "System Events" to perform action "AXPress" of (menu item "${state}" of menu "Shuffle" of menu item "Shuffle" of menu "Controls" of menu bar item "Controls" of menu bar 1 of application process "iTunes" )
+EOF
+					return 0
+					;;
+				toggle|*)
+					osascript 1>/dev/null 2>&1 <<-EOF
+					tell application "System Events" to perform action "AXPress" of (button 2 of process "iTunes"'s window "iTunes"'s scroll area 1)
+EOF
+					return 0
+					;;
+			esac
+			;;
 		""|-h|--help)
 			echo "Usage: itunes <option>"
 			echo "option:"
 			echo "\tlaunch|play|pause|stop|rewind|resume|quit"
 			echo "\tmute|unmute\tcontrol volume set"
 			echo "\tnext|previous\tplay next or previous track"
+			echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
 			echo "\tvol\tSet the volume, takes an argument from 0 to 100"
 			echo "\thelp\tshow this message and exit"
 			return 0

From 0bd3c9996fa58494fbefaad483abbe60ed332889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 13 Dec 2014 19:13:27 +0100
Subject: [PATCH 0903/1378] Extract VCS folders definition to avoid repetition

---
 lib/grep.zsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 276fec382..ad38ec6fc 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -6,18 +6,17 @@
 GREP_OPTIONS="--color=auto"
 
 # avoid VCS folders (if the necessary grep flags are available)
+VCS_FOLDERS="{.cvs,.git,.hg,.svn}"
+
 grep-flag-available() {
     echo | grep $1 "" >/dev/null 2>&1
 }
 if grep-flag-available --exclude-dir=.cvs; then
-    for PATTERN in .cvs .git .hg .svn; do
-        GREP_OPTIONS+=" --exclude-dir=$PATTERN"
-    done
+    GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"
 elif grep-flag-available --exclude=.cvs; then
-    for PATTERN in .cvs .git .hg .svn; do
-        GREP_OPTIONS+=" --exclude=$PATTERN"
-    done
+    GREP_OPTIONS+=" --exclude=$VCS_FOLDERS"
 fi
+unset VCS_FOLDERS
 unfunction grep-flag-available
 
 export GREP_OPTIONS="$GREP_OPTIONS"

From cf586b54b8aacd7fad7afc74d4f395da56e828b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 13 Dec 2014 19:14:23 +0100
Subject: [PATCH 0904/1378] Ignore .bzr folders in grep too

---
 lib/grep.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index ad38ec6fc..4a44113e1 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -6,7 +6,7 @@
 GREP_OPTIONS="--color=auto"
 
 # avoid VCS folders (if the necessary grep flags are available)
-VCS_FOLDERS="{.cvs,.git,.hg,.svn}"
+VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
 
 grep-flag-available() {
     echo | grep $1 "" >/dev/null 2>&1

From 0190eb084bfb39bfa5920f85c2fc33730236217c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 13 Dec 2014 19:18:11 +0100
Subject: [PATCH 0905/1378] Use unaliased grep in flag check

---
 lib/grep.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 4a44113e1..06751db1a 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -9,7 +9,7 @@ GREP_OPTIONS="--color=auto"
 VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
 
 grep-flag-available() {
-    echo | grep $1 "" >/dev/null 2>&1
+    echo | command grep $1 "" >/dev/null 2>&1
 }
 if grep-flag-available --exclude-dir=.cvs; then
     GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"

From 711843153d6e53a89d37931217f59c4f6a3a35db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 13 Dec 2014 19:36:57 +0100
Subject: [PATCH 0906/1378] Tidy up the grep.zsh library

---
 lib/grep.zsh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 06751db1a..4e55464c5 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -1,23 +1,24 @@
-#
-# Color grep results
-# Examples: http://rubyurl.com/ZXv
-#
+# is x grep argument available?
+grep-flag-available() {
+    echo | grep $1 "" >/dev/null 2>&1
+}
 
+# color grep results
 GREP_OPTIONS="--color=auto"
 
-# avoid VCS folders (if the necessary grep flags are available)
+# ignore VCS folders (if the necessary grep flags are available)
 VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
 
-grep-flag-available() {
-    echo | command grep $1 "" >/dev/null 2>&1
-}
 if grep-flag-available --exclude-dir=.cvs; then
     GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"
 elif grep-flag-available --exclude=.cvs; then
     GREP_OPTIONS+=" --exclude=$VCS_FOLDERS"
 fi
-unset VCS_FOLDERS
-unfunction grep-flag-available
 
+# export grep settings
 export GREP_OPTIONS="$GREP_OPTIONS"
 export GREP_COLOR='1;32'
+
+# clean up
+unset VCS_FOLDERS
+unfunction grep-flag-available

From dd270878053a73600382de1c3592c04d985e5e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Mon, 24 Nov 2014 13:08:39 +0100
Subject: [PATCH 0907/1378] Change to alias and remove deprecated GREP_COLOR

---
 lib/grep.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 4e55464c5..348ebe623 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -16,9 +16,9 @@ elif grep-flag-available --exclude=.cvs; then
 fi
 
 # export grep settings
-export GREP_OPTIONS="$GREP_OPTIONS"
-export GREP_COLOR='1;32'
+alias grep="grep $GREP_OPTIONS"
 
 # clean up
+unset GREP_OPTIONS
 unset VCS_FOLDERS
 unfunction grep-flag-available

From 08b9f8d6770e2f626bca0d320d2b577e0e1597c5 Mon Sep 17 00:00:00 2001
From: ekaragodin <ekaragodin@gmail.com>
Date: Sun, 14 Dec 2014 11:09:34 +0600
Subject: [PATCH 0908/1378] Added Yii2 command completion

---
 plugins/yii2/yii2.plugin.zsh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/yii2/yii2.plugin.zsh

diff --git a/plugins/yii2/yii2.plugin.zsh b/plugins/yii2/yii2.plugin.zsh
new file mode 100644
index 000000000..137b3a076
--- /dev/null
+++ b/plugins/yii2/yii2.plugin.zsh
@@ -0,0 +1,29 @@
+# Yii2 command completion
+
+_yii2_format_command () {
+  awk '/^- [a-z]+/ { sub(":", "", $2); print $2 }'
+}
+
+_yii2 () {
+  if [ -f ./yii ]; then
+    _arguments \
+      '1: :->command'\
+      '*: :->params'
+
+    case $state in
+      command)
+
+      local -a commands
+      local -a name
+
+      if [[ $words[2] == *\/ ]]; then
+        name=$words[2]
+      fi
+
+      commands=(${(f)"$(./yii help $name | _yii2_format_command)"})
+      compadd -Q -S '' -a -- commands
+    esac
+  fi
+}
+
+compdef _yii2 yii

From 7488e9b510f0fec31bb05362f8aa97ec857e8962 Mon Sep 17 00:00:00 2001
From: ekaragodin <ekaragodin@gmail.com>
Date: Mon, 15 Dec 2014 08:18:18 +0600
Subject: [PATCH 0909/1378] Add yii2 readme

---
 plugins/yii2/README.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 plugins/yii2/README.md

diff --git a/plugins/yii2/README.md b/plugins/yii2/README.md
new file mode 100644
index 000000000..345b66eb6
--- /dev/null
+++ b/plugins/yii2/README.md
@@ -0,0 +1,7 @@
+# Yii2 autocomplete plugin
+
+* Adds autocomplete commands and subcommands for yii.
+
+## Requirements
+
+Autocomplete works from directory where your `yii` file contains.

From 77da20997e8dd753193768d46fe27175a21f23cb Mon Sep 17 00:00:00 2001
From: David Feinberg <david@rawberg.com>
Date: Sun, 14 Dec 2014 18:19:00 -0800
Subject: [PATCH 0910/1378] mira theme shows active node, ruby and java
 versions

---
 themes/mira.zsh-theme | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 themes/mira.zsh-theme

diff --git a/themes/mira.zsh-theme b/themes/mira.zsh-theme
new file mode 100644
index 000000000..fa2bf42f3
--- /dev/null
+++ b/themes/mira.zsh-theme
@@ -0,0 +1,29 @@
+# Based on bira zsh theme with nvm, rvm and jenv support
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
+local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
+
+local rvm_ruby=''
+if which rvm-prompt &> /dev/null; then
+  rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm_ruby='%{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
+  fi
+fi
+
+local nvm_node=''
+nvm_node='%{$fg[green]%}‹$(nvm_prompt_info)›%{$reset_color%}'
+
+local jenv_java=''
+jenv_java='%{$fg[blue]%}‹$(jenv_prompt_info)›%{$reset_color%}'
+
+local git_branch='$(git_prompt_info)%{$reset_color%}'
+
+PROMPT="╭─${user_host} ${current_dir} ${nvm_node} ${rvm_ruby} ${jenv_java} ${git_branch}
+╰─%B$%b "
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
\ No newline at end of file

From 02d647773a4331a5464918a0cebe35cf0bd614ed Mon Sep 17 00:00:00 2001
From: David Feinberg <david@rawberg.com>
Date: Sun, 14 Dec 2014 18:28:06 -0800
Subject: [PATCH 0911/1378] added node- before node version for consistency

---
 themes/mira.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/mira.zsh-theme b/themes/mira.zsh-theme
index fa2bf42f3..e6c952998 100644
--- a/themes/mira.zsh-theme
+++ b/themes/mira.zsh-theme
@@ -14,7 +14,7 @@ else
 fi
 
 local nvm_node=''
-nvm_node='%{$fg[green]%}‹$(nvm_prompt_info)›%{$reset_color%}'
+nvm_node='%{$fg[green]%}‹node-$(nvm_prompt_info)›%{$reset_color%}'
 
 local jenv_java=''
 jenv_java='%{$fg[blue]%}‹$(jenv_prompt_info)›%{$reset_color%}'
@@ -26,4 +26,4 @@ PROMPT="╭─${user_host} ${current_dir} ${nvm_node} ${rvm_ruby} ${jenv_java} $
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
-ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"

From 0c77e4ba6f52642d7f94e6cd72c869ad2e47c62f Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Mon, 15 Dec 2014 12:41:22 +0800
Subject: [PATCH 0912/1378] update git-extras plugin

---
 plugins/git-extras/git-extras.plugin.zsh | 198 ++++++++++++++---------
 1 file changed, 122 insertions(+), 76 deletions(-)

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index 8419166ab..d91c1af81 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -3,19 +3,20 @@
 # Description
 # -----------
 #
-#  Completion script for git-extras (http://github.com/visionmedia/git-extras).
+#  Completion script for git-extras (http://github.com/tj/git-extras).
 #
 # ------------------------------------------------------------------------------
 # Authors
 # -------
 #
 #  * Alexis GRIMALDI (https://github.com/agrimaldi)
+#  * spacewander (https://github.com/spacewander)
 #
 # ------------------------------------------------------------------------------
 # Inspirations
 # -----------
 #
-#  * git-extras (http://github.com/visionmedia/git-extras)
+#  * git-extras (http://github.com/tj/git-extras)
 #  * git-flow-completion (http://github.com/bobthecow/git-flow-completion)
 #
 # ------------------------------------------------------------------------------
@@ -30,10 +31,21 @@ __git_command_successful () {
 }
 
 
+__git_commits() {
+    declare -A commits
+    git log --oneline -15 | sed 's/\([[:alnum:]]\{7\}\) /\1:/' | while read commit
+    do
+        hash=$(echo $commit | cut -d':' -f1)
+        commits[$hash]="$commit"
+    done
+    local ret=1
+    _describe -t commits commit commits && ret=0
+}
+
 __git_tag_names() {
     local expl
     declare -a tag_names
-    tag_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
+    tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
     __git_command_successful || return
     _wanted tag-names expl tag-name compadd $* - $tag_names
 }
@@ -47,31 +59,27 @@ __git_branch_names() {
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-
-__git_feature_branch_names() {
+__git_specific_branch_names() {
     local expl
     declare -a branch_names
-    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/feature 2>/dev/null)"}#refs/heads/feature/})
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})
     __git_command_successful || return
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
 
+__git_feature_branch_names() {
+    __git_specific_branch_names 'feature'
+}
+
+
 __git_refactor_branch_names() {
-    local expl
-    declare -a branch_names
-    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/refactor 2>/dev/null)"}#refs/heads/refactor/})
-    __git_command_successful || return
-    _wanted branch-names expl branch-name compadd $* - $branch_names
+    __git_specific_branch_names 'refactor'
 }
 
 
 __git_bug_branch_names() {
-    local expl
-    declare -a branch_names
-    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/bug 2>/dev/null)"}#refs/heads/bug/})
-    __git_command_successful || return
-    _wanted branch-names expl branch-name compadd $* - $branch_names
+    __git_specific_branch_names 'bug'
 }
 
 
@@ -92,6 +100,35 @@ __git_author_names() {
     _wanted author-names expl author-name compadd $* - $author_names
 }
 
+# subcommands
+
+_git-bug() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge bug into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_bug_branch_names'
+                    ;;
+            esac
+    esac
+}
+
 
 _git-changelog() {
     _arguments \
@@ -99,11 +136,6 @@ _git-changelog() {
 }
 
 
-_git-effort() {
-    _arguments \
-        '--above[ignore file with less than x commits]' \
-}
-
 
 _git-contrib() {
     _arguments \
@@ -135,6 +167,11 @@ _git-delete-tag() {
 }
 
 
+_git-effort() {
+    _arguments \
+        '--above[ignore file with less than x commits]'
+}
+
 _git-extras() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -154,20 +191,7 @@ _git-extras() {
     esac
 
     _arguments \
-        '(-v --version)'{-v,--version}'[show current version]' \
-}
-
-
-_git-graft() {
-    _arguments \
-        ':src-branch-name:__git_branch_names' \
-        ':dest-branch-name:__git_branch_names'
-}
-
-
-_git-squash() {
-    _arguments \
-        ':branch-name:__git_branch_names'
+        '(-v --version)'{-v,--version}'[show current version]'
 }
 
 
@@ -199,6 +223,25 @@ _git-feature() {
 }
 
 
+_git-graft() {
+    _arguments \
+        ':src-branch-name:__git_branch_names' \
+        ':dest-branch-name:__git_branch_names'
+}
+
+
+_git-ignore() {
+    _arguments  -C \
+        '(--local -l)'{--local,-l}'[show local gitignore]' \
+        '(--global -g)'{--global,-g}'[show global gitignore]'
+}
+
+_git-missing() {
+    _arguments \
+        ':first-branch-name:__git_branch_names' \
+        ':second-branch-name:__git_branch_names'
+}
+
 _git-refactor() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -227,59 +270,62 @@ _git-refactor() {
 }
 
 
-_git-bug() {
-    local curcontext=$curcontext state line ret=1
-    declare -A opt_args
+_git-squash() {
+    _arguments \
+        ':branch-name:__git_branch_names'
+}
 
-    _arguments -C \
-        ': :->command' \
-        '*:: :->option-or-argument' && ret=0
-
-    case $state in
-        (command)
-            declare -a commands
-            commands=(
-                'finish:merge bug into the current branch'
-            )
-            _describe -t commands command commands && ret=0
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*}-$line[1]:
-            case $line[1] in
-                (finish)
-                    _arguments -C \
-                        ':branch-name:__git_bug_branch_names'
-                    ;;
-            esac
-    esac
+_git-summary() {
+    _arguments '--line[summarize with lines other than commits]'
+    __git_commits
 }
 
 
+_git-undo(){
+    _arguments  -C \
+        '(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \
+        '(--hard -h)'{--hard,-h}'[wipes your commit(s)]'
+}
+
 zstyle ':completion:*:*:git:*' user-commands \
+    alias:'define, search and show aliases' \
+    archive-file:'export the current HEAD of the git repository to a archive' \
+    back:'undo and stage latest commits' \
+    bug:'create a bug branch' \
     changelog:'populate changelog file with commits since the previous tag' \
+    commits-since:'list commits since a given date' \
     contrib:'display author contributions' \
     count:'count commits' \
+    create-branch:'create local and remote branch' \
     delete-branch:'delete local and remote branch' \
+    delete-merged-brancees:'delete merged branches'\
     delete-submodule:'delete submodule' \
     delete-tag:'delete local and remote tag' \
-    extras:'git-extras' \
-    graft:'merge commits from source branch to destination branch' \
-    squash:'merge commits from source branch into the current one as a single commit' \
-    feature:'create a feature branch' \
-    refactor:'create a refactor branch' \
-    bug:'create a bug branch' \
-    summary:'repository summary' \
     effort:'display effort statistics' \
-    repl:'read-eval-print-loop' \
-    commits-since:'list commits since a given date' \
-    release:'release commit with the given tag' \
-    alias:'define, search and show aliases' \
+    extras:'git-extras' \
+    feature:'create a feature branch' \
+    fork:'fork a repo on github' \
+    fresh-branch:'create empty local branch' \
+    gh-pages:'create the GitHub Pages branch' \
+    graft:'merge commits from source branch to destination branch' \
     ignore:'add patterns to .gitignore' \
     info:'show info about the repository' \
-    create-branch:'create local and remote branch' \
-    fresh-branch:'create empty local branch' \
-    undo:'remove the latest commit' \
-    setup:'setup a git repository' \
-    touch:'one step creation of new files' \
-    obliterate:'Completely remove a file from the repository, including past commits and tags' \
     local-commits:'list unpushed commits on the local branch' \
+    lock:'lock a file excluded from version control' \
+    locked:'ls files that have been locked' \
+    missing:'show commits missing from another branch' \
+    pr:'checks out a pull request locally' \
+    rebase-patch:'rebases a patch' \
+    refactor:'create a refactor branch' \
+    release:'commit, tag and push changes to the repository' \
+    rename-tag:'rename a tag' \
+    repl:'read-eval-print-loop' \
+    reset-file:'reset one file' \
+    root:'show path of root' \
+    setup:'setup a git repository' \
+    show-tree:'show branch tree of commit history' \
+    squash:'merge commits from source branch into the current one as a single commit' \
+    summary:'repository summary' \
+    touch:'one step creation of new files' \
+    undo:'remove the latest commit' \
+    unlock:'unlock a file excluded from version control'

From 00ff1bbd1c666be789f94c30cfdd837d16d190d8 Mon Sep 17 00:00:00 2001
From: ekaragodin <ekaragodin@gmail.com>
Date: Mon, 15 Dec 2014 21:37:38 +0600
Subject: [PATCH 0913/1378] Updated Yii2 command completion

---
 plugins/yii2/yii2.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/yii2/yii2.plugin.zsh b/plugins/yii2/yii2.plugin.zsh
index 137b3a076..e8993adf4 100644
--- a/plugins/yii2/yii2.plugin.zsh
+++ b/plugins/yii2/yii2.plugin.zsh
@@ -20,10 +20,10 @@ _yii2 () {
         name=$words[2]
       fi
 
-      commands=(${(f)"$(./yii help $name | _yii2_format_command)"})
+      commands=(${(f)"$(./yii help $name --color=0 | _yii2_format_command)"})
       compadd -Q -S '' -a -- commands
     esac
   fi
 }
 
-compdef _yii2 yii
+compdef _yii2 yii
\ No newline at end of file

From 1978a0923c864cacdc520adff83ed63f62c91073 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 15 Dec 2014 08:11:04 -0800
Subject: [PATCH 0914/1378] Revert PR #3359 as this is breaking stuff for many
 folks. Need to rethink how we handle system defaults differently on this

---
 lib/history.zsh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 179c22848..e78a98e9e 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -2,12 +2,9 @@
 if [ -z "$HISTFILE" ]; then
     HISTFILE=$HOME/.zsh_history
 fi
-if [ -z "$HISTSIZE" ]; then
-    HISTSIZE=10000
-fi
-if [ -z "$SAVEHIST" ]; then
-    SAVEHIST=10000
-fi
+
+HISTSIZE=10000
+SAVEHIST=10000
 
 setopt extended_history
 setopt hist_expire_dups_first

From 7931d5ce1a72cc49cc64478042bc3ef3b667ac8e Mon Sep 17 00:00:00 2001
From: Superbil <superbil@gmail.com>
Date: Tue, 16 Dec 2014 00:17:58 +0800
Subject: [PATCH 0915/1378] Fix aws.plugins.zsh check rule

Check _aws_zsh_completer_path had exist or not
---
 plugins/aws/aws.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index de786725f..0ae18dd56 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -22,7 +22,10 @@ function aws_profiles {
 compctl -K aws_profiles asp
 
 if _homebrew-installed && _awscli-homebrew-installed ; then
-  source $(brew --prefix)/opt/awscli/libexec/bin/aws_zsh_completer.sh
+  _aws_zsh_completer_path=$(brew --prefix)/opt/awscli/libexec/bin/aws_zsh_completer.sh
 else
-  source `which aws_zsh_completer.sh`
+  _aws_zsh_completer_path=$(which aws_zsh_completer.sh)
 fi
+
+[ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path
+unset _aws_zsh_completer_path

From 83553597a1430e2f3459de74de1cf33ae4ce67be Mon Sep 17 00:00:00 2001
From: Mark Feltner <feltner.mj@gmail.com>
Date: Tue, 14 Jan 2014 23:13:49 -0600
Subject: [PATCH 0916/1378] fix(tools/check_for_upgrade): Don't source profile

Reverts #2296, but mostly #1883.

There is no need to source ~/.profile when this script is read. oh-my-zsh writes no configuration data in ~/.profile.

If the user wishes to use data within ~/.profile, then they should source it in another place.

Fixes #2315
---
 tools/check_for_upgrade.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 4a0803210..b2b356e0c 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -22,8 +22,6 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
-[ -f ~/.profile ] && source ~/.profile
-
 # Cancel upgrade if the current user doesn't have write permissions for the
 # oh-my-zsh directory.
 [[ -w "$ZSH" ]] || return 0

From f7deb52c478e3ae7045320130c1aa8ca9dca993f Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Tue, 16 Dec 2014 17:35:08 +0100
Subject: [PATCH 0917/1378] Update the list of Heroku Postgres commands

---
 plugins/heroku/_heroku | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index 46663303a..bb2f7403f 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -27,8 +27,6 @@ _1st_arguments=(
   "config\:push":"push local config vars to heroku"
   "config\:set":"set one or more config vars"
   "config\:unset":"unset one or more config vars"
-  "db\:push":"push local data up to your app"
-  "db\:pull":"pull heroku data down into your local database"
   "domains":"list custom domains for an app"
   "domains\:add":"add a custom domain to an app"
   "domains\:remove":"remove a custom domain from an app"
@@ -43,12 +41,20 @@ _1st_arguments=(
   "logs\:drains":"manage syslog drains"
   "maintenance\:on":"put the app into maintenance mode"
   "maintenance\:off":"take the app out of maintenance mode"
+  "pg\:credentials":"display the DATABASE credentials"
+  "pg\:diagnose":"run diagnostics report on DATABASE"
   "pg\:info":"display database information"
-  "pg\:ingress":"allow direct connections to the database from this IP for one minute"
+  "pg\:kill":"kill a query"
+  "pg\:killall":"terminates ALL connections"
+  "pg\:maintenance":"manage maintenance for DATABASE"
   "pg\:promote":"sets DATABASE as your DATABASE_URL"
+  "pg\:ps":"view active queries with execution time"
   "pg\:psql":"open a psql shell to the database"
+  "pg\:pull":"pull from REMOTE_SOURCE_DATABASE to LOCAL_TARGET_DATABASE"
+  "pg\:push":"push from LOCAL_SOURCE_DATABASE to REMOTE_TARGET_DATABASE"
   "pg\:reset":"delete all data in DATABASE"
   "pg\:unfollow":"stop a replica from following and make it a read/write database"
+  "pg\:upgrade":"unfollow a database and upgrade it to the latest PostgreSQL version"
   "pg\:wait":"monitor database creation, exit when complete"
   "pgbackups":"list captured backups"
   "pgbackups\:url":"get a temporary URL for a backup"
@@ -108,26 +114,6 @@ case "$words[1]" in
       '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
     )
     ;;
-  db:push)
-    _command_args=(
-      '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-      '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-      '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
-      '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
-      '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-      '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
-    )
-    ;;
-  db:pull)
-    _command_args=(
-      '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
-      '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
-      '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
-      '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
-      '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
-      '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
-    )
-    ;;
   keys)
     _command_args=(
       '(-l|--long)'{-l,--long}'[display extended information for each key]' \

From 16d07683058719811a7871cbf7bed066ac8fc784 Mon Sep 17 00:00:00 2001
From: Joe Block <jpb@unixorn.net>
Date: Sun, 14 Dec 2014 21:10:48 -0800
Subject: [PATCH 0918/1378] Quote path in case $HOME has a space in it.

I've seen stranger things on OS X, unfortunately.
This reverts commit 1f5cecee4768be192e439a72a873a6cfe8720927.
---
 lib/nvm.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
index 5cadf7061..61d997fc0 100644
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
@@ -1,6 +1,6 @@
 # get the node.js version
 function nvm_prompt_info() {
-  [ -f $HOME/.nvm/nvm.sh ] || return
+  [ -f "$HOME/.nvm/nvm.sh" ] || return
   local nvm_prompt
   nvm_prompt=$(node -v 2>/dev/null)
   [[ "${nvm_prompt}x" == "x" ]] && return

From 9e5f0f0e9d22af07bd6cb4d509e66dfc8cfcd3bd Mon Sep 17 00:00:00 2001
From: Paul van den Berg <paul.vandenberg@nedap.com>
Date: Thu, 18 Dec 2014 22:59:00 +0100
Subject: [PATCH 0919/1378] added exec command to docker plugin

---
 plugins/docker/_docker | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 28568a6e5..880b6faa6 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -4,6 +4,7 @@
 # Requires: Docker installed
 # Author: Azaan (@aeonazaan)
 # Updates: Bob Maerten (@bobmaerten) for Docker v0.9+
+#          Paul van den Berg (@bergvandenp) for Docker v1.3+ 
 
 
 # ----- Helper functions
@@ -238,6 +239,14 @@ __wait() {
     __docker_containers
 }
 
+__exec() {
+    _arguments \
+      '(-d,--detach=)'{-d,--detach=}'[Detached mode: run command in the background]' \
+      '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \
+      '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-TTY]'
+    __docker_containers
+}
+
 # end commands ---------
 # ----------------------
 
@@ -276,6 +285,7 @@ _1st_arguments=(
     "top":"Lookup the running processes of a container"
     "version":"Show the docker version information"
     "wait":"Block until a container stops, then print its exit code"
+    "exec":"Run a task inside a running container"
 )
 
 _arguments '*:: :->command'
@@ -353,4 +363,6 @@ case "$words[1]" in
         __version ;;
     wait)
         __wait ;;
+    exec)
+        __exec ;;
 esac

From 7295e38885080b0650cbb274f03efca737552116 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sun, 21 Dec 2014 15:05:22 -0500
Subject: [PATCH 0920/1378] termsupport: add chpwd hook for setting pwd in
 Apple Terminal.app

---
 lib/termsupport.zsh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 9d6681603..d9f2b64d4 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -1,7 +1,6 @@
 #usage: title short_tab_title looooooooooooooooooooooggggggg_windows_title
 #http://www.faqs.org/docs/Linux-mini/Xterm-Title.html#ss3.1
 #Fully support screen, iterm, and probably most modern xterm and rxvt
-#Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
   if [[ "$DISABLE_AUTO_TITLE" == "true" ]] || [[ "$EMACS" == *term* ]]; then
     return
@@ -10,7 +9,7 @@ function title {
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ $TERM == ansi ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
-    print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
+    print -Pn "\e]1;$1:q\a" #set icon (=tab) name
   fi
 }
 
@@ -34,5 +33,18 @@ function omz_termsupport_preexec {
   title '$CMD' '%100>...>$LINE%<<'
 }
 
+#Appears each time pwd is changed
+function omz_termsupport_chpwd {
+  #Notify Terminal.app of current directory using undocumented OSC sequence
+  #found in OS X 10.10's /etc/bashrc
+  if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
+    local PWD_URL="file://$HOSTNAME${PWD// /%20}"
+    printf '\e]7;%s\a' "$PWD_URL"
+  fi
+}
+#Fire it once so the pwd is set properly upon shell startup
+omz_termsupport_chpwd
+
 precmd_functions+=(omz_termsupport_precmd)
 preexec_functions+=(omz_termsupport_preexec)
+chpwd_functions+=(omz_termsupport_chpwd)

From 957564ab9f515dd3565689c9974119310a08f4bc Mon Sep 17 00:00:00 2001
From: liuxiang <liuxiang921@gmail.com>
Date: Sat, 27 Dec 2014 23:56:57 +0800
Subject: [PATCH 0921/1378] Add completion for httpie

---
 plugins/httpie/httpie.plugin.zsh | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 plugins/httpie/httpie.plugin.zsh

diff --git a/plugins/httpie/httpie.plugin.zsh b/plugins/httpie/httpie.plugin.zsh
new file mode 100644
index 000000000..68ead6c67
--- /dev/null
+++ b/plugins/httpie/httpie.plugin.zsh
@@ -0,0 +1,33 @@
+function _httpie_completion() {
+  _arguments -C \
+    '(- 1 *)--version[display version information]' \
+    '(-j|--json)'{-j,--json}'[(default) Data items from the command line are serialized as a JSON object]' \
+    '(-f|--form)'{-f,--form}'[Data items from the command line are serialized as form fields]' \
+    '(--pretty)--pretty[<all,colors,format,none> Controls output processing]:options' \
+    '(-s|--style)'{-s,--style}'[Output coloring style]' \
+    '(-p|--print)'{-p,--print}'[String specifying what the output should contain: H(request headers), B(request body), h(response headers), b(response body)]' \
+    '(-v|--verbose)'{-v,--verbose}'[Print the whole request as well as the response. Shortcut for --print=HBbh.]' \
+    '(-h|--headers)'{-h,--headers}'[Print only the response headers. Shortcut for --print=h]' \
+    '(-b|--body)'{-b,--body}'[Print only the response body. Shortcut for --print=b]' \
+    '(-S|--stream)'{-S,--stream}'[Always stream the output by line, i.e., behave like `tail -f'"'"']' \
+    '(-o|--output)'{-o,--output}'[Save output to FILE]:file:_files' \
+    '(-d|--download)'{-d,--download}'[Do not print the response body to stdout. Rather, download it and store it in a file. The filename is guessed unless specified with --output filename. This action is similar to the default behaviour of wget.]' \
+    '(-c|--continue)'{-c,--continue}'[Resume an interrupted download. Note that the --output option needs to be specified as well.]' \
+    '(--session)--session[Create, or reuse and update a session. Within a session, custom headers, auth credential, as well as any cookies sent by the server persist between requests]:file:_files' \
+    '(--session-read-only)--session-read-only[Create or read a session without updating it form the request/response exchange]:file:_files' \
+    '(-a|--auth)'{-a,--auth}'[<USER:PASS> If only the username is provided (-a username), HTTPie will prompt for the password]' \
+    '(--auth-type)--auth-type[<basic, digest> The authentication mechanism to be used. Defaults to "basic".]' \
+    '(--proxy)--proxy[<PROTOCOL:PROXY_URL> String mapping protocol to the URL of the proxy]' \
+    '(--follow)--follow[Set this flag if full redirects are allowed (e.g. re-POST-ing of data at new Location).]' \
+    '(--verify)--verify[<VERIFY> Set to "no" to skip checking the host'"'"'s SSL certificate. You can also pass the path to a CA_BUNDLE file for private certs. You can also set the REQUESTS_CA_BUNDLE  environment variable. Defaults to "yes".]' \
+    '(--timeout)--timeout[<SECONDS> The connection timeout of the request in seconds. The default value is 30 seconds]' \
+    '(--check-status)--check-status[By default, HTTPie exits with 0 when no network or other fatal errors occur. This flag instructs HTTPie to also check the HTTP status code and exit with an error if the status indicates one.]' \
+    '(--ignore-stdin)--ignore-stdin[Do not attempt to read stdin]' \
+    '(--help)--help[Show this help message and exit]' \
+    '(--traceback)--traceback[Prints exception traceback should one occur]' \
+    '(--debug)--debug[Prints exception traceback should one occur, and also other information that is useful for debugging HTTPie itself and for reporting bugs]' \
+    '1: :->cmds' \
+    '*: :->args' && ret=0
+}
+
+compdef _httpie_completion http
\ No newline at end of file

From 8790fa3723afb15dcac56e9fc71b4a84cd6c9a1f Mon Sep 17 00:00:00 2001
From: rexk <myungsunrex@gmail.com>
Date: Tue, 30 Dec 2014 14:52:14 -0800
Subject: [PATCH 0922/1378] go plugin upgrade for version 1.4

---
 plugins/golang/golang.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index f2be6ca9c..900fc630d 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -23,6 +23,7 @@ __go_tool_complete() {
     'env[print Go environment information]'
     'fix[run go tool fix on packages]'
     'fmt[run gofmt on package sources]'
+    'generate[generate Go files by processing source]'
     'get[download and install packages and dependencies]'
     'help[display help]'
     'install[compile and install packages and dependencies]'

From 833e6f5958b9851d2dbcf8ae706474af4079a25e Mon Sep 17 00:00:00 2001
From: Jyrki Pulliainen <jyrki@spotify.com>
Date: Wed, 7 Jan 2015 18:15:00 +0100
Subject: [PATCH 0923/1378] virtualenvwrapper: Deactivate only if in virtualenv

If user manually deactivates the virtualenv when using this mode, zsh
will produce following error:

    deactivate:12: command not found: virtualenv_deactivate

To avoid this, check that the VIRTUAL_ENV flag is set before trying to
automatically deactivate the virtual environment.

Fixes #2185
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 52e02d3e0..217ab0722 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -38,7 +38,7 @@ if (( $+commands[$virtualenvwrapper] )); then
                 source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
               fi
             fi
-          elif [ $CD_VIRTUAL_ENV ]; then
+          elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
             # We've just left the repo, deactivate the environment
             # Note: this only happens if the virtualenv was activated automatically
             deactivate && unset CD_VIRTUAL_ENV

From bf7b9165fd725d2bdf45ca7e639b2c91f5ef65bb Mon Sep 17 00:00:00 2001
From: Stephen <srj@thermeon.com>
Date: Thu, 8 Jan 2015 16:01:16 +0000
Subject: [PATCH 0924/1378] Allow custom cache dir

We are running oh-my-zsh on a shared install and the only issue is each
user having a custom cache dir. This will allow us to set the cache dir
to ZSH_CACHE_DIR=~/oh-my-zsh/cache/ .
---
 lib/completion.zsh | 2 +-
 oh-my-zsh.sh       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 3a19a4eba..ea6139fde 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -38,7 +38,7 @@ cdpath=(.)
 
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1
-zstyle ':completion::complete:*' cache-path $ZSH/cache/
+zstyle ':completion::complete:*' cache-path $ZSH_CACHE_DIR
 
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index d75b521c7..bc7a8e496 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,6 +14,13 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
+# Set ZSH_CACHE_DIR to the path where cache files sould be created
+# or else we will use the default cache/
+if [[ -z "$ZSH_CACHE_DIR" ]]; then
+  ZSH_CACHE_DIR="$ZSH/cache/"
+fi
+
+
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh); do

From ceb42ecdb6296b136e3ead9e6ab53c24a01fedc9 Mon Sep 17 00:00:00 2001
From: Stephen <srj@thermeon.com>
Date: Thu, 8 Jan 2015 16:38:05 +0000
Subject: [PATCH 0925/1378] Update /home/srj/.oh-my-zsh/cache references

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 4 ++--
 plugins/zsh_reload/zsh_reload.plugin.zsh             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index bc36c80db..e472578b0 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -4,8 +4,8 @@
 
 # Flag indicating if we've previously jumped to last directory.
 typeset -g ZSH_LAST_WORKING_DIRECTORY
-mkdir -p "$ZSH/cache"
-local cache_file="$ZSH/cache/last-working-dir"
+mkdir -p $ZSH_CACHE_DIR
+local cache_file="$ZSH_CACHE_DIR/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index 3f44b99c6..cde9ebeca 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,7 +1,7 @@
 # reload zshrc
 function src()
 {
-  local cache="$ZSH/cache"
+  local cache=$ZSH_CACHE_DIR
   autoload -U compinit zrecompile
   compinit -d "$cache/zcomp-$HOST"
 

From a55a313328e7437e1ff9fcdc659e247c61a438f0 Mon Sep 17 00:00:00 2001
From: Dzianis Dashkevich <dskecse@gmail.com>
Date: Fri, 9 Jan 2015 16:40:03 +0300
Subject: [PATCH 0926/1378] Add rdms alias to rails plugin

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 824658e44..5ed96f8cd 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -45,6 +45,7 @@ alias rsd='rails server --debugger'
 
 # Rake aliases
 alias rdm='rake db:migrate'
+alias rdms='rake db:migrate:status'
 alias rdr='rake db:rollback'
 alias rdc='rake db:create'
 alias rds='rake db:seed'

From f997ed7ed8028e400216cfac9bee64b53017e588 Mon Sep 17 00:00:00 2001
From: Andrey Sitnik <andrey@sitnik.ru>
Date: Sat, 10 Jan 2015 15:38:49 +0100
Subject: [PATCH 0927/1378] Add Fedora support for command-not-found plugin

---
 .../command-not-found.plugin.zsh                 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index f3d7ec2df..797554a13 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -7,3 +7,19 @@
 # Arch Linux command-not-found support, you must have package pkgfile installed
 # https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
 [[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
+
+# Fedora command-not-found support
+if [ -f /usr/libexec/pk-command-not-found ]; then
+    command_not_found_handler () {
+        runcnf=1
+        retval=127
+        [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
+        [ ! -x /usr/libexec/packagekitd ] && runcnf=0
+        if [ $runcnf -eq 1 ]
+            then
+            /usr/libexec/pk-command-not-found $@
+            retval=$?
+        fi
+        return $retval
+    }
+fi

From 5b90092555dc13c7577f1cad93857a859be02711 Mon Sep 17 00:00:00 2001
From: CkEsc <iamckesc@gmail.com>
Date: Sun, 11 Jan 2015 17:52:08 +0300
Subject: [PATCH 0928/1378] Sublime Text plugin: added sst alias for sudo run
 sublime

---
 plugins/sublime/sublime.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 5acc75cc7..38a7596fd 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -12,6 +12,8 @@ if [[ $('uname') == 'Linux' ]]; then
     for _sublime_path in $_sublime_linux_paths; do
         if [[ -a $_sublime_path ]]; then
             st_run() { $_sublime_path $@ >/dev/null 2>&1 &| }
+            st_run_sudo() {sudo $_sublime_path $@ >/dev/null 2>&1}
+            alias sst=st_run_sudo
             alias st=st_run
             break
         fi

From 3c4998319ab0796221a70ba19437629afb18ac31 Mon Sep 17 00:00:00 2001
From: Yu Jiang <sunlight07@users.noreply.github.com>
Date: Mon, 12 Jan 2015 21:57:00 +0800
Subject: [PATCH 0929/1378] Update django.plugin.zsh

activate django plugin on command "django-admin"
---
 plugins/django/django.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index aaaa7d21d..2e9ce1c52 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -236,5 +236,6 @@ _managepy() {
 
 compdef _managepy manage.py
 compdef _managepy django
+compdef _managepy django-admin
 compdef _managepy django-admin.py
 compdef _managepy django-manage

From 3abc2a4375ef2b623aa579d991aa802f3746de52 Mon Sep 17 00:00:00 2001
From: Luis Martins <luis.martins@multiweb.pt>
Date: Mon, 12 Jan 2015 17:26:04 +0000
Subject: [PATCH 0930/1378] Fix Plugin commands

---
 plugins/wp-cli/wp-cli.plugin.zsh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 5d9551e24..ac430b7a2 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -52,19 +52,19 @@ alias wpmlo='wp menu location'
 # Option
 
 # Plugin
-alias wppa='activate'
-alias wppda='deactivate'
-alias wppd='delete'
-alias wppg='get'
-alias wppi='install'
-alias wppis='is-installed'
-alias wppl='list'
-alias wppp='path'
-alias wpps='search'
-alias wppst='status'
-alias wppt='toggle'
-alias wppu='uninstall'
-alias wppu='update'
+alias wppa='wp plugin activate'
+alias wppda='wp plugin deactivate'
+alias wppd='wp plugin delete'
+alias wppg='wp plugin get'
+alias wppi='wp plugin install'
+alias wppis='wp plugin is-installed'
+alias wppl='wp plugin list'
+alias wppp='wp plugin path'
+alias wpps='wp plugin search'
+alias wppst='wp plugin status'
+alias wppt='wp plugin toggle'
+alias wppu='wp plugin uninstall'
+alias wppu='wp plugin update'
 
 # Post
 alias wppoc='wp post create'

From 5cb0ed98d1e5f0119e7871e21948a6b931f14a78 Mon Sep 17 00:00:00 2001
From: "Nicholas T." <Nicholas.TD07@gmail.com>
Date: Thu, 15 Jan 2015 09:09:41 +1000
Subject: [PATCH 0931/1378] Fast installation time by shallow copying git repo

Use `--depth=1` to clone just the lastest version rather than every version in git.
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index a53ac48ab..69213d4a3 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null 2>&1 && env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
+hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"
   exit
 }

From b2f8764855e14d113bb2cfd1cd788bd7baaae05a Mon Sep 17 00:00:00 2001
From: Harsh Singh <hisingh1@gmail.com>
Date: Thu, 15 Jan 2015 12:55:32 -0600
Subject: [PATCH 0932/1378] Adds completions to wp-cli plugin

---
 plugins/wp-cli/wp-cli.plugin.zsh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 5d9551e24..71636cff2 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -136,3 +136,25 @@ alias wpwd='wp widget delete'
 alias wpwl='wp widget list'
 alias wpwm='wp widget move'
 alias wpwu='wp widget update'
+
+
+autoload -U +X bashcompinit && bashcompinit
+# bash completion for the `wp` command
+
+_wp_complete() {
+	local cur=${COMP_WORDS[COMP_CWORD]}
+
+	IFS=$'\n';  # want to preserve spaces at the end
+	local opts="$(wp cli completions --line="$COMP_LINE" --point="$COMP_POINT")"
+
+	if [[ "$opts" =~ \<file\>\s* ]]
+	then
+		COMPREPLY=( $(compgen -f -- $cur) )
+	elif [[ $opts = "" ]]
+	then
+		COMPREPLY=( $(compgen -f -- $cur) )
+	else
+		COMPREPLY=( ${opts[*]} )
+	fi
+}
+complete -o nospace -F _wp_complete wp

From fd3a34844f649b2be21fe4e5504a2cf086d1340b Mon Sep 17 00:00:00 2001
From: Josh Sherman <josh@gravityblvd.com>
Date: Tue, 20 Jan 2015 21:24:41 -0500
Subject: [PATCH 0933/1378] Update git-flow.plugin.zsh

---
 plugins/git-flow/git-flow.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index b9ea06844..4357c0895 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -5,7 +5,7 @@
 #
 # To achieve git-flow completion nirvana:
 #
-#  0. Update your zsh's git-completion module to the newest verion.
+#  0. Update your zsh's git-completion module to the newest version.
 #     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
 #
 #  1. Install this file. Either:
@@ -17,7 +17,7 @@
 #
 #            source ~/.git-flow-completion.zsh
 #
-#     c. Or, use this file as a oh-my-zsh plugin.
+#     c. Or, use this file as an oh-my-zsh plugin.
 #
 
 #Alias

From 49549d95582832a25957af6daca6621f60c775ac Mon Sep 17 00:00:00 2001
From: Josh Sherman <josh@gravityblvd.com>
Date: Tue, 20 Jan 2015 21:25:07 -0500
Subject: [PATCH 0934/1378] Update git-hubflow.plugin.zsh

---
 plugins/git-hubflow/git-hubflow.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
index a09f88391..4cf5b9177 100644
--- a/plugins/git-hubflow/git-hubflow.plugin.zsh
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -5,7 +5,7 @@
 #
 # To achieve git-hubflow completion nirvana:
 #
-#  0. Update your zsh's git-completion module to the newest verion.
+#  0. Update your zsh's git-completion module to the newest version.
 #     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
 #
 #  1. Install this file. Either:
@@ -17,7 +17,7 @@
 #
 #            source ~/.git-hubflow-completion.zsh
 #
-#     c. Or, use this file as a oh-my-zsh plugin.
+#     c. Or, use this file as an oh-my-zsh plugin.
 #
 
 _git-hf ()

From 4533c7a31c737622782ce3233d2eb536f9cb4f2e Mon Sep 17 00:00:00 2001
From: Markus Faerevaag <m@frv.ag>
Date: Mon, 26 Jan 2015 00:13:39 +0100
Subject: [PATCH 0935/1378] [wd] Update to v0.4.1

---
 plugins/wd/README.md | 14 ++++++++++++--
 plugins/wd/_wd.sh    | 13 +++++++++++--
 plugins/wd/wd.sh     | 46 ++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
index bcfeab684..ed149eb3e 100644
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md
@@ -5,6 +5,8 @@ wd
 
 `wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems ineffecient when the folder is frequently visited or has a long path.
 
+*NOTE*: If you are not using zsh, check out the `ruby` branch which has `wd` implemented as a gem.
+
 
 ### Setup
 
@@ -33,7 +35,7 @@ Run either in terminal:
  * Add `wd` function to `.zshrc` (or `.profile` etc.):
 
         wd() {
-            . ~/paht/to/wd/wd.sh
+            . ~/path/to/cloned/repo/wd/wd.sh
         }
 
  * Install manpage. From `wd`'s base directory (requires root permissions):
@@ -84,7 +86,15 @@ Also, you may have to force a rebuild of `zcompdump` by running:
 
  * List all warp points (stored in `~/.warprc`):
 
-        $ wd ls
+        $ wd list
+
+ * List files in given warp point:
+
+        $ wd ls foo
+
+ * Show path of given warp point:
+
+        $ wd path foo
 
  * List warp points to current directory, or optionally, path to given warp point:
 
diff --git a/plugins/wd/_wd.sh b/plugins/wd/_wd.sh
index 2bb58dd31..b67f4a1e2 100644
--- a/plugins/wd/_wd.sh
+++ b/plugins/wd/_wd.sh
@@ -20,10 +20,13 @@ function _wd() {
     'add:Adds the current working directory to your warp points'
     'add!:Overwrites existing warp point'
     'rm:Removes the given warp point'
-    'ls:Outputs all stored warp points'
-    'show:Outputs all warp points that point to the current directory or shows a specific target directory for a point'
+    'list:Outputs all stored warp points'
+    'ls:Show files from given warp point'
+    'path:Show path to given warp point'
     'show:Outputs all warp points that point to the current directory or shows a specific target directory for a point'
     'help:Show this extremely helpful text'
+    'clean:Remove points warping to nonexistent directories'
+    'clean!:Remove nonexistent directories without confirmation'
     '..:Go back to last directory'
   )
 
@@ -47,6 +50,12 @@ function _wd() {
         show)
           _describe -t points "Warp points" warp_points && ret=0
           ;;
+        ls)
+          _describe -t points "Warp points" warp_points && ret=0
+          ;;
+        path)
+          _describe -t points "Warp points" warp_points && ret=0
+          ;;
       esac
       ;;
   esac
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 5ecbdc503..3b9548168 100755
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -80,7 +80,9 @@ Commands:
 	rm <point>	Removes the given warp point
 	show		Print warp points to current directory
 	show <point>	Print path to given warp point
-	ls		Print all stored warp points
+	list	        Print all stored warp points
+ls  <point>     Show files from given warp point
+path <point>    Show the path to given warp point
 	clean!		Remove points warping to nonexistent directories
 
 	-v | --version	Print version
@@ -96,7 +98,7 @@ wd_exit_fail()
 {
     local msg=$1
 
-    wd_print_msg $WD_RED $1
+    wd_print_msg $WD_RED $msg
     WD_EXIT_CODE=1
 }
 
@@ -108,6 +110,22 @@ wd_exit_warn()
     WD_EXIT_CODE=1
 }
 
+wd_getdir()
+{
+    local name_arg=$1
+
+    point=$(wd_show $name_arg)
+    dir=${point:28+$#name_arg+7}
+
+    if [[ -z $name_arg ]]; then
+        wd_exit_fail "You must enter a warp point"
+        break
+    elif [[ -z $dir ]]; then
+        wd_exit_fail "Unknown warp point '${name_arg}'"
+        break
+    fi
+}
+
 # core
 
 wd_warp()
@@ -201,6 +219,18 @@ wd_list_all()
     done <<< $(sed "s:${HOME}:~:g" $WD_CONFIG)
 }
 
+wd_ls()
+{
+    wd_getdir $1
+    ls $dir
+}
+
+wd_path()
+{
+    wd_getdir $1
+    echo $(echo $dir | sed "s:${HOME}:~:g")
+}
+
 wd_show()
 {
     local name_arg=$1
@@ -316,7 +346,7 @@ do
 done < $WD_CONFIG
 
 # get opts
-args=$(getopt -o a:r:c:lhs -l add:,rm:,clean\!,ls,help,show -- $*)
+args=$(getopt -o a:r:c:lhs -l add:,rm:,clean\!,list,ls:,path:,help,show -- $*)
 
 # check if no arguments were given, and that version is not set
 if [[ ($? -ne 0 || $#* -eq 0) && -z $wd_print_version ]]
@@ -349,10 +379,18 @@ else
                 wd_remove $2
                 break
                 ;;
-            -l|--list|ls)
+            -l|list)
                 wd_list_all
                 break
                 ;;
+            -ls|ls)
+                wd_ls $2
+                break
+                ;;
+            -p|--path|path)
+                wd_path $2
+                break
+                ;;
             -h|--help|help)
                 wd_print_usage
                 break

From 5f79ab5547f51bd32dcd0a1b21fc26c8720711ba Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Tue, 27 Jan 2015 21:00:07 -0600
Subject: [PATCH 0936/1378] Move chpwd update output from chpwd hook to precmd
 to avoid contaminating script/function output

---
 lib/termsupport.zsh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index d9f2b64d4..ce36f229f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -16,12 +16,19 @@ function title {
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
 ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
-#Appears when you have the prompt
+# Runs when you have the prompt
 function omz_termsupport_precmd {
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+
+  # Notify Terminal.app of current directory using undocumented OSC sequence
+  # found in OS X 10.9 and 10.10's /etc/bashrc
+  if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
+    local PWD_URL="file://$HOSTNAME${PWD// /%20}"
+    printf '\e]7;%s\a' "$PWD_URL"
+  fi
 }
 
-#Appears at the beginning of (and during) of command execution
+# Runs at the beginning of (and during) of command execution
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
@@ -33,18 +40,5 @@ function omz_termsupport_preexec {
   title '$CMD' '%100>...>$LINE%<<'
 }
 
-#Appears each time pwd is changed
-function omz_termsupport_chpwd {
-  #Notify Terminal.app of current directory using undocumented OSC sequence
-  #found in OS X 10.10's /etc/bashrc
-  if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
-    local PWD_URL="file://$HOSTNAME${PWD// /%20}"
-    printf '\e]7;%s\a' "$PWD_URL"
-  fi
-}
-#Fire it once so the pwd is set properly upon shell startup
-omz_termsupport_chpwd
-
 precmd_functions+=(omz_termsupport_precmd)
 preexec_functions+=(omz_termsupport_preexec)
-chpwd_functions+=(omz_termsupport_chpwd)

From c4d3de1ea07b0d53f8b9b011ac5d44e23ac0c747 Mon Sep 17 00:00:00 2001
From: Darius Grigalevicius <darius.grigalevicius@nfq.lt>
Date: Wed, 28 Jan 2015 14:02:36 +0200
Subject: [PATCH 0937/1378] added server:run alias

---
 plugins/symfony2/symfony2.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 7a19cbdd3..e94280ed0 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -20,6 +20,7 @@ compdef _symfony2 sf
 #Alias
 alias sf='`_symfony_console`'
 alias sfcl='sf cache:clear'
+alias sfsr='sf server:run -vvv'
 alias sfcw='sf cache:warmup'
 alias sfroute='sf router:debug'
 alias sfcontainer='sf container:debug'

From e60458793ab9703bb65adb6c326f43c6bd5fd126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 17 Dec 2014 11:11:53 +0100
Subject: [PATCH 0938/1378] Switch newer-than logic to get the desired behavior

In the old version, the function returned true (0) if the cache file
was newer than the Cakefile, which was *always* unless the Cakefile
had been updated. Therefore we generated the file every time unless
the Cakefile was updated, which was precisely when we needed to
regenerate the cache file.

Now it generates the cache file only when the Cakefile has been
updated.
---
 plugins/cake/cake.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
index 44cc47470..2370df949 100644
--- a/plugins/cake/cake.plugin.zsh
+++ b/plugins/cake/cake.plugin.zsh
@@ -15,7 +15,7 @@ _cake_does_target_list_need_generating () {
 	fi
 
 	[ ! -f ${_cake_task_cache_file} ] && return 0;
-	[ ${_cake_task_cache_file} -nt Cakefile ] && return 0;
+	[ Cakefile -nt ${_cake_task_cache_file} ] && return 0;
 	return 1;
 }
 

From 8ccfc3d444a36905003397083ac5ece46eda2a3b Mon Sep 17 00:00:00 2001
From: Michael Robinson <mike@pagesofinterest.net>
Date: Fri, 9 Jan 2015 08:33:51 +1300
Subject: [PATCH 0939/1378] Removing 'local' usage to prevent issue when
 installed with antigen

Error encountered when installed with antigen: "chpwd:2: no such file or directory:".  Solution described in https://github.com/zsh-users/antigen/issues/75
---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index e472578b0..4fa6fcc34 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -5,7 +5,7 @@
 # Flag indicating if we've previously jumped to last directory.
 typeset -g ZSH_LAST_WORKING_DIRECTORY
 mkdir -p $ZSH_CACHE_DIR
-local cache_file="$ZSH_CACHE_DIR/last-working-dir"
+cache_file="$ZSH_CACHE_DIR/last-working-dir"
 
 # Updates the last directory once directory is changed.
 function chpwd() {

From f2130fa1a3f440418a6c48f9bace43ce7443117f Mon Sep 17 00:00:00 2001
From: The Linux Kitten <kitten@openbsdbox>
Date: Mon, 2 Feb 2015 20:49:24 +0100
Subject: [PATCH 0940/1378] Test if --color=auto is a valid option for grep

---
 lib/grep.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 348ebe623..3fa103d19 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -3,8 +3,12 @@ grep-flag-available() {
     echo | grep $1 "" >/dev/null 2>&1
 }
 
+GREP_OPTIONS=""
+
 # color grep results
-GREP_OPTIONS="--color=auto"
+if grep-flag-available --color=auto; then
+    GREP_OPTIONS+=" --color=auto"
+fi
 
 # ignore VCS folders (if the necessary grep flags are available)
 VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"

From be7028012ecc97bf8976d5de0aed51869720be2a Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Wed, 4 Feb 2015 01:00:51 -0500
Subject: [PATCH 0941/1378] Reword comments on termsupport internal functions.

---
 lib/termsupport.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index ce36f229f..bd0cf6ffe 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -16,7 +16,7 @@ function title {
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
 ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
-# Runs when you have the prompt
+# Runs before showing the prompt
 function omz_termsupport_precmd {
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 
@@ -28,7 +28,7 @@ function omz_termsupport_precmd {
   fi
 }
 
-# Runs at the beginning of (and during) of command execution
+# Runs before executing the command
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob

From 8cb97d6f22378940e0238967d08f10ba62a630ce Mon Sep 17 00:00:00 2001
From: Tejas Bubane <tejas.bubane@infibeam.net>
Date: Wed, 4 Feb 2015 12:24:17 +0530
Subject: [PATCH 0942/1378] Add alias for git add --all

---
 plugins/git/git.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bf7cd1ac9..bde219dae 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -75,6 +75,7 @@ compdef _git gss=git-status
 alias ga='git add'
 compdef _git ga=git-add
 alias gap='git add --patch'
+alias gaa='git add --all'
 alias gm='git merge'
 compdef _git gm=git-merge
 alias grh='git reset HEAD'
@@ -174,6 +175,3 @@ alias gignore='git update-index --assume-unchanged'
 alias gunignore='git update-index --no-assume-unchanged'
 # list temporarily ignored files
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-
-
-

From 431faa924ea2a4176b8b83a75ba856f097e6a089 Mon Sep 17 00:00:00 2001
From: Bilal Budhani <bilalbudhani@gmail.com>
Date: Wed, 4 Feb 2015 15:39:34 +0530
Subject: [PATCH 0943/1378] Creates Ember-cli plugin and Adds its aliases

---
 plugins/ember-cli/README.md            | 22 ++++++++++++++++++++++
 plugins/ember-cli/ember-cli.plugin.zsh | 19 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 plugins/ember-cli/README.md
 create mode 100644 plugins/ember-cli/ember-cli.plugin.zsh

diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md
new file mode 100644
index 000000000..d1dedf884
--- /dev/null
+++ b/plugins/ember-cli/README.md
@@ -0,0 +1,22 @@
+# Ember-cli
+
+**Maintainer:** [BilalBudhani](http://www.github.com/BilalBudhani)
+
+Ember-cli (http://www.ember-cli.com/)
+
+### List of Aliases
+
+alias es='ember serve'
+alias ea='ember addon'
+alias eb='ember build'
+alias ed='ember destroy'
+alias eg='ember generate'
+alias eh='ember help'
+alias ein='ember init'
+alias eia='ember install:addon'
+alias eib='ember install:bower'
+alias ein='ember install:npm'
+alias ei='ember install'
+alias et='ember test'
+alias eu='ember update'
+alias ev='ember version'
diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh
new file mode 100644
index 000000000..044a2c043
--- /dev/null
+++ b/plugins/ember-cli/ember-cli.plugin.zsh
@@ -0,0 +1,19 @@
+# Ember ClI 
+# visit http://www.ember-cli.com/ to view user guid 
+
+alias es='ember serve'
+alias ea='ember addon'
+alias eb='ember build'
+alias ed='ember destroy'
+alias eg='ember generate'
+alias eh='ember help'
+alias ein='ember init'
+alias eia='ember install:addon'
+alias eib='ember install:bower'
+alias ein='ember install:npm'
+alias ei='ember install'
+alias et='ember test'
+alias eu='ember update'
+
+# version
+alias ev='ember version'

From 7de44dbdb767e52e509010b1468126259e0b8b87 Mon Sep 17 00:00:00 2001
From: Gabor Marton <gabor.marton@prezi.com>
Date: Wed, 4 Feb 2015 12:56:58 +0100
Subject: [PATCH 0944/1378] Added trapwinch to vi-mode plugin.

---
 plugins/vi-mode/vi-mode.plugin.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 3ed32b3fb..f2745b409 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -14,6 +14,14 @@ function zle-keymap-select zle-line-init zle-line-finish {
   zle -R
 }
 
+# Ensure that the prompt is redrawn when the terminal size changes.
+TRAPWINCH() {
+  if [[ -o zle ]]; then
+    zle reset-prompt
+    zle -R
+  fi
+}
+
 zle -N zle-line-init
 zle -N zle-line-finish
 zle -N zle-keymap-select

From 2e0da6864bc0d770855524ad54eecd4f0cd72829 Mon Sep 17 00:00:00 2001
From: Mathias Geat <mathias@ailoo.net>
Date: Fri, 30 Jan 2015 20:31:05 +0100
Subject: [PATCH 0945/1378] add chucknorris plugin

---
 plugins/chucknorris/.gitignore             |   1 +
 plugins/chucknorris/LICENSE                |   2 +
 plugins/chucknorris/chucknorris.plugin.zsh |   6 +
 plugins/chucknorris/fortunes/chucknorris   | 904 +++++++++++++++++++++
 4 files changed, 913 insertions(+)
 create mode 100644 plugins/chucknorris/.gitignore
 create mode 100644 plugins/chucknorris/LICENSE
 create mode 100644 plugins/chucknorris/chucknorris.plugin.zsh
 create mode 100644 plugins/chucknorris/fortunes/chucknorris

diff --git a/plugins/chucknorris/.gitignore b/plugins/chucknorris/.gitignore
new file mode 100644
index 000000000..267c504a6
--- /dev/null
+++ b/plugins/chucknorris/.gitignore
@@ -0,0 +1 @@
+fortunes/chucknorris.dat
diff --git a/plugins/chucknorris/LICENSE b/plugins/chucknorris/LICENSE
new file mode 100644
index 000000000..5f40edd1e
--- /dev/null
+++ b/plugins/chucknorris/LICENSE
@@ -0,0 +1,2 @@
+License: GPL v2
+Thanks to http://www.k-lug.org/~kessler/projects.html for the fortune file.
diff --git a/plugins/chucknorris/chucknorris.plugin.zsh b/plugins/chucknorris/chucknorris.plugin.zsh
new file mode 100644
index 000000000..096364633
--- /dev/null
+++ b/plugins/chucknorris/chucknorris.plugin.zsh
@@ -0,0 +1,6 @@
+if [ ! -f $ZSH/plugins/chucknorris/fortunes/chucknorris.dat ]; then
+    strfile $ZSH/plugins/chucknorris/fortunes/chucknorris $ZSH/plugins/chucknorris/fortunes/chucknorris.dat
+fi
+
+alias chuck="fortune -a $ZSH/plugins/chucknorris/fortunes"
+alias chuck_cow="chuck | cowthink"
diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
new file mode 100644
index 000000000..b8edf9ac3
--- /dev/null
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -0,0 +1,904 @@
+Chuck Norris' tears cure cancer. Too bad he has never cried. Ever. 
+%
+Chuck Norris does not sleep. He waits. 
+%
+Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs. 
+%
+The chief export of Chuck Norris is pain. 
+%
+If you can see Chuck Norris, he can see you. If you can't see Chuck Norris, you may be only seconds away from death. 
+%
+Chuck Norris has counted to infinity. Twice. 
+%
+Chuck Norris does not hunt because the word hunting implies the probability of failure. Chuck Norris goes killing. 
+%
+Chuck Norris' blood type is AK+. Ass-Kicking Positive. It is compatible only with heavy construction equipment, tanks, and fighter jets. 
+%
+Chuck Norris is 1/8th Cherokee. This has nothing to do with ancestry, the man ate a fucking Indian. 
+%
+In fine print on the last page of the Guinness Book of World Records it notes that all world records are held by Chuck Norris, and those listed in the book are simply the closest anyone else has ever gotten. 
+There is no chin behind Chuck Norris' beard. There is only another fist.
+%
+Chuck Norris does not teabag the ladies. He potato-sacks them. 
+Pluto is actually an orbiting group of British soldiers from the American Revolution who entered space after the Chuck gave them a roundhouse kick to the face. 
+%
+When Chuck Norris goes to donate blood, he declines the syringe, and instead requests a hand gun and a bucket. 
+%
+There are no steroids in baseball. Just players Chuck Norris has breathed on. 
+%
+Chuck Norris once challenged Lance Armstrong in a "Who has more testicles?" contest. Chuck Norris won by 5. 
+%
+Chuck Norris was the fourth wise man, who gave baby Jesus the gift of beard, which he carried with him until he died. The other three wise men were enraged by the preference that Jesus showed to Chuck's gift, and arranged to have him written out of the bible. All three died soon after of mysterious roundhouse-kick related injuries. 
+%
+Chuck Norris sheds his skin twice a year. 
+%
+When Chuck Norris calls 1-900 numbers, he doesnt get charged. He holds up the phone and money falls out. 
+%
+Chuck Norris once ate a whole cake before his friends could tell him there was a stripper in it. 
+%
+Some people like to eat frogs' legs. Chuck Norris likes to eat lizard legs. Hence, snakes. 
+%
+There are no races, only countries of people Chuck Norris has beaten to different shades of black and blue. 
+%
+When Chuck Norris was denied an Egg McMuffin at McDonald's because it was 10:35, he roundhouse kicked the store so hard it became a Wendy's. 
+%
+Chuck Norris can't finish a "color by numbers" because his markers are filled with the blood of his victims. Unfortunately, all blood is dark red. 
+%
+A Chuck Norris-delivered Roundhouse Kick is the preferred method of execution in 16 states. 
+%
+When Chuck Norris falls in water, Chuck Norris doesn't get wet. Water gets Chuck Norris. 
+%
+Scientists have estimated that the energy given off during the Big Bang is roughly equal to 1CNRhK (Chuck Norris Roundhouse Kick) 
+%
+Chuck Norris' house has no doors, only walls that he walks through. 
+%
+When Chuck Norris has sex with a man, it won't be because he is gay. It will be because he has run out of women. 
+%
+How much wood would a woodchuck chuck if a woodchuck could Chuck Norris? ...All of it. 
+%
+Chuck Norris doesn't actually write books, the words assemble themselves out of fear. 
+%
+In honor of Chuck Norris, all McDonald's in Texas have an even larger size than the super-size. When ordering, just ask to be "Norrisized". 
+%
+Chuck Norris CAN believe it's not butter. 
+%
+If tapped, a Chuck Norris roundhouse kick could power the country of Australia for 44 minutes. 
+%
+Chuck Norris can divide by zero. 
+%
+The grass is always greener on the other side, unless Chuck Norris has been there. In that case the grass is most likely soaked in blood and tears. 
+%
+A picture is worth a thousand words. A Chuck Norris is worth 1 billion words. 
+%
+Newton's Third Law is wrong: Although it states that for each action, there is an equal and opposite reaction, there is no force equal in reaction to a Chuck Norris roundhouse kick. 
+%
+Chuck Norris invented his own type of karate. It's called Chuck-Will-Kill. 
+%
+When an episode of Walker Texas Ranger was aired in France, the French surrendered to Chuck Norris just to be on the safe side. 
+%
+While urinating, Chuck Norris is easily capable of welding titanium. 
+%
+Chuck Norris once sued the Houghton-Mifflin textbook company when it became apparent that their account of the war of 1812 was plagiarized from his autobiography. 
+%
+When Chuck Norris talks, everybody listens. And dies. 
+%
+When Steven Seagal kills a ninja, he only takes its hide. When Chuck Norris kills a ninja, he uses every part. 
+%
+Wilt Chamberlain claims to have slept with more than 20,000 women in his lifetime. Chuck Norris calls this "a slow Tuesday." 
+%
+Contrary to popular belief, there is indeed enough Chuck Norris to go around. 
+%
+Chuck Norris doesnt shave; he kicks himself in the face. The only thing that can cut Chuck Norris is Chuck Norris. 
+%
+For some, the left testicle is larger than the right one. For Chuck Norris, each testicle is larger than the other one. 
+%
+Chuck Norris always knows the EXACT location of Carmen SanDiego. 
+%
+When taking the SAT, write "Chuck Norris" for every answer. You will score over 8000. 
+%
+Chuck Norris invented black. In fact, he invented the entire spectrum of visible light. Except pink. Tom Cruise invented pink. 
+%
+When you're Chuck Norris, anything + anything is equal to 1. One roundhouse kick to the face. 
+%
+Chuck Norris has the greatest Poker-Face of all time. He won the 1983 World Series of Poker, despite holding only a Joker, a Get out of Jail Free Monopoloy card, a 2 of clubs, 7 of spades and a green #4 card from the game UNO. 
+%
+On his birthday, Chuck Norris randomly selects one lucky child to be thrown into the sun. 
+%
+Nobody doesn't like Sara Lee. Except Chuck Norris. 
+%
+Chuck Norris doesn't throw up if he drinks too much. Chuck Norris throws down! 
+%
+In the beginning there was nothing...then Chuck Norris Roundhouse kicked that nothing in the face and said "Get a job". That is the story of the universe. 
+%
+Chuck Norris has 12 moons. One of those moons is the Earth. 
+%
+Chuck Norris grinds his coffee with his teeth and boils the water with his own rage. 
+%
+Archeologists unearthed an old english dictionary dating back to the year 1236. It defined "victim" as "one who has encountered Chuck Norris" 
+%
+Chuck Norris ordered a Big Mac at Burger King, and got one. 
+%
+Chuck Norris and Mr. T walked into a bar. The bar was instantly destroyed, as that level of awesome cannot be contained in one building. 
+%
+If you Google search "Chuck Norris getting his ass kicked" you will generate zero results. It just doesn't happen. 
+%
+Chuck Norris can drink an entire gallon of milk in thirty-seven seconds. 
+%
+Little known medical fact: Chuck Norris invented the Caesarean section when he roundhouse-kicked his way out of his monther's womb. 
+%
+Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint. 
+The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage. 
+%
+It takes Chuck Norris 20 minutes to watch 60 Minutes. 
+%
+You know how they say if you die in your dream then you will die in real life? In actuality, if you dream of death then Chuck Norris will find you and kill you. 
+%
+Chuck Norris has a deep and abiding respect for human life... unless it gets in his way. 
+%
+The Bermuda Triangle used to be the Bermuda Square, until Chuck Norris Roundhouse kicked one of the corners off. 
+%
+There are no weapons of mass destruction in Iraq, Chuck Norris lives in Oklahoma. 
+%
+Chuck Norris doesn't believe in Germany. 
+%
+When Chuck Norris is in a crowded area, he doesn't walk around people. He walks through them. 
+%
+Chuck Norris once ate an entire bottle of sleeping pills. They made him blink. 
+%
+James Cameron wanted Chuck Norris to play the Terminator. However, upon reflection, he realized that would have turned his movie into a documentary, so he went with Arnold Schwarzenegger. 
+%
+Chuck Norris can touch MC Hammer. 
+%
+Thousands of years ago Chuck Norris came across a bear. It was so terrified that it fled north into the arctic. It was also so terrified that all of its decendents now have white hair. 
+%
+Chuck Norris played Russian Roulette with a fully loaded gun and won. 
+%
+It takes 14 puppeteers to make Chuck Norris smile, but only 2 to make him destroy an orphanage. 
+%
+Chuck Norris is responsible for China's over-population. He hosted a Karate tournament in Beijing and all women within 1,000 miles became pregnant instantly.
+%
+Some people wear Superman pajamas. Superman wears Chuck Norris pajamas. 
+%
+Chuck Norris once worked as a weatherman for the San Diego evening news. Every night he would make the same forecast: Partly cloudy with a 75% chance of Pain. 
+%
+Simply by pulling on both ends, Chuck Norris can stretch diamonds back into coal. 
+%
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down. 
+%
+Chuck Norris invented the bolt-action rifle, liquor, sexual intercourse, and football-- in that order. 
+%
+A high tide means Chuck Norris is flying over your coast. The tide is caused by God pissing his pants. 
+%
+Chuck Norris keeps his friends close and his enemies closer. Close enough to drop them with one round house kick to the face. 
+%
+There is in fact an "I" in Norris, but there is no "team"? not even close. 
+%
+Scotty in Star Trek often says "Ye cannae change the laws of physics." This is untrue. Chuck Norris can change the laws of physics. With his fists. 
+%
+An anagram for Walker Texas Ranger is KARATE WRANGLER SEX. I don't know what that is, but it sounds AWESOME. 
+%
+Chuck Norris doesn't stub his toes. He accidentally destroys chairs, bedframes, and sidewalks. 
+%
+Using his trademark roundhouse kick, Chuck Norris once made a fieldgoal in RJ Stadium in Tampa Bay from the 50 yard line of Qualcomm stadium in San Diego. 
+%
+Chuck Norris roundhouse kicks don't really kill people. They wipe out their entire existence from the space-time continuum. 
+%
+Chuck Norris does not own a stove, oven, or microwave , because revenge is a dish best served cold. 
+%
+Tom Clancy has to pay royalties to Chuck Norris because "The Sum of All Fears" is the name of Chuck Norris' autobiography. 
+%
+Chuck Norris can slam a revolving door. 
+%
+Chuck Norris is expected to win gold in every swimming competition at the 2008 Beijing Olympics, even though Chuck Norris does not swim. This is because when Chuck Norris enters the water, the water gets out of his way and Chuck Norris simply walks across the pool floor. 
+%
+Chuck Norris built a better mousetrap, but the world was too frightened to beat a path to his door. 
+%
+The original draft of The Lord of the Rings featured Chuck Norris instead of Frodo Baggins. It was only 5 pages long, as Chuck roundhouse-kicked Sauron's ass halfway through the first chapter. 
+%
+Hellen Keller's favorite color is Chuck Norris. 
+%
+Chuck Norris eats beef jerky and craps gunpowder. Then, he uses that gunpowder to make a bullet, which he uses to kill a cow and make more beef jerky. Some people refer to this as the "Circle of Life." 
+%
+If, by some incredible space-time paradox, Chuck Norris would ever fight himself, he'd win. Period. 
+%
+Chuck Norris is currently suing myspace for taking the name of what he calls everything around you. 
+%
+The crossing lights in Chuck Norris's home town say "Die slowly" and "die quickly". They each have a picture of Chuck Norris punching or kicking a pedestrian. 
+%
+Science Fact: Roundhouse kicks are comprised primarily of an element called Chucktanium. 
+%
+The Sherman tank was originaly called the Norris tank until Chuck Norris decided it wasn't tough enough to be associated with him. The Army, for fear of Chuck Norris, renamed the tank and promised to develop a weapon more fitting of his name. To date, no weapon created has been badass enough to be named after Chuck Norris. 
+%
+Chuck Norris proved that we are alone in the universe. We weren't before his first space expedition. 
+%
+Superman once watched an episode of Walker, Texas Ranger. He then cried himself to sleep. 
+%
+Chuck Norris doesn't step on toes. Chuck Norris steps on necks. 
+%
+The movie "Delta Force" was extremely hard to make because Chuck had to downplay his abilities. The first few cuts were completely unbelievable. 
+%
+Movie trivia: The movie "Invasion U.S.A." is, in fact, a documentary. 
+%
+Chuck Norris does not "style" his hair. It lays perfectly in place out of sheer terror. 
+%
+There is no such thing as global warming. Chuck Norris was cold, so he turned the sun up. 
+%
+A study showed the leading causes of death in the United States are: 
+1:Heart disease 
+2:Chuck Norris 
+3:Cancer
+%
+It's widely believed that Jesus was Chuck Norris' stunt double for crucifixion due to the fact that it is impossible for nails to pierce Chuck Norris' skin. 
+%
+Chuck Norris did in fact, build Rome in a day. 
+%
+Along with his black belt, Chuck Norris often chooses to wear brown shoes. No one has DARED call him on it. Ever. 
+%
+Anytime someone is elected president in the United States, they must ask permission from Chuck Norris to live in the White House. The reason for this is because Chuck Norris had won every Federal, State, and Local election since 1777. He just allows others to run the country in his place. 
+%
+Once you go Norris, you are physically unable to go back. 
+%
+Ninjas want to grow up to be just like Chuck Norris. But usually they grow up just to be killed by Chuck Norris. 
+%
+Chuck Norris once sued Burger King after they refused to put razor wire in his Whopper Jr, insisting that that actually is "his" way. 
+%
+The last thing you hear before Chuck Norris gives you a roundhouse kick? No one knows because dead men tell no tales. 
+%
+Chuck Norris doesn't play god. Playing is for children. 
+%
+As a teen, Chuck Norris had sex with every nun in a convent tucked away in the hills of Tuscany. Nine months later the nuns gave birth to the 1972 Miami Dolphins, the only undefeated and untied team in professional football history. 
+%
+Chuck Norris is the only person in the world that can actually email a roundhouse kick. 
+%
+Chuck Norris won super bowls VII and VIII singlehandedly before unexpectedly retiring to pursue a career in ass-kicking. 
+%
+Wo hu cang long. The translation from Mandarin Chinese reads: "Crouching Chuck, Hidden Norris" 
+%
+Chuck Norris can set ants on fire with a magnifying glass. At night. 
+%
+Some kids play Kick the can. Chuck Norris played Kick the keg. 
+%
+'Icy-Hot' is too weak for Chuck Norris. After a workout, Chuck Norris rubs his muscles down with liquid-hot MAGMA. 
+%
+Chuck Norris cannot love, he can only not kill. 
+%
+When Chuck Norris was a baby, he didn't suck his mother's breast. His mother served him whiskey, straight out of the bottle. 
+%
+According to Einstein's theory of relativity, Chuck Norris can actually roundhouse kick you yesterday. 
+%
+Chuck Norris once pulled out a single hair from his beard and skewered three men through the heart with it. 
+%
+In an act of great philanthropy, Chuck made a generous donation to the American Cancer Society. He donated 6,000 dead bodies for scientific research. 
+%
+Chuck Norris' favourite cut of meat is the roundhouse. 
+%
+When J. Robert Oppenheimer said "I am become death, the destroyer Of worlds", He was not referring to the atomic bomb. He was referring to the Chuck Norris halloween costume he was wearing. 
+%
+Chuck Norris recently had the idea to sell his urine as a canned beverage. We know this beverage as Red Bull. 
+%
+In a recent survey it was discovered the 94% of American women lost their virginity to Chuck Norris. The other 6% were incredibly fat or ugly. 
+%
+Chuck Norris invented a language that incorporates karate and roundhouse kicks. So next time Chuck Norris is kicking your ass, don't be offended or hurt, he may be just trying to tell you he likes your hat. 
+%
+If at first you don't succeed, you're not Chuck Norris. 
+If Chuck Norris were a calendar, every month would be named Chucktober, and every day he'd kick your ass. 
+%
+Fear is not the only emotion Chuck Norris can smell. He can also detect hope, as in "I hope I don't get a roundhouse kick from Chuck Norris." 
+Too late, asshole. 
+%
+Chuck Norris's show is called Walker: Texas Ranger, because Chuck Norris doesn't run. 
+%
+MacGyver can build an airplane out of gum and paper clips, but Chuck Norris can roundhouse-kick his head through a wall and take it. 
+%
+Behind every successful man, there is a woman. Behind every dead man, there is Chuck Norris. 
+%
+What's known as the UFC, or Ultimate Fighting Championship, doesn't use its full name, which happens to be "Ultimate Fighting Championship, Non-Chuck-Norris-Division". 
+%
+Chuck Norris brushes his teeth with a mixture of iron shavings, industrial paint remover, and wood-grain alcohol. 
+%
+The easiest way to determine Chuck Norris' age is to cut him in half and count the rings. 
+%
+There is endless debate about the existence of the human soul. Well it does exist, and Chuck Norris finds it delicious. 
+%
+Most boots are made for walkin'. Chuck Norris' boots ain't that merciful. 
+%
+The US did not boycott the 1980 Summer Olympics in Moscow due to political reasons: Chuck Norris killed the entire US team with a single round-house kick during TaeKwonDo practice. 
+%
+Chuck Norris wears a live rattlesnake as a condom. 
+%
+When the movie Pulp Fiction was filmed they had to borrow Chuck Norris's wallet... It's the one that says "Bad Mother Fucker" on it 
+%
+The Bible was originally titled "Chuck Norris and Friends" 
+%
+Chuck Norris began selling the Total Gym as an ill-fated attempt to make his day-to-day opponents less laughably pathetic. 
+%
+Do you know why Baskin Robbins only has 31 flavors? Because Chuck Norris doesn't like Fudge Ripple. 
+%
+When Chuck Norris says "More cowbell", he fucking MEANS it. 
+%
+On the set of Walker Texas Ranger Chuck Norris brought a dying lamb back to life by nuzzling it with his beard. As the onlookers gathered, the lamb sprang to life. Chuck Norris then roundhouse kicked it, killing it instantly. This was just to prove that the good Chuck giveth, and the good Chuck, he taketh away. 
+%
+Chuck Norris was what Willis was talkin' about. 
+%
+Google won't search for Chuck Norris because it knows you don't find Chuck Norris, he finds you. 
+%
+Chuck Norris can lead a horse to water AND make it drink. 
+%
+Nagasaki never had a bomb dropped on it. Chuck Norris jumped out of a plane and punched the ground. 
+%
+It is scientifically impossible for Chuck Norris to have had a mortal father. The most popular theory is that he went back in time and fathered himself. 
+%
+Chuck Norris destroyed the periodic table, because Chuck Norris only recognizes the element of surprise. 
+%
+It is believed dinosaurs are extinct due to a giant meteor. That's true if you want to call Chuck Norris a giant meteor. 
+%
+Chuck Norris shot the sheriff, but he round house kicked the deputy. 
+%
+That's not Chuck Norris doing push-ups -- that's Chuck Norris moving the Earth away from the path of a deadly asteroid. 
+%
+Chuck Norris can judge a book by its cover. 
+%
+Nothing can escape the gravity of a black hole, except for Chuck Norris. Chuck Norris eats black holes. They taste like chicken. 
+%
+Chuck Norris does not play the lottery. It doesn't have nearly enough balls. 
+%
+Q: How many Chuck Norris' does it take to change a light bulb?
+A: None, Chuck Norris prefers to kill in the dark. 
+%
+As President Roosevelt said: "We have nothing to fear but fear itself. And Chuck Norris." 
+%
+Chuck Norris just says "no" to drugs. If he said "yes", it would collapse Colombia's infrastructure. 
+%
+Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.� 
+%
+Crime does not pay - unless you are an undertaker following Walker, Texas Ranger, on a routine patrol. 
+%
+Chuck Norris invented the internet? just so he had a place to store his porn. 
+%
+Chuck Norris does not own a house. He walks into random houses and people move. 
+%
+It is better to give than to receive. This is especially true of a Chuck Norris roundhouse kick. 
+%
+Chuck Norris is the only person to ever win a staring contest against Ray Charles and Stevie Wonder at the same time. 
+%
+Industrial logging isn't the cause of deforestation. Chuck Norris needs toothpicks. 
+%
+Chuck Norris smells what the Rock is cooking... because the Rock is Chuck Norris' personal chef. 
+%
+When Chuck Norris plays Oregon Trail, his family does not die from cholera or dysentery, but rather, roundhouse kicks to the face. He also requires no wagon, since he carries the oxen, axels, and buffalo meat on his back. He always makes it to Oregon before you. 
+%
+Chuck Norris is the reason why Waldo is hiding. 
+%
+"Brokeback Mountain" is not just a movie. It's also what Chuck Norris calls the pile of dead ninjas in his front yard. 
+%
+When God said, "let there be light", Chuck Norris said, "say 'please'." 
+%
+Chuck Norris does not eat. Food understands that the only safe haven from Chuck Norris' fists is inside his own body. 
+%
+One day Chuck Norris walked down the street with a massive erection. There were no survivors. 
+%
+Chuck Norris built a time machine and went back in time to stop the JFK assassination. As Oswald shot, Chuck met all three bullets with his beard, deflecting them. JFK's head exploded out of sheer amazement. 
+%
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants. 
+%
+Chuck Norris uses a night light. Not because Chuck Norris is afraid of the dark, but the dark is afraid of Chuck Norris. 
+%
+Chuck Norris is not capable of hitting a target on the broad side of a barn. Every time he tries, the whole damn barn falls down. 
+%
+Before each filming of Walker: Texas Ranger, Chuck Norris is injected with fourteen times the lethal dose of elephant tranquilzer. This is, of course, to limit his strength and mobility, in an attempt to lower the fatality rate of the actors he fights. 
+%
+When Bruce Banner gets mad, he turns into the Hulk. When the Hulk gets mad, he turns into Chuck Norris. 
+%
+Chuck Norris kills anyone that asks, "You want fries with that" because by now everyone should know that Chuck doesn't ever want fries with anything. Ever. 
+%
+Chuck Norris once kicked a horse in the chin. Its decendants are known today as Giraffes. 
+%
+Sticks and stones may break your bones, but a Chuck Norris glare will liquefy your kidneys. 
+%
+Human cloning is outlawed because if Chuck Norris were cloned, then it would be possible for a Chuck Norris roundhouse kick to meet another chuck Norris roundhouse kick. Physicists theorize that this contact would end the universe. 
+%
+Chuck Norris once went skydiving, but promised never to do it again. One Grand Canyon is enough. 
+%
+Chuck Norris's version of a "chocolate milkshake" is a raw porterhouse wrapped around ten Hershey bars, and doused in diesel fuel. 
+%
+If Chuck Norris round-house kicks you, you will die. If Chuck Norris' misses you with the round-house kick, the wind behind the kick will tear out your pancreas. 
+%
+In a fight between Batman and Darth Vader, the winner would be Chuck Norris. 
+%
+Chuck Norris puts his pants on one leg at a time, just like the rest of us. The only difference is, then he fucking kills people. 
+%
+Everybody loves Raymond. Except Chuck Norris. 
+%
+Contrary to popular belief, the Titanic didn't hit an iceberg. The ship was off course and accidentally ran into Chuck Norris while he was doing the backstroke across the Atlantic. 
+%
+Chuck Norris got his drivers license at the age of 16. Seconds. 
+%
+The original title for Alien vs. Predator was Alien and Predator vs Chuck Norris. The film was cancelled shortly after going into preproduction. No one would pay nine dollars to see a movie fourteen seconds long. 
+%
+Chuck Norris' sperm is so badass, he had sex with Nicole Kidman, and 7 months later she prematurely gave birth to a Ford Excursion. 
+%
+Chuck Norris can win at solitaire with only 18 cards. 
+%
+Chuck Norris once shat blood - the blood of 11,940 natives he had killed and eaten. 
+%
+Maslow's theory of higher needs does not apply to Chuck Norris. He only has two needs: killing people and finding people to kill. 
+%
+The truth will set you free. Unless Chuck Norris has you, in which case, forget it buddy! 
+%
+For most people, home is where the heart is. For Chuck Norris, home is where he stores his collection of human skulls. 
+%
+Kryptonite has been found to contain trace elements of Chuck Norris roundhouse kicks to the face. This is why it is so deadly to Superman. 
+%
+Saddam Hussein was not found hiding in a "hole." Saddam was roundhouse-kicked in the head by Chuck Norris in Kansas, which sent him through the earth, stopping just short of the surface of Iraq. 
+%
+Coroners refer to dead people as "ABC's". Already Been Chucked. 
+%
+Chuck Norris doesn't look both ways before he crosses the street... he just roundhouses any cars that get too close. 
+%
+Chuck Norris does not have to answer the phone. His beard picks up the incoming electrical impulses and translates them into audible sound. 
+%
+How many roundhouse kicks does it take to get to the center of a tootsie pop? Just one. From Chuck Norris. 
+%
+Chuck Norris doesnt wear a watch, HE decides what time it is. 
+%
+The phrase 'break a leg' was originally coined by Chuck Norris's co-stars in Walker, Texas Ranger as a good luck charm, indicating that a broken leg might be the worst extent of their injuries. This never proved to be the case. 
+%
+When chuck Norris does division, there are no remainders. 
+%
+If you rearrange the letters in "Chuck Norris", they also spell "Crush Rock In". The words "with his fists" are understood. 
+%
+Never look a gift Chuck Norris in the mouth, because he will bite your damn eyes off. 
+%
+Give a man a fish, and you will feed him for a day. Give a man anything that is better than a fish, and Chuck Norris will beat his ass and take it. 
+%
+Chuck Norris used to play baseball. When Babe Ruth was hailed as the better player, Chuck Norris killed him with a baseball bat to the throat. Lou Gehrig got off easy. 
+%
+The original title for Star Wars was "Skywalker: Texas Ranger". Starring Chuck Norris. 
+%
+Guantuanamo Bay, Cuba, is the military code-word for "Chuck Norris' basement". 
+%
+The phrase 'balls to the wall' was originally conceived to describe Chuck Norris entering any building smaller than an aircraft hangar. 
+%
+Chuck Norris' roundhouse kick is so powerful, it can be seen from outer space by the naked eye. 
+%
+Ozzy Osbourne bites the heads off of bats. Chuck Norris bites the heads off of Siberian Tigers. 
+%
+He who lives by the sword, dies by the sword. He who lives by Chuck Norris, dies by the roundhouse kick. 
+%
+The best-laid plans of mice and men often go awry. Even the worst-laid plans of Chuck Norris come off without a hitch. 
+%
+The phrase 'dead ringer' refers to someone who sits behind Chuck Norris in a movie theater and forgets to turn their cell phone off. 
+%
+Chuck Norris' Roundhouse kick is so powerful, that on the set of Sidekicks he single-footedly destroyed Jonathan Brandis' Career. 
+%
+Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face. 
+%
+Chuck Norris can taste lies. 
+%
+Chuck Norris does not kick ass and take names. In fact, Chuck Norris kicks ass and assigns the corpse a number. It is currently recorded to be in the billions. 
+%
+One time, Chuck Norris accidentally stubbed his toe. It destroyed the entire state of Ohio. 
+%
+Little Miss Muffet sat on her tuffet, until Chuck Norris roundhouse kicked her into a glacier. 
+%
+In 1990, Chuck Norris founded the non-profit organization "Kick Drugs Out of America". If the organization's name were "Roundhouse Kick Drugs out of America", there wouldn't be any drugs in the Western Hemisphere. Anywhere. 
+%
+Chuck Norris can blow bubbles with beef jerky. 
+%
+They had to edit the first ending of 'Lone Wolf McQuade' after Chuck Norris kicked David Carradine's ass, then proceeded to barbecue and eat him. 
+%
+Chuck Norris does, in fact, live in a round house. 
+%
+Chuck Norris was once on Jeopardy. This show is notable in that it was the first occasion in Jeopardy history that Alex Trebek had appeared without a mustache. And a head. 
+%
+When Chuck Norris works out on the Total Gym, the Total Gym feels like it's been raped. 
+%
+4 out of 5 doctors fail to recommend Chuck Norris as a solution to most problems. Also, 80% of doctors die unexplained, needlessly brutal deaths. 
+%
+Chuck Norris can skeletize a cow in two minutes. 
+%
+The only sure things are Death and Taxes?and when Chuck Norris goes to work for the IRS, they'll be the same thing.
+Chuck Norris' first job was as a paperboy. There were no survivors. 
+%
+With the rising cost of gasoline, Chuck Norris is beginning to worry about his drinking habit. 
+%
+The square root of Chuck Norris is pain. Do not try to square Chuck Norris, the result is death. 
+%
+Chuck Norris' testicles do not produce sperm. They produce tiny white ninjas that recognize only one mission: seek and destroy. 
+%
+To be or not to be? That is the question. The answer? Chuck Norris. 
+%
+Chuck Norris has never been in a fight, ever. Do you call one roundhouse kick to the face a fight? 
+%
+There are two types of people in the world... people that suck, and Chuck Norris. 
+%
+Chuck Norris never wet his bed as a child. The bed wet itself out of fear. 
+%
+If you were somehow able to land a punch on Chuck Norris your entire arm would shatter upon impact. This is only in theory, since, come on, who in their right mind would try this? 
+%
+70% of a human's weight is water. 70% of Chuck Norris' weight is his dick. 
+%
+Jean-Claude Van Damme once kicked Chuck Norris' ass. He was then awakened from his dream by a roundhouse kick to the face. 
+%
+The pie scene in "American Pie" is based on a dare Chuck Norris took when he was younger. However, in Chuck Norris' case, the "pie" was the molten crater of an active volcano. 
+%
+Chuck Norris uses 8'x10' sheets of plywood as toilet paper. 
+%
+Noah was the only man notified before Chuck Norris relieved himself in the Atlantic Ocean. 
+%
+Chuck Norris once invited all of the other badasses from TV to duke it out in order to see who was the supreme badass. Only two showed up-- Jack Bauer and MacGyver. 
+%
+
+%
+MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart. 
+%
+Jack Bauer tried to use his detailed knowledge of torture techniques, but to no avail: Chuck Norris thrives on pain. Chuck Norris then ripped off Jack Bauer's arm and beat him to death with it. Game, set, match. 
+%
+Chuck Norris eats steak for every single meal. Most times he forgets to kill the cow. 
+%
+The First Law of Thermodynamics states that energy can neither be created nor destroyed... unless it meets Chuck Norris. 
+%
+Chuck Norris doesn't go on the internet, he has every internet site stored in his memory. He refreshes webpages by blinking. 
+%
+Fact: Chuck Norris doesn't consider it sex if the woman survives. 
+%
+It is said that looking into Chuck Norris' eyes will reveal your future. Unfortunately, everybody's future is always the same: death by a roundhouse-kick to the face. 
+%
+Chuck Norris knows everything there is to know - Except for the definition of mercy. 
+%
+Scientifically speaking, it is impossible to charge Chuck Norris with "obstruction of justice." This is because even Chuck Norris cannot be in two places at the same time. 
+%
+Chuck Norris never has to wax his skis because they're always slick with blood. 
+%
+When you say "no one's perfect", Chuck Norris takes this as a personal insult. 
+%
+Chuck Norris can win a game of Trivial Pursuit with one roll of the dice, and without answering a single question... just a nod of the head, and a stroke of the beard. 
+%
+182,000 Americans die from Chuck Norris-related accidents every year. 
+%
+Paper beats rock, rock beats scissors, and scissors beats paper, but Chuck Norris beats all 3 at the same time. 
+%
+Jesus can walk on water, but Chuck Norris can walk on Jesus. 
+%
+All roads lead to Chuck Norris. And by the transitive property, a roundhouse kick to the face. 
+%
+If you're driving down the road and you think Chuck Norris just cut you off, you better thank your lucky stars it wasn't the other way around. 
+%
+July 4th is Independence day. And the day Chuck Norris was born. Coincidence? i think not. 
+%
+Chuck Norris never goes to the dentist because his teeth are unbreakable. His enemies never go to the dentist because they have no teeth. 
+%
+In the medical community, death is referred to as "Chuck Norris Disease" 
+%
+Chuck Norris was once in a knife fight, and the knife lost. 
+%
+If you work in an office with Chuck Norris, don't ask him for his three-hole-punch. 
+%
+In the Words of Julius Caesar, "Veni, Vidi, Vici, Chuck Norris". Translation: I came, I saw, and I was roundhouse-kicked inthe face by Chuck Norris. 
+%
+The First rule of Chuck Norris is: you do not talk about Chuck Norris. 
+%
+Chuck Norris is widely predicted to be first black president. If you're thinking to yourself, "But Chuck Norris isn't black", then you are dead wrong. And stop being a racist. 
+%
+When Chuck Norris plays Monopoly, it affects the actual world economy. 
+%
+Chuck Norris can be unlocked on the hardest level of Tekken. But only Chuck Norris is skilled enough to unlock himself. Then he roundhouse kicks the Playstation back to Japan. 
+%
+Chuck Norris drinks napalm to quell his heartburn. 
+%
+Every time someone uses the word "intense", Chuck Norris always replies "you know what else is intense?" followed by a roundhouse kick to the face. 
+%
+As an infant, Chuck Norris' parents gave him a toy hammer. He gave the world Stonehenge. 
+%
+Chuck Norris once ordered a steak in a restaurant. The steak did what it was told. 
+%
+Most people fear the Reaper. Chuck Norris considers him "a promising Rookie". 
+%
+There are only two things that can cut diamonds: other diamonds, and Chuck Norris. 
+%
+President Roosevelt once rode his horse 100 miles. Chuck Norris carried his the same distance in half the time. 
+%
+Chuck Norris once ate four 30lb bowling balls without chewing. 
+%
+What many people dont know is chuck norris is the founder of planned parenthood. Not even unborn children can escape his wrath. 
+%
+Chuck Norris was banned from competitive bullriding after a 1992 exhibition in San Antonio, when he rode the bull 1,346 miles from Texas to Milwaukee Wisconsin to pick up his dry cleaning. 
+%
+Chuck Norris qualified with a top speed of 324 mph at the Daytona 500, without a car. 
+%
+Chuck Norris likes his coffee half and half: half coffee grounds, half wood-grain alcohol. 
+%
+Chuck Norris uses tabasco sauce instead of visine. 
+%
+The chemical formula for the highly toxic cyanide ion is CN-. These are also Chuck Norris' initials. This is not a coincidence. 
+%
+Chuck Norris' credit cards have no limit. Last weekend, he maxed them out. 
+%
+Think of a hot woman. Chuck Norris did her. 
+%
+A man once claimed Chuck Norris kicked his ass twice, but it was promptly dismissed as false - no one could survive it the first time. 
+%
+Chuck Norris sleeps with a pillow under his gun. 
+%
+Chuck Norris owns a chain of fast-food restaurants throughout the southwest. They serve nothing but barbecue-flavored ice cream and Hot Pockets. 
+%
+Chuck Norris doesn't chew gum. Chuck Norris chews tin foil. 
+%
+Aliens DO indeed exist. They just know better than to visit a planet that Chuck Norris is on. 
+%
+When in a bar, you can order a drink called a "Chuck Norris". It is also known as a "Bloody Mary", if your name happens to be Mary. 
+%
+Every time Chuck Norris smiles, someone dies. Unless he smiles while he's roundhouse kicking someone in the face. Then two people die. 
+%
+Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag. 
+%
+There's an order to the universe: space, time, Chuck Norris.... Just kidding, Chuck Norris is first. 
+%
+A man once asked Chuck Norris if his real name is "Charles". Chuck Norris did not respond, he simply stared at him until he exploded. 
+%
+Chuck Norris starts everyday with a protein shake made from Carnation Instant Breakfast, one dozen eggs, pure Colombian cocaine, and rattlesnake venom. He injects it directly into his neck with a syringe. 
+%
+In a tagteam match, Chuck Norris was teamed with Hulk Hogan against King Kong Bundy and Andre The Giant. He pinned all 3 at the same time. 
+%
+Chuck Norris doesn't see dead people. He makes people dead. 
+%
+Chuck Norris is the only person who can simultaneously hold and fire FIVE Uzis: One in each hand, one in each foot -- and the 5th one he roundhouse-kicks into the air, so that it sprays bullets. 
+%
+For undercover police work, Chuck Norris pins his badge underneath his shirt, directly into his chest. 
+%
+In the X-Men movies, none of the X-Men super-powers are done with special effects. Chuck Norris is the stuntman for every character. 
+%
+We live in an expanding universe. All of it is trying to get away from Chuck Norris. 
+%
+Chuck Norris went looking for a bar but couldn't find one. He walked to a vacant lot and sat there. Sure enough within an hour an a half someone constructed a bar around him. He then ordered a shot, drank it, and then burned the place to the ground. Chuck Norris yelled over the roar of the flames, "always leave things the way you found em!" 
+%
+It is said that every time you masturbate, God kills a kitten. Every time God masturbates, Chuck Norris kills a lion. 
+%
+The word 'Kill' was invented by Chuck Norris. Other words were 'Die', 'Beer', and 'What'. 
+%
+Chuck Norris is a vegetarian. Meaning, he does not eat animals until first he puts them into vegetative state with his fists. 
+%
+The 11th commandment is "Thou shalt not piss off Chuck Norris" This commandment is rarely enforced, as it is impossible to accomplish. 
+%
+Chuck Norris is his own line at the DMV. 
+%
+Two wrongs don't make a right. Unless you're Chuck Norris. Then two wrongs make a roundhouse kick to the face. 
+%
+Who let the dogs out? Chuck Norris let the dogs out... and then roundhouse kicked them through an Oldsmobile. 
+%
+Chuck Norris can do a roundhouse kick faster than the speed of light. This means that if you turn on a light switch, you will be dead before the lightbulb turns on. 
+%
+When Chuck Norris goes to out to eat, he orders a whole chicken, but he only eats its soul. 
+%
+Chuck Norris sold his soul to the devil for his rugged good looks and unparalleled martial arts ability. Shortly after the transaction was finalized, Chuck roundhouse-kicked the devil in the face and took his soul back. The devil, who appreciates irony, couldn't stay mad and admitted he should have seen it coming. They now play poker every second Wednesday of the month. 
+%
+Chuck Norris has never won an Academy Award for acting... because he's not acting. 
+%
+If Chuck Norris wants your opinion, he'll beat it into you. 
+%
+Not everyone that Chuck Norris is mad at gets killed. Some get away. They are called astronauts. 
+%
+Chuck Norris has to register every part of his body as a separate lethal weapon. His spleen is considered a concealed weapon in over 50 states. 
+%
+A movie scene depicting Chuck Norris losing a fight with Bruce Lee was the product of history's most expensive visual effect. When adjusted for inflation, the effect cost more than the Gross National Product of Paraguay. 
+%
+Godzilla is a Japanese rendition of Chuck Norris' first visit to Tokyo. 
+%
+They once made a Chuck Norris toilet paper, but there was a problem-- It wouldn't take shit from anybody. 
+%
+Chuck Norris once rode a nine foot grizzly bear through an automatic car wash, instead of taking a shower. 
+%
+"Sweating bullets" is literally what happens when Chuck Norris gets too hot. 
+%
+Chuck Norris' sperm can be seen with the naked eye. Each one is the size of a quarter. 
+%
+After taking a steroids test doctors informed Chuck Norris that he had tested positive. He laughed upon receiving this information, and said "of course my urine tested positive, what do you think they make steroids from?" 
+%
+Chuck Norris doesn't daydream. He's too busy giving other people nightmares. 
+%
+When Arnold says the line "I'll be back" in the first Terminator movie it is implied that is he going to ask Chuck Norris for help. 
+%
+There are no such things as tornados. Chuck Norris just hates trailer parks. 
+%
+Chuck Norris' Penis is a third degree blackbelt, and an honorable 32nd-degree mason. 
+%
+Chuck Norris does not follow fashion trends, they follow him. But then he turns around and kicks their ass. Nobody follows Chuck Norris. 
+%
+The phrase 'break a leg' was originally coined by Chuck Norris's co-stars in Walker, Texas Ranger as a good luck charm indicating that a broken leg might be the worst extent of their injuries. This never proved to be the case. 
+%
+Chuck Norris' roundhouse kick is so powerful, it can be seen from outer space by the naked eye. 
+%
+Diamonds are not, despite popular belief, carbon. They are, in fact, Chuck Norris fecal matter. This was proven a recently, when scientific analysis revealed what appeared to be Jean-Claude Van Damme bone fragments inside the Hope Diamond. 
+%
+Chuck Norris once participated in the running of the bulls. He walked. 
+%
+The Drummer for Def Leppard's only got one arm. Chuck Norris needed a back scratcher. 
+%
+Chuck Norris was the orginal sculptor of Mount Rushmore. He completed the entire project using only a bottle opener and a drywall trowel.
+%
+Chuck Norris once rode a bull, and nine months later it had a calf. 
+%
+Chuck Norris once lost the remote, but maintained control of the TV by yelling at it in between bites of his "Filet of Child" sandwich. 
+%
+For Spring Break '05, Chuck Norris drove to Madagascar, riding a chariot pulled by two electric eels. 
+%
+The Manhattan Project was not intended to create nuclear weapons, it was meant to recreate the destructive power in a Chuck Norris Roundhouse Kick. They didn't even come close. 
+%
+Chuck Norris has banned rainbows from the state of North Dakota. 
+%
+Divide Chuck Norris by zero and you will in fact get one........one bad-ass motherfucker that is. 
+%
+TNT was originally developed by Chuck Norris to cure indigestion. 
+%
+After returning from World War 2 unscathed, Bob Dole was congratulated by Chuck Norris with a handshake. The rest is history. 
+%
+Chuck Norris runs on batteries. Specifically, Die Hards. 
+%
+"Let the Bodies Hit the Floor" was originally written as Chuck Norris' theme song. 
+%
+Chuck Norris will never have a heart attack. His heart isn't nearly foolish enough to attack him. 
+%
+Only Chuck Norris can prevent forest fires. 
+%
+When Chuck Norris makes a burrito, its main ingredient is real toes. 
+%
+Chuck Norris is not Irish. His hair is soaked in the blood of his victims. 
+%
+In the movie "The Matrix", Chuck Norris is the Matrix. If you pay close attention in the green "falling code" scenes, you can make out the faint texture of his beard. 
+%
+Chuck Norris' dick is so big, it has it's own dick, and that dick is still bigger than yours. 
+%
+They say curiosity killed the cat. This is false. Chuck Norris killed the cat. Every single one of them. 
+%
+There is no such thing as a lesbian, just a woman who has never met Chuck Norris. 
+%
+Chuck Norris crossed the road. No one has ever dared question his motives. 
+%
+When Chuck Norris was born, he immediately had sex with the first nurse he saw. He was her first. She was his third. That afternoon. 
+%
+One time, at band camp, Chuck Norris ate a percussionist. 
+%
+Chuck Norris doesn't say "who's your daddy", because he knows the answer. 
+%
+Chuck Norris originally wrote the first dictionary. The definition for each word is as follows - A swift roundhouse kick to the face. 
+%
+Love does not hurt. Chuck Norris does. 
+%
+The term "Cleveland Steamer" got its name from Chuck Norris, when he took a dump while visiting the Rock and Roll Hall of fame and buried northern Ohio under a glacier of fecal matter. 
+%
+Chuck Norris once round-house kicked a salesman. Over the phone. 
+%
+The pen is mighter than the sword, but only if the pen is held by Chuck Norris. 
+%
+Chuck Norris doesn't kill two birds with one stone. Chuck Norris kills all birds, with two stones. The ones in his pants. 
+%
+Chuck Norris knows the last digit of pi. 
+%
+Those aren't credits that roll after Walker Texas Ranger. It is actually a list of fatalities that occurred during the making of the episode. 
+%
+The air around Chuck Norris is always a balmy 78 degrees. 
+%
+When Chuck Norris wants an egg, he cracks open a chicken. 
+%
+Chuck Norris plays racquetball with a waffle iron and a bowling ball. 
+%
+According to the Bible, God created the universe in six days. Before that, Chuck Norris created God by snapping his fingers. 
+%
+Chuck Norris doesn't believe in ravioli. He stuffs a live turtle with beef and smothers it in pig's blood. 
+%
+Count from one to ten. That's how long it would take Chuck Norris to kill you...Fourty seven times. 
+%
+The 1972 Miami Dolphins lost one game, it was an exhibition game vs. Chuck Norris and three seven year old girls. Chuck Norris won with a roundhouse-kick to the face in overtime. 
+%
+Chuck Norris is not Politically Correct. He is just Correct. Always. 
+%
+Mr. T pities the fool. Chuck Norris rips the fool's fucking head off. 
+%
+Chuck Norris had to stop washing his clothes in the ocean. The tsunamis were killing people. 
+%
+Chuck Norris has volunteered to remain on earth after the Rapture; he will spend his time fighting the Anti-Christ. 
+%
+They were going to release a Chuck Norris edition of Clue, but the answer always turns out to be "Chuck Norris. In The Library. With a Roundhouse Kick." 
+%
+Chuck Norris is the only known mammal in history to have an opposable thumb. On his penis. 
+%
+A man once taunted Chuck Norris with a bag of Lay's potato chips, saying "Betcha can't eat just one!" Chuck Norris proceeded to eat the chips, the bag, and the man in one deft move. 
+%
+Chuck Norris' favorite cereal is Kellogg's Nails 'N' Gravel. 
+%
+In the first Jurassic Park movie, the Tyrannosaurus Rex wasn't chasing the jeep. Chuck Norris was chasing the Tyrannosaurus AND the jeep. 
+%
+Chuck Norris has never been accused of murder for the simple fact that his roundhouse kicks are recognized world-wide as "acts of God." 
+%
+"Brokeback Mountain" is not just a movie. It's also what Chuck Norris calls the pile of dead ninjas in his front yard. 
+%
+Chuck Norris does not wear a condom. Because there is no such thing as protection from Chuck Norris.
+%
+Chuck Norris once had sex with a cigarette machine in the Osaka airport. 
+%
+Rules of fighting: 1) Don't bring a knife to a gun fight. 2) Don't bring a gun to a Chuck Norris fight. 
+%
+Chuck Norris is the only man who has, literally, beaten the odds. With his fists. 
+%
+In ancient China there is a legend that one day a child will be born from a dragon, grow to be a man, and vanquish evil from the land. That man is not Chuck Norris, because Chuck Norris killed that man. 
+%
+Chuck Norris wipes his ass with chain mail and sandpaper. 
+%
+When you play Monopoly with Chuck Norris, you do not pass go, and you do not collect two hundred dollars. You will be lucky if you make it out alive. 
+%
+Chuck Norris describes human beings as "a sociable holder for blood and guts". 
+%
+Chuck Norris once got into a fight with a one-armed Ninja. Seeing that he had an unfair advantage, Chuck Norris ripped both of his arms off and one of his legs. He then roundhouse-kicked the ninja in the head, killing him instantly, and proceeded to sow his limbs back on using only a rusty tent spike and bailing wire. 
+%
+Chuck Norris likes his ice like he likes his skulls: crushed. 
+%
+Chuck Norris can kick through all 6 degrees of separation, hitting anyone, anywhere, in the face, at any time. 
+%
+Most tough men eat nails for breakfast. chuck Norris does all of his grocery shopping at Home Depot. 
+%
+Chuck Norris did not "lose" his virginity, he stalked it and then destroyed it with extreme prejudice. 
+%
+Everything King Midas touches turnes to gold. Everything Chuck Norris touches turns up dead. 
+%
+Chuck Norris' pulse is measured on the richter scale. 
+%
+Most people know that Descarte said, "I think, therefore I am." What most people don't know is that that quote continues, "...afraid of Chuck Norris." 
+%
+Chuck Norris once roundhouse-kicked a ten dollar bill into 200 nickels. 
+%
+For every movie about Vietnam starring Chuck Norris, the historical duration of the war decreases. Just 3 more "Missing in Action" sequels, and that war will have never actually existed. 
+%
+Chuck Norris' penis has a Hemi. 
+%
+Chuck Norris enjoys a good practical joke. His favorite is where he removes your lower intestine and pretends to make a balloon animal out of it. Then he cracks your skull open with a Volvo for not complimenting him on his balloon animal. 
+%
+Chuck Norris CAN in fact 'raise the roof'. And he can do it with one hand. 
+%
+Kenny G is allowed to live because Chuck Norris doesn't kill women. 
+%
+Life is not, in fact, like a box of chocolates. It is more like a box of Chuck Norris, roundhouse kicking you in the face. And if you receive a box of Chuck Norris, you ALWAYS know what you are going to get. 
+%
+For Chuck Norris, every street is "one way". HIS WAY. 
+%
+There are now five cup sizes at Starbucks: Short, Tall, Grande, Venti, and Chuck Norris. 
+%
+During the Vietnam War, Chuck Norris allowed himself to be captured. For torture, they made him eat his own entrails. He asked for seconds. 
+%
+Chuck Norris once created a flamethrower by urinating into a lighter. 
+%
+Instead of having a cigarette after sex, Chuck Norris heads outside and brands his cattle. 
+%
+Chuck Norris actually built the stairway to heaven. 
+%
+Whoever said "only the good die young" was probably in Chuck Norris's kindergarten class. 
+%
+Chuck Norris once skewered a man with the Eiffel tower. 
+%
+The best part of waking up, is not Folgers in your cup, but knowing that Chuck Norris didn't kill you in your sleep. 
+%
+Chuck Norris doesn't own a can opener, he just chews through the can. 
+%
+Occam's Razor says that the simplest answer tends to be the correct one. Norris' Razor involves a flick of the wrist and a Columbian Necktie. 
+%
+Chuck Norris needs a monkeywrench and a blowtorch to masturbate. 
+%
+Proponents of higher-order theories of consciousness argue that consciousness is explained by the relation between two levels of mental states in which a higher-order mental state takes another mental state. If you mention this to Chuck Norris, expect an explosive roundhouse kick to the face for spouting too much fancy-talk. 
+%
+Chuck Norris invented all 32 letters of the alphabet. 
+%
+Remember The Ultimate Warrior? He quit wrestling because Chuck Norris wanted his nickname back. 
+%
+If a tree falls in the forest, does anybody hear? Yes. Chuck Norris hears it. Chuck Norris can hear everything. Chuck Norris can hear the shrieking terror in your soul. 
+%
+Chuck Norris actually owns IBM. It was an extremely hostile takeover. 
+%
+He, who laughs last, laughs best. He who laughs at Chuck Norris ? dies. 
+%
+Chuck Norris is like a dog, not only because he can smell fear, but because he can piss on whatever the fuck he wants. 
+%
+Chuck Norris can jump-start a car using jumper cables attached to his nipples. 
+%
+Chuck Norris neither melts in your mouth nor in your hand. He shreds your trachea before ravaging your soul with a combination of chocolate, whickey, roundhouse kicks and death. Oh, and pain. Lots of pain. 
+%
+Chuck Norris doesn't have blood. He is filled with magma. 
+%

From fc606d91a0cc8f58c69af39544ddefcb2bdccc55 Mon Sep 17 00:00:00 2001
From: Deepu Mohan Puthrote <github@deepumohan.com>
Date: Sat, 7 Feb 2015 16:57:53 +0000
Subject: [PATCH 0946/1378] Added alias for downloading maven dependencies'
 sources and javadocs

---
 plugins/mvn/mvn.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 0c4f77162..865b15235 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -60,6 +60,8 @@ alias mvntc='mvn tomcat:run'
 alias mvnjetty='mvn jetty:run'
 alias mvndt='mvn dependency:tree'
 alias mvns='mvn site'
+alias mvnsrc='mvn dependency:sources'
+alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 
 function listMavenCompletions { 
      reply=(

From 6bccb1a7b0448610d10518e3ac9f47315e94e7b9 Mon Sep 17 00:00:00 2001
From: Jakob Jordan <j.jordan@fz-juelich.de>
Date: Mon, 9 Feb 2015 18:18:15 +0100
Subject: [PATCH 0947/1378] removed superfluous vcs_info_msg in trapd00r theme

in the trapd00r theme vcs info is already displayed on the first line if in a version controlled directory. the second vcs info was displayed at the end of the second line without providing additional information. this was removed.
---
 themes/trapd00r.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index cb1c43c56..ca1676fb5 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -86,7 +86,7 @@ prompt_jnrowe_precmd () {
   else
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='${vcs_info_msg_0_}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
 > '
 fi
 }

From 7f636ba5901b1abe9bb01d94b9e290bed982a873 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@financialforce.com>
Date: Mon, 17 Nov 2014 20:38:22 -0800
Subject: [PATCH 0948/1378] Backwards logic in newer check.

Regen .ant_targets only if it's newer than build.xml? Yeah, that seems wrong.
---
 plugins/ant/ant.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index 45f2b06eb..38d13f2a8 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -1,6 +1,6 @@
 _ant_does_target_list_need_generating () {
   [ ! -f .ant_targets ] && return 0;
-  [ .ant_targets -nt build.xml ] && return 0;
+  [ build.xml -nt .ant_targets ] && return 0;
   return 1;
 }
 

From 013b2bffcf11d0bc3ff29c96a8e6846166639c2c Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@financialforce.com>
Date: Mon, 17 Nov 2014 20:43:19 -0800
Subject: [PATCH 0949/1378] Change ant target enumeration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make use of ant's project help feature instead of trying to parse XML with regex (see: http://stackoverflow.com/a/1732454/740787).
This is a behavioral change that does a few things:
 • adds support for ant imports, which were previously not recognized as possibly containing targets
 • supresses targets with no description, as these are conventionally for internal use only
---
 plugins/ant/ant.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index 38d13f2a8..a945967d5 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -7,7 +7,7 @@ _ant_does_target_list_need_generating () {
 _ant () {
   if [ -f build.xml ]; then
     if _ant_does_target_list_need_generating; then
-     sed -n '/<target/s/<target.*name="\([^"]*\).*$/\1/p' build.xml > .ant_targets
+    	ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
     fi
     compadd `cat .ant_targets`
   fi

From 349493a0b81ae98117ea1a115a92ba509476298f Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@financialforce.com>
Date: Mon, 9 Feb 2015 12:43:51 -0800
Subject: [PATCH 0950/1378] Fix for ant targets with leading dash

As suggested in https://github.com/robbyrussell/oh-my-zsh/pull/3329#issuecomment-72062236
---
 plugins/ant/ant.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index a945967d5..0b738c94f 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -9,7 +9,7 @@ _ant () {
     if _ant_does_target_list_need_generating; then
     	ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
     fi
-    compadd `cat .ant_targets`
+    compadd -- `cat .ant_targets`
   fi
 }
 

From 5fe22fcbc6364aaacce373d71fa7d6b6f2d11a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 16 Dec 2014 00:43:01 +0100
Subject: [PATCH 0951/1378] Clean up and fix +1/-0 syntax to work as expected

This change follows this proposed behaviour:

 Ctrl+Shift+Left:  move to last visited directory
 Ctrl+Shift+Right: move to next visited directory

an alternative behaviour would be:

 Ctrl+Shift+Left:  move directory to the left in `dirs` output
 Ctrl+Shift+Right: move directory to the right in `dirs` output

It also introduces `setopt nopushdminus` as a way to standardise
pushd syntax. It's value wasn't clear before, which has been the
cause of so many pull requests regarding this plugin not working
in some environments.
---
 plugins/dircycle/dircycle.plugin.zsh | 29 ++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index c6b6ba785..2064af46a 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -1,10 +1,27 @@
-##
-# dircycle plugin: enables cycling through the directory
-# stack using Ctrl+Shift+Left/Right
+# enables cycling through the directory stack using
+# Ctrl+Shift+Left/Right
+#
+# left/right direction follows the order in which directories
+# were visited, like left/right arrows do in a browser
 
-eval "insert-cycledleft () { zle push-line; LBUFFER='pushd -q +1'; zle accept-line }"
+# NO_PUSHD_MINUS syntax:
+#  pushd +N: start counting from left of `dirs' output
+#  pushd -N: start counting from right of `dirs' output
+setopt nopushdminus
+
+insert-cycledleft () {
+	zle push-line
+	LBUFFER='pushd -q +1'
+	zle accept-line
+}
 zle -N insert-cycledleft
-bindkey "\e[1;6D" insert-cycledleft
-eval "insert-cycledright () { zle push-line; LBUFFER='pushd -q +0'; zle accept-line }"
+
+insert-cycledright () {
+	zle push-line
+	LBUFFER='pushd -q -0'
+	zle accept-line
+}
 zle -N insert-cycledright
+
+bindkey "\e[1;6D" insert-cycledleft
 bindkey "\e[1;6C" insert-cycledright

From e93fd939adb69a498ba1296b1ce0c99786e26084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 16 Dec 2014 01:29:06 +0100
Subject: [PATCH 0952/1378] Run pushd command directly and trigger prompt
 redraw

---
 plugins/dircycle/dircycle.plugin.zsh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 2064af46a..1c4a0175a 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -10,16 +10,14 @@
 setopt nopushdminus
 
 insert-cycledleft () {
-	zle push-line
-	LBUFFER='pushd -q +1'
-	zle accept-line
+	builtin pushd -q +1 &>/dev/null || true
+	zle reset-prompt
 }
 zle -N insert-cycledleft
 
 insert-cycledright () {
-	zle push-line
-	LBUFFER='pushd -q -0'
-	zle accept-line
+	builtin pushd -q -0 &>/dev/null || true
+	zle reset-prompt
 }
 zle -N insert-cycledright
 

From 999bab187c0a59301f4055fb6239a5352d3c96ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 20 Dec 2014 20:35:52 +0100
Subject: [PATCH 0953/1378] Emulate zsh in zlewidgets instead of static setopt
 command

This way the user can keep their preferred pushd syntax while enabling
us to use a standard syntax in our defined functions.

To explain further, without a clear value on the PUSHD_MINUS option, we
could be changing the +1/-0 values all we want, that some user would
find that it didn't work for him.

We have two options, then:
- Setting a particular value, which was my first approach.
- Using `emulate -L zsh` to ensure all options defined in the function's
  body won't be passed along to the main zsh instance.
  For more info see:
  http://zsh.sourceforge.net/Doc/Release/Shell-Builtin-Commands.html#index-emulate
---
 plugins/dircycle/dircycle.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 1c4a0175a..12b20ab04 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -7,15 +7,20 @@
 # NO_PUSHD_MINUS syntax:
 #  pushd +N: start counting from left of `dirs' output
 #  pushd -N: start counting from right of `dirs' output
-setopt nopushdminus
 
 insert-cycledleft () {
+	emulate -L zsh
+	setopt nopushdminus
+
 	builtin pushd -q +1 &>/dev/null || true
 	zle reset-prompt
 }
 zle -N insert-cycledleft
 
 insert-cycledright () {
+	emulate -L zsh
+	setopt nopushdminus
+
 	builtin pushd -q -0 &>/dev/null || true
 	zle reset-prompt
 }

From 282240bf37d6fd9979da2c3a41006824dbb4e268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 24 Dec 2014 01:33:28 +0100
Subject: [PATCH 0954/1378] Account for iTerm2 sent keys in dircycle plugin

---
 plugins/dircycle/dircycle.plugin.zsh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 12b20ab04..1e31105b1 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -26,5 +26,12 @@ insert-cycledright () {
 }
 zle -N insert-cycledright
 
-bindkey "\e[1;6D" insert-cycledleft
-bindkey "\e[1;6C" insert-cycledright
+
+# add key bindings for iTerm2
+if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+	bindkey "^[[1;6D" insert-cycledleft
+	bindkey "^[[1;6C" insert-cycledright
+else
+	bindkey "\e[1;6D" insert-cycledleft
+	bindkey "\e[1;6C" insert-cycledright
+fi
\ No newline at end of file

From 25b1cd687b28cb8d05229130ee5a0e2494276894 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:32:20 +0100
Subject: [PATCH 0955/1378] Brings all directory stuff to directories.zsh

- Cleans out aliases.zsh.
- Removes unneeded cd function.
---
 lib/aliases.zsh     | 13 -------------
 lib/directories.zsh | 38 +++++++++++++++-----------------------
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index aae865046..c67f854a7 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -1,11 +1,3 @@
-# Push and pop directories on directory stack
-alias pu='pushd'
-alias po='popd'
-
-# Basic directory operations
-alias ...='cd ../..'
-alias -- -='cd -'
-
 # Super user
 alias _='sudo'
 alias please='sudo'
@@ -25,11 +17,6 @@ then
 else
     alias history='fc -l 1'
 fi
-# List direcory contents
-alias lsa='ls -lah'
-alias l='ls -lah'
-alias ll='ls -lh'
-alias la='ls -lAh'
 
 alias afind='ack-grep -il'
 
diff --git a/lib/directories.zsh b/lib/directories.zsh
index 02743e0c7..1693d5dd1 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -3,12 +3,10 @@ setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus
 
-alias ..='cd ..'
-alias cd..='cd ..'
-alias cd...='cd ../..'
-alias cd....='cd ../../..'
-alias cd.....='cd ../../../..'
-alias cd/='cd /'
+alias -g ...='../..'
+alias -g ....='../../..'
+alias -g .....='../../../..'
+alias -g ......='../../../../..'
 
 alias 1='cd -'
 alias 2='cd -2'
@@ -20,23 +18,17 @@ alias 7='cd -7'
 alias 8='cd -8'
 alias 9='cd -9'
 
-cd () {
-  if   [[ "x$*" == "x..." ]]; then
-    cd ../..
-  elif [[ "x$*" == "x...." ]]; then
-    cd ../../..
-  elif [[ "x$*" == "x....." ]]; then
-    cd ../../../..
-  elif [[ "x$*" == "x......" ]]; then
-    cd ../../../../..
-  elif [ -d ~/.autoenv ]; then
-    source ~/.autoenv/activate.sh
-    autoenv_cd "$@"
-  else
-    builtin cd "$@"
-  fi
-}
-
 alias md='mkdir -p'
 alias rd=rmdir
 alias d='dirs -v | head -10'
+
+# List direcory contents
+alias lsa='ls -lah'
+alias l='ls -la'
+alias ll='ls -l'
+alias la='ls -lA'
+alias sl=ls # often screw this up
+
+# Push and pop directories on directory stack
+alias pu='pushd'
+alias po='popd'

From ace98846eac9726f7161617291e1fd2affc3f4eb Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:40:22 +0100
Subject: [PATCH 0956/1378] Pushes autoenv code to its plugin.

Sources the activate.sh file or informs the user, that its not
available.
Overriding the cd function, as it was formerly done, is not needed
anymore, activate.sh does this by itself.
---
 plugins/autoenv/autoenv.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index ca5666979..a8271849e 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,6 +1,17 @@
+# Activates autoenv or reports its failure
+if ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
+  echo '-------- AUTOENV ---------'
+  echo 'Could not find ~/.autoenv/activate.sh.'
+  echo 'Please check if autoenv is correctly installed.'
+  echo 'In the meantime the autoenv plugin is DISABLED.'
+  echo '--------------------------'
+  return 1
+fi
+
 # The use_env call below is a reusable command to activate/create a new Python
 # virtualenv, requiring only a single declarative line of code in your .env files.
 # It only performs an action if the requested virtualenv is not the current one.
+
 use_env() {
     typeset venv
     venv="$1"

From d33b0aae917c62012bf203538ba86d6236869834 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:50:19 +0100
Subject: [PATCH 0957/1378] Refactors history alias and moves it.

More compact case statement instead of the ugly if elif... else
statement. Moves it to history.zsh
---
 lib/aliases.zsh | 14 --------------
 lib/history.zsh |  9 +++++++++
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index c67f854a7..da29fde58 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -4,19 +4,5 @@ alias please='sudo'
 
 #alias g='grep -in'
 
-# Show history
-if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
-then
-    alias history='fc -fl 1'
-elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ]
-then
-    alias history='fc -El 1'
-elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ]
-then
-    alias history='fc -il 1'
-else
-    alias history='fc -l 1'
-fi
-
 alias afind='ack-grep -il'
 
diff --git a/lib/history.zsh b/lib/history.zsh
index e78a98e9e..5de71c2d3 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -6,6 +6,15 @@ fi
 HISTSIZE=10000
 SAVEHIST=10000
 
+# Show history
+case $HIST_STAMPS in
+  "mm/dd/yyyy") alias history='fc -fl 1' ;;
+  "dd.mm.yyyy") alias history='fc -El 1' ;;
+  "yyyy-mm-dd") alias history='fc -il 1' ;;
+  *) alias history='fc -l 1' ;;
+esac
+
+setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first
 setopt hist_ignore_dups # ignore duplication command history list

From 101149b1ae6fb5ce0b982289fca901b2feab5439 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:53:14 +0100
Subject: [PATCH 0958/1378] Moves remaining aliases to misc and deletes file.

There were only three aliases left in aliases.zsh
File deleted!
---
 lib/aliases.zsh | 8 --------
 lib/misc.zsh    | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 lib/aliases.zsh

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
deleted file mode 100644
index da29fde58..000000000
--- a/lib/aliases.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Super user
-alias _='sudo'
-alias please='sudo'
-
-#alias g='grep -in'
-
-alias afind='ack-grep -il'
-
diff --git a/lib/misc.zsh b/lib/misc.zsh
index a8678b8ec..892d78ef3 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -13,3 +13,10 @@ export PAGER="less"
 export LESS="-R"
 
 export LC_CTYPE=$LANG
+
+## super user alias
+alias _='sudo'
+alias please='sudo'
+
+## more intelligent acking for ubuntu users
+alias afind='ack-grep -il'

From 83c4e0620689d2410056bddcdfbf8e300673e982 Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Fri, 10 Jan 2014 23:55:10 +0100
Subject: [PATCH 0959/1378] Moves a bindkey call from misc to key-bindings.

---
 lib/key-bindings.zsh | 3 +++
 lib/misc.zsh         | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9063c6a18..eb2b58058 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -64,6 +64,9 @@ autoload -U edit-command-line
 zle -N edit-command-line
 bindkey '\C-x\C-e' edit-command-line
 
+# file rename magick
+bindkey "^[m" copy-prev-shell-word
+
 # consider emacs keybindings:
 
 #bindkey -e  ## emacs key bindings
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 892d78ef3..ea8a05fcb 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -2,9 +2,6 @@
 autoload -U url-quote-magic
 zle -N self-insert url-quote-magic
 
-## file rename magick
-bindkey "^[m" copy-prev-shell-word
-
 ## jobs
 setopt long_list_jobs
 

From 724143c3297249961977a957d8fa1bc92cd7be2c Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Sat, 11 Jan 2014 00:04:53 +0100
Subject: [PATCH 0960/1378] Deletes dot aliases from common-aliases.

They are implemented in lib anyway.
---
 plugins/common-aliases/common-aliases.plugin.zsh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 90d59910c..e3830adcf 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -20,12 +20,6 @@ alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
 
 alias t='tail -f'
 
-# because typing 'cd' is A LOT of work!!
-alias ..='cd ../'
-alias ...='cd ../../'
-alias ....='cd ../../../'
-alias .....='cd ../../../../'
-
 # Command line head / tail shortcuts
 alias -g H='| head'
 alias -g T='| tail'

From 4b4292a496c139039807f082425cc5507f762c0d Mon Sep 17 00:00:00 2001
From: LFDM <1986gh@gmail.com>
Date: Sat, 15 Mar 2014 00:00:14 +0100
Subject: [PATCH 0961/1378] Fix a typo

---
 lib/directories.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 1693d5dd1..b7a53ecfe 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -22,7 +22,7 @@ alias md='mkdir -p'
 alias rd=rmdir
 alias d='dirs -v | head -10'
 
-# List direcory contents
+# List directory contents
 alias lsa='ls -lah'
 alias l='ls -la'
 alias ll='ls -l'

From 51946eb3ce8021aebe940f879225828d89c12317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 9 Feb 2015 20:29:10 +0100
Subject: [PATCH 0962/1378] Implement deletion of sl alias as per #3055

---
 lib/directories.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index b7a53ecfe..1a9698544 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -27,7 +27,6 @@ alias lsa='ls -lah'
 alias l='ls -la'
 alias ll='ls -l'
 alias la='ls -lA'
-alias sl=ls # often screw this up
 
 # Push and pop directories on directory stack
 alias pu='pushd'

From 2193135ebc4ce0778ff6949b448e4526dbd34284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 9 Feb 2015 20:43:48 +0100
Subject: [PATCH 0963/1378] Clean up appearance lib file and redundant `colors`
 calls in other files

---
 lib/theme-and-appearance.zsh             |  8 +++-----
 plugins/git-prompt/git-prompt.plugin.zsh |  3 ---
 plugins/jump/jump.plugin.zsh             |  1 -
 themes/adben.zsh-theme                   | 15 ++++++---------
 themes/apple.zsh-theme                   |  1 -
 themes/gnzh.zsh-theme                    |  3 +--
 themes/half-life.zsh-theme               |  2 --
 themes/jonathan.zsh-theme                |  5 +----
 themes/kolo.zsh-theme                    |  2 --
 themes/mikeh.zsh-theme                   |  2 --
 themes/simonoff.zsh-theme                |  5 +----
 themes/steeef.zsh-theme                  |  2 --
 themes/zhann.zsh-theme                   |  2 --
 13 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 0353f9db4..926303ca4 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -1,14 +1,13 @@
 # ls colors
-autoload colors; colors;
+autoload -U colors && colors
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
-#export LS_COLORS
 
 # Enable ls colors
 if [ "$DISABLE_LS_COLORS" != "true" ]
 then
   # Find the option for using colors in ls, depending on the version: Linux or BSD
   if [[ "$(uname -s)" == "NetBSD" ]]; then
-    # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors); 
+    # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors);
     # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
     gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
   elif [[ "$(uname -s)" == "OpenBSD" ]]; then
@@ -23,7 +22,7 @@ fi
 #setopt no_beep
 setopt auto_cd
 setopt multios
-setopt cdablevarS
+setopt cdablevars
 
 if [[ x$WINDOW != x ]]
 then
@@ -43,4 +42,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is c
 
 # Setup the prompt with pretty colors
 setopt prompt_subst
-
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 01b8a88d9..d868a5fe1 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -2,9 +2,6 @@
 # http://github.com/olivierverdier/zsh-git-prompt
 #
 export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt
-# Initialize colors.
-autoload -U colors
-colors
 
 # Allow for functions in the prompt.
 setopt PROMPT_SUBST
diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index b16814fe4..d082c11e5 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -27,7 +27,6 @@ unmark() {
 	rm -i "$MARKPATH/$1"
 }
 
-autoload colors
 marks() {
 	for link in $MARKPATH/*(@); do
 		local markname="$fg[cyan]${link:t}$reset_color"
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index 6869c8a20..212b823a5 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -69,17 +69,17 @@ function precmd {
         #Choose from all databases, regardless of whether they are considered "offensive"
         fortune -a
     }
-    #obtains the tip 
+    #obtains the tip
     ps1_command_tip () {
         wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d'
-    }  
+    }
     prompt_header () {
         if [[ "true" == "$ENABLE_COMMAND_TIP" ]]; then
             ps1_command_tip
         else
             ps1_fortune
-        fi 
-    }   
+        fi
+    }
     PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
     # set a simple variable to show when in screen
     if [[ -n "${WINDOW}" ]]; then
@@ -99,11 +99,8 @@ prompt_context () {
 set_prompt () {
     # required for the prompt
     setopt prompt_subst
-    autoload colors zsh/terminfo
-    if [[ "$terminfo[colors]" -gt 8 ]]; then
-        colors
-    fi 
-    
+    autoload zsh/terminfo
+
     # ######### PROMPT #########
     PROMPT='${PROMPT_HEAD}
 ${RED_START}$(prompt_context)
diff --git a/themes/apple.zsh-theme b/themes/apple.zsh-theme
index 275341dc6..95e6249fa 100644
--- a/themes/apple.zsh-theme
+++ b/themes/apple.zsh-theme
@@ -7,7 +7,6 @@ get_git_dirty() {
 }
 
 autoload -Uz vcs_info
-autoload -U colors && colors
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
 zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 0519fbefb..ab154c1e5 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -2,8 +2,7 @@
 # Based on bira theme
 
 # load some modules
-autoload -U colors zsh/terminfo # Used in the colour alias below
-colors
+autoload -U zsh/terminfo # Used in the colour alias below
 setopt prompt_subst
 
 # make some aliases for the colours: (could use normal escape sequences too)
diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index 942affa94..a3c505706 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -13,8 +13,6 @@ function virtualenv_info {
 PR_GIT_UPDATE=1
 
 setopt prompt_subst
-autoload colors
-colors
 
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index bca92970c..2f0e77431 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -44,10 +44,7 @@ setprompt () {
     ###
     # See if we can use colors.
 
-    autoload colors zsh/terminfo
-    if [[ "$terminfo[colors]" -ge 8 ]]; then
-	colors
-    fi
+    autoload zsh/terminfo
     for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
 	eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
 	eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
diff --git a/themes/kolo.zsh-theme b/themes/kolo.zsh-theme
index e743289c3..51b0af724 100644
--- a/themes/kolo.zsh-theme
+++ b/themes/kolo.zsh-theme
@@ -1,5 +1,3 @@
-autoload -U colors && colors
-
 autoload -Uz vcs_info
 
 zstyle ':vcs_info:*' stagedstr '%F{green}●'
diff --git a/themes/mikeh.zsh-theme b/themes/mikeh.zsh-theme
index 943f04d38..a95383ba5 100644
--- a/themes/mikeh.zsh-theme
+++ b/themes/mikeh.zsh-theme
@@ -1,6 +1,4 @@
 setopt prompt_subst
-autoload colors
-colors
 
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index fb4d32e24..63ce4261b 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -63,10 +63,7 @@ setprompt () {
 ###
 # See if we can use colors.
 
-    autoload colors zsh/terminfo
-    if [[ "$terminfo[colors]" -ge 8 ]]; then
-    colors
-    fi
+    autoload zsh/terminfo
     for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
     eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
     eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index e38188d35..13728ca9a 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -15,8 +15,6 @@ function virtualenv_info {
 PR_GIT_UPDATE=1
 
 setopt prompt_subst
-autoload colors
-colors
 
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 5c0854730..27597ec6c 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -1,5 +1,3 @@
-autoload -U colors && colors
-
 autoload -Uz vcs_info
 
 zstyle ':vcs_info:*' stagedstr '%F{green}●'

From 80d856e1655cc2b2e9d6899bae884631283a8063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 26 Dec 2014 22:33:36 +0100
Subject: [PATCH 0964/1378] Clean up web-search plugin logic to allow easier
 changes

---
 plugins/web-search/web-search.plugin.zsh | 55 ++++++++++++------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 28559deb9..1e661250a 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -1,42 +1,43 @@
 # web_search from terminal
 
 function web_search() {
-  # get the open command
-  local open_cmd
-  if [[ "$OSTYPE" = darwin* ]]; then
-    open_cmd='open'
-  else
-    open_cmd='xdg-open'
-  fi
+  emulate -L zsh
+
+  # define search engine URLS
+  typeset -A urls
+  urls=(
+    google      "https://www.google.com/search?q="
+    bing        "https://www.bing.com/search?q="
+    yahoo       "https://www.yahoo.com/search?q="
+    duckduckgo  "https://www.duckduckgo.com/?q="
+  )
+
+  # define the open command
+  case "$OSTYPE" in
+    darwin*)  open_cmd="open" ;;
+    linux*)   open_cmd="xdg-open" ;;
+    *)        echo "Platform $OSTYPE not supported"
+              return 1
+              ;;
+  esac
 
   # check whether the search engine is supported
-  if [[ ! $1 =~ '(google|bing|yahoo|duckduckgo)' ]];
-  then
+  if [[ -z "$urls[$1]" ]]; then
     echo "Search engine $1 not supported."
     return 1
   fi
 
-  local url="http://www.$1.com"
-
-  # no keyword provided, simply open the search engine homepage
-  if [[ $# -le 1 ]]; then
-    $open_cmd "$url"
-    return
-  fi
-  if [[ $1 == 'duckduckgo' ]]; then
-  #slightly different search syntax for DDG
-    url="${url}/?q="
+  # search or go to main page depending on number of arguments passed
+  if [[ $# -gt 1 ]]; then
+    # build search url:
+    # join arguments passed with '+', then append to search engine URL
+    url="${urls[$1]}${(j:+:)@[2,-1]}"
   else
-    url="${url}/search?q="
+    # build main page url:
+    # split by '/', then rejoin protocol (1) and domain (2) parts with '//'
+    url="${(j://:)${(s:/:)urls[$1]}[1,2]}"
   fi
-  shift   # shift out $1
 
-  while [[ $# -gt 0 ]]; do
-    url="${url}$1+"
-    shift
-  done
-
-  url="${url%?}" # remove the last '+'
   nohup $open_cmd "$url" >/dev/null 2&>1
 }
 

From 80ba54a94fe7d7628d159823d5c63e12811c68b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 27 Dec 2014 02:27:24 +0100
Subject: [PATCH 0965/1378] Add Yandex support to web-search plugin

---
 plugins/web-search/web-search.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 1e661250a..5e3c00d3c 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -10,6 +10,7 @@ function web_search() {
     bing        "https://www.bing.com/search?q="
     yahoo       "https://www.yahoo.com/search?q="
     duckduckgo  "https://www.duckduckgo.com/?q="
+    yandex      "http://yandex.ru/yandsearch?text="
   )
 
   # define the open command
@@ -46,6 +47,8 @@ alias bing='web_search bing'
 alias google='web_search google'
 alias yahoo='web_search yahoo'
 alias ddg='web_search duckduckgo'
+alias yandex='web_search yandex'
+
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
 alias news='web_search duckduckgo \!n'

From adaea31ca013054094a45b009ab22382c4d94666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 27 Dec 2014 02:30:16 +0100
Subject: [PATCH 0966/1378] Silence nohup output in web-search plugin

---
 plugins/web-search/web-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 5e3c00d3c..19f9cad33 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -39,7 +39,7 @@ function web_search() {
     url="${(j://:)${(s:/:)urls[$1]}[1,2]}"
   fi
 
-  nohup $open_cmd "$url" >/dev/null 2&>1
+  nohup $open_cmd "$url" &>/dev/null
 }
 
 

From c45885093fd8fa3375286ef1dcba9bc296e08a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 27 Dec 2014 02:56:30 +0100
Subject: [PATCH 0967/1378] Add support for cygwin open in web-search plugin

---
 plugins/web-search/web-search.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 19f9cad33..52d03b2d0 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -16,6 +16,7 @@ function web_search() {
   # define the open command
   case "$OSTYPE" in
     darwin*)  open_cmd="open" ;;
+    cygwin*)  open_cmd="cygstart" ;;
     linux*)   open_cmd="xdg-open" ;;
     *)        echo "Platform $OSTYPE not supported"
               return 1

From e8daf8150e923bfd30769e9a55c15daec523996b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 27 Dec 2014 03:15:56 +0100
Subject: [PATCH 0968/1378] Fix yahoo search URL in web-search plugin

---
 plugins/web-search/web-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 52d03b2d0..b0a4a2926 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -8,7 +8,7 @@ function web_search() {
   urls=(
     google      "https://www.google.com/search?q="
     bing        "https://www.bing.com/search?q="
-    yahoo       "https://www.yahoo.com/search?q="
+    yahoo       "https://search.yahoo.com/search?p="
     duckduckgo  "https://www.duckduckgo.com/?q="
     yandex      "http://yandex.ru/yandsearch?text="
   )

From 02d75684f3ddd2dcd181c9265545d5639d09bd5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 4 Jan 2015 01:40:25 +0100
Subject: [PATCH 0969/1378] Force using https in Yandex search engine

---
 plugins/web-search/web-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index b0a4a2926..572427b0b 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -10,7 +10,7 @@ function web_search() {
     bing        "https://www.bing.com/search?q="
     yahoo       "https://search.yahoo.com/search?p="
     duckduckgo  "https://www.duckduckgo.com/?q="
-    yandex      "http://yandex.ru/yandsearch?text="
+    yandex      "https://yandex.ru/yandsearch?text="
   )
 
   # define the open command

From 0cc3afe27788e35d5f72236f41a7e4514c11491d Mon Sep 17 00:00:00 2001
From: Julien Pepy <komuta@gmail.com>
Date: Fri, 5 Dec 2014 09:57:59 +0100
Subject: [PATCH 0970/1378] Fix get command list for recent composer versions

---
 plugins/composer/composer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 86f2ca4df..f75119c4a 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -7,7 +7,7 @@
 
 # Composer basic command completion
 _composer_get_command_list () {
-	composer --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+	composer --no-ansi | sed "1,/Available commands/d" | awk '/^\s*[a-z]+/ { print $1 }'
 }
 
 _composer_get_required_list () {

From 5f4e8e57da117b5fc2325ea411aafc66053b8570 Mon Sep 17 00:00:00 2001
From: Andrey Janzen <andrey@janzen.su>
Date: Fri, 26 Jul 2013 00:37:11 +0700
Subject: [PATCH 0971/1378] Allow completion for 'composer.phar', not only
 'composer'

Use $_comp_command1 for command list generation instead of 'composer':

  `$_comp_command1` contains the command written in the command line.
  This allows us to have a different composer name
---
 plugins/composer/composer.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index f75119c4a..324bc64a0 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -7,11 +7,11 @@
 
 # Composer basic command completion
 _composer_get_command_list () {
-	composer --no-ansi | sed "1,/Available commands/d" | awk '/^\s*[a-z]+/ { print $1 }'
+    $_comp_command1 --no-ansi | sed "1,/Available commands/d" | awk '/^\s*[a-z]+/ { print $1 }'
 }
 
 _composer_get_required_list () {
-    composer show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
+    $_comp_command1 show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
 }
 
 _composer () {
@@ -35,6 +35,7 @@ _composer () {
 }
 
 compdef _composer composer
+compdef _composer composer.phar
 
 # Aliases
 alias c='composer'

From ef220f0928269f3cdb613db3d3f9ba7775317109 Mon Sep 17 00:00:00 2001
From: Maxime Fabre <ehtnam6@gmail.com>
Date: Sat, 17 Aug 2013 17:11:21 +0200
Subject: [PATCH 0972/1378] Add aliases for composer global

---
 plugins/composer/composer.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 324bc64a0..97207242a 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -41,9 +41,12 @@ compdef _composer composer.phar
 alias c='composer'
 alias csu='composer self-update'
 alias cu='composer update'
+alias cr='composer require'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
+alias cgu='composer global update'
+alias cgr='composer global require'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'

From 6fb866183d84e53fa009853691e5c0bdd101820b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 4 Jan 2015 22:24:55 +0100
Subject: [PATCH 0973/1378] Remove composer.json file requirement

This is because we can't be sure which arguments require a json file
and which don't, so the `else' statement will always be difficult to
check for correctness.
---
 plugins/composer/composer.plugin.zsh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 97207242a..7f70e3d72 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -20,18 +20,15 @@ _composer () {
   _arguments \
     '1: :->command'\
     '*: :->args'
-  if [ -f composer.json ]; then
-    case $state in
-      command)
-        compadd `_composer_get_command_list`
-        ;;
-      *)
-        compadd `_composer_get_required_list`
-        ;;
-    esac
-  else
-    compadd create-project init search selfupdate show
-  fi
+
+  case $state in
+    command)
+      compadd $(_composer_get_command_list)
+      ;;
+    *)
+      compadd $(_composer_get_required_list)
+      ;;
+  esac
 }
 
 compdef _composer composer

From c3940cf44a58393906e896decc93542c3ab17f4a Mon Sep 17 00:00:00 2001
From: Martin Schrodi <martin.schrodi@retarus.de>
Date: Fri, 14 Mar 2014 11:52:40 +0100
Subject: [PATCH 0974/1378] Fixed breakage in new git repo without commits

---
 themes/rkj-repos.zsh-theme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index eed084f15..0a9f83d36 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -19,7 +19,8 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
 
 function mygit() {
   ref1=$(git symbolic-ref HEAD 2> /dev/null) || return
-  ref2=$(git rev-parse HEAD | head -c 6) || return
+  gitdir=$(git rev-parse --git-dir 2> /dev/null) || return
+  heads=($gitdir/refs/heads/*(N)) ; [[ -z $heads ]] && ref2="" || ref2=$(git rev-parse HEAD | head -c 6)
   ref="$ref1 %{$fg[grey]%}$ref2"
   #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "

From f04246aa4820031c025ed25baf0df23d786d38fd Mon Sep 17 00:00:00 2001
From: Martin Schrodi <pfault@f4n.de>
Date: Sat, 19 Apr 2014 03:04:58 +0200
Subject: [PATCH 0975/1378] rkj-repos: code cleanup and updated with functions
 from lib/git.zsh (thx mcornella)

---
 themes/rkj-repos.zsh-theme | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 0a9f83d36..8585e66be 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -16,14 +16,15 @@ ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[grey]%}"
+ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
 
 function mygit() {
-  ref1=$(git symbolic-ref HEAD 2> /dev/null) || return
-  gitdir=$(git rev-parse --git-dir 2> /dev/null) || return
-  heads=($gitdir/refs/heads/*(N)) ; [[ -z $heads ]] && ref2="" || ref2=$(git rev-parse HEAD | head -c 6)
-  ref="$ref1 %{$fg[grey]%}$ref2"
-  #ref=$(git symbolic-ref HEAD 2> /dev/null) $(git rev-parse HEAD | head -c 6) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
+  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX "
+  fi
 }
 
 function retcode() {}

From 4fc6dccb4286828c7cd53d3612ec69b0c0d9aaf2 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 20 Dec 2014 02:24:26 -0500
Subject: [PATCH 0976/1378] term: Move DISABLE_AUTO_TITLE check to hooks

Move the DISABLE_AUTO_TITLE check from title() to the preX hook
functions that call it, to allow the title() function to be used
directly by user or other callers.
---
 lib/termsupport.zsh | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index bd0cf6ffe..2fa61c431 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -1,8 +1,16 @@
-#usage: title short_tab_title looooooooooooooooooooooggggggg_windows_title
-#http://www.faqs.org/docs/Linux-mini/Xterm-Title.html#ss3.1
-#Fully support screen, iterm, and probably most modern xterm and rxvt
+# Set terminal window and tab/icon title
+#
+# usage: title short_tab_title [long_window_title]
+#
+# See: http://www.faqs.org/docs/Linux-mini/Xterm-Title.html#ss3.1
+# Fully supports screen, iterm, and probably most modern xterm and rxvt
+# (In screen, only short_tab_title is used)
+# Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
-  if [[ "$DISABLE_AUTO_TITLE" == "true" ]] || [[ "$EMACS" == *term* ]]; then
+  if [[ $2 == "" ]]; then
+    2="$1"
+  fi
+  if [[ "$EMACS" == *term* ]]; then
     return
   fi
   if [[ "$TERM" == screen* ]]; then
@@ -18,6 +26,10 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
+  if [[ $DISABLE_AUTO_TITLE == true ]]; then
+    return
+  fi
+
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 
   # Notify Terminal.app of current directory using undocumented OSC sequence
@@ -30,6 +42,10 @@ function omz_termsupport_precmd {
 
 # Runs before executing the command
 function omz_termsupport_preexec {
+  if [[ $DISABLE_AUTO_TITLE == true ]]; then
+    return
+  fi
+
   emulate -L zsh
   setopt extended_glob
 

From b7e5dd35efb0750634eb16b7040337ce80f67684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 10 Feb 2015 19:43:25 +0100
Subject: [PATCH 0977/1378] Quick-fix code style

---
 lib/termsupport.zsh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 2fa61c431..f21b0b041 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -7,12 +7,12 @@
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
-  if [[ $2 == "" ]]; then
-    2="$1"
-  fi
-  if [[ "$EMACS" == *term* ]]; then
-    return
-  fi
+  [[ "$EMACS" == *term* ]] && return
+
+  # if $2 is unset use $1 as default
+  # if it is set and empty, leave it as is
+  : ${2=$1}
+
   if [[ "$TERM" == screen* ]]; then
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ $TERM == ansi ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then

From 2e41d06b7655067272cee1e54d2d66693136a90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 10 Feb 2015 19:53:40 +0100
Subject: [PATCH 0978/1378] Use quoted $TERM value everywhere

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index f21b0b041..58c6203a0 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -15,7 +15,7 @@ function title {
 
   if [[ "$TERM" == screen* ]]; then
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
-  elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ $TERM == ansi ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  elif [[ "$TERM" == xterm* ]] || [[ "$TERM" == rxvt* ]] || [[ "$TERM" == ansi ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
     print -Pn "\e]1;$1:q\a" #set icon (=tab) name
   fi

From 4161aa4f9de45233bdee7073933498422a50d213 Mon Sep 17 00:00:00 2001
From: Brandon Sandrowicz <brandon@sandrowicz.org>
Date: Tue, 20 May 2014 09:41:36 -0400
Subject: [PATCH 0979/1378] Fixing virtualenvwrapper plugin for Ubuntu (and
 Debian)

Ubuntu and Debian store the system-installed virtualenvwrapper in
/etc/bash_completion.d/virtualenvwrapper, so that it gets automatically sourced
at startup in Bash. By not putting it somewhere in $PATH, they end up excluding
others (e.g. Zsh) that might want to use that file. Oops!

The virtualenvwrapper plugin should account for this so that Ubuntu (or Debian)
users don't end up with this message:

zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh. Please install with `pip install virtualenvwrapper`.

even when they have a virtualenvwrapper installed to a known location.
---
 .../virtualenvwrapper/virtualenvwrapper.plugin.zsh  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 217ab0722..9a0616b72 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,12 +1,19 @@
 virtualenvwrapper='virtualenvwrapper.sh'
+
 if (( $+commands[$virtualenvwrapper] )); then
-
   source ${${virtualenvwrapper}:c}
+elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
+  virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
+  source "/etc/bash_completion.d/virtualenvwrapper"
+else
+  print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`."
+  return
+fi
 
+if type workon 2>&1 >/dev/null; then
   if [[ "$WORKON_HOME" == "" ]]; then
     echo "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work"
   else
-
     if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       # Automatically activate Git projects's virtual environments based on the
       # directory name of the project. Virtual environment name can be overridden
@@ -61,5 +68,5 @@ if (( $+commands[$virtualenvwrapper] )); then
     fi
   fi
 else
-  print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`."
+  print "zsh virtualenvwrapper plugin: shell function 'workon' not defined. Please check ${virtualenvwrapper}." >&2
 fi

From b62911660d3743d3dfb0116f5b05aabd67a24a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 10 Feb 2015 12:20:24 +0100
Subject: [PATCH 0980/1378] Organize error checking in virtualenwrapper plugin

---
 .../virtualenvwrapper.plugin.zsh              | 123 +++++++++---------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 9a0616b72..0ad336917 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -6,67 +6,70 @@ elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
   virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
   source "/etc/bash_completion.d/virtualenvwrapper"
 else
-  print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}. Please install with \`pip install virtualenvwrapper\`."
+  print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
+        "Please install with \`pip install virtualenvwrapper\`" >&2
+  return
+fi
+if ! type workon &>/dev/null; then
+  print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
+        "Please check ${virtualenvwrapper}" >&2
   return
 fi
 
-if type workon 2>&1 >/dev/null; then
-  if [[ "$WORKON_HOME" == "" ]]; then
-    echo "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work"
-  else
-    if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-      # Automatically activate Git projects's virtual environments based on the
-      # directory name of the project. Virtual environment name can be overridden
-      # by placing a .venv file in the project root with a virtualenv name in it
-      function workon_cwd {
-        if [ ! $WORKON_CWD ]; then
-          WORKON_CWD=1
-          # Check if this is a Git repo
-          PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
-          if (( $? != 0 )); then
-            PROJECT_ROOT="."
-          fi
-          # Check for virtualenv name override
-          if [[ -f "$PROJECT_ROOT/.venv" ]]; then
-            ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
-          elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
-            ENV_NAME="$PROJECT_ROOT/.venv"
-          elif [[ "$PROJECT_ROOT" != "." ]]; then
-            ENV_NAME=`basename "$PROJECT_ROOT"`
-          else
-            ENV_NAME=""
-          fi
-          if [[ "$ENV_NAME" != "" ]]; then
-            # Activate the environment only if it is not already active
-            if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
-              if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
-                workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
-              elif [[ -e "$ENV_NAME/bin/activate" ]]; then
-                source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
-              fi
-            fi
-          elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
-            # We've just left the repo, deactivate the environment
-            # Note: this only happens if the virtualenv was activated automatically
-            deactivate && unset CD_VIRTUAL_ENV
-          fi
-          unset PROJECT_ROOT
-          unset WORKON_CWD
-        fi
-      }
-
-      # Append workon_cwd to the chpwd_functions array, so it will be called on cd
-      # http://zsh.sourceforge.net/Doc/Release/Functions.html
-      # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
-      if (( ${+chpwd_functions} )); then
-        if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
-          set -A chpwd_functions $chpwd_functions workon_cwd
-        fi
-      else
-        set -A chpwd_functions workon_cwd
-      fi
-    fi
-  fi
-else
-  print "zsh virtualenvwrapper plugin: shell function 'workon' not defined. Please check ${virtualenvwrapper}." >&2
+if [[ "$WORKON_HOME" == "" ]]; then
+  print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2
+  return
+fi
+
+if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
+  # Automatically activate Git projects's virtual environments based on the
+  # directory name of the project. Virtual environment name can be overridden
+  # by placing a .venv file in the project root with a virtualenv name in it
+  function workon_cwd {
+    if [ ! $WORKON_CWD ]; then
+      WORKON_CWD=1
+      # Check if this is a Git repo
+      PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
+      if (( $? != 0 )); then
+        PROJECT_ROOT="."
+      fi
+      # Check for virtualenv name override
+      if [[ -f "$PROJECT_ROOT/.venv" ]]; then
+        ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+      elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
+        ENV_NAME="$PROJECT_ROOT/.venv"
+      elif [[ "$PROJECT_ROOT" != "." ]]; then
+        ENV_NAME=`basename "$PROJECT_ROOT"`
+      else
+        ENV_NAME=""
+      fi
+      if [[ "$ENV_NAME" != "" ]]; then
+        # Activate the environment only if it is not already active
+        if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+          if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+            workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+          elif [[ -e "$ENV_NAME/bin/activate" ]]; then
+            source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
+          fi
+        fi
+      elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
+        # We've just left the repo, deactivate the environment
+        # Note: this only happens if the virtualenv was activated automatically
+        deactivate && unset CD_VIRTUAL_ENV
+      fi
+      unset PROJECT_ROOT
+      unset WORKON_CWD
+    fi
+  }
+
+  # Append workon_cwd to the chpwd_functions array, so it will be called on cd
+  # http://zsh.sourceforge.net/Doc/Release/Functions.html
+  # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
+  if (( ${+chpwd_functions} )); then
+    if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
+      set -A chpwd_functions $chpwd_functions workon_cwd
+    fi
+  else
+    set -A chpwd_functions workon_cwd
+  fi
 fi

From 732c7b8070a75ac5ad5384b4d22d19f499e8424f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 10 Feb 2015 12:24:05 +0100
Subject: [PATCH 0981/1378] Simplify adding workon_cwd to chpwd hook

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 0ad336917..5faa1a823 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -64,12 +64,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
 
   # Append workon_cwd to the chpwd_functions array, so it will be called on cd
   # http://zsh.sourceforge.net/Doc/Release/Functions.html
-  # TODO: replace with 'add-zsh-hook chpwd workon_cwd' when oh-my-zsh min version is raised above 4.3.4
-  if (( ${+chpwd_functions} )); then
-    if (( $chpwd_functions[(I)workon_cwd] == 0 )); then
-      set -A chpwd_functions $chpwd_functions workon_cwd
-    fi
-  else
-    set -A chpwd_functions workon_cwd
+  if ! (( $chpwd_functions[(I)workon_cwd] )); then
+    chpwd_functions+=(workon_cwd)
   fi
 fi

From 448e966129bb5c08c7b2da4636491f0f890cf0ab Mon Sep 17 00:00:00 2001
From: frozen_dude <frozendude@gmail.com>
Date: Mon, 29 Jul 2013 20:04:23 +0200
Subject: [PATCH 0982/1378] Fix for bad LC_CTYPE entry

LANG is a colon-separated list of prefered locales; LC_CTYPE is single entry,
therefore we need to remove all but one entry.

Also, there is no need setting it if it is already set (LC_ALL also sets
LC_CTYPE, so we check it too).
---
 lib/misc.zsh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index ea8a05fcb..6987c099c 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -9,11 +9,21 @@ setopt long_list_jobs
 export PAGER="less"
 export LESS="-R"
 
-export LC_CTYPE=$LANG
-
 ## super user alias
 alias _='sudo'
 alias please='sudo'
 
 ## more intelligent acking for ubuntu users
 alias afind='ack-grep -il'
+
+## how to interpret text characters
+if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then # only define if undefined
+	export LC_CTYPE=${LANG%%:*}                 # pick the first entry from LANG
+	[[ -z "$LC_CTYPE" ]] && \
+		export LC_CTYPE=`locale -a | grep en_US.utf8 | head -1`
+	[[ -z "$LC_CTYPE" ]] && \
+		export LC_CTYPE=`locale -a | grep en_US | head -1`
+	[[ -z "$LC_CTYPE" ]] && \
+		export LC_CTYPE=C                         # default to internal encoding.
+fi
+

From 0edf416bea1a180e82a8f5f96444d74fabb5867f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 9 Feb 2015 18:57:23 +0100
Subject: [PATCH 0983/1378] Temporarily delete over-engineered solution

---
 lib/misc.zsh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 6987c099c..0b7cb2696 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -16,14 +16,7 @@ alias please='sudo'
 ## more intelligent acking for ubuntu users
 alias afind='ack-grep -il'
 
-## how to interpret text characters
-if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then # only define if undefined
-	export LC_CTYPE=${LANG%%:*}                 # pick the first entry from LANG
-	[[ -z "$LC_CTYPE" ]] && \
-		export LC_CTYPE=`locale -a | grep en_US.utf8 | head -1`
-	[[ -z "$LC_CTYPE" ]] && \
-		export LC_CTYPE=`locale -a | grep en_US | head -1`
-	[[ -z "$LC_CTYPE" ]] && \
-		export LC_CTYPE=C                         # default to internal encoding.
+# only define LC_CTYPE if undefined
+if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then
+	export LC_CTYPE=${LANG%%:*} # pick the first entry from LANG
 fi
-

From 3ba10ad0a2ed85c26e096126a7899a401cf8f9e7 Mon Sep 17 00:00:00 2001
From: Ashley Valent <avalent@atlassian.com>
Date: Wed, 11 Feb 2015 11:19:42 +1100
Subject: [PATCH 0984/1378] Added cab autocompletion to the cabal plugin.

cab is a wrapper for ghc-pkg and cabal that provides some nice features
like listing outdated packages.
See https://hackage.haskell.org/package/cab for more details on the cab
program.
---
 plugins/cabal/cabal.plugin.zsh | 40 ++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
index 9f76add7a..cf7d2cf5e 100644
--- a/plugins/cabal/cabal.plugin.zsh
+++ b/plugins/cabal/cabal.plugin.zsh
@@ -45,3 +45,43 @@ function _cabal_commands() {
 }
 
 compdef _cabal_commands cabal
+
+function _cab_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "sync:Fetch the latest package index"
+          "install:Install packages"
+          "uninstall:Uninstall packages"
+          "installed:List installed packages"
+          "configure:Configure a cabal package"
+          "build:Build a cabal package"
+          "clean:Clean up a build directory"
+          "outdated:Display outdated packages"
+          "info:Display information of a package"
+          "sdist:Make tar.gz for source distribution"
+          "upload:Uploading tar.gz to HackageDB"
+          "get:Untar a package in the current directory"
+          "deps:Show dependencies of this package"
+          "revdeps:Show reverse dependencies of this package"
+          "check:Check consistency of packages"
+          "genpaths:Generate Paths_<pkg>.hs"
+          "search:Search available packages by package name"
+          "add:Add a source directory"
+          "test:Run tests"
+          "bench:Run benchmarks"
+          "doc:Generate manuals"
+          "ghci:Run GHCi (with a sandbox)"
+          "init:Initialize a sandbox"
+          "help:Display the help message of the command"
+        )
+        _describe -t subcommands 'cab subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+command -v cab >/dev/null 2>&1 && { compdef _cab_commands cab }

From f1d12c598b936a54fa1fb5b9a2b8abc4b58bbc85 Mon Sep 17 00:00:00 2001
From: Neal <neal@ineal.me>
Date: Fri, 5 Jul 2013 08:48:46 -0500
Subject: [PATCH 0985/1378] Add .ipsw to the extract plugin.

---
 plugins/extract/_extract           |  2 +-
 plugins/extract/extract.plugin.zsh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index dca890954..387b344bc 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,6 +3,6 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0
+  "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|ipsw|rar|7z|deb)(-.)'" && return 0
 
 
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 898d3d36e..690126ba6 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -23,7 +23,7 @@ function extract() {
 
   remove_archive=1
   if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
-    remove_archive=0 
+    remove_archive=0
     shift
   fi
 
@@ -52,7 +52,7 @@ function extract() {
       (*.xz) unxz "$1" ;;
       (*.lzma) unlzma "$1" ;;
       (*.Z) uncompress "$1" ;;
-      (*.zip|*.war|*.jar|*.sublime-package) unzip "$1" -d $extract_dir ;;
+      (*.zip|*.war|*.jar|*.sublime-package|*.ipsw) unzip "$1" -d $extract_dir ;;
       (*.rar) unrar x -ad "$1" ;;
       (*.7z) 7za x "$1" ;;
       (*.deb)
@@ -64,10 +64,10 @@ function extract() {
         cd ..; rm *.tar.gz debian-binary
         cd ..
       ;;
-      (*) 
+      (*)
         echo "extract: '$1' cannot be extracted" 1>&2
-        success=1 
-      ;; 
+        success=1
+      ;;
     esac
 
     (( success = $success > 0 ? $success : $? ))

From 6967393fe6dacc45f5339e0cfacbabe41f8882fb Mon Sep 17 00:00:00 2001
From: James Womack <jwomack@netflix.com>
Date: Thu, 12 Feb 2015 23:19:43 -0800
Subject: [PATCH 0986/1378] Add convenience aliases for installation of npm
 modules

---
 plugins/npm/npm.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index c3eb91d31..d19079b3f 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -1 +1,7 @@
 eval "$(npm completion 2>/dev/null)"
+
+# Install and save to dependencies
+alias npms="npm i -S "
+
+# Install and save to dev-dependencies
+alias npmd="npm i -D "

From 68955f17ad5fe1cc4461868b2b2d059976d43dfb Mon Sep 17 00:00:00 2001
From: ctroncoso <schmickcl@gmail.com>
Date: Fri, 13 Feb 2015 09:49:54 -0300
Subject: [PATCH 0987/1378] docker containers based on defined names

docker container autocomplete listing uses containers ID instead of names.
Most users identify their containers by name. ID is only needed and used on a dynamic environment more suited in scripts.
---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 880b6faa6..14bad1e7e 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -11,7 +11,7 @@
 # Output a selectable list of all running docker containers
 __docker_containers() {
     declare -a cont_cmd
-    cont_cmd=($(docker ps | awk 'NR>1{print $1":[CON("$1")"$2"("$3")]"}'))
+    cont_cmd=($(docker ps | awk 'NR>1{print $NF":[CON("$1")"$2"("$3")]"}'))
     _describe 'containers' cont_cmd
 }
 

From 3704fbb71eb4d886aff11cdaff79a1a23a895cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 11 Feb 2015 19:58:33 +0100
Subject: [PATCH 0988/1378] Extract CWD notifier back out of auto-title hooks

---
 lib/termsupport.zsh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 58c6203a0..e1c2e2f93 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -31,13 +31,6 @@ function omz_termsupport_precmd {
   fi
 
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
-
-  # Notify Terminal.app of current directory using undocumented OSC sequence
-  # found in OS X 10.9 and 10.10's /etc/bashrc
-  if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
-    local PWD_URL="file://$HOSTNAME${PWD// /%20}"
-    printf '\e]7;%s\a' "$PWD_URL"
-  fi
 }
 
 # Runs before executing the command
@@ -58,3 +51,16 @@ function omz_termsupport_preexec {
 
 precmd_functions+=(omz_termsupport_precmd)
 preexec_functions+=(omz_termsupport_preexec)
+
+
+# Runs before showing the prompt, to update the current directory in Terminal.app
+function omz_termsupport_cwd {
+  # Notify Terminal.app of current directory using undocumented OSC sequence
+  # found in OS X 10.9 and 10.10's /etc/bashrc
+  if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
+    local PWD_URL="file://$HOSTNAME${PWD// /%20}"
+    printf '\e]7;%s\a' "$PWD_URL"
+  fi
+}
+
+precmd_functions+=(omz_termsupport_cwd)

From 4b20bfe0ee4c5ae85a926b7c496b34cf9091f5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 11 Feb 2015 20:30:01 +0100
Subject: [PATCH 0989/1378] Fix first-tab completion in task command

This is done by calling `_task` at the end of the _task completion file,
as is standard in completion files.
---
 plugins/taskwarrior/_task | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
index 0bda738bb..5cc253152 100644
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
@@ -246,3 +246,5 @@ _task_default() {
 
 	return ret
 }
+
+_task

From 7c00bcdb829fad5e7306358259761037d297fb15 Mon Sep 17 00:00:00 2001
From: Matthias Doering <matthias.doering@mldsc.de>
Date: Sat, 14 Feb 2015 10:34:22 -0800
Subject: [PATCH 0990/1378] Modify theme to optimize the usability, when you
 use solarized dark as shell color scheme.

---
 themes/rkj-repos.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 8585e66be..a3f1f3dfa 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -15,8 +15,8 @@ ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}✱"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%}✈"
-ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[grey]%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[blue]%}✈"
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[blue]%}"
 ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
 
 function mygit() {

From a9e97e5d2da90cf3e2b4575888fe585972ebcc74 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 14 Feb 2015 19:05:27 -0500
Subject: [PATCH 0991/1378] Remove terminalapp plugin and fold its
 implementation in to lib/termsupport.zsh. Replaces the redundant Terminal.app
 support that was recently added to termsupport.

---
 lib/termsupport.zsh                        | 43 +++++++++++++++++-----
 plugins/terminalapp/terminalapp.plugin.zsh | 39 --------------------
 2 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 plugins/terminalapp/terminalapp.plugin.zsh

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e1c2e2f93..da74dfdba 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -53,14 +53,37 @@ precmd_functions+=(omz_termsupport_precmd)
 preexec_functions+=(omz_termsupport_preexec)
 
 
-# Runs before showing the prompt, to update the current directory in Terminal.app
-function omz_termsupport_cwd {
-  # Notify Terminal.app of current directory using undocumented OSC sequence
-  # found in OS X 10.9 and 10.10's /etc/bashrc
-  if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then
-    local PWD_URL="file://$HOSTNAME${PWD// /%20}"
-    printf '\e]7;%s\a' "$PWD_URL"
-  fi
-}
+# Keep Apple Terminal.app's current working directory updated
+# Based on this answer: http://superuser.com/a/315029
 
-precmd_functions+=(omz_termsupport_cwd)
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
+  # Emits the control sequence to notify Terminal.app of the cwd
+  function update_terminalapp_cwd() {
+        # Identify the directory using a "file:" scheme URL, including
+        # the host name to disambiguate local vs. remote paths.
+
+        # Percent-encode the pathname.
+        local URL_PATH=''
+        {
+            # Use LANG=C to process text byte-by-byte.
+            local i ch hexch LANG=C
+            for ((i = 1; i <= ${#PWD}; ++i)); do
+                ch="$PWD[i]"
+                if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
+                    URL_PATH+="$ch"
+                else
+                    hexch=$(printf "%02X" "'$ch")
+                    URL_PATH+="%$hexch"
+                fi
+            done
+        }
+
+        local PWD_URL="file://$HOST$URL_PATH"
+        printf '\e]7;%s\a' "$PWD_URL"
+    }
+
+    # Use a precmd hook instead of a chpwd hook to avoid contaminating output
+    precmd_functions+=(update_terminalapp_cwd)
+    # Run once to get initial cwd set
+    update_terminalapp_cwd
+fi
diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
deleted file mode 100644
index 6e47ee188..000000000
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ /dev/null
@@ -1,39 +0,0 @@
-# Set Apple Terminal.app resume directory
-# based on this answer: http://superuser.com/a/315029
-# 2012-10-26: (javageek) Changed code using the updated answer
-
-# Tell the terminal about the working directory whenever it changes.
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
-  update_terminal_cwd() {
-        # Identify the directory using a "file:" scheme URL, including
-        # the host name to disambiguate local vs. remote paths.
-
-        # Percent-encode the pathname.
-        local URL_PATH=''
-        {
-            # Use LANG=C to process text byte-by-byte.
-            local i ch hexch LANG=C
-            for ((i = 1; i <= ${#PWD}; ++i)); do
-                ch="$PWD[i]"
-                if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
-                    URL_PATH+="$ch"
-                else
-                    hexch=$(printf "%02X" "'$ch")
-                    URL_PATH+="%$hexch"
-                fi
-            done
-        }
-
-        local PWD_URL="file://$HOST$URL_PATH"
-        #echo "$PWD_URL"        # testing
-        printf '\e]7;%s\a' "$PWD_URL"
-    }
-
-    # Register the function so it is called whenever the working
-    # directory changes.
-    autoload add-zsh-hook
-    add-zsh-hook precmd update_terminal_cwd
-
-    # Tell the terminal about the initial directory.
-    update_terminal_cwd
-fi

From 3a18c33f17fb73ead87f3c532b3f5c21ea192e10 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 14 Feb 2015 20:30:03 -0500
Subject: [PATCH 0992/1378] In termsupport, use LC_CTYPE instead of LANG to
 enable byte-by-byte text processing. LANG doesn't seem to actually work.

---
 lib/termsupport.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index da74dfdba..9ff8a811c 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -65,8 +65,8 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
         # Percent-encode the pathname.
         local URL_PATH=''
         {
-            # Use LANG=C to process text byte-by-byte.
-            local i ch hexch LANG=C
+            # Use LC_CTYPE=C to process text byte-by-byte.
+            local i ch hexch LC_CTYPE=C
             for ((i = 1; i <= ${#PWD}; ++i)); do
                 ch="$PWD[i]"
                 if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then

From ec9525b94e938c476c07e68bb479eb848bb5dbc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Vaello=20Mart=C3=ADnez?=
 <miguel.vaellomartinez@gmail.com>
Date: Sun, 15 Feb 2015 15:39:50 +0100
Subject: [PATCH 0993/1378] Add initial JHBuild plugin support

This is a bunch of alias for the JHBuild tool.
A well known tool in the GNOME dev project.
---
 plugins/jhbuild/README.md          |  4 ++++
 plugins/jhbuild/jhbuild.plugin.zsh | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 plugins/jhbuild/README.md
 create mode 100644 plugins/jhbuild/jhbuild.plugin.zsh

diff --git a/plugins/jhbuild/README.md b/plugins/jhbuild/README.md
new file mode 100644
index 000000000..910526966
--- /dev/null
+++ b/plugins/jhbuild/README.md
@@ -0,0 +1,4 @@
+## JHBuild
+**Maintainer:** [Miguel Vaello](https://github.com/miguxbe)
+
+This plugin adds some jhbuild aliases and increase the completion function provided by zsh.
diff --git a/plugins/jhbuild/jhbuild.plugin.zsh b/plugins/jhbuild/jhbuild.plugin.zsh
new file mode 100644
index 000000000..fed1bc9fc
--- /dev/null
+++ b/plugins/jhbuild/jhbuild.plugin.zsh
@@ -0,0 +1,28 @@
+# Aliases
+#
+alias jh='jhbuild'
+# Build
+alias jhb='jhbuild build'
+alias jhbo='jhbuild buildone'
+# Checks
+alias jhckb='jhbuild checkbranches'
+alias jhckm='jhbuild checkmodulesets'
+# Info & list
+alias jhi='jhbuild info'
+alias jhl='jhbuild list'
+# Clean
+alias jhc='jhbuild clean'
+alias jhco='jhbuild cleanone'
+# Run
+alias jhr='jhbuild run'
+# Depends
+alias jhrd='jhbuild rdepends'
+alias jhsd='jhbuild sysdeps'
+# Update
+alias jhu='jhbuild update'
+alias jhuo='jhbuild updateone'
+# Uninstall
+alias jhun='jhbuild uninstall'
+
+
+

From b39dbec7e9d49083be5d9034604f98f1a4d264fd Mon Sep 17 00:00:00 2001
From: Alexandros Giouzenis <alexandrosg@gmail.com>
Date: Tue, 3 Feb 2015 18:58:09 +0200
Subject: [PATCH 0994/1378] Fix tmuxinator completion for symlinked dirs

Tmuxinator start command can be ommited
Fix #2812
---
 plugins/tmuxinator/_tmuxinator | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index e4f8b6ce0..551267ed2 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -8,6 +8,8 @@ _arguments -C \
   '1: :->cmds' \
   '2:: :->args' && ret=0
 
+_configs=(${$(echo ~/.tmuxinator/*.yml):r:t})
+
 case $state in
   cmds)
     _values "tmuxinator command" \
@@ -21,13 +23,13 @@ case $state in
         "list[list all existing projects]" \
         "doctor[look for problems in your configuration]" \
         "help[shows this help document]" \
-        "version[shows tmuxinator version number]"
+        "version[shows tmuxinator version number]" \
+        $_configs
     ret=0
     ;;
   args)
     case $line[1] in
       start|open|copy|delete|debug)
-        _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
         [[ -n "$_configs" ]] && _values 'configs' $_configs
         ret=0
         ;;

From 8cf04ed3d7d5552bc2242a5987d46f6faf0fe2dc Mon Sep 17 00:00:00 2001
From: Alex Talker <alextalker@openmailbox.org>
Date: Thu, 15 Jan 2015 04:13:40 +0300
Subject: [PATCH 0995/1378] Fix echo nothing if $SHORT_HOST doesn't exist.

---
 themes/candy-kingdom.zsh-theme | 2 +-
 themes/fino-time.zsh-theme     | 2 +-
 themes/fino.zsh-theme          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index 889128758..adba1ad39 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -13,7 +13,7 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST
+    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST}
 }
 
 PROMPT='
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 67b6b6e08..6e7e654ff 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -21,7 +21,7 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST
+    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST}
 }
 
 
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 50d41e899..e4477589e 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -17,7 +17,7 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST
+    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST}
 }
 
 local ruby_env=''

From 2790a5e565ecf1a695c25c7ef0d5aa23f8bb5239 Mon Sep 17 00:00:00 2001
From: Zhiming Wang <zmwangx@gmail.com>
Date: Sun, 15 Feb 2015 11:37:28 -0800
Subject: [PATCH 0996/1378] Bring back -h option to ls variants

The -h options in l, ll, and la were lost in 25b1cd6. There's no reason
to remove them.
---
 lib/directories.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 1a9698544..3bffa9fd9 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -24,9 +24,9 @@ alias d='dirs -v | head -10'
 
 # List directory contents
 alias lsa='ls -lah'
-alias l='ls -la'
-alias ll='ls -l'
-alias la='ls -lA'
+alias l='ls -lah'
+alias ll='ls -lh'
+alias la='ls -lAh'
 
 # Push and pop directories on directory stack
 alias pu='pushd'

From 7c73a3aea4861a281bc931a064f13a7c7da3b6be Mon Sep 17 00:00:00 2001
From: pi0 <pyapar@gmail.com>
Date: Mon, 16 Feb 2015 11:58:54 +0330
Subject: [PATCH 0997/1378] Laravel 5 support

---
 plugins/laravel4/laravel4.plugin.zsh |  2 +-
 plugins/laravel5/laravel5.plugin.zsh | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 plugins/laravel5/laravel5.plugin.zsh

diff --git a/plugins/laravel4/laravel4.plugin.zsh b/plugins/laravel4/laravel4.plugin.zsh
index 4b1022b66..0edc84970 100644
--- a/plugins/laravel4/laravel4.plugin.zsh
+++ b/plugins/laravel4/laravel4.plugin.zsh
@@ -1,6 +1,6 @@
 # Laravel4 basic command completion
 _laravel4_get_command_list () {
-	php artisan --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+	php artisan --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z]+/ { print $1 }'
 }
 
 _laravel4 () {
diff --git a/plugins/laravel5/laravel5.plugin.zsh b/plugins/laravel5/laravel5.plugin.zsh
new file mode 100644
index 000000000..2afa99317
--- /dev/null
+++ b/plugins/laravel5/laravel5.plugin.zsh
@@ -0,0 +1,20 @@
+# Laravel5 basic command completion
+_laravel5_get_command_list () {
+	php artisan --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z]+/ { print $1 }'
+}
+
+_laravel5 () {
+  if [ -f artisan ]; then
+    compadd `_laravel5_get_command_list`
+  fi
+}
+
+compdef _laravel5 artisan
+compdef _laravel5 la5
+
+#Alias
+alias la5='php artisan'
+
+alias la5dump='php artisan dump-autoload'
+alias la5cache='php artisan cache:clear'
+alias la5routes='php artisan routes'

From cd36deda23a1f6f53ba910077b22c200fb820299 Mon Sep 17 00:00:00 2001
From: Karsten Kosmala <kosmala@cosmocode.de>
Date: Mon, 16 Feb 2015 12:04:37 +0100
Subject: [PATCH 0998/1378] added stats command to docker plugin

---
 plugins/docker/_docker | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 880b6faa6..df8319ea7 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -219,6 +219,10 @@ __start() {
     __docker_containers
 }
 
+__stats() {
+    __docker_containers
+}
+
 __stop() {
     _arguments \
         '(-t,--time=)'{-t,--time=}'[Number of seconds to wait for the container to stop before killing it.]'
@@ -280,6 +284,7 @@ _1st_arguments=(
     "save":"Save an image to a tar archive"
     "search":"Search for an image in the docker index"
     "start":"Start a stopped container"
+    "stats":"Display a live stream of one or more containers' resource usage statistics"
     "stop":"Stop a running container"
     "tag":"Tag an image into a repository"
     "top":"Lookup the running processes of a container"
@@ -351,6 +356,8 @@ case "$words[1]" in
         __save ;;
     search)
         __search ;;
+    stats)
+        __stats ;;
     start)
         __start ;;
     stop)

From 6ccf67a077e07bc57cdca6980dcdf346cbd2138e Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Mon, 16 Feb 2015 10:24:22 -0500
Subject: [PATCH 0999/1378] Do not put explicit dot in $cdpath, since it causes
 problems on Cygwin due to an underlying zsh bug.

---
 lib/completion.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index ea6139fde..4b1bb0a62 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -34,7 +34,6 @@ fi
 
 # disable named-directories autocompletion
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
-cdpath=(.)
 
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1

From 46e6e2e23a175ee7e571878a18b4fae03c269b69 Mon Sep 17 00:00:00 2001
From: Roderick Randolph <roderickrandolph@users.noreply.github.com>
Date: Mon, 16 Feb 2015 12:22:18 -0500
Subject: [PATCH 1000/1378] Fixes incorrect prompt arrow color

Fixes a bug where color of status arrow in prompt is red even when the exit code was zero (or success). This fix correclty returns green arrow on success and red for non-success exit code.
---
 themes/awesomepanda.zsh-theme | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda.zsh-theme
index 411b89837..1c5d06b2d 100644
--- a/themes/awesomepanda.zsh-theme
+++ b/themes/awesomepanda.zsh-theme
@@ -1,18 +1,16 @@
 # the svn plugin has to be activated for this to work.
-
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
+local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
+PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[yellow]%} ✗ %{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) "
 
-
-
 ZSH_PROMPT_BASE_COLOR="%{$fg_bold[blue]%}"
 ZSH_THEME_REPO_NAME_COLOR="%{$fg_bold[red]%}"
 
 ZSH_THEME_SVN_PROMPT_PREFIX="svn:("
 ZSH_THEME_SVN_PROMPT_SUFFIX=")"
 ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%} ✘ %{$reset_color%}"
-ZSH_THEME_SVN_PROMPT_CLEAN=" "
\ No newline at end of file
+ZSH_THEME_SVN_PROMPT_CLEAN=" "

From 8b5950b812b56a652ce1101f8d4adc569e516160 Mon Sep 17 00:00:00 2001
From: Oleg Voronkovich <oleg-voronkovich@yandex.ru>
Date: Sun, 15 Feb 2015 19:12:51 +0300
Subject: [PATCH 1001/1378] Fix: "\s" is a gawk-specific regexp operator.

---
 plugins/composer/composer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 7f70e3d72..86f5be3d0 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -7,7 +7,7 @@
 
 # Composer basic command completion
 _composer_get_command_list () {
-    $_comp_command1 --no-ansi | sed "1,/Available commands/d" | awk '/^\s*[a-z]+/ { print $1 }'
+    $_comp_command1 --no-ansi | sed "1,/Available commands/d" | awk '/^[ \t]*[a-z]+/ { print $1 }'
 }
 
 _composer_get_required_list () {

From 702ff1ca9167455d2df385790e9023f758d5fc33 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Tue, 17 Feb 2015 00:49:53 -0500
Subject: [PATCH 1002/1378] Add support for non-UTF-8 encodings in caller's
 locale.

---
 lib/termsupport.zsh | 73 +++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 25 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 9ff8a811c..70b54301d 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -55,35 +55,58 @@ preexec_functions+=(omz_termsupport_preexec)
 
 # Keep Apple Terminal.app's current working directory updated
 # Based on this answer: http://superuser.com/a/315029
+# With extra fixes to handle multibyte chars and non-UTF-8 locales
 
 if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
+
+  # URL-encodes a string
+  # Outputs the encoded string on stdout
+  # Returns nonzero if encoding failed
+  function _omz_urlencode() {
+    local url_str=''
+    {
+      local str=$1
+
+      # URLs must use UTF-8 encoding; convert if required
+      local encoding=${LC_CTYPE/*./}
+      if [[ $encoding != UTF-8 ]]; then
+        str=$(iconv -f $encoding -t UTF-8)
+        if [[ $? != 0 ]]; then
+          echo "Error converting string from $encoding to UTF-8" >&2
+          return 1
+        fi
+      fi
+
+      # Use LC_CTYPE=C to process text byte-by-byte
+      local i ch hexch LC_CTYPE=C
+      for ((i = 1; i <= ${#str}; ++i)); do
+        ch="$str[i]"
+        if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
+          url_str+="$ch"
+        else
+          hexch=$(printf "%02X" "'$ch")
+          url_str+="%$hexch"
+        fi
+      done
+      echo $url_str
+    }
+  }
+
   # Emits the control sequence to notify Terminal.app of the cwd
   function update_terminalapp_cwd() {
-        # Identify the directory using a "file:" scheme URL, including
-        # the host name to disambiguate local vs. remote paths.
+    # Identify the directory using a "file:" scheme URL, including
+    # the host name to disambiguate local vs. remote paths.
 
-        # Percent-encode the pathname.
-        local URL_PATH=''
-        {
-            # Use LC_CTYPE=C to process text byte-by-byte.
-            local i ch hexch LC_CTYPE=C
-            for ((i = 1; i <= ${#PWD}; ++i)); do
-                ch="$PWD[i]"
-                if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
-                    URL_PATH+="$ch"
-                else
-                    hexch=$(printf "%02X" "'$ch")
-                    URL_PATH+="%$hexch"
-                fi
-            done
-        }
+    # Percent-encode the pathname.
+    local URL_PATH=$(_omz_urlencode $PWD)
+    [[ $? != 0 ]] && return 1
+    local PWD_URL="file://$HOST$URL_PATH"
+    # Undocumented Terminal.app-specific control sequence
+    printf '\e]7;%s\a' $PWD_URL
+  }
 
-        local PWD_URL="file://$HOST$URL_PATH"
-        printf '\e]7;%s\a' "$PWD_URL"
-    }
-
-    # Use a precmd hook instead of a chpwd hook to avoid contaminating output
-    precmd_functions+=(update_terminalapp_cwd)
-    # Run once to get initial cwd set
-    update_terminalapp_cwd
+  # Use a precmd hook instead of a chpwd hook to avoid contaminating output
+  precmd_functions+=(update_terminalapp_cwd)
+  # Run once to get initial cwd set
+  update_terminalapp_cwd
 fi

From 187cf07c9148d5d6dda9b8ac1b453bd6e39ea550 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Tue, 17 Feb 2015 00:54:54 -0500
Subject: [PATCH 1003/1378] For unspecified encodings, assume it's UTF-8 or
 compatible (e.g. ASCII) and muddle through without character encoding
 conversion.

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 70b54301d..ef9f0e5f1 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -69,7 +69,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
 
       # URLs must use UTF-8 encoding; convert if required
       local encoding=${LC_CTYPE/*./}
-      if [[ $encoding != UTF-8 ]]; then
+      if [[ -n $encoding && $encoding != UTF-8 ]]; then
         str=$(iconv -f $encoding -t UTF-8)
         if [[ $? != 0 ]]; then
           echo "Error converting string from $encoding to UTF-8" >&2

From 6b29aab37a4984b5f31c4dae3dda1f54860eca51 Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Tue, 17 Feb 2015 07:27:38 +0100
Subject: [PATCH 1004/1378] Create readme.md

---
 plugins/ubuntu/readme.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/ubuntu/readme.md

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
new file mode 100644
index 000000000..5954ead0e
--- /dev/null
+++ b/plugins/ubuntu/readme.md
@@ -0,0 +1,23 @@
+This plugin was created because the aliases in the debian plugin are inconsistent and hard to remember. Also this apt-priority detaction that switched between apt-get and aptitude was dropped to keep it simpler. This plugin uses apt-get for everything but a few things that are only possible with aptitude I guess. Ubuntu does not have aptitude installed by default.
+
+The aliases for this plugin are easy to remember because they are consistent (the debian plugin is not). 
+
+acs = **a**pt-**c**ache **s**earch  
+acp = **a**pt-**c**ache **p**olicy
+
+ag  = sudo **a**pt-**g**et  
+agi = sudo **a**pt-**g**et **i**nstall  
+agd = sudo **a**pt-**g**et **d**select-upgrade  
+By now you already can guess almost all aliases  
+
+There are two exeptions since ...  
+agu  = sudo **a**pt-**g**et **u**pdate  - we have ...  
+agug = sudo **a**pt-**g**et **u**pgrade - as the exeptional 4 letter alias for a single command.
+
+afs = **a**pt-**f**ile **s**earch --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
+
+Then there are the 2 other 4 letter aliases for combined commands, that are straight forward and easy to remember.  
+aguu = sudo **a**pt-**g**et **u**pdate && sudo apt-get **u**pgrade      - better then adg or not?  
+agud = sudo **a**pt-**g**et **u**pdate && sudo apt-get **d**ist-upgrade
+
+For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/debian/debian.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command.

From f50b3fe7107d4bb6a9439a4032ac6922b9c0c20b Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Tue, 17 Feb 2015 07:33:45 +0100
Subject: [PATCH 1005/1378] Create ubuntu plugin, based on debian plugin.

* Easy to remember aliases
* Simplified
* Added aar() function for `sudo apt-add-repository xxxx && apt-get upgrade && apt-get install xxxx`
---
 plugins/ubuntu/ubuntu.plugin.zsh | 141 +++++++++++++++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 plugins/ubuntu/ubuntu.plugin.zsh

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
new file mode 100644
index 000000000..0211d3374
--- /dev/null
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -0,0 +1,141 @@
+# Authors:
+# https://github.com/AlexBio
+# https://github.com/dbb
+# https://github.com/Mappleconfusers
+# Nicolas Jonas nextgenthemes.com
+#
+# Debian, Ubuntu and friends related zsh aliases and functions for zsh
+
+alias acs='apt-cache search'
+compdef _acs acs='apt-cache search'
+
+alias afs='apt-file search --regexp'
+compdef _afs afs='apt-file search --regexp'
+
+# These are apt-get only
+alias ags='apt-get source'   # asrc
+compdef _ags ags='apt-get source'
+
+alias acp='apt-cache policy' # app
+compdef _acp acp='apt-cache policy'
+
+# superuser operations ######################################################
+alias afu='sudo apt-file update'
+compdef _afu afu='sudo apt-file update'
+
+alias ppap='sudo ppa-purge'
+compdef _ppap ppap='sudo ppa-purge'
+
+alias ag='sudo apt-get'            # age - but without sudo
+alias aga='sudo apt-get autoclean' # aac
+alias agb='sudo apt-get build-dep' # abd
+alias agc='sudo apt-get clean'     # adc
+alias agd='sudo apt-get dselect-upgrade' # ads
+alias agi='sudo apt-get install'  # ai
+alias agp='sudo apt-get purge'    # ap
+alias agr='sudo apt-get remove'   # ar
+alias agu='sudo apt-get update'   # ad
+alias agud='sudo apt-get update && sudo apt-get dist-upgrade' #adu
+alias agug='sudo apt-get upgrade' # ag
+alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
+
+compdef _ag ag='sudo apt-get'
+compdef _aga aga='sudo apt-get autoclean'
+compdef _agb agb='sudo apt-get build-dep'
+compdef _agc agc='sudo apt-get clean'
+compdef _agd agd='sudo apt-get dselect-upgrade'
+compdef _agi agi='sudo apt-get install'
+compdef _agp agp='sudo apt-get purge'
+compdef _agr agr='sudo apt-get remove'
+compdef _agu agu='sudo apt-get update'
+compdef _agud agud='sudo apt-get update && sudo apt-get dist-upgrade'
+compdef _agug agug='sudo apt-get upgrade'
+compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade'
+
+# Remove ALL kernel images and headers EXCEPT the one in use
+alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
+	?not(~n`uname -r`))'
+
+# Misc. #####################################################################
+# print all installed packages
+alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
+
+# Create a basic .deb package
+alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
+
+# apt-add-repository with automatic install/upgrade of the desired package
+# Usage: aar ppa:xxxxxx/xxxxxx [packagename]
+# If packagename is not given as 2nd arument the function will ask for it and guess the defaupt by taking
+# the part after the / from the ppa name wich is sometimes the right name for the package you want to install
+aar() {
+	if [ -n "$2" ]; then
+		PACKAGE=$2
+	else
+		read "PACKAGE?Type in the package name to install/upgrade with this ppa [${1##*/}]: "
+	fi
+	
+	if [ -z "$PACKAGE" ]; then
+		PACKAGE=${1##*/}
+	fi
+	
+	sudo apt-add-repository $1 && sudo apt-get update
+	sudo apt-get install $PACKAGE
+}
+
+# Prints apt history
+# Usage:
+#   apt-history install
+#   apt-history upgrade
+#   apt-history remove
+#   apt-history rollback
+#   apt-history list
+# Based On: http://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
+apt-history () {
+  case "$1" in
+    install)
+      zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
+      ;;
+    upgrade|remove)
+      zgrep --no-filename $1 $(ls -rt /var/log/dpkg*)
+      ;;
+    rollback)
+      zgrep --no-filename upgrade $(ls -rt /var/log/dpkg*) | \
+        grep "$2" -A10000000 | \
+        grep "$3" -B10000000 | \
+        awk '{print $4"="$5}'
+      ;;
+    list)
+      zcat $(ls -rt /var/log/dpkg*)
+      ;;
+    *)
+      echo "Parameters:"
+      echo " install - Lists all packages that have been installed."
+      echo " upgrade - Lists all packages that have been upgraded."
+      echo " remove - Lists all packages that have been removed."
+      echo " rollback - Lists rollback information."
+      echo " list - Lists all contains of dpkg logs."
+      ;;
+  esac
+}
+
+# Kernel-package building shortcut
+kerndeb () {
+    # temporarily unset MAKEFLAGS ( '-j3' will fail )
+    MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
+    print '$MAKEFLAGS set to '"'$MAKEFLAGS'"
+	appendage='-custom' # this shows up in $ (uname -r )
+    revision=$(date +"%Y%m%d") # this shows up in the .deb file name
+
+    make-kpkg clean
+
+    time fakeroot make-kpkg --append-to-version "$appendage" --revision \
+        "$revision" kernel_image kernel_headers
+}
+
+# List packages by size
+function apt-list-packages {
+    dpkg-query -W --showformat='${Installed-Size} ${Package} ${Status}\n' | \
+    grep -v deinstall | \
+    sort -n | \
+    awk '{print $1" "$2}'
+}

From 3120b9ad458353915f03c1e5df1683b6e0122db2 Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Tue, 17 Feb 2015 07:36:23 +0100
Subject: [PATCH 1006/1378] Update readme.md

---
 plugins/ubuntu/readme.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index 5954ead0e..c05352f3b 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -1,6 +1,4 @@
-This plugin was created because the aliases in the debian plugin are inconsistent and hard to remember. Also this apt-priority detaction that switched between apt-get and aptitude was dropped to keep it simpler. This plugin uses apt-get for everything but a few things that are only possible with aptitude I guess. Ubuntu does not have aptitude installed by default.
-
-The aliases for this plugin are easy to remember because they are consistent (the debian plugin is not). 
+This plugin was created because the aliases in the debian plugin are inconsistent and hard to remember. Also this apt-priority detection that switched between apt-get and aptitude was dropped to keep it simpler. This plugin uses apt-get for everything but a few things that are only possible with aptitude I guess. Ubuntu does not have aptitude installed by default.
 
 acs = **a**pt-**c**ache **s**earch  
 acp = **a**pt-**c**ache **p**olicy

From 660eeb19c7850fd6c5470b40538426d2dbeccfe6 Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Tue, 17 Feb 2015 07:48:01 +0100
Subject: [PATCH 1007/1378] Update readme.md

---
 plugins/ubuntu/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index c05352f3b..e7e610604 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -10,7 +10,7 @@ By now you already can guess almost all aliases
 
 There are two exeptions since ...  
 agu  = sudo **a**pt-**g**et **u**pdate  - we have ...  
-agug = sudo **a**pt-**g**et **u**pgrade - as the exeptional 4 letter alias for a single command.
+agug = sudo **a**pt-**g**et **u**p**g**rade - as the exeptional 4 letter alias for a single command.
 
 afs = **a**pt-**f**ile **s**earch --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
 

From d8b99321383b8d7982506709a07aaa92f5f2d9fc Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Tue, 17 Feb 2015 07:49:55 +0100
Subject: [PATCH 1008/1378] Update readme.md

---
 plugins/ubuntu/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index e7e610604..6366cadca 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -18,4 +18,4 @@ Then there are the 2 other 4 letter aliases for combined commands, that are stra
 aguu = sudo **a**pt-**g**et **u**pdate && sudo apt-get **u**pgrade      - better then adg or not?  
 agud = sudo **a**pt-**g**et **u**pdate && sudo apt-get **d**ist-upgrade
 
-For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/debian/debian.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command.
+For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/ubuntu/ubuntu.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command.

From 099246dd9e74f7a2488fe7c51fe8c40502295def Mon Sep 17 00:00:00 2001
From: "Daniel Campoverde [alx741]" <alx741@riseup.net>
Date: Wed, 18 Feb 2015 14:25:15 -0500
Subject: [PATCH 1009/1378] PLUGINS: vi-mode: allow ctrl-p, ctrl-n for history
 navigation

Allow ctrl-p, ctrl-n for history navigation while in insert mode.
---
 plugins/vi-mode/vi-mode.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index f2745b409..45ec22a09 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -34,6 +34,10 @@ bindkey -v
 autoload -Uz edit-command-line
 bindkey -M vicmd 'v' edit-command-line
 
+# allow ctrl-p, ctrl-n for navigate history (standard behaviour)
+bindkey '^P' up-history
+bindkey '^N' down-history
+
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"

From 33900dfd328ea21954cc7772af21e5d44ea71f3f Mon Sep 17 00:00:00 2001
From: "Daniel Campoverde [alx741]" <alx741@riseup.net>
Date: Wed, 18 Feb 2015 14:29:44 -0500
Subject: [PATCH 1010/1378] PLUGINS: vi-mode: allow ctrl-h, ctrl-?, ctrl-w for
 char and word deletion

Allow ctrl-h, ctrl-?, ctrl-w after changes in normal mode.
---
 plugins/vi-mode/vi-mode.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 45ec22a09..1de8bf91a 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -38,6 +38,11 @@ bindkey -M vicmd 'v' edit-command-line
 bindkey '^P' up-history
 bindkey '^N' down-history
 
+# allow ctrl-h, ctrl-w, ctrl-? for char and word deletion (standard behaviour)
+bindkey '^?' backward-delete-char
+bindkey '^h' backward-delete-char
+bindkey '^w' backward-kill-word
+
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
   MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"

From 152a751342d678a90dd8597e512c1d07f72e9477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 19 Feb 2015 15:48:29 +0100
Subject: [PATCH 1011/1378] Revert usage of install.ohmyz.sh URL, until HTTPS
 support.

This reverts commit b6cbba9dfee5985232b473e94595c2fb1ab83715.
---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 09cff2135..d09e6b4bd 100644
--- a/README.textile
+++ b/README.textile
@@ -18,11 +18,11 @@ You can install this via the command-line with either @curl@ or @wget@.
 
 h4. via @curl@:
 
-@curl -L http://install.ohmyz.sh | sh@
+@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh@
 
 h4. via @wget@:
 
-@wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
+@wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
 
 h4. *Optionally*, change the install directory:
 

From e10470f6a320f37a07a229c65c5c7a9646477992 Mon Sep 17 00:00:00 2001
From: wajdi <w.hawari@gmail.com>
Date: Thu, 19 Feb 2015 10:34:51 -0500
Subject: [PATCH 1012/1378] Adding ssh-config to vagrant plugin autocomplete.
 Was missing

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 0c82acd42..76f80b0d7 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -113,7 +113,7 @@ case $state in
       (box)
           __vagrant-box
       ;;
-      (up|provision|package|destroy|reload|ssh|halt|resume|status)
+      (up|provision|package|destroy|reload|ssh|ssh-config|halt|resume|status)
 	_arguments ':feature:__vm_list'
     esac
   ;;

From 8ce1245770a0d9a8f738362bbf749e918b48d7e9 Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Thu, 19 Feb 2015 17:55:32 +0200
Subject: [PATCH 1013/1378] added the 'mix local.hex' command to plugin
 completions

---
 plugins/mix/_mix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index 602f5ffa0..b7c982e0a 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -21,6 +21,7 @@ _1st_arguments=(
     'local.install:Install a task or an archive locally'
     'local.rebar:Install rebar locally'
     'local.uninstall:Uninstall local tasks or archives'
+    'local.hex:Install Hex locally'
     'new:Creates a new Elixir project'
     'run:Run the given file or expression'
     "test:Run a project's tests"

From 393676387a99683f2a5ccf44557d874ffd272d63 Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Thu, 19 Feb 2015 19:37:54 +0100
Subject: [PATCH 1014/1378] Markdown bolds to capital letters

---
 plugins/ubuntu/readme.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index 6366cadca..17c805a44 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -1,21 +1,21 @@
 This plugin was created because the aliases in the debian plugin are inconsistent and hard to remember. Also this apt-priority detection that switched between apt-get and aptitude was dropped to keep it simpler. This plugin uses apt-get for everything but a few things that are only possible with aptitude I guess. Ubuntu does not have aptitude installed by default.
 
-acs = **a**pt-**c**ache **s**earch  
-acp = **a**pt-**c**ache **p**olicy
+acs = Apt-Cache Search  
+acp = Apt-Cache Policy
 
-ag  = sudo **a**pt-**g**et  
-agi = sudo **a**pt-**g**et **i**nstall  
-agd = sudo **a**pt-**g**et **d**select-upgrade  
+ag  = sudo Apt-Get  
+agi = sudo Apt-Get Install  
+agd = sudo Apt-Get Dselect-upgrade  
 By now you already can guess almost all aliases  
 
 There are two exeptions since ...  
-agu  = sudo **a**pt-**g**et **u**pdate  - we have ...  
-agug = sudo **a**pt-**g**et **u**p**g**rade - as the exeptional 4 letter alias for a single command.
+agu  = sudo Apt-Get Update  - we have ...  
+agug = sudo Apt-Get UpGrade - as the exeptional 4 letter alias for a single command.
 
-afs = **a**pt-**f**ile **s**earch --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
+afs = Apt-F*ile Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
 
 Then there are the 2 other 4 letter aliases for combined commands, that are straight forward and easy to remember.  
-aguu = sudo **a**pt-**g**et **u**pdate && sudo apt-get **u**pgrade      - better then adg or not?  
-agud = sudo **a**pt-**g**et **u**pdate && sudo apt-get **d**ist-upgrade
+aguu = sudo Apt-Get Update && sudo apt-get Upgrade      - better then adg or not?  
+agud = sudo Apt-Get Update && sudo apt-get Dist-upgrade
 
 For a full list aliases and the functions just watch the plugins code https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/ubuntu/ubuntu.plugin.zsh, look at the comments if you want to switch from the debian plugin. Ubuntu, Mint and & co users will like the new aar function to install packages from ppas with a single command.

From aff01d920e36231c59f3d8c43ffdc8564019b818 Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Thu, 19 Feb 2015 19:43:31 +0100
Subject: [PATCH 1015/1378] Update readme.md

---
 plugins/ubuntu/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ubuntu/readme.md b/plugins/ubuntu/readme.md
index 17c805a44..c9ef61f4e 100644
--- a/plugins/ubuntu/readme.md
+++ b/plugins/ubuntu/readme.md
@@ -12,7 +12,7 @@ There are two exeptions since ...
 agu  = sudo Apt-Get Update  - we have ...  
 agug = sudo Apt-Get UpGrade - as the exeptional 4 letter alias for a single command.
 
-afs = Apt-F*ile Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
+afs = Apt-File Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command.
 
 Then there are the 2 other 4 letter aliases for combined commands, that are straight forward and easy to remember.  
 aguu = sudo Apt-Get Update && sudo apt-get Upgrade      - better then adg or not?  

From bc8abe5ea26aa031395c754e3e9710dcc62dd0f0 Mon Sep 17 00:00:00 2001
From: Brian Derr <brian@derrclan.com>
Date: Thu, 19 Feb 2015 13:30:50 -0800
Subject: [PATCH 1016/1378] Verify zle is active before trying to reset-prompt.

---
 plugins/vi-mode/vi-mode.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index f2745b409..ac9233290 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -17,8 +17,12 @@ function zle-keymap-select zle-line-init zle-line-finish {
 # Ensure that the prompt is redrawn when the terminal size changes.
 TRAPWINCH() {
   if [[ -o zle ]]; then
-    zle reset-prompt
-    zle -R
+    # Verify that zle is active before trying to reset-prompt.
+    zle
+    if [[ $? -eq 0 ]]; then
+      zle reset-prompt
+      zle -R
+    fi
   fi
 }
 

From 5f907817836ea1186120b9165556d7894f2c8481 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Thu, 19 Feb 2015 23:53:48 -0500
Subject: [PATCH 1017/1378] plugins/chucknorris: Add automatic updating of the
 compiled fortune data file. Use local variable for readability, and anonymous
 function to provide a scope for the local variable.

---
 plugins/chucknorris/chucknorris.plugin.zsh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/chucknorris/chucknorris.plugin.zsh b/plugins/chucknorris/chucknorris.plugin.zsh
index 096364633..fd52f2b78 100644
--- a/plugins/chucknorris/chucknorris.plugin.zsh
+++ b/plugins/chucknorris/chucknorris.plugin.zsh
@@ -1,6 +1,12 @@
-if [ ! -f $ZSH/plugins/chucknorris/fortunes/chucknorris.dat ]; then
-    strfile $ZSH/plugins/chucknorris/fortunes/chucknorris $ZSH/plugins/chucknorris/fortunes/chucknorris.dat
-fi
+() {
+  # Automatically generate or update Chuck's compiled fortune data file
+  local fdir=$ZSH/plugins/chucknorris/fortunes
+  if [[ ! -f $fdir/chucknorris.dat ]] || [[ $fdir/chucknorris.dat -ot $fdir/chucknorris ]]; then
+    strfile $fdir/chucknorris $fdir/chucknorris.dat
+  fi
+
+  # Aliases
+  alias chuck="fortune -a $fdir"
+  alias chuck_cow="chuck | cowthink"
+}
 
-alias chuck="fortune -a $ZSH/plugins/chucknorris/fortunes"
-alias chuck_cow="chuck | cowthink"

From 1246c3e08bfb7d999bac2ae3e9933084cffbc4eb Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Fri, 20 Feb 2015 02:34:54 -0500
Subject: [PATCH 1018/1378] install.sh: Replace nonstandard "sed -i" with sed +
 mv commands. Makes portable to systems whose sed lacks "-i", like OpenBSD.

---
 tools/install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index bd4c55749..496199363 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -23,14 +23,16 @@ fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
 cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
-sed -i -e "/^export ZSH=/ c\\
+sed "/^export ZSH=/ c\\
 export ZSH=$ZSH
-" ~/.zshrc
+" ~/.zshrc > ~/.zshrc-omztemp
+mv -f ~/.zshrc-omztemp ~/.zshrc
 
 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
-sed -i -e "/export PATH=/ c\\
+sed "/export PATH=/ c\\
 export PATH=\"$PATH\"
-" ~/.zshrc
+" ~/.zshrc > ~/.zshrc-omztemp
+mv -f ~/.zshrc-omztemp ~/.zshrc
 
 if [ "$SHELL" != "$(which zsh)" ]; then
     echo "\033[0;34mTime to change your default shell to zsh!\033[0m"

From 0a99ca0df0f53e546c9c6ac5240e38f3a2dd2c3b Mon Sep 17 00:00:00 2001
From: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
Date: Fri, 20 Feb 2015 15:17:00 -0200
Subject: [PATCH 1019/1378] plugins: mercurial: Update the order prompt vars
 are displayed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a user sets ZSH_THEME_HG_PROMPT_* as the following, he ends up with
%{$reset_color%} resetting the bold style of last character ")" because
_SUFFIX was expanded before calling hg_dirty():

    ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[blue]%}hg:(%{$fg[white]%}"
    ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}"
    ZSH_THEME_HG_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
    ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[blue]%})"

With this patch, the variable ZSH_THEME_HG_PROMPT_SUFFIX is lastly
displayed, following the same order as in git_prompt_info(),
i.e. <prefix><dirty><suffix>.
---
 plugins/mercurial/mercurial.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index ed4d23713..86200ccf6 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -35,7 +35,7 @@ function hg_prompt_info {
   if [ $(in_hg) ]; then
     _DISPLAY=$(hg_get_branch_name)
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR"
     unset _DISPLAY
   fi
 }

From cb37c934c0e1083897b501e5b8a85340e3b7e470 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 21 Feb 2015 16:00:40 -0500
Subject: [PATCH 1020/1378] Remove unnecessary braces.

---
 lib/termsupport.zsh | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index ef9f0e5f1..7cb3791e6 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -63,33 +63,31 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
   # Outputs the encoded string on stdout
   # Returns nonzero if encoding failed
   function _omz_urlencode() {
+    local str=$1
     local url_str=''
-    {
-      local str=$1
 
-      # URLs must use UTF-8 encoding; convert if required
-      local encoding=${LC_CTYPE/*./}
-      if [[ -n $encoding && $encoding != UTF-8 ]]; then
-        str=$(iconv -f $encoding -t UTF-8)
-        if [[ $? != 0 ]]; then
-          echo "Error converting string from $encoding to UTF-8" >&2
-          return 1
-        fi
+    # URLs must use UTF-8 encoding; convert if required
+    local encoding=${LC_CTYPE/*./}
+    if [[ -n $encoding && $encoding != UTF-8 ]]; then
+      str=$(iconv -f $encoding -t UTF-8)
+      if [[ $? != 0 ]]; then
+        echo "Error converting string from $encoding to UTF-8" >&2
+        return 1
       fi
+    fi
 
-      # Use LC_CTYPE=C to process text byte-by-byte
-      local i ch hexch LC_CTYPE=C
-      for ((i = 1; i <= ${#str}; ++i)); do
-        ch="$str[i]"
-        if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
-          url_str+="$ch"
-        else
-          hexch=$(printf "%02X" "'$ch")
-          url_str+="%$hexch"
-        fi
-      done
-      echo $url_str
-    }
+    # Use LC_CTYPE=C to process text byte-by-byte
+    local i ch hexch LC_CTYPE=C
+    for ((i = 1; i <= ${#str}; ++i)); do
+      ch="$str[i]"
+      if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
+        url_str+="$ch"
+      else
+        hexch=$(printf "%02X" "'$ch")
+        url_str+="%$hexch"
+      fi
+    done
+    echo $url_str
   }
 
   # Emits the control sequence to notify Terminal.app of the cwd

From 88f42b6132adedff7557170168416d575569b56e Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 21 Feb 2015 16:25:28 -0500
Subject: [PATCH 1021/1378] Add support for variant "utf8" locale suffix
 spelling. Fix dumb bug in iconv call that would cause it to hang.

---
 lib/termsupport.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 7cb3791e6..52622f5ab 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -64,12 +64,12 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
   # Returns nonzero if encoding failed
   function _omz_urlencode() {
     local str=$1
-    local url_str=''
+    local url_str=""
 
     # URLs must use UTF-8 encoding; convert if required
     local encoding=${LC_CTYPE/*./}
-    if [[ -n $encoding && $encoding != UTF-8 ]]; then
-      str=$(iconv -f $encoding -t UTF-8)
+    if [[ -n $encoding && $encoding != UTF-8 && $encoding != utf8 ]]; then
+      str=$(echo $str | iconv -f $encoding -t UTF-8)
       if [[ $? != 0 ]]; then
         echo "Error converting string from $encoding to UTF-8" >&2
         return 1

From cb0718c14785de7cf808ef4e2d7ddf5ab3eda8e0 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 21 Feb 2015 18:24:07 -0500
Subject: [PATCH 1022/1378] chucknorris: locate plugin dir using $0 instead of
 hardcoded $ZSH

---
 plugins/chucknorris/chucknorris.plugin.zsh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/chucknorris/chucknorris.plugin.zsh b/plugins/chucknorris/chucknorris.plugin.zsh
index fd52f2b78..1cdc945d1 100644
--- a/plugins/chucknorris/chucknorris.plugin.zsh
+++ b/plugins/chucknorris/chucknorris.plugin.zsh
@@ -1,12 +1,11 @@
-() {
-  # Automatically generate or update Chuck's compiled fortune data file
-  local fdir=$ZSH/plugins/chucknorris/fortunes
-  if [[ ! -f $fdir/chucknorris.dat ]] || [[ $fdir/chucknorris.dat -ot $fdir/chucknorris ]]; then
-    strfile $fdir/chucknorris $fdir/chucknorris.dat
-  fi
+# Automatically generate or update Chuck's compiled fortune data file
+DIR=${0:h}/fortunes
+if [[ ! -f $DIR/chucknorris.dat ]] || [[ $DIR/chucknorris.dat -ot $DIR/chucknorris ]]; then
+  strfile $DIR/chucknorris $DIR/chucknorris.dat
+fi
 
-  # Aliases
-  alias chuck="fortune -a $fdir"
-  alias chuck_cow="chuck | cowthink"
-}
+# Aliases
+alias chuck="fortune -a $DIR"
+alias chuck_cow="chuck | cowthink"
 
+unset DIR
\ No newline at end of file

From 8f1741d56c21f1daf50c1e1f76a5eea37106e239 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 21 Feb 2015 16:07:27 -0800
Subject: [PATCH 1023/1378] Moving README to markdown... and taking first steps
 at reorganizing it. Also updated the LICENSE to reflect 2015.

---
 MIT-LICENSE.txt |   2 +-
 README.markdown | 175 ++++++++++++++++++++++++++++++++++++++++++++++++
 README.textile  | 111 ------------------------------
 3 files changed, 176 insertions(+), 112 deletions(-)
 create mode 100644 README.markdown
 delete mode 100644 README.textile

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
index 6eb8aab34..dfbd90035 100644
--- a/MIT-LICENSE.txt
+++ b/MIT-LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2014 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
+Copyright (c) 2009-2015 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.markdown b/README.markdown
new file mode 100644
index 000000000..1a8e6f8d0
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,175 @@
+![Oh My Zsh](https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png)
+
+
+Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
+
+Oh My Zsh is a way of life. Once installed, your terminal prompt will become the talk of the town. Everytime you begin interacting with your command prompt, you'll begin to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+
+To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter.
+
+## Getting Started
+
+
+### Pre-requisites
+
+__Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
+
+* Unix-based operating system (Mac OS X or Linux)
+* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent)
+  * This is commonly pre-installed. (`zsh --version` to confirm)
+* `curl` or `wget` should be installed
+
+### Basic Installation
+
+Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either @curl@ or @wget@.
+
+#### via curl
+
+`curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh`
+
+#### via wget
+
+`wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh`
+
+## Using Oh My Zsh
+
+### Plugins
+
+Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a look in the [plugins](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins) directory and/or the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins) to see what's currently available.
+
+#### Enabling Plugins
+
+If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load in initialization.
+
+For example, this line might begin to look like...
+
+`plugins=(git bundler osx rake ruby)`
+
+#### Using Plugins
+
+Most plugins (should! we're working on this) include a __README__, which documents how to use them.
+
+### Themes
+
+We'll admit it. Early in the Oh My Zsh world... we may have gotten a far too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
+
+#### Selecting a Theme
+
+_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just right (for him)._
+
+Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
+
+`ZSH_THEME="robbyrussell"`
+
+To use a different theme, simple change the value to match the name of your desired theme. For example:
+
+`ZSH_THEME="agnoster"` (this is one of the fancy ones)
+
+Open up a new terminal window and your prompt should look something like...
+
+## Advanced Topics
+
+If you're the type that likes to get their hands dirty... these sections might resonate.
+
+### Advanced Installation
+
+For those who want to install this manually and/or set custom paths.
+
+#### Custom Directory
+
+The default location is `~/.oh-my-zsh` (hidden in your home directory)
+
+If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
+
+`curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh`
+
+#### Manual Installation
+
+##### 1. Clone the repository:
+
+`git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh`
+
+##### 2. *Optionally*, backup your existing @~/.zshrc@ file:
+
+`cp ~/.zshrc ~/.zshrc.orig`
+
+##### 3. Create a new zsh configuration file
+
+You can create a new zsh config file by copying the template that we included for you.
+
+`cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc`
+
+##### 4. Change your default shell
+
+`chsh -s /bin/zsh`
+
+##### 5. Initialize your new zsh configuration
+
+Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.
+
+### Installation Problems
+
+If you have any hiccups installing, here are a few common fixes.
+
+* You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
+* If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.
+
+### Custom Plugins and Themes
+
+If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory.
+
+If you have many functions that go well together, you can put them as a `abcyzeae.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin.
+
+If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
+
+## Getting Updates
+
+By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
+
+`DISABLE_UPDATE_PROMPT=true`
+
+To disable automatic upgrades, set the following in your `~/.zshrc`:
+
+`DISABLE_AUTO_UPDATE=true`
+
+### Manual Updates
+
+If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?)... you just need to run:
+
+`upgrade_oh_my_zsh`
+
+Magic!
+
+## Uninstalling Oh My Zsh
+
+Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy breakup.
+
+If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.
+
+## Contributing
+
+I'm far from being a [Zsh](http://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
+
+We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.
+
+### Do NOT Send Us Themes
+
+We have (more than) enough themes for the time being. Please fork the project and add one in there – you can let people know how to grab it from there.
+
+## Contributors
+
+Oh My Zsh has a vibrant community of happy users and delightful contributors. Without all the time and help from our contributors, it wouldn't be so awesome.
+
+Thank you so much!
+
+## Follow Us
+
+We have an [ohmyzsh](https://twitter.com/ohmyzsh) account. You should follow it.
+
+## Merchandise
+
+We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
+
+## LICENSE
+
+Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt).
diff --git a/README.textile b/README.textile
deleted file mode 100644
index d09e6b4bd..000000000
--- a/README.textile
+++ /dev/null
@@ -1,111 +0,0 @@
-!https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png!
-
-@oh-my-zsh@ is an open source, community-driven framework for managing your "Zsh":http://www.zsh.org/ configuration.
-
-It comes bundled with a ton of helpful functions, helpers, plugins, themes, and a few things that make you shout…
-
-bq. "OH MY ZSHELL!"
-
-h2. Setup
-
-@oh-my-zsh@ should work with any recent release of "Zsh":http://www.zsh.org/. The minimum recommended version is *4.3.9*.
-
-If not already installed, you can install "Zsh":http://www.zsh.org/ using the command-line.
-
-h3. The automatic installer… do you trust me?
-
-You can install this via the command-line with either @curl@ or @wget@.
-
-h4. via @curl@:
-
-@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh@
-
-h4. via @wget@:
-
-@wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@
-
-h4. *Optionally*, change the install directory:
-
-The default location is @~/.oh-my-zsh@ (hidden in your home directory).
-
-You can change the install directory with the @ZSH@ environment variable, either by running @export ZSH=/your/path@ before installing, or by setting it before the end of the install pipeline like this:
-
-@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
-
-h3. The manual way
-
-1. Clone the repository:
-
-@git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
-
-2. *Optionally*, backup your existing @~/.zshrc@ file:
-
-@cp ~/.zshrc ~/.zshrc.orig@
-
-3. Create a new "Zsh":http://www.zsh.org/ config file by copying the "Zsh":http://www.zsh.org/ template we've provided:
-
-@cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
-
-4. Set "Zsh":http://www.zsh.org/ as your default shell:
-
-@chsh -s /bin/zsh@
-
-5. Start or restart "Zsh":http://www.zsh.org/ by opening a new command-line window.
-
-h3. Problems?
-
-You _might_ need to modify your @PATH@ in @~/.zshrc@ if you're not able to find some commands after switching to @oh-my-zsh@.
-
-If you installed manually or changed the install location, check the @ZSH@ environment variable in @~/.zshrc@.
-
-h2. Usage
-
-* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's available)
-** example: @plugins=(git osx ruby)@
-* theme support: change the @ZSH_THEME@ environment variable in @~/.zshrc@
-** take a look at the @themes/@ directory and the "wiki":https://wiki.github.com/robbyrussell/oh-my-zsh/themes to see what comes bundled with @oh-my-zsh@
-* & much, much more… take a look at the @lib/@ directory to see what @oh-my-zsh@ has to offer…
-
-h2. Useful
-
-The "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty useful for tips.
-
-h3. Customization
-
-If you want to override any of the default behaviors, just add a new file (ending in @.zsh@) in the @custom/@ directory.
-
-If you have many functions that go well together, you can put them as a @*.plugin.zsh@ file in the @custom/plugins/@ directory and then enable this plugin (see '"Usage":https://github.com/robbyrussell/oh-my-zsh#usage' above).
-
-If you would like to override the functionality of a plugin distributed with @oh-my-zsh@, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
-
-h3. Updates
-
-By default you will be prompted to check for upgrades. If you would like @oh-my-zsh@ to automatically upgrade itself without prompting you, set the following in your @~/.zshrc@:
-
-@DISABLE_UPDATE_PROMPT=true@
-
-To disable upgrades entirely, set the following in your @~/.zshrc@:
-
-@DISABLE_AUTO_UPDATE=true@
-
-To upgrade directly from the command-line, just run @upgrade_oh_my_zsh@.
-
-h3. Uninstalling
-
-If you want to uninstall @oh-my-zsh@, just run @uninstall_oh_my_zsh@ from the command-line and it'll remove itself and revert you to @bash@ (or your previous "Zsh":http://www.zsh.org/ configuration).
-
-h2. Help out!
-
-I'm far from being a "Zsh":http://www.zsh.org/ expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
-
-h3. (Don't) send us your theme (for now)!
-
--I'm hoping to collect a bunch of themes – you can see existing ones in the @themes/@ directory.-
-
-We have enough themes for the time being. Please fork the project and add on in there – you can let people know how to grab it from there.
-
-h2. Contributors
-
-This project wouldn't exist without all of our awesome users and contributors: "view our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
-
-Thank you so much!

From caac64cf37912f37d85c7eb8fa6e053ceb7d2151 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 21 Feb 2015 16:11:57 -0800
Subject: [PATCH 1024/1378] Few copy edits to README

---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 1a8e6f8d0..40f5e661c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,14 +3,14 @@
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
 
-Oh My Zsh is a way of life. Once installed, your terminal prompt will become the talk of the town. Everytime you begin interacting with your command prompt, you'll begin to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interace with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
 
 To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter.
 
 ## Getting Started
 
 
-### Pre-requisites
+### Prerequisites
 
 __Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
 

From 5cd31822c72964b19b6c1938694697726b2ac3b9 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 21 Feb 2015 16:13:53 -0800
Subject: [PATCH 1025/1378] Missed a few textile formatting spots

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 40f5e661c..8fa0de46b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -21,7 +21,7 @@ __Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
 
 ### Basic Installation
 
-Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either @curl@ or @wget@.
+Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl` or `wget`.
 
 #### via curl
 

From a1de65e3595c9bc3438b98d9ca671c2890a4b613 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 21 Feb 2015 16:19:22 -0800
Subject: [PATCH 1026/1378] Removing  --no-check-certificate from README

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 8fa0de46b..25bcdbe6e 100644
--- a/README.markdown
+++ b/README.markdown
@@ -29,7 +29,7 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 
 #### via wget
 
-`wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh`
+`wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh`
 
 ## Using Oh My Zsh
 

From d7837c6041b1099982e3f278b50e8868b8b30ff9 Mon Sep 17 00:00:00 2001
From: Brian Derr <brian@derrclan.com>
Date: Sat, 21 Feb 2015 18:08:54 -0800
Subject: [PATCH 1027/1378] Shorten the zle check and reset-prompt into one
 line.

---
 plugins/vi-mode/vi-mode.plugin.zsh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index ac9233290..80df97d61 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -16,14 +16,7 @@ function zle-keymap-select zle-line-init zle-line-finish {
 
 # Ensure that the prompt is redrawn when the terminal size changes.
 TRAPWINCH() {
-  if [[ -o zle ]]; then
-    # Verify that zle is active before trying to reset-prompt.
-    zle
-    if [[ $? -eq 0 ]]; then
-      zle reset-prompt
-      zle -R
-    fi
-  fi
+  zle && { zle reset-prompt; zle -R }
 }
 
 zle -N zle-line-init

From aa16e18644b3fee0b3cf0320692d6566d539cdd0 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 22 Feb 2015 09:29:31 -0800
Subject: [PATCH 1028/1378] Updating histoby-substring-search README to
 instruct user to load plugins via .zshrc. Closes #1832.

---
 plugins/history-substring-search/README          | 7 -------
 plugins/history-substring-search/README.markdown | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 plugins/history-substring-search/README
 create mode 100644 plugins/history-substring-search/README.markdown

diff --git a/plugins/history-substring-search/README b/plugins/history-substring-search/README
deleted file mode 100644
index be11adf76..000000000
--- a/plugins/history-substring-search/README
+++ /dev/null
@@ -1,7 +0,0 @@
-To activate this script, load it into an interactive ZSH session:
-
-  % source history-substring-search.zsh
-
-See the "history-substring-search.zsh" file for more information:
-
-  % sed -n '2,/^$/s/^#//p' history-substring-search.zsh | more
diff --git a/plugins/history-substring-search/README.markdown b/plugins/history-substring-search/README.markdown
new file mode 100644
index 000000000..143b813a1
--- /dev/null
+++ b/plugins/history-substring-search/README.markdown
@@ -0,0 +1,7 @@
+To activate this script, please include it the `plugins` variable within `~/.zshrc`
+
+  `plugins=(git history-substring-search.zsh)`
+
+See the "history-substring-search.zsh" file for more information:
+
+  `sed -n '2,/^$/s/^#//p' history-substring-search.zsh | more`

From ce607d3fcb4c730c991563b4c62725cd89ce0ced Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 22 Feb 2015 09:51:22 -0800
Subject: [PATCH 1029/1378] Adding keystrong return to oascrupt per suggestion
 by @enzzzy. Fixes #2913.

---
 plugins/osx/osx.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index d366f1fc8..d0f9f009a 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -35,6 +35,7 @@ EOF
           set current_session to current session
           tell current_session
             write text "${command}"
+            keystroke return
           end tell
         end tell
       end tell

From 43bdea4c2fab0ff313a28e2b45274a90c8cc3c76 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 22 Feb 2015 09:57:42 -0800
Subject: [PATCH 1030/1378] Removing say() function in perl plugin so that it
 doesn't overwrite OSX comand line utility. Closes #2562

---
 plugins/perl/perl.plugin.zsh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/perl/perl.plugin.zsh b/plugins/perl/perl.plugin.zsh
index f94c4195d..1fbf7c122 100644
--- a/plugins/perl/perl.plugin.zsh
+++ b/plugins/perl/perl.plugin.zsh
@@ -27,7 +27,7 @@ alias latest-perl='curl -s http://www.perl.org/get.html | perl -wlne '\''if (/pe
 
 # Functions #################################################################
 
-# newpl - creates a basic Perl script file and opens it with $EDITOR 
+# newpl - creates a basic Perl script file and opens it with $EDITOR
 newpl () {
 	# set $EDITOR to 'vim' if it is undefined
 	[[ -z $EDITOR ]] && EDITOR=vim
@@ -54,9 +54,3 @@ pgs() { # [find] [replace] [filename]
 prep() { # [pattern] [filename unless STDOUT]
     perl -nle 'print if /'"$1"'/;' $2
 }
-
-# say - append a newline to 'print'
-say() {
-    print "$1\n"
-}
-

From 7fc47e7ebcff3ec1e01399d32752451f14e3de6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mads=20M=C3=A6tzke=20Tandrup?= <mads@maetzke-tandrup.dk>
Date: Sun, 22 Feb 2015 22:14:37 +0100
Subject: [PATCH 1031/1378] Fixing spaces in title and message given to
 bgnotify on OS X

---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index 259d27424..5ccead3b8 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -34,7 +34,7 @@ bgnotify () {
   if hash notify-send 2>/dev/null; then #ubuntu!
     notify-send $1 $2
   elif hash terminal-notifier 2>/dev/null; then #osx
-    terminal-notifier -message $2 -title $1
+    terminal-notifier -message "$2" -title "$1"
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m $1 $2
   elif hash notifu 2>/dev/null; then #cygwyn support!

From 8b45118f266fd5422f80a7868add48234adc1d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ordon?= <michal@tehidea.com>
Date: Mon, 23 Feb 2015 11:43:19 +0000
Subject: [PATCH 1032/1378] Update Grunt plugin to 0.1.2

---
 plugins/grunt/grunt.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/grunt/grunt.plugin.zsh b/plugins/grunt/grunt.plugin.zsh
index 48f6cb5a2..3f9695177 100644
--- a/plugins/grunt/grunt.plugin.zsh
+++ b/plugins/grunt/grunt.plugin.zsh
@@ -1,4 +1,5 @@
 #compdef grunt
+#autoload
 # -----------------------------------------------------------------------------
 #  _grunt
 #
@@ -8,11 +9,11 @@
 #
 # -----------------------------------------------------------------------------
 #
-#  Version     : 0.1.0
+#  Version     : 0.1.2
 #  Author      : Yonchu <yuyuchu3333@gmail.com>
 #  License     : MIT License
 #  Repository  : https://github.com/yonchu/grunt-zsh-completion
-#  Last Change : 22 Jul 2013.
+#  Last Change : 20 Aug 2014.
 #
 #  Copyright (c) 2013 Yonchu.
 #
@@ -46,7 +47,7 @@
 #
 # -----------------------------------------------------------------------------
 
-function _grunt() {
+function __grunt() {
     local curcontext="$curcontext" update_policy state
     local show_grunt_path update_msg gruntfile opts tasks
 
@@ -113,7 +114,7 @@ function _grunt() {
 #   The cache variable name: __grunt_version __grunt_gruntfile __grunt_opts __grunt_tasks
 function __grunt_update_cache() {
     # TODO
-    local version='0.1.0'
+    local version='0.1.2'
     local is_updating=0
     local gruntfile="$1"
     local grunt_info no_update_options cache_path
@@ -177,6 +178,7 @@ function __grunt_get_tasks() {
         | grep 'Available tasks' -A 100 \
         | grep '^ ' \
         | sed -e 's/^[[:blank:]]*//' -e 's/[[:blank:]]*$//' \
+        | sed -e 's/:/\\:/g' \
         | sed -e 's/  /:/'
 }
 
@@ -250,4 +252,4 @@ function __grunt_caching_policy() {
     (( $#oldp ))
 }
 
-compdef _grunt grunt
+compdef __grunt grunt
\ No newline at end of file

From 0dc7b5c049b9cfb747b48d13b32799266b231caf Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Thu, 12 Feb 2015 15:08:19 +0200
Subject: [PATCH 1033/1378] add nmap plugin with some aliases for scan modes

---
 plugins/nmap/README.md       | 32 ++++++++++++++++++++++++++++++++
 plugins/nmap/nmap.plugin.zsh | 28 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 plugins/nmap/README.md
 create mode 100644 plugins/nmap/nmap.plugin.zsh

diff --git a/plugins/nmap/README.md b/plugins/nmap/README.md
new file mode 100644
index 000000000..8bb8e0648
--- /dev/null
+++ b/plugins/nmap/README.md
@@ -0,0 +1,32 @@
+# Nmap aliases plugin
+
+Adds some useful aliases for nmap similar to the profiles in zenmap.
+
+Nmap options are:
+ * -sS - TCP SYN scan
+ * -v - verbose
+ * -T1 - timing of scan. Options are paranoid (0), sneaky (1), polite (2), normal (3), aggressive (4), and insane (5)
+ * -sF - FIN scan (can sneak through non-stateful firewalls)
+ * -PE - ICMP echo discovery probe
+ * -PP - timestamp discovery probe
+ * -PY - SCTP init ping
+ * -g - use given number as source port
+ * -A - enable OS detection, version detection, script scanning, and traceroute (aggressive)
+ * -O - enable OS detection
+ * -sA - TCP ACK scan
+ * -F - fast scan
+ * --script=vulscan - also access vulnerabilities in target
+
+## Aliases explained
+
+ * nmap_open_ports - scan for open ports on target
+ * nmap_list_interfaces - list all network interfaces on host where the command runs
+ * nmap_slow - slow scan that avoids to spam the targets logs
+ * nmap_fin - scan to see if hosts are up with TCP FIN scan
+ * nmap_full - aggressive full scan that scans all ports, tries to determine OS and service versions
+ * nmap_check_for_firewall - TCP ACK scan to check for firewall existence
+ * nmap_ping_through_firewall - Host discovery with SYN and ACK probes instead of just pings to avoid firewall
+   restrictions
+ * nmap_fast - Fast scan of the top 300 popular ports
+ * nmap_detect_versions - detects versions of services and OS, runs on all ports
+ * nmap_check_for_vulns - uses vulscan script to check target services for vulnerabilities
diff --git a/plugins/nmap/nmap.plugin.zsh b/plugins/nmap/nmap.plugin.zsh
new file mode 100644
index 000000000..f3603f622
--- /dev/null
+++ b/plugins/nmap/nmap.plugin.zsh
@@ -0,0 +1,28 @@
+# Some useful nmap aliases for scan modes
+
+# Nmap options are:
+#  -sS - TCP SYN scan
+#  -v - verbose
+#  -T1 - timing of scan. Options are paranoid (0), sneaky (1), polite (2), normal (3), aggressive (4), and insane (5)
+#  -sF - FIN scan (can sneak through non-stateful firewalls)
+#  -PE - ICMP echo discovery probe
+#  -PP - timestamp discovery probe
+#  -PY - SCTP init ping
+#  -g - use given number as source port
+#  -A - enable OS detection, version detection, script scanning, and traceroute (aggressive)
+#  -O - enable OS detection
+#  -sA - TCP ACK scan
+#  -F - fast scan
+#  --script=vulscan - also access vulnerabilities in target
+
+alias nmap_open_ports="nmap --open"
+alias nmap_list_interfaces="nmap --iflist"
+alias nmap_slow="nmap -sS -v -T1"
+alias nmap_fin="nmap -sF -v"
+alias nmap_full="nmap -sS -T4 -PE -PP -PS80,443 -PY -g 53 -A -p1-65535 -v"
+alias nmap_check_for_firewall="nmap -sA -p1-65535 -v -T4"
+alias nmap_ping_through_firewall="nmap -PS -PA"
+alias nmap_fast="nmap -F -T5 --top-ports 300"
+alias nmap_detect_versions="nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
+alias nmap_check_for_vulns="nmap --script=vulscan"
+

From 1308515d1c2014a52aca3ac952a0172d9961eee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= <koddsson@gmail.com>
Date: Sun, 22 Feb 2015 19:15:33 +0000
Subject: [PATCH 1034/1378] Re-order OS detection if..else statement.

This patch will re-order the if statements when checking what operating
system the user is running.

This is useful for people that already have a `notify-send` binary in
their $PATH but are running OSX. An example of such requirements is
anyone running `vagrant-notify` is required to have a `notify-send`
binary on their $PATH.

See [link](https://github.com/fgrehm/vagrant-notify#os-x).
---
 plugins/bgnotify/bgnotify.plugin.zsh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index 5ccead3b8..14ca4c817 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -1,6 +1,5 @@
 #!/usr/bin/env zsh
 
-
 ## setup ##
 
 [[ -o interactive ]] || return #interactive only!
@@ -21,22 +20,22 @@ if ! (type bgnotify_formatted | grep -q 'function'); then
 fi
 
 currentWindowId () {
-  if hash notify-send 2>/dev/null; then #ubuntu!
-    xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
-  elif hash osascript 2>/dev/null; then #osx
+  if hash osascript 2>/dev/null; then #osx
     osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
+  elif hash notify-send 2>/dev/null; then #ubuntu!
+    xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
   else
     echo $EPOCHSECONDS #fallback for windows
   fi
 }
 
 bgnotify () {
-  if hash notify-send 2>/dev/null; then #ubuntu!
-    notify-send $1 $2
-  elif hash terminal-notifier 2>/dev/null; then #osx
+  if hash terminal-notifier 2>/dev/null; then #osx
     terminal-notifier -message "$2" -title "$1"
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m $1 $2
+  elif hash notify-send 2>/dev/null; then #ubuntu!
+    notify-send $1 $2
   elif hash notifu 2>/dev/null; then #cygwyn support!
     notifu /m "$2" /p "$1"
   fi

From 2e1b964c002aa193fef733d52da252e2e11ca2ef Mon Sep 17 00:00:00 2001
From: wyldphyre <craigreynolds@Claire.local>
Date: Tue, 24 Feb 2015 20:58:50 +0800
Subject: [PATCH 1035/1378] Add README.md file

---
 plugins/sublime/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/sublime/README.md

diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md
new file mode 100644
index 000000000..75b2d9dc1
--- /dev/null
+++ b/plugins/sublime/README.md
@@ -0,0 +1,15 @@
+## sublime
+
+Plugin for Sublime Text, a cross platform text and code editor, available for Linux, Mac OS X, and Windows.
+
+### Requirements
+
+ * [Sublime Text](http://www.sublimetext.com/)
+
+### Usage
+
+ * If `st` command is called without an argument, launch Sublime Text
+
+ * If `st` is passed a directory, `cd` to it and open it in Sublime Text
+
+ * If `st` is passed a file, open it in Sublime Text
\ No newline at end of file

From 01ec37e5f87281e91b174d068a43d0ce6e43944e Mon Sep 17 00:00:00 2001
From: wyldphyre <craigreynolds@Claire.local>
Date: Tue, 24 Feb 2015 21:05:58 +0800
Subject: [PATCH 1036/1378] Added missing 'stt' command alias

---
 plugins/sublime/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md
index 75b2d9dc1..e38cf66dc 100644
--- a/plugins/sublime/README.md
+++ b/plugins/sublime/README.md
@@ -12,4 +12,6 @@ Plugin for Sublime Text, a cross platform text and code editor, available for Li
 
  * If `st` is passed a directory, `cd` to it and open it in Sublime Text
 
- * If `st` is passed a file, open it in Sublime Text
\ No newline at end of file
+ * If `st` is passed a file, open it in Sublime Text
+
+ * if `stt` command is called, it is equivalent to `st .`, opening the current folder in Sublime Text
\ No newline at end of file

From c58c6233052381300870f8073e315ab9ca1b3be6 Mon Sep 17 00:00:00 2001
From: James Womack <jwomack@netflix.com>
Date: Wed, 11 Mar 2015 14:18:42 -0700
Subject: [PATCH 1037/1378] Use camelCase for npm aliases

---
 plugins/npm/npm.plugin.zsh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index d19079b3f..68ec5fabd 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -1,7 +1,14 @@
 eval "$(npm completion 2>/dev/null)"
 
-# Install and save to dependencies
-alias npms="npm i -S "
 
-# Install and save to dev-dependencies
-alias npmd="npm i -D "
+# npm package names are lowercase
+# - https://twitter.com/substack/status/23122603153150361
+# Thus, we've used camelCase for the following aliases:
+
+# Install and save to dependencies in your package.json
+# npms is used by https://www.npmjs.com/package/npms
+alias npmS="npm i -S "
+
+# Install and save to dev-dependencies in your package.json
+# npmd is used by https://github.com/dominictarr/npmd
+alias npmD="npm i -D "

From a414b5e3d906bb13062ca9ec19118c01ac44dc2a Mon Sep 17 00:00:00 2001
From: XerWandeRer <xerwanderer@me.com>
Date: Mon, 16 Mar 2015 13:55:35 +0800
Subject: [PATCH 1038/1378] Update _adb

Added support for `tcpip` option
---
 plugins/adb/_adb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 4c998172d..22089581a 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -21,6 +21,7 @@ _1st_arguments=(
 'push:copy file/dir to device'
 'shell:run remote shell interactively'
 'sync:copy host->device only if changed (-l means list but dont copy)'
+‘tcpip:restart host adb in tcpip mode’
 'uninstall:remove this app package from the device'
 'version:show version num'
 )

From 0dde9943c9cc90c720a33e6713450d96cf210777 Mon Sep 17 00:00:00 2001
From: Abner Chen <houjunchen@gmail.com>
Date: Tue, 17 Mar 2015 03:26:44 +0800
Subject: [PATCH 1039/1378] [Modify] Update django.plugin.zsh for Django 1.7.6

---
 plugins/django/django.plugin.zsh | 263 +++++++++++++++++++++++++------
 1 file changed, 212 insertions(+), 51 deletions(-)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 2e9ce1c52..35865a692 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -2,59 +2,114 @@
 
 typeset -ga nul_args
 nul_args=(
+  '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))'
   '--settings=-[the Python path to a settings module.]:file:_files'
-  '--pythonpath=-[a directory to add to the Python path.]::directory:_directories'
+  '--pythonpath=-[a directory to add to the Python path.]:directory:_directories'
   '--traceback[print traceback on exception.]'
+  "--no-color[Don't colorize the command output.]"
   "--version[show program's version number and exit.]"
   {-h,--help}'[show this help message and exit.]'
 )
 
-_managepy-adminindex(){
+typeset -ga start_args
+start_args=(
+  '--template=-[The path or URL to load the template from.]:directory:_directories'
+  '--extension=-[The file extension(s) to render (default: "py").]'
+  '--name=-[The file name(s) to render.]:file:_files'
+)
+
+typeset -ga db_args
+db_args=(
+  '--database=-[Nominates a database. Defaults to the "default" database.]'
+)
+
+typeset -ga noinput_args
+noinput_args=(
+  '--noinput[tells Django to NOT prompt the user for input of any kind.]'
+)
+
+typeset -ga no_init_data_args
+no_init_data_args=(
+  '--no-initial-data[Tells Django not to load any initial data after database synchronization.]'
+)
+
+typeset -ga tag_args
+tag_args=(
+  '--tag=-[Run only checks labeled with given tag.]'
+  '--list-tags[List available tags.]'
+)
+
+_managepy-check(){
   _arguments -s : \
-    $nul_args \
-    '*::directory:_directories' && ret=0
+    $tag_args \
+    $nul_args && ret=0
+}
+
+_managepy-changepassword(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
 }
 
 _managepy-createcachetable(){
   _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-createsuperuser(){
+  _arguments -s : \
+    '--username=-[Specifies the login for the superuser.]' \
+    '--email=-[Specifies the email for the superuser.]' \
+    $noinput_args \
+    $db_args \
     $nul_args && ret=0
 }
 
 _managepy-collectstatic(){
   _arguments -s : \
-    '--link=-[Create a symbolic link to each file instead of copying.]:' \
-    '--noinput=-[Do NOT prompt the user for input of any kind.]:' \
-    '--no-post-process=-[Do NOT post process collected files.]:' \
-    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]:' \
-    '--dry-run=-[Do everything except modify the filesystem.]:' \
-    '--clear=-[Clear the existing files using the storage before trying to copy or link the original file.]:' \
-    '--link=-[Create a symbolic link to each file instead of copying.]:' \
-    '--no-default-ignore=-[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]:' \
+    '--link[Create a symbolic link to each file instead of copying.]' \
+    '--no-post-process[Do NOT post process collected files.]' \
+    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]' \
+    '--dry-run[Do everything except modify the filesystem.]' \
+    '--clear[Clear the existing files using the storage before trying to copy or link the original file.]' \
+    '--link[Create a symbolic link to each file instead of copying.]' \
+    '--no-default-ignore[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]' \
+    $noinput_args \
     $nul_args && ret=0
 }
 
 _managepy-dbshell(){
   _arguments -s : \
+    $db_args \
     $nul_args && ret=0
 }
 
 _managepy-diffsettings(){
   _arguments -s : \
+    "--all[Display all settings, regardless of their value.]"
     $nul_args && ret=0
 }
 
 _managepy-dumpdata(){
   _arguments -s : \
-    '--format=-[specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
-    '--indent=-[specifies the indent level to use when pretty-printing output.]:' \
+    '--format=-[Specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
+    '--indent=-[Specifies the indent level to use when pretty-printing output.]' \
+    '--exclude=-[An app_label or app_label.ModelName to exclude (use multiple --exclude to exclude multiple apps/models).]' \
+    '--natural-foreign[Use natural foreign keys if they are available.]' \
+    '--natural-primary[Use natural primary keys if they are available.]' \
+    "--all[Use Django's base manager to dump all models stored in the database.]" \
+    '--pks=-[Only dump objects with given primary keys.]' \
+    $db_args \
     $nul_args \
     '*::appname:_applist' && ret=0
 }
 
 _managepy-flush(){
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $no_init_data_args \
+    $db_args \
+    $noinput_args \
     $nul_args && ret=0
 }
 
@@ -75,32 +130,61 @@ _managepy_cmds(){
 
 _managepy-inspectdb(){
   _arguments -s : \
+    $db_args \
     $nul_args && ret=0
 }
 
 _managepy-loaddata(){
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--ignorenonexistent[Ignores entries in the serialized data for fields that do not currently exist on the model.]' \
+    '--app=-[Only look for fixtures in the specified app.]:appname:_applist' \
     '*::file:_files' \
+    $db_args \
     $nul_args && ret=0
 }
 
-_managepy-reset(){
+_managepy-makemessages(){
   _arguments -s : \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
-    '*::appname:_applist' \
+    '--locale=-[Creates or updates the message files for the given locale(s) (e.g. pt_BR).]' \
+    '--domain=-[The domain of the message files (default: "django").]' \
+    '--all[Updates the message files for all existing locales.]' \
+    '--extension=-[The file extension(s) to examine (default: "html,txt", or "js" if the domain is "djangojs").]' \
+    '--symlinks[Follows symlinks to directories when examining source code and templates for translation strings.]' \
+    '--ignore=-[Ignore files or directories matching this glob-style pattern.]' \
+    "--no-default-ignore[Don't ignore the common glob-style patterns 'CVS', '.*', '*~' and '*.pyc'.]" \
+    "--no-wrap[Don't break long message lines into several lines.]" \
+    "--no-location[Don't write '#: filename:line' lines.]" \
+    '--no-obsolete[emove obsolete message strings.]' \
+    '--keep-pot[Keep .pot file after making messages.]' \
+    $nul_args && ret=0
+}
+_managepy-makemigrations(){
+  _arguments -s : \
+    '--dry-run[Just show what migrations would be made]' \
+    '--merge[Enable fixing of migration conflicts.]' \
+    '--empty[Create an empty migration.]' \
+    $noinput_args \
+    $nul_args && ret=0
+}
+_managepy-migrate(){
+  _arguments -s : \
+    '--fake[Mark migrations as run without actually running them]' \
+    '--list[Show a list of all known migrations and which are applied]' \
+    $no_init_data_args \
+    $noinput_args \
+    $db_args \
     $nul_args && ret=0
 }
 
 _managepy-runfcgi(){
   local state
-  
+
   local fcgi_opts
   fcgi_opts=(
     'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
     'host[hostname to listen on..]:'
     'port[port to listen on.]:'
-    'socket[UNIX socket to listen on.]::file:_files'
+    'socket[UNIX socket to listen on.]:file:_files'
     'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
     'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
     'maxspare[max number of spare processes / threads.]:'
@@ -112,7 +196,7 @@ _managepy-runfcgi(){
     'outlog[write stdout to this file.]:file:_files'
     'errlog[write stderr to this file.]:file:_files'
   )
-  
+
   _arguments -s : \
     $nul_args \
     '*: :_values "FCGI Setting" $fcgi_opts' && ret=0
@@ -120,72 +204,148 @@ _managepy-runfcgi(){
 
 _managepy-runserver(){
   _arguments -s : \
-    '--noreload[tells Django to NOT use the auto-reloader.]' \
-    '--adminmedia[specifies the directory from which to serve admin media.]:directory:_files' \
+    '--ipv6[Tells Django to use an IPv6 address.]' \
+    '--nothreading[Tells Django to NOT use threading.]' \
+    '--noreload[Tells Django to NOT use the auto-reloader.]' \
+    '--nostatic[Tells Django to NOT automatically serve static files at STATIC_URL.]' \
+    '--insecure[Allows serving static files even if DEBUG is False.]' \
     $nul_args && ret=0
 }
 
 _managepy-shell(){
   _arguments -s : \
-    '--plain[tells Django to use plain Python, not IPython.]' \
+    '--plain[Tells Django to use plain Python, not IPython.]' \
+    '--no-startup[When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.]' \
+    '--interface=-[Specify an interactive interpreter interface.]:INTERFACE:((ipython bpython))' \
     $nul_args && ret=0
 }
 
-_managepy-sql(){}
-_managepy-sqlall(){}
-_managepy-sqlclear(){}
-_managepy-sqlcustom(){}
-_managepy-sqlflush(){}
-_managepy-sqlindexes(){}
-_managepy-sqlinitialdata(){}
-_managepy-sqlreset(){}
-_managepy-sqlsequencereset(){}
-_managepy-startapp(){}
-_managepy-startproject(){}
+_managepy-sql(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlall(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlclear(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlcustom(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-dropindexes(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlflush(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlindexes(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-sqlinitialdata(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-sqlsequencereset(){
+  _arguments -s : \
+    $db_args \
+    $nul_args && ret=0
+}
+
+_managepy-squashmigrations(){
+  _arguments -s : \
+    '--no-optimize[Do not try to optimize the squashed operations.]' \
+    $noinput_args \
+    $nul_args && ret=0
+}
+
+_managepy-startapp(){
+  _arguments -s : \
+    $start_args \
+    $nul_args && ret=0
+}
+_managepy-startproject(){
+  _arguments -s : \
+    $start_args \
+    $nul_args && ret=0
+}
 
 _managepy-syncdb() {
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $noinput_args \
+    $no_init_data_args \
+    $db_args \
     $nul_args && ret=0
 }
 
 _managepy-test() {
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
-    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    '--failfast[Tells Django to stop running the test suite after first failed test.]' \
+    '--testrunner=-[Tells Django to use specified test runner class instead of the one specified by the TEST_RUNNER setting.]' \
+    '--liveserver=-[Overrides the default address where the live server (used with LiveServerTestCase) is expected to run from. The default value is localhost:8081.]' \
+    '--top-level-directory=-[Top level of project for unittest discovery.]' \
+    '--pattern=-[The test matching pattern. Defaults to test*.py.]:' \
+    $noinput_args \
     '*::appname:_applist' \
     $nul_args && ret=0
 }
 
 _managepy-testserver() {
   _arguments -s : \
-    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
     '--addrport=-[port number or ipaddr:port to run the server on.]' \
+    '--ipv6[Tells Django to use an IPv6 address.]' \
+    $noinput_args \
     '*::fixture:_files' \
     $nul_args && ret=0
 }
 
 _managepy-validate() {
   _arguments -s : \
+    $tag_args \
     $nul_args && ret=0
 }
 
 _managepy-commands() {
   local -a commands
-  
+
   commands=(
-    'adminindex:prints the admin-index template snippet for the given app name(s).'
-    'createcachetable:creates the table needed to use the SQL cache backend.'
+    "changepassword:Change a user's password for django.contrib.auth."
+    'check:Checks the entire Django project for potential problems.'
+    'compilemessages:Compiles .po files to .mo files for use with builtin gettext support.'
+    'createcachetable:Creates the table needed to use the SQL cache backend.'
+    'createsuperuser:Used to create a superuser.'
     'collectstatic:Collect static files in a single location.'
-    'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
-    "diffsettings:displays differences between the current settings.py and Django's default settings."
+    'dbshell:Runs the command-line client for the current DATABASE_ENGINE.'
+    "diffsettings:Displays differences between the current settings.py and Django's default settings."
     'dumpdata:Output the contents of the database as a fixture of the given format.'
     'flush:Executes ``sqlflush`` on the current database.'
     'help:manage.py help.'
     'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
     'loaddata:Installs the named fixture(s) in the database.'
-    'reset:Executes ``sqlreset`` for the given app(s) in the current database.'
+    'makemessages:Runs over the entire source tree of the current directory and pulls out all strings marked for translation.'
+    'makemigrations:Creates new migration(s) for apps.'
+    'migrate:Updates database schema. Manages both apps with migrations and those without.'
     'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
     'runserver:Starts a lightweight Web server for development.'
     'shell:Runs a Python interactive interpreter.'
@@ -193,11 +353,12 @@ _managepy-commands() {
     'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
     'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
     'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
+    'sqldropindexes:Prints the DROP INDEX SQL statements for the given model module name(s).'
     'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
     'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
     "sqlinitialdata:RENAMED: see 'sqlcustom'"
-    'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
     'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
+    'squashmigrations:Squashes an existing set of migrations (from first until specified) into a single new one.'
     "startapp:Creates a Django app directory structure for the given app name in this project's directory."
     "startproject:Creates a Django project directory structure for the given project name in this current directory."
     "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
@@ -205,7 +366,7 @@ _managepy-commands() {
     'testserver:Runs a development server with data from the given fixture(s).'
     'validate:Validates all installed models.'
   )
-  
+
   _describe -t commands 'manage.py command' commands && ret=0
 }
 
@@ -223,7 +384,7 @@ _applist() {
 
 _managepy() {
   local curcontext=$curcontext ret=1
-  
+
   if ((CURRENT == 2)); then
     _managepy-commands
   else

From d4918ae8a096545d0135e3f001bc1195c0a365fe Mon Sep 17 00:00:00 2001
From: Nathan Daly <NHDaly@gmail.com>
Date: Fri, 27 Mar 2015 15:59:53 -0700
Subject: [PATCH 1040/1378] Fixed Typo.

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 25bcdbe6e..9f96e315d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,7 +3,7 @@
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
 
-__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interace with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interface with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
 
 To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter.
 

From eea77b7cb7a8d64a03d7eddc5e0f05e122b82546 Mon Sep 17 00:00:00 2001
From: Will Mendes <willmendesneto@gmail.com>
Date: Sat, 18 Apr 2015 20:59:13 -0300
Subject: [PATCH 1041/1378] Add stackoverflow link

---
 plugins/frontend-search/README.md                  | 2 ++
 plugins/frontend-search/frontend-search.plugin.zsh | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index 32784d03b..c1ccc9092 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -47,6 +47,7 @@ The search content are
 * `angularjs <google.com/search?as_q=<search-term>&as_sitesearch=angularjs.org>`
 * `reactjs <google.com/search?as_q=<search-term>&as_sitesearch=facebook.github.io/react>`
 * `emberjs <emberjs.com>`
+* `stackoverflow <stackoverflow.com>`
 
 
 ## Aliases ##
@@ -72,6 +73,7 @@ There are a few aliases presented as well:
 * `angularjs` A shorthand for `frontend angularjs`
 * `reactjs` A shorthand for `frontend reactjs`
 * `emberjs` A shorthand for `frontend emberjs`
+* `stackoverflow` A shorthand for `frontend stackoverflow`
 
 ## Author
 
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index f1d45b0d1..c9e51b2e0 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -17,7 +17,7 @@ function frontend() {
   fi
 
   # check whether the search engine is supported
-  if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs)' ]];
+  if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs|stackoverflow)' ]];
   then
     echo "Search valid search content $1 not supported."
     echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')"
@@ -40,6 +40,7 @@ function frontend() {
     echo "* angularjs"
     echo "* reactjs"
     echo "* emberjs"
+    echo "* stackoverflow"
     echo ""
 
     return 1
@@ -103,6 +104,9 @@ function frontend() {
     "emberjs")
       url="${url}emberjs.com"
       url="${url}/api/#stq=$2&stp=1" ;;
+    "stackoverflow")
+      url="${url}https://stackoverflow.com"
+      url="${url}/search?q=$2" ;;
     *) echo "INVALID PARAM!"
        return ;;
   esac
@@ -149,3 +153,6 @@ alias smacss='frontend smacss'
 alias angularjs='frontend angularjs'
 alias reactjs='frontend reactjs'
 alias emberjs='frontend emberjs'
+
+# search websites
+alias stackoverflow='frontend stackoverflow'

From 7f0b577b142fad91ad04f03112498304c9f27dbb Mon Sep 17 00:00:00 2001
From: dnixx <nicoqh@gmail.com>
Date: Tue, 21 Apr 2015 21:34:26 +0200
Subject: [PATCH 1042/1378] Use the newest Vundle commands

Vundle changed the command names during an interface update. The old commands will be deprecated. https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
---
 plugins/vundle/vundle.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 830774fe3..b5f1c0bbf 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -13,15 +13,15 @@ function vundle-init () {
 
 function vundle () {
   vundle-init
-  vim -c "execute \"BundleInstall\" | q | q"
+  vim -c "execute \"PluginInstall\" | q | q"
 }
 
 function vundle-update () {
   vundle-init
-  vim -c "execute \"BundleInstall!\" | q | q"
+  vim -c "execute \"PluginInstall!\" | q | q"
 }
 
 function vundle-clean () {
   vundle-init
-  vim -c "execute \"BundleClean!\" | q | q"
+  vim -c "execute \"PluginClean!\" | q | q"
 }

From 05f2ad3dbb537bcbfbf3acf54221552d036de997 Mon Sep 17 00:00:00 2001
From: Will Mendes <willmendesneto@gmail.com>
Date: Thu, 23 Apr 2015 00:38:25 -0300
Subject: [PATCH 1043/1378] fix stackoverflow url in search

---
 plugins/frontend-search/frontend-search.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index c9e51b2e0..b9fb8634c 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -105,7 +105,7 @@ function frontend() {
       url="${url}emberjs.com"
       url="${url}/api/#stq=$2&stp=1" ;;
     "stackoverflow")
-      url="${url}https://stackoverflow.com"
+      url="${url}stackoverflow.com"
       url="${url}/search?q=$2" ;;
     *) echo "INVALID PARAM!"
        return ;;

From 551d68ad11c65ece0ea2af07a58fe971795bb9e6 Mon Sep 17 00:00:00 2001
From: Matthew Ziegelbaum <mziegelbaum@gmail.com>
Date: Sat, 25 Apr 2015 16:08:26 -0400
Subject: [PATCH 1044/1378] Fixes gradle autocomplete. Regex did not include
 subproject tasks before.

---
 plugins/gradle/gradle.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 9229512f7..14ababa9e 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -72,7 +72,7 @@ _gradle_tasks () {
   if [ in_gradle ]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-     gradle tasks --all | grep "^[ ]*[a-zA-Z0-9]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+     gradle tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
     fi
     compadd -X "==== Gradle Tasks ====" `cat .gradletasknamecache`
   fi
@@ -82,7 +82,7 @@ _gradlew_tasks () {
   if [ in_gradle ]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-     gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+     gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
     fi
     compadd -X "==== Gradlew Tasks ====" `cat .gradletasknamecache`
   fi

From 590d3935955dfcda42bdc9edc94b30855c29305e Mon Sep 17 00:00:00 2001
From: Will Mendes <willmendesneto@gmail.com>
Date: Sun, 26 Apr 2015 11:43:45 -0300
Subject: [PATCH 1045/1378] Add autocomplete for frontend-search

---
 plugins/frontend-search/README.md           |  15 +--
 plugins/frontend-search/_frontend-search.sh | 128 ++++++++++++++++++++
 2 files changed, 134 insertions(+), 9 deletions(-)
 create mode 100644 plugins/frontend-search/_frontend-search.sh

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index c1ccc9092..801d450f3 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -1,18 +1,12 @@
 ## Rationale ##
 
-The idea for this script is to help searches in important doc contents from frontend.
+> Searches for your Frontend contents more easier
+
 
 ## Instalation ##
 
-I will send a Pull Request with this plugin for .oh-my-zsh official repository. If accept them, it's only add in plugins list that exists in ```.zshrc``` file.
 
-For now, you can clone this repository and add in ```custom/plugins``` folder
-
-```bash
-$ git clone git://github.com/willmendesneto/frontend-search.git ~/.oh-my-zsh/custom/plugins/frontend-search
-```
-
-After this, restart your terminal and frontend-search plugin is configurated in you CLI.
+Open your `.zshrc` file and load `frontend-search` plugin
 
 ```bash
 ...
@@ -20,6 +14,7 @@ plugins=( <your-plugins-list>... frontend-search)
 ...
 ```
 
+
 ## Commands ##
 
 All command searches are accept only in format
@@ -75,9 +70,11 @@ There are a few aliases presented as well:
 * `emberjs` A shorthand for `frontend emberjs`
 * `stackoverflow` A shorthand for `frontend stackoverflow`
 
+
 ## Author
 
 **Wilson Mendes (willmendesneto)**
++ <https://plus.google.com/+WilsonMendes>
 + <https://twitter.com/willmendesneto>
 + <http://github.com/willmendesneto>
 
diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend-search.sh
new file mode 100644
index 000000000..252f21570
--- /dev/null
+++ b/plugins/frontend-search/_frontend-search.sh
@@ -0,0 +1,128 @@
+#compdef frontend
+
+zstyle ':completion:*:descriptions' format '%B%d%b'
+zstyle ':completion::complete:frontend:*:commands' group-name commands
+zstyle ':completion::complete:frontend:*:frontend_points' group-name frontend_points
+zstyle ':completion::complete:frontend::' list-grouped
+
+zmodload zsh/mapfile
+
+function _frontend() {
+  local CONFIG=$HOME/.frontend-search
+  local ret=1
+
+  local -a commands
+  local -a frontend_points
+
+  frontend_points=( "${(f)mapfile[$CONFIG]//$HOME/~}" )
+
+  commands=(
+    'jquery: Search in jQuery website'
+    'mdn: Search in MDN website'
+    'compass: Search in COMPASS website'
+    'html5please: Search in HTML5 Please website'
+    'caniuse: Search in Can I Use website'
+    'aurajs: Search in AuraJs website'
+    'dartlang: Search in Dart website'
+    'lodash: Search in Lo-Dash website'
+    'qunit: Search in Qunit website'
+    'fontello: Search in fontello website'
+    'bootsnipp: Search in bootsnipp website'
+    'cssflow: Search in cssflow website'
+    'codepen: Search in codepen website'
+    'unheap: Search in unheap website'
+    'bem: Search in BEM website'
+    'smacss: Search in SMACSS website'
+    'angularjs: Search in Angular website'
+    'reactjs: Search in React website'
+    'emberjs: Search in Ember website'
+    'stackoverflow: Search in StackOverflow website'
+  )
+
+  _arguments -C \
+    '1: :->first_arg' \
+    '2: :->second_arg' && ret=0
+
+  case $state in
+    first_arg)
+      _describe -t frontend_points "Warp points" frontend_points && ret=0
+      _describe -t commands "Commands" commands && ret=0
+      ;;
+    second_arg)
+      case $words[2] in
+        jquery)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        mdn)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        compass)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        html5please)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        caniuse)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        aurajs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        dartlang)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        lodash)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        qunit)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        fontello)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        bootsnipp)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        cssflow)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        codepen)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        unheap)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        bem)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        smacss)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        angularjs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        reactjs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        emberjs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+        stackoverflow)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return $ret
+}
+
+_frontend "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From 5c9c373cd7944b514c22c292333700bea0408203 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Tue, 28 Apr 2015 00:05:11 -0700
Subject: [PATCH 1046/1378] Fix minimal.zsh-theme's check for in_svn and add
 support for mercurial

---
 themes/minimal.zsh-theme | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index a2a16031f..f79e795d9 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -6,13 +6,19 @@ ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
 ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
 ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
 ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
+ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
 
 vcs_status() {
-    if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
+    if [[ $(whence in_svn) != "" ]] && in_svn; then
         svn_prompt_info
+    elif [[ $(whence in_hg) != "" ]] && in_hg; then
+        hg_prompt_info
     else
         git_prompt_info
     fi
 }
 
-PROMPT='%2~ $(vcs_status)»%b '
\ No newline at end of file
+PROMPT='%2~ $(vcs_status)»%b '

From 2dbf9951d92e1f63672da3721b23b1d53b5cfa31 Mon Sep 17 00:00:00 2001
From: Kennedy Oliveira <kennedy.oliveira@outlook.com>
Date: Wed, 29 Apr 2015 15:17:11 -0300
Subject: [PATCH 1047/1378] Fixing some issues where show repeated weird
 values, and fixed commands that need the container autocomplete without being
 running, like start, now it autocompletes showing all the containers so you
 can start without knowing the right name

---
 plugins/docker/_docker | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index aadc9c61d..fd459a0ca 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -12,7 +12,16 @@
 __docker_containers() {
     declare -a cont_cmd
     cont_cmd=($(docker ps | awk 'NR>1{print $NF":[CON("$1")"$2"("$3")]"}'))
-    _describe 'containers' cont_cmd
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'containers' cont_cmd
+}
+
+# Output a selectable list of all containers, even not running
+__docker_all_containers() {
+    declare -a cont_cmd
+    cont_cmd=($(docker ps -a | awk 'NR>1{print $NF":[CON("$1")"$2"("$3")]"}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'containers' cont_cmd
 }
 
 # output a selectable list of all docker images
@@ -57,7 +66,7 @@ __diff() {
     __docker_containers
 }
 
-__events() {
+__events() {    
     _arguments \
         '--since=[Show previously created events and then stream.]'
 }
@@ -98,10 +107,12 @@ __insert() {
 
 __inspect() {
     __docker_images
-    __docker_containers
+    __docker_all_containers
 }
 
 __kill() {
+    _arguments \
+        '(-s,--signal=)'{-s,--signal=}'[KILL Signal]'
     __docker_containers
 }
 
@@ -162,7 +173,7 @@ __rm() {
         '(-f,--force=)'{-f,--force=}'[Force removal of running container]' \
         '(-l,--link=)'{-l,--link=}'[Remove the specified link and not the underlying container]' \
         '(-v,--volumes=)'{-v,--volumes=}'[Remove the volumes associated to the container]'
-    __docker_containers
+    __docker_all_containers
 }
 
 __rmi() {
@@ -216,7 +227,7 @@ __start() {
     _arguments \
         '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \
         '(-i,--interactive=)'{-i,--interactive=}'[Attach container''s stdin]'
-    __docker_containers
+    __docker_all_containers
 }
 
 __stats() {

From 66052e2d07fc4e6205bf7f14adfa12d53d9ad487 Mon Sep 17 00:00:00 2001
From: Jordan Klassen <jordan@klassen.me.uk>
Date: Wed, 29 Apr 2015 15:37:39 -0700
Subject: [PATCH 1048/1378] Add hyphen insensitivity

---
 lib/completion.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 4b1bb0a62..452c0dfe7 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -15,7 +15,12 @@ if [ "x$CASE_SENSITIVE" = "xtrue" ]; then
   zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
   unset CASE_SENSITIVE
 else
-  zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+  if [ "x$HYPHEN_INSENSITIVE" = "xtrue" ]; then
+    zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+    unset HYPHEN_INSENSITIVE
+  else
+    zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+  fi
 fi
 
 zstyle ':completion:*' list-colors ''

From 8e8cdc0502fc35844975548fa268e7ed027d00b7 Mon Sep 17 00:00:00 2001
From: Cooper Maruyama <cooperm@susteen.com>
Date: Fri, 1 May 2015 01:34:20 -0700
Subject: [PATCH 1049/1378] Add coffeescript aliases: cf, cfc, cfp

cf: compile and show output
cfc: compile & copy
cfp: compile from pasteboard & print
---
 plugins/coffee/coffee.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/coffee/coffee.plugin.zsh

diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh
new file mode 100644
index 000000000..96393f66d
--- /dev/null
+++ b/plugins/coffee/coffee.plugin.zsh
@@ -0,0 +1,13 @@
+#!/bin/zsh
+
+# compile a string of coffeescript and print to output
+cf () {
+  coffee -peb $1
+}
+# compile & copy to clipboard
+cfc () {
+  cf $1 | tail -n +2 | pbcopy
+}
+
+# compile from pasteboard & print
+alias cfp='coffeeMe "$(pbpaste)"'

From a315ddc075e6a6a4b9dbdcaced0fa08349597223 Mon Sep 17 00:00:00 2001
From: Cooper Maruyama <cooperm@susteen.com>
Date: Fri, 1 May 2015 01:37:55 -0700
Subject: [PATCH 1050/1378] typofix

---
 plugins/coffee/coffee.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh
index 96393f66d..be34b03c2 100644
--- a/plugins/coffee/coffee.plugin.zsh
+++ b/plugins/coffee/coffee.plugin.zsh
@@ -6,7 +6,7 @@ cf () {
 }
 # compile & copy to clipboard
 cfc () {
-  cf $1 | tail -n +2 | pbcopy
+  cf $1 | pbcopy
 }
 
 # compile from pasteboard & print

From 45121611fe00a27155aa4259c31761224d4ccef4 Mon Sep 17 00:00:00 2001
From: Jordan Klassen <jordan@klassen.me.uk>
Date: Fri, 1 May 2015 15:10:45 -0700
Subject: [PATCH 1051/1378] Update template zshrc with HYPHEN_INSENSITIVE

---
 templates/zshrc.zsh-template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 763288dfd..44e8b0d1b 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -10,6 +10,10 @@ ZSH_THEME="robbyrussell"
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
 
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
 # Uncomment the following line to disable bi-weekly auto-update checks.
 # DISABLE_AUTO_UPDATE="true"
 

From 24552f02259829428c412a88729de4cfd0b7ba8b Mon Sep 17 00:00:00 2001
From: Cooper Maruyama <cooperm@susteen.com>
Date: Sat, 2 May 2015 07:14:21 -0700
Subject: [PATCH 1052/1378] Add readme and add new alias cfpc:
 paste+compile+copy

---
 plugins/coffee/README            | 31 +++++++++++++++++++++++++++++++
 plugins/coffee/coffee.plugin.zsh |  3 +++
 2 files changed, 34 insertions(+)
 create mode 100644 plugins/coffee/README

diff --git a/plugins/coffee/README b/plugins/coffee/README
new file mode 100644
index 000000000..d0e7bbe74
--- /dev/null
+++ b/plugins/coffee/README
@@ -0,0 +1,31 @@
+## Coffeescript Plugin
+
+This plugin provides aliases for quickly compiling and previewing your
+cofeescript code.
+
+When writing Coffeescript it's very common to want to preview the output of a
+certain snippet of code, either because you want to test the output or because
+you'd like to execute it in a browser console which doesn't accept Coffeescript.
+
+Preview the compiled result of your coffeescript with `cf "code"` as per the
+following:
+
+```zsh
+$ cf 'if a then be else c'
+if (a) {
+  b;
+} else {
+  c;
+}
+```
+
+Also provides the following aliases:
+
+* **cfc:** Copies the compiled JS to your clipboard. Very useful when you want
+           to run the code in a JS console.
+
+* **cfp:** Compiles from your currently copied clipboard. Useful when you want 
+           to compile large/multi-line snippets
+
+* **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the
+            the result back to clipboard.
diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh
index be34b03c2..1a7bedd87 100644
--- a/plugins/coffee/coffee.plugin.zsh
+++ b/plugins/coffee/coffee.plugin.zsh
@@ -11,3 +11,6 @@ cfc () {
 
 # compile from pasteboard & print
 alias cfp='coffeeMe "$(pbpaste)"'
+
+# compile from pasteboard and copy to clipboard
+alias cfpc='cfp | pbcopy'

From d80918bf981d5df3f192346b44c0c35636ee7b2b Mon Sep 17 00:00:00 2001
From: Cooper Maruyama <cooperm@susteen.com>
Date: Sat, 2 May 2015 07:16:27 -0700
Subject: [PATCH 1053/1378] add markdown extension to README

---
 plugins/coffee/{README => README.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/coffee/{README => README.md} (100%)

diff --git a/plugins/coffee/README b/plugins/coffee/README.md
similarity index 100%
rename from plugins/coffee/README
rename to plugins/coffee/README.md

From 83cf909ad621938d3dc64c1f28155e819e1b6ea5 Mon Sep 17 00:00:00 2001
From: Toni Ristola <toni.ristola@gofore.com>
Date: Mon, 4 May 2015 07:47:02 +0300
Subject: [PATCH 1054/1378] Added aliases for docker compose

---
 plugins/docker-compose/README.md                 |  1 +
 plugins/docker-compose/docker-compose.plugin.zsh | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 plugins/docker-compose/README.md
 create mode 100644 plugins/docker-compose/docker-compose.plugin.zsh

diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
new file mode 100644
index 000000000..77b98f30d
--- /dev/null
+++ b/plugins/docker-compose/README.md
@@ -0,0 +1 @@
+# Docker-compose plugin for oh my zsh
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
new file mode 100644
index 000000000..08500408d
--- /dev/null
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -0,0 +1,14 @@
+# Authors:
+# https://github.com/tristola
+#
+# Docker-compose related zsh aliases
+
+# Aliases ###################################################################
+
+alias dcup='docker-compose up'
+alias dcb='docker-compose build'
+alias dcrm='docker-compose rm'
+alias dcps='docker-compose ps'
+alias dcstop='docker-compose stop'
+alias dcrestart='docker-compose restart'
+

From d60d4f68aa75cc21a0fc771020fdbd578b872d75 Mon Sep 17 00:00:00 2001
From: Satoshi Ohmori <sachin21dev@gmail.com>
Date: Tue, 5 May 2015 14:27:59 +0900
Subject: [PATCH 1055/1378] Add alias of bundle clean

---
 plugins/bundler/bundler.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index ba3d3f623..dfff6956e 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -4,6 +4,7 @@ alias bp="bundle package"
 alias bo="bundle open"
 alias bu="bundle update"
 alias bi="bundle_install"
+alias bcn="bundle clean"
 
 bundled_commands=(
   annotate

From 03b8c199e591de73de3824fc6b366138964c1ba6 Mon Sep 17 00:00:00 2001
From: Pablo Tamarit <pablo.tmrt@gmail.com>
Date: Tue, 5 May 2015 19:49:19 +0200
Subject: [PATCH 1056/1378] Fix 'chsh' by checking '/etc/shells' instead of
 using 'which'

fix test for chsh in install
in case $SHELL is zsh but not the last one in /etc/shells
fixes #3026 fixes #3779 fixes #3780
---
 tools/install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index bd4c55749..c83a6f23d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -32,10 +32,12 @@ sed -i -e "/export PATH=/ c\\
 export PATH=\"$PATH\"
 " ~/.zshrc
 
-if [ "$SHELL" != "$(which zsh)" ]; then
+TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
+if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
     echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
-    chsh -s `which zsh`
+    chsh -s $(grep /zsh$ /etc/shells | tail -1)
 fi
+unset TEST_CURRENT_SHELL
 
 echo "\033[0;32m"'         __                                     __   '"\033[0m"
 echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"

From 9a5e1a055201409ebe9e1ab97cd8c3fe52b990f5 Mon Sep 17 00:00:00 2001
From: Aleks <aleks@s-ko.net>
Date: Wed, 6 May 2015 10:26:05 +0100
Subject: [PATCH 1057/1378] Use $EDITOR

---
 plugins/common-aliases/common-aliases.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index e3830adcf..fc19d73c3 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -13,7 +13,7 @@ alias lS='ls -1FSsh'
 alias lart='ls -1Fcart'
 alias lrt='ls -1Fcrt'
 
-alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file
+alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file
 
 alias grep='grep --color'
 alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '

From 5b75cc7880de1931a0507800d90eb77ed659fa46 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Fri, 12 Jul 2013 15:26:04 +0200
Subject: [PATCH 1058/1378] Many updates to git plugin (see #2790)

---
 plugins/git/README.md      |  10 +-
 plugins/git/_git-branch    |  83 ---------
 plugins/git/_git-remote    |  74 --------
 plugins/git/git.plugin.zsh | 335 ++++++++++++++++++++-----------------
 4 files changed, 188 insertions(+), 314 deletions(-)
 delete mode 100644 plugins/git/_git-branch
 delete mode 100644 plugins/git/_git-remote

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 8462dda1c..76da2a8ae 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -1,4 +1,10 @@
 ## git
-**Maintainer:** [Stibbons](https://github.com/Stibbons)
 
-This plugin adds several git aliases and increase the completion function provided by zsh
+**Maintainer:** [@ncanceill](https://github.com/ncanceill)
+
+This plugin adds many useful aliases and functions.
+
+### Usage
+
+See the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugin:git) for a list of aliases and functions provided by the plugin.
+
diff --git a/plugins/git/_git-branch b/plugins/git/_git-branch
deleted file mode 100644
index 6b9c1a483..000000000
--- a/plugins/git/_git-branch
+++ /dev/null
@@ -1,83 +0,0 @@
-#compdef git-branch
-
-_git-branch () 
-{
-  declare l c m d
-
-  l='--color --no-color -r -a --all -v --verbose --abbrev --no-abbrev'
-  c='-l -f --force -t --track --no-track --set-upstream --contains --merged --no-merged'
-  m='-m -M'
-  d='-d -D'
-
-  declare -a dependent_creation_args
-  if (( words[(I)-r] == 0 )); then
-    dependent_creation_args=(
-      "($l $m $d): :__git_branch_names"
-      "::start-point:__git_revisions")
-  fi
-
-  declare -a dependent_deletion_args
-  if (( words[(I)-d] || words[(I)-D] )); then
-    dependent_creation_args=
-    dependent_deletion_args=(
-      '-r[delete only remote-tracking branches]')
-    if (( words[(I)-r] )); then
-      dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_remote_branch_names'
-    else
-      dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_branch_names'
-    fi
-  fi
-
-  declare -a dependent_modification_args
-  if (( words[(I)-m] || words[(I)-M] )); then
-    dependent_creation_args=
-    dependent_modification_args=(
-      ':old or new branch name:__git_branch_names'
-      '::new branch name:__git_branch_names')
-  fi
-
-  _arguments -w -S -s \
-    "($c $m $d --no-color :)--color=-[turn on branch coloring]:: :__git_color_whens" \
-    "($c $m $d : --color)--no-color[turn off branch coloring]" \
-    "($c $m      -a --all)-r[list or delete only remote-tracking branches]" \
-    "($c $m $d : -r)"{-a,--all}"[list both remote-tracking branches and local branches]" \
-    "($c $m $d : -v --verbose)"{-v,--verbose}'[show SHA1 and commit subject line for each head]' \
-    "($c $m $d :)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length" \
-    "($c $m $d :)--no-abbrev[do not abbreviate sha1s]" \
-    "($l $m $d)-l[create the branch's reflog]" \
-    "($l $m $d -f --force)"{-f,--force}"[force the creation of a new branch]" \
-    "($l $m $d -t --track)"{-t,--track}"[set up configuration so that pull merges from the start point]" \
-    "($l $m $d)--no-track[override the branch.autosetupmerge configuration variable]" \
-    "($l $m $d)--set-upstream[set up configuration so that pull merges]" \
-    "($l $m $d)--contains=[only list branches which contain the specified commit]: :__git_committishs" \
-    "($l $m $d)--merged=[only list branches which are fully contained by HEAD]: :__git_committishs" \
-    "($l $m $d)--no-merged=[do not list branches which are fully contained by HEAD]: :__git_committishs" \
-    $dependent_creation_args \
-    "($l $c $d -M)-m[rename a branch and the corresponding reflog]" \
-    "($l $c $d -m)-M[rename a branch even if the new branch-name already exists]" \
-    $dependent_modification_args \
-    "($l $c $m -D)-d[delete a fully merged branch]" \
-    "($l $c $m -d)-D[delete a branch]" \
-    $dependent_deletion_args
-}
-
-(( $+functions[__git_ignore_line] )) ||
-__git_ignore_line () {
-  declare -a ignored
-  ignored=()
-  ((CURRENT > 1)) &&
-    ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
-  ((CURRENT < $#line)) &&
-    ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
-  $* -F ignored
-}
-
-(( $+functions[__git_ignore_line_inside_arguments] )) ||
-__git_ignore_line_inside_arguments () {
-  declare -a compadd_opts
-
-  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
-
-  __git_ignore_line $* $compadd_opts
-}
-
diff --git a/plugins/git/_git-remote b/plugins/git/_git-remote
deleted file mode 100644
index 4ba62a357..000000000
--- a/plugins/git/_git-remote
+++ /dev/null
@@ -1,74 +0,0 @@
-#compdef git-remote
-
-# NOTE: --track is undocumented.
-# TODO: --track, -t, --master, and -m should take remote branches, I guess.
-# NOTE: --master is undocumented.
-# NOTE: --fetch is undocumented.
-_git-remote () {
-  local curcontext=$curcontext state line
-  declare -A opt_args
-
-  _arguments -C \
-    ':command:->command' \
-    '*::options:->options' && ret=0
-
-  case $state in
-    (command)
-      declare -a commands
-
-      commands=(
-        'add:add a new remote'
-        'show:show information about a given remote'
-        'prune:delete all stale tracking branches for a given remote'
-        'update:fetch updates for a set of remotes'
-        'rm:remove a remote from .git/config and all associated tracking branches'
-        'rename:rename a remote from .git/config and update all associated tracking branches'
-        'set-head:sets or deletes the default branch'
-        'set-branches:changes the list of branches tracked by the named remote.'
-        'set-url:changes URL remote points to.'
-        )
-
-      _describe -t commands 'sub-command' commands && ret=0
-      ;;
-    (options)
-      case $line[1] in
-        (add)
-          _arguments \
-            '*'{--track,-t}'[track given branch instead of default glob refspec]:branch:__git_branch_names' \
-            '(--master -m)'{--master,-m}'[set the remote'\''s HEAD to point to given master branch]:branch:__git_branch_names' \
-            '(--fetch -f)'{--fetch,-f}'[run git-fetch on the new remote after it has been created]' \
-            ':branch name:__git_remotes' \
-            ':url:_urls' && ret=0
-          ;;
-        (show)
-          _arguments \
-            '-n[do not contact the remote for a list of branches]' \
-            ':remote:__git_remotes' && ret=0
-          ;;
-        (prune)
-          _arguments \
-            '(--dry-run -n)'{-n,--dry-run}'[do not actually prune, only list what would be done]' \
-            ':remote:__git_remotes' && ret=0
-          ;;
-        (update)
-          __git_remote-groups && ret=0
-          ;;
-        (rm)
-          __git_remotes && ret=0
-          ;;
-        (rename)
-          __git_remotes && ret=0
-          ;;
-        (set-url)
-          _arguments \
-            '*--push[manipulate push URLs]' \
-            '(--add)--add[add URL]' \
-            '(--delete)--delete[delete URLs]' \
-            ':branch name:__git_remotes' \
-            ':url:_urls' && ret=0
-          ;;
-          
-      esac
-      ;;
-  esac
-}
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9da448814..e42e09688 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,177 +1,202 @@
-# Aliases
-alias g='git'
-compdef g=git
-alias gst='git status'
-compdef _git gst=git-status
-alias gd='git diff'
-compdef _git gd=git-diff
-alias gdc='git diff --cached'
-compdef _git gdc=git-diff
-alias gdt='git diff-tree --no-commit-id --name-only -r'
-compdef _git gdc=git diff-tree --no-commit-id --name-only -r
-alias gl='git pull'
-compdef _git gl=git-pull
-alias gup='git pull --rebase'
-compdef _git gup=git-fetch
-alias gp='git push'
-compdef _git gp=git-push
-alias gd='git diff'
-gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
-alias gdt='git difftool'
-alias gc='git commit -v'
-compdef _git gc=git-commit
-alias gc!='git commit -v --amend'
-compdef _git gc!=git-commit
-alias gca='git commit -v -a'
-compdef _git gc=git-commit
-alias gca!='git commit -v -a --amend'
-compdef _git gca!=git-commit
-alias gcmsg='git commit -m'
-compdef _git gcmsg=git-commit
-alias gco='git checkout'
-compdef _git gco=git-checkout
-alias gcm='git checkout master'
-alias gr='git remote'
-compdef _git gr=git-remote
-alias grv='git remote -v'
-compdef _git grv=git-remote
-alias grmv='git remote rename'
-compdef _git grmv=git-remote
-alias grrm='git remote remove'
-compdef _git grrm=git-remote
-alias grset='git remote set-url'
-compdef _git grset=git-remote
-alias grup='git remote update'
-compdef _git grset=git-remote
-alias grbi='git rebase -i'
-compdef _git grbi=git-rebase
-alias grbc='git rebase --continue'
-compdef _git grbc=git-rebase
-alias grba='git rebase --abort'
-compdef _git grba=git-rebase
-alias gb='git branch'
-compdef _git gb=git-branch
-alias gba='git branch -a'
-compdef _git gba=git-branch
-alias gbr='git branch --remote'
-alias gcount='git shortlog -sn'
-compdef gcount=git
-alias gcl='git config --list'
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
-alias glg='git log --stat --max-count=10'
-compdef _git glg=git-log
-alias glgg='git log --graph --max-count=10'
-compdef _git glgg=git-log
-alias glgga='git log --graph --decorate --all'
-compdef _git glgga=git-log
-alias glo='git log --oneline --decorate --color'
-compdef _git glo=git-log
-alias glog='git log --oneline --decorate --color --graph'
-compdef _git glog=git-log
-alias gss='git status -s'
-compdef _git gss=git-status
-alias ga='git add'
-compdef _git ga=git-add
-alias gap='git add --patch'
-alias gaa='git add --all'
-alias gm='git merge'
-compdef _git gm=git-merge
-alias grh='git reset HEAD'
-alias grhh='git reset HEAD --hard'
-alias gclean='git reset --hard && git clean -dfx'
-alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
+# Query/use custom command for `git`.
+local git_cmd
+zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd
+: ${git_cmd:=git}
 
-# Sign and verify commits with GPG
-alias gcs='git commit -S'
-compdef _git gcs=git-commit
-alias gsps='git show --pretty=short --show-signature'
-compdef _git gsps=git-show
-
-# Sign and verify tags with GPG
-alias gts='git tag -s'
-compdef _git gts=git-tag
-alias gvt='git verify-tag'
-compdef _git gvt=git verify-tag
-
-#remove the gf alias
-#alias gf='git ls-files | grep'
-
-alias gpoat='git push origin --all && git push origin --tags'
-alias gmt='git mergetool --no-prompt'
-compdef _git gmt=git-mergetool
-
-alias gg='git gui citool'
-alias gga='git gui citool --amend'
-alias gk='gitk --all --branches'
-
-alias gsts='git stash show --text'
-alias gsta='git stash'
-alias gstp='git stash pop'
-alias gstd='git stash drop'
-
-# Will cd into the top of the current repository
-# or submodule.
-alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
-
-# Git and svn mix
-alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
-compdef git-svn-dcommit-push=git
-
-alias gsr='git svn rebase'
-alias gsd='git svn dcommit'
 #
-# Will return the current branch name
+# Functions
+#
+
+# The current branch name
 # Usage example: git pull origin $(current_branch)
-#
+# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if
+# it's not a symbolic ref, but in a Git repo.
 function current_branch() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+  local ref
+  ref=$($git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
+  local ret=$?
+  if [[ $ret != 0 ]]; then
+    [[ $ret == 128 ]] && return  # no git repo.
+    ref=$($git_cmd rev-parse --short HEAD 2> /dev/null) || return
+  fi
   echo ${ref#refs/heads/}
 }
-
+# The list of remotes
 function current_repository() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo $(git remote -v | cut -d':' -f 2)
+  if ! $git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
+    return
+  fi
+  echo $($git_cmd remote -v | cut -d':' -f 2)
 }
-
-# these aliases take advantage of the previous function
-alias ggpull='git pull origin $(current_branch)'
-compdef ggpull=git
-alias ggpur='git pull --rebase origin $(current_branch)'
-compdef ggpur=git
-alias ggpush='git push origin $(current_branch)'
-compdef ggpush=git
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
-
 # Pretty log messages
 function _git_log_prettily(){
   if ! [ -z $1 ]; then
     git log --pretty=$1
   fi
 }
-alias glp="_git_log_prettily"
-compdef _git glp=git-log
-
-# Work In Progress (wip)
-# These features allow to pause a branch development and switch to another one (wip)
-# When you want to go back to work, just unwip it
-#
-# This function return a warning if the current branch is a wip
+# Warn if the current branch is a WIP
 function work_in_progress() {
   if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
     echo "WIP!!"
   fi
 }
-# these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"'
-alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
-# these alias ignore changes to file
+#
+# Aliases
+# (sorted alphabetically)
+#
+
+alias g='git'
+
+alias ga='git add'
+
+alias gb='git branch'
+alias gba='git branch -a'
+alias gbda='git branch --merged | command grep -vE "^(\*|\s*master\s*$)" | command xargs -n 1 git branch -d'
+alias gbl='git blame -b -w'
+alias gbnm='git branch --no-merged'
+alias gbr='git branch --remote'
+alias gbs='git bisect'
+alias gbsb='git bisect bad'
+alias gbsg='git bisect good'
+alias gbsr='git bisect reset'
+alias gbss='git bisect start'
+
+alias gc='git commit -v'
+alias gc!='git commit -v --amend'
+alias gca='git commit -v -a'
+alias gca!='git commit -v -a --amend'
+alias gcan!='git commit -v -a -s --no-edit --amend'
+alias gcb='git checkout -b'
+alias gcf='git config --list'
+alias gcl='git clone --recursive'
+alias gclean='git reset --hard && git clean -dfx'
+alias gcm='git checkout master'
+alias gcmsg='git commit -m'
+alias gco='git checkout'
+alias gcount='git shortlog -sn'
+compdef gcount=git
+alias gcp='git cherry-pick'
+alias gcs='git commit -S'
+
+alias gd='git diff'
+alias gdc='git diff --cached'
+alias gdt='git diff-tree --no-commit-id --name-only -r'
+gdv() { git diff -w "$@" | view - }
+compdef _git gdv=git-diff
+alias gdw='git diff --word-diff'
+
+alias gf='git fetch'
+alias gfa='git fetch --all --prune'
+function gfg() { git ls-files | grep $@ }
+compdef gfg=grep
+alias gfo='git fetch origin'
+
+alias gg='git gui citool'
+alias gga='git gui citool --amend'
+ggf() {
+[[ "$#" != 1 ]] && b="$(current_branch)"
+git push --force origin "${b:=$1}"
+}
+compdef _git ggf=git-checkout
+ggl() {
+[[ "$#" != 1 ]] && b="$(current_branch)"
+git pull origin "${b:=$1}"
+}
+compdef _git ggl=git-checkout
+ggp() {
+[[ "$#" != 1 ]] && b="$(current_branch)"
+git push origin "${b:=$1}"
+}
+compdef _git ggp=git-checkout
+ggpnp() {
+ggl "$1" && ggp "$1"
+}
+compdef _git ggpnp=git-checkout
+alias ggsup='git branch --set-upstream-to=origin/$(current_branch)'
+ggu() {
+[[ "$#" != 1 ]] && b="$(current_branch)"
+git pull --rebase origin "${b:=$1}"
+}
+compdef _git ggu=git-checkout
+
 alias gignore='git update-index --assume-unchanged'
-alias gunignore='git update-index --no-assume-unchanged'
-# list temporarily ignored files
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+compdef git-svn-dcommit-push=git
+
+alias gk='\gitk --all --branches'
+compdef _git gk='gitk'
+alias gke='\gitk --all $(git log -g --pretty=format:%h)'
+compdef _git gke='gitk'
+
+alias gl='git pull'
+alias glg='git log --stat --color'
+alias glgp='git log --stat --color -p'
+alias glgg='git log --graph --color'
+alias glgga='git log --graph --decorate --all'
+alias glgm='git log --graph --max-count=10'
+alias glo='git log --oneline --decorate --color'
+alias glol="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
+alias glola="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
+alias glog='git log --oneline --decorate --color --graph'
+alias glp="_git_log_prettily"
+compdef _git glp=git-log
+
+alias gm='git merge'
+alias gmom='git merge origin/master'
+alias gmt='git mergetool --no-prompt'
+alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
+alias gmum='git merge upstream/master'
+
+alias gp='git push'
+alias gpd='git push --dry-run'
+alias gpoat='git push origin --all && git push origin --tags'
+compdef _git gpoat=git-push
+alias gpu='git push upstream'
+alias gpv='git push -v'
+
+alias gr='git remote'
+alias gra='git remote add'
+alias grb='git rebase'
+alias grba='git rebase --abort'
+alias grbc='git rebase --continue'
+alias grbi='git rebase -i'
+alias grbm='git rebase master'
+alias grbs='git rebase --skip'
+alias grh='git reset HEAD'
+alias grhh='git reset HEAD --hard'
+alias grmv='git remote rename'
+alias grrm='git remote remove'
+alias grset='git remote set-url'
+alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
+alias gru='git reset --'
+alias grup='git remote update'
+alias grv='git remote -v'
+
+alias gsb='git status -sb'
+alias gsd='git svn dcommit'
+alias gsi='git submodule init'
+alias gsps='git show --pretty=short --show-signature'
+alias gsr='git svn rebase'
+alias gss='git status -s'
+alias gst='git status'
+alias gsta='git stash'
+alias gstaa='git stash apply'
+alias gstd='git stash drop'
+alias gstl='git stash list'
+alias gstp='git stash pop'
+alias gsts='git stash show --text'
+alias gsu='git submodule update'
+
+alias gts='git tag -s'
+
+alias gunignore='git update-index --no-assume-unchanged'
+alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
+alias gup='git pull --rebase'
+alias gupv='git pull --rebase -v'
+
+alias gvt='git verify-tag'
+
+alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
+alias gwip='git add -A; git rm $(git ls-files --deleted); git commit -m "--wip--"'

From de769058b9bb846cdbda8eadfde7ebc1bad3993d Mon Sep 17 00:00:00 2001
From: Andrew Dwyer <andrewrdwyer@gmail.com>
Date: Sat, 9 May 2015 14:33:01 +0930
Subject: [PATCH 1059/1378] Fix awk command. \s only working in gawk

---
 plugins/n98-magerun/n98-magerun.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
index e4b0d6885..3a29f39b3 100755
--- a/plugins/n98-magerun/n98-magerun.plugin.zsh
+++ b/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -7,7 +7,7 @@
 
 # n98-magerun basic command completion
 _n98_magerun_get_command_list () {
-  n98-magerun.phar --no-ansi | sed "1,/Available commands/d" | awk '/^\s+[a-z]+/ { print $1 }'
+  n98-magerun.phar --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z\-:]+/ { print $1 }'
 }
 
 _n98_magerun () {
@@ -15,9 +15,10 @@ _n98_magerun () {
 }
 
 compdef _n98_magerun n98-magerun.phar
+compdef _n98_magerun n98-magerun
 
 # Aliases
-alias n98-magerun='n98-magerun.phar'
+alias n98='n98-magerun.phar'
 alias mage='n98-magerun.phar'
 alias magefl='n98-magerun.phar cache:flush'
 

From 2449e41248f03f4313e67294883cb928d597ad27 Mon Sep 17 00:00:00 2001
From: Andrew Dwyer <andrewrdwyer@gmail.com>
Date: Sat, 9 May 2015 15:43:30 +0930
Subject: [PATCH 1060/1378] Add file completion as optional argument

---
 plugins/n98-magerun/n98-magerun.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
index 3a29f39b3..bfcf27b98 100755
--- a/plugins/n98-magerun/n98-magerun.plugin.zsh
+++ b/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -7,11 +7,19 @@
 
 # n98-magerun basic command completion
 _n98_magerun_get_command_list () {
-  n98-magerun.phar --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z\-:]+/ { print $1 }'
+  $_comp_command1 --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z\-:]+/ { print $1 }'
 }
 
+
 _n98_magerun () {
-  compadd `_n98_magerun_get_command_list`
+  _arguments '1: :->command' '*:optional arg:_files'
+
+  case $state in
+    command)
+      compadd $(_n98_magerun_get_command_list)
+      ;;
+    *)
+  esac
 }
 
 compdef _n98_magerun n98-magerun.phar

From 4d0aca48dace8cc4952aeb3c266837b993133a1c Mon Sep 17 00:00:00 2001
From: Diego Rabatone Oliveira <diraol@diraol.eng.br>
Date: Sat, 9 May 2015 18:46:54 -0300
Subject: [PATCH 1061/1378] Differing upgrade and safe-upgrade

Improving with "safe-upgrade" for aptitude and "upgrade" for apt-get
---
 plugins/debian/debian.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 6e45e0521..31a772d60 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -9,8 +9,10 @@
 # You can just set apt_pref='apt-get' to override it.
 if [[ -e $( which -p aptitude 2>&1 ) ]]; then
     apt_pref='aptitude'
+    apt_upgr='safe-upgrade'
 else
     apt_pref='apt-get'
+    apt_upgr='upgrade'
 fi
 
 # Use sudo by default if it's installed
@@ -45,10 +47,10 @@ if [[ $use_sudo -eq 1 ]]; then
     alias abd='sudo $apt_pref build-dep'
     alias ac='sudo $apt_pref clean'
     alias ad='sudo $apt_pref update'
-    alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
+    alias adg='sudo $apt_pref update && sudo $apt_pref $apt_upgr'
     alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
     alias afu='sudo apt-file update'
-    alias ag='sudo $apt_pref upgrade'
+    alias ag='sudo $apt_pref $apt_upgr'
     alias ai='sudo $apt_pref install'
     # Install all packages given on the command line while using only the first word of each line:
     # acs ... | ail
@@ -80,10 +82,10 @@ else
     }
     alias ac='su -ls \'$apt_pref clean\' root'
     alias ad='su -lc \'$apt_pref update\' root'
-    alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
+    alias adg='su -lc \'$apt_pref update && aptitude $apt_upgr\' root'
     alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
     alias afu='su -lc "apt-file update"'
-    alias ag='su -lc \'$apt_pref safe-upgrade\' root'
+    alias ag='su -lc \'$apt_pref $apt_upgr\' root'
     ai() {
         cmd="su -lc 'aptitude -P install $@' root"
         print "$cmd"
@@ -136,7 +138,7 @@ apt_pref_compdef abd "build-dep"
 apt_pref_compdef ac  "clean"
 apt_pref_compdef ad  "update"
 apt_pref_compdef afu "update"
-apt_pref_compdef ag  "upgrade"
+apt_pref_compdef ag  "$apt_upgr"
 apt_pref_compdef ai  "install"
 apt_pref_compdef ail "install"
 apt_pref_compdef ap  "purge"

From 6504a2d386570213a3a1b1e9b371622b1f74ab2f Mon Sep 17 00:00:00 2001
From: Jad Bitar <jadbitar@mac.com>
Date: Tue, 12 May 2015 13:23:05 -0400
Subject: [PATCH 1062/1378] Add CakePHP3 plugin

---
 plugins/cakephp3/cakephp3.plugin.zsh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/cakephp3/cakephp3.plugin.zsh

diff --git a/plugins/cakephp3/cakephp3.plugin.zsh b/plugins/cakephp3/cakephp3.plugin.zsh
new file mode 100644
index 000000000..28d5af2ea
--- /dev/null
+++ b/plugins/cakephp3/cakephp3.plugin.zsh
@@ -0,0 +1,19 @@
+# CakePHP 3 basic command completion
+_cakephp3_get_command_list () {
+	cakephp3commands=($(bin/cake completion commands));printf "%s\n" "${cakephp3commands[@]}"
+}
+
+_cakephp3 () {
+  if [ -f bin/cake ]; then
+    compadd `_cakephp3_get_command_list`
+  fi
+}
+
+compdef _cakephp3 bin/cake
+compdef _cakephp3 cake
+
+#Alias
+alias c3='bin/cake'
+
+alias c3cache='bin/cake orm_cache clear'
+alias c3migrate='bin/cake migrations migrate'

From 7b478d75a3a0db466e78b6e46a0e468d64354618 Mon Sep 17 00:00:00 2001
From: epelletier <enguerrand.pelletier@supinfo.com>
Date: Thu, 21 May 2015 17:34:24 +0200
Subject: [PATCH 1063/1378] Detect the .venv in any parent directory of the
 current directory

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 5faa1a823..b3a3b56d5 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -29,8 +29,11 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
     if [ ! $WORKON_CWD ]; then
       WORKON_CWD=1
       # Check if this is a Git repo
-      PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
-      if (( $? != 0 )); then
+      PROJECT_ROOT=`pwd`
+      while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
+        PROJECT_ROOT=`realpath $PROJECT_ROOT/..`
+      done
+      if [[ "$PROJECT_ROOT" == "/" ]]; then
         PROJECT_ROOT="."
       fi
       # Check for virtualenv name override

From 743be91b207d4617e68b04a43311438652cec63d Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@FreeBSD.org>
Date: Thu, 21 May 2015 12:34:04 -0700
Subject: [PATCH 1064/1378] Don't leak extendedglob to global environment.

---
 plugins/history-substring-search/history-substring-search.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index 22f03dd6d..65f0750db 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -175,7 +175,6 @@ fi
 # implementation details
 #-----------------------------------------------------------------------------
 
-setopt extendedglob
 zmodload -F zsh/parameter
 
 #
@@ -284,6 +283,7 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
 fi
 
 function _history-substring-search-begin() {
+  setopt localoptions extendedglob
   _history_substring_search_move_cursor_eol=false
   _history_substring_search_query_highlight=
 
@@ -350,6 +350,7 @@ function _history-substring-search-begin() {
 }
 
 function _history-substring-search-end() {
+  setopt localoptions extendedglob
   _history_substring_search_result=$BUFFER
 
   # move the cursor to the end of the command line

From 0c8cb11d44d4ed4f458907cc19a0896416590587 Mon Sep 17 00:00:00 2001
From: GunfighterJ <joseph.jenniges@gmail.com>
Date: Mon, 25 May 2015 16:02:26 -0500
Subject: [PATCH 1065/1378] Add sublime text 3 paths to check list

---
 plugins/sublime/sublime.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 38a7596fd..ef76826cf 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -8,6 +8,8 @@ if [[ $('uname') == 'Linux' ]]; then
         "/usr/bin/sublime_text"
         "/usr/local/bin/sublime_text"
         "/usr/bin/subl"
+        "/opt/sublime_text_3/sublime_text"
+        "/usr/bin/subl3"
     )
     for _sublime_path in $_sublime_linux_paths; do
         if [[ -a $_sublime_path ]]; then

From ea6adc5a0a3332e541a812a2da0e94c73e2102da Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 29 May 2015 22:59:07 -0400
Subject: [PATCH 1066/1378] Add omz_diagnostic_dump() to help with bug reports.

---
 lib/diagnostics.zsh | 280 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 lib/diagnostics.zsh

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
new file mode 100644
index 000000000..cca13f4e4
--- /dev/null
+++ b/lib/diagnostics.zsh
@@ -0,0 +1,280 @@
+# diagnostics.zsh
+#
+# Diagnostic and debugging support for oh-my-zsh
+
+# omz_diagnostic_dump()
+#
+# Author: Andrew Janke <andrew@apjanke.net>
+#
+# Usage:
+#
+# omz_diagnostic_dump [-v] [-V] [file]
+#
+# NOTE: This is a work in progress. Its interface and behavior are going to change,
+# and probably in non-back-compatible ways.
+#
+# Outputs a bunch of information about the state and configuration of
+# oh-my-zsh, zsh, and the user's system. This is intended to provide a
+# bunch of context for diagnosing your own or a third party's problems, and to
+# be suitable for posting to public bug reports.
+#
+# The output is human-readable and its format may change over time. It is not
+# suitable for parsing. All the output is in one single file so it can be posted
+# as a gist or bug comment on GitHub. GitHub doesn't support attaching tarballs
+# or other files to bugs; otherwise, this would probably have an option to produce
+# tarballs that contain copies of the config and customization files instead of
+# catting them all in to one file.
+#
+# This is intended to be widely portable, and run anywhere that oh-my-zsh does.
+# Feel free to report any portability issues as bugs.
+#
+# This is written in a defensive style so it still works (and can detect) cases when
+# basic functionality like echo and which have been redefined. In particular, almost
+# everything is invoked with "builtin" or "command", to work in the face of user 
+# redefinitions.
+#
+# OPTIONS
+#
+# [file]   Specifies the output file. If not given, a file in the current directory
+#        is selected automatically.
+#
+# -v    Increase the verbosity of the dump output. May be specified multiple times.
+#       Verbosity levels:
+#        0 - Basic info, shell state, omz configuration, git state
+#        1 - (default) Adds key binding info and configuration file contents
+#        2 - Adds zcompdump file contents
+#
+# -V    Reduce the verbosity of the dump output. May be specified multiple times.
+#
+# TODO:
+# * Multi-file capture
+# * Add automatic gist uploading
+# * Consider whether to move default output file location to TMPDIR. More robust
+#     but less user friendly.
+#
+function omz_diagnostic_dump() {
+  emulate -L zsh
+
+  local thisfcn=omz_diagnostic_dump
+  local -A opts
+  local opt_verbose opt_noverbose opt_outfile
+  local timestamp=$(date +%Y%m%d-%H%M%S)
+  local outfile=omz_diagdump_$timestamp.txt
+  builtin zparseopts -A opts -D -- "v+=opt_verbose" "V+=opt_noverbose"
+  local verbose n_verbose=${#opt_verbose} n_noverbose=${#opt_noverbose}
+  (( verbose = 1 + n_verbose - n_noverbose ))
+
+  if [[ ${#*} > 0 ]]; then
+    opt_outfile=$1
+  fi
+  if [[ ${#*} > 1 ]]; then
+    builtin echo "$thisfcn: error: too many arguments" >&2
+    return 1
+  fi
+  if [[ -n "$opt_outfile" ]]; then
+    outfile="$opt_outfile"
+  fi
+
+  # Always write directly to a file so terminal escape sequences are
+  # captured cleanly
+  _omz_diag_dump_one_big_text &> "$outfile"
+  if [[ $? != 0 ]]; then
+    builtin echo "$thisfcn: error while creating diagnostic dump; see $outfile for details"
+  fi
+
+  builtin echo
+  builtin echo Diagnostic dump file created at: "$outfile"
+  builtin echo
+  builtin echo To share this with OMZ developers, post it as a gist on GitHub 
+  builtin echo at "https://gist.github.com" and share the link to the gist.
+  builtin echo
+  builtin echo "WARNING: This dump file contains all your zsh and omz configuration files,"
+  builtin echo "so don't share it publicly if there's sensitive information in them."
+  builtin echo
+
+}
+
+function _omz_diag_dump_one_big_text() {
+  local program programs progfile md5
+
+  builtin echo oh-my-zsh diagnostic dump
+  builtin echo
+
+  # Basic system and zsh information
+  command date
+  command uname -a
+  builtin echo OSTYPE=$OSTYPE
+  command zsh --version
+  builtin echo User: $USER
+  builtin echo
+
+  # Installed programs
+  programs=(sh zsh ksh bash sed cat grep find git posh)
+  for program in $programs; do
+    local md5_str="" md5="" link_str="" extra_str=""
+    progfile=$(builtin which $program)
+    if [[ $? == 0 ]]; then
+      if [[ -e $progfile ]]; then
+        if builtin whence md5 &>/dev/null; then
+          extra_str+=" $(md5 -q $progfile)"
+        fi
+        if [[ -h "$progfile" ]]; then
+          extra_str+=" ( -> ${file:A} )"
+        fi
+      fi
+      builtin printf '%-9s %-20s %s\n' "$program is" "$progfile" "$extra_str"
+    else
+      builtin echo "$program: not found"
+    fi
+  done
+  builtin echo
+  builtin echo Versions:
+  builtin echo "zsh: $(zsh --version)"
+  builtin echo "bash: $(bash --version | command grep bash)"
+  builtin echo "git: $(git --version)"
+  builtin echo "grep: $(grep --version)"
+  builtin echo
+
+  # Core command definitions
+  _omz_diag_dump_check_core_commands || return 1
+  builtin echo  
+
+  # ZSH Process state
+  builtin echo Process state:
+  builtin echo pwd: $PWD
+  if builtin whence pstree &>/dev/null; then
+    builtin echo Process tree for this shell:
+    pstree -p $$
+  else
+    ps -fT
+  fi
+  builtin set | command grep -a '^\(ZSH\|plugins\|TERM\|LC_\|LANG\|precmd\|chpwd\|preexec\|FPATH\|TTY\|DISPLAY\|PATH\)\|OMZ'
+  builtin echo
+  #TODO: Should this include `env` instead of or in addition to `export`?
+  builtin echo Exported:
+  builtin echo $(builtin export | command sed 's/=.*//')
+  builtin echo 
+  builtin echo Locale:
+  command locale
+  builtin echo
+
+  # Zsh configuration
+  builtin echo Zsh configuration:
+  builtin echo setopt: $(builtin setopt)
+  builtin echo
+
+  # Oh-my-zsh installation
+  builtin echo oh-my-zsh installation:
+  command ls -ld ~/.z*
+  command ls -ld ~/.oh*
+  builtin echo
+  builtin echo oh-my-zsh git state:
+  (cd $ZSH && builtin echo "HEAD: $(git rev-parse HEAD)" && git remote -v && git status | command grep "[^[:space:]]")
+  if [[ $verbose -ge 1 ]]; then
+    (cd $ZSH && git reflog --date=default | command grep pull)
+  fi
+  builtin echo
+  if [[ -e $ZSH_CUSTOM ]]; then
+    local custom_dir=$ZSH_CUSTOM
+    if [[ -h $custom_dir ]]; then
+      custom_dir=$(cd $custom_dir && pwd -P)
+    fi
+    builtin echo "oh-my-zsh custom dir:"
+    builtin echo "   $ZSH_CUSTOM ($custom_dir)"
+    (cd ${custom_dir:h} && command find ${custom_dir:t} -name .git -prune -o -print)
+    builtin echo
+  fi
+
+  # Key binding and terminal info
+  if [[ $verbose -ge 1 ]]; then
+    builtin echo "bindkey:"
+    builtin bindkey
+    builtin echo
+    builtin echo "infocmp:"
+    command infocmp
+    builtin echo
+  fi
+
+  # Configuration file info
+  local zdotdir=${ZDOTDIR:-$HOME}
+  builtin echo "Zsh configuration files:"
+  local cfgfile cfgfiles
+  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout 
+    $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout )
+  command ls -lad $cfgfiles 2>&1
+  builtin echo
+  if [[ $verbose -ge 1 ]]; then
+    for cfgfile in $cfgfiles; do
+      _omz_diag_dump_echo_file_w_header $cfgfile
+    done
+  fi
+  builtin echo "Zsh compdump files:"
+  local dumpfile dumpfiles
+  command ls -lad $zdotdir/.zcompdump*
+  dumpfiles=( $zdotdir/.zcompdump*(N) )
+  if [[ $verbose -ge 2 ]]; then
+    for dumpfile in $dumpfiles; do
+      _omz_diag_dump_echo_file_w_header $dumpfile
+    done
+  fi
+
+}
+
+function _omz_diag_dump_check_core_commands() {
+  builtin echo "Core command check:"
+  local redefined name builtins externals
+  redefined=()
+  # All the zsh non-module builtin commands
+  # These are taken from the zsh reference manual for 5.0.2
+  # Commands from modules should not be included.
+  # (For back-compatibility, if any of these are newish, they should be removed,
+  # or at least made conditional on the version of the current running zsh.)
+  # "history" is also excluded because OMZ is known to redefine that
+  builtins=( alias autoload bg bindkey break builtin bye cd chdir command
+    comparguments compcall compctl compdescribe compfiles compgroups compquote comptags
+    comptry compvalues continue declare dirs disable disown echo echotc echoti emulate
+    enable eval exec exit export false fc fg float functions getln getopts hash
+    integer jobs kill let limit local log logout noglob popd print printf
+    pushd pushln pwd r read readonly rehash return sched set setopt shift
+    source suspend test times trap true ttyctl type typeset ulimit umask unalias
+    unfunction unhash unlimit unset unsetopt vared wait whence where which zcompile
+    zle zmodload zparseopts zregexparse zstyle )
+  builtins_fatal=( builtin command local )
+  externals=( zsh )
+  for name in $builtins; do
+    if [[ $(builtin whence -w $name) != "$name: builtin" ]]; then
+      builtin echo "builtin '$name' has been redefined"
+      builtin which $name
+      redefined+=$name
+    fi
+  done
+  for name in $externals; do
+    if [[ $(builtin whence -w $name) != "$name: command" ]]; then
+      builtin echo "command '$name' has been redefined"
+      builtin which $name
+      redefined+=$name
+    fi
+  done
+
+  if [[ -n "$redefined" ]]; then
+    builtin echo "SOME CORE COMMANDS HAVE BEEN REDEFINED: $redefined"
+  else
+    builtin echo "All core commands are defined normally"
+  fi
+
+}
+
+function _omz_diag_dump_echo_file_w_header() {
+  local file=$1
+  if [[ ( -f $file || -h $file ) ]]; then
+    builtin echo "========== $file =========="
+    if [[ -h $file ]]; then
+      builtin echo "==========    ( => ${file:A} )   =========="
+    fi
+    command cat $file
+    builtin echo "========== end $file =========="
+    builtin echo
+  fi
+}
+
+

From 7416018d1c51ae2ff008538c98e6f9b19b752bc5 Mon Sep 17 00:00:00 2001
From: Nicolas Brousse <pro@nicolas-brousse.fr>
Date: Sun, 31 May 2015 19:34:01 +0200
Subject: [PATCH 1067/1378] Create new aliases for homebrew plugin

---
 plugins/brew/brew.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 42fb80c9a..5b5847328 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,2 +1,4 @@
 alias brews='brew list -1'
-alias bubu="brew update && brew upgrade && brew cleanup"
+alias bubo='brew update && brew outdated'
+alias bubc='brew upgrade && brew cleanup'
+alias bubu='bubo && bubc'

From 7f232f69fe8140a919759ea3b0811a71247f11e1 Mon Sep 17 00:00:00 2001
From: william <mkwmms@users.noreply.github.com>
Date: Tue, 2 Jun 2015 14:43:38 -0600
Subject: [PATCH 1068/1378] Respect $ZSH_CACHE_DIR when creating fasd's cache

---
 plugins/fasd/fasd.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index 8ad43fc23..472ab2b0f 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -1,5 +1,5 @@
 if [ $commands[fasd] ]; then # check if fasd is installed
-  fasd_cache="$HOME/.fasd-init-cache"
+  fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache"
   if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
     fasd --init auto >| "$fasd_cache"
   fi

From cc639287d2fbb3e5b032a70b2f5fb671ee9e95ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 28 Feb 2015 13:31:54 +0100
Subject: [PATCH 1069/1378] Round 3 of batch-closing obsolete issues


From cffeefde903149df8ef48224fedf5205cb2497c3 Mon Sep 17 00:00:00 2001
From: Lucas Braun <lucas.braun@annkissam.com>
Date: Thu, 4 Jun 2015 11:00:21 -0400
Subject: [PATCH 1070/1378] Add installation instructions to README

Update README formatting
---
 plugins/zeus/README.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md
index 8964eaaec..451880049 100644
--- a/plugins/zeus/README.md
+++ b/plugins/zeus/README.md
@@ -42,12 +42,15 @@
 * `zsw` aliases `rm .zeus.sock`
 * `zweep` aliases `rm .zeus.sock`
 
-`zdbr` aliases `zeus rake db:reset db:test:prepare`
-`zdbreset` aliases `zeus rake db:reset db:test:prepare`
+* `zdbr` aliases `zeus rake db:reset db:test:prepare`
+* `zdbreset` aliases `zeus rake db:reset db:test:prepare`
 
-`zdbm` aliases `zeus rake db:migrate db:test:prepare`
-`zdbmigrate` aliases `zeus rake db:migrate db:test:prepare`
+* `zdbm` aliases `zeus rake db:migrate db:test:prepare`
+* `zdbmigrate` aliases `zeus rake db:migrate db:test:prepare`
 
-`zdbc` aliases `zeus rake db:create`
+* `zdbc` aliases `zeus rake db:create`
 
-`zdbcm` aliases `zeus rake db:create db:migrate db:test:prepare`
+* `zdbcm` aliases `zeus rake db:create db:migrate db:test:prepare`
+
+## Installation
+Add zeus to the plugins line of your `.zshconfig` file (e.g. `plugins=(rails git zeus)`)

From 82c1288cb25b1567b4d17f33a75192de1b9f4634 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sat, 6 Jun 2015 01:19:29 -0400
Subject: [PATCH 1071/1378] Include some bash rc files; improve formatting;
 more version info

---
 lib/diagnostics.zsh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index cca13f4e4..7991b64c8 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -104,12 +104,12 @@ function _omz_diag_dump_one_big_text() {
   command date
   command uname -a
   builtin echo OSTYPE=$OSTYPE
-  command zsh --version
+  builtin echo ZSH_VERSION=$ZSH_VERSION
   builtin echo User: $USER
   builtin echo
 
   # Installed programs
-  programs=(sh zsh ksh bash sed cat grep find git posh)
+  programs=(sh zsh ksh bash sed cat grep ls find git posh)
   for program in $programs; do
     local md5_str="" md5="" link_str="" extra_str=""
     progfile=$(builtin which $program)
@@ -119,7 +119,7 @@ function _omz_diag_dump_one_big_text() {
           extra_str+=" $(md5 -q $progfile)"
         fi
         if [[ -h "$progfile" ]]; then
-          extra_str+=" ( -> ${file:A} )"
+          extra_str+=" ( -> ${progfile:A} )"
         fi
       fi
       builtin printf '%-9s %-20s %s\n' "$program is" "$progfile" "$extra_str"
@@ -128,8 +128,9 @@ function _omz_diag_dump_one_big_text() {
     fi
   done
   builtin echo
-  builtin echo Versions:
+  builtin echo Command Versions:
   builtin echo "zsh: $(zsh --version)"
+  builtin echo "this zsh session: $ZSH_VERSION"
   builtin echo "bash: $(bash --version | command grep bash)"
   builtin echo "git: $(git --version)"
   builtin echo "grep: $(grep --version)"
@@ -199,8 +200,12 @@ function _omz_diag_dump_one_big_text() {
   local zdotdir=${ZDOTDIR:-$HOME}
   builtin echo "Zsh configuration files:"
   local cfgfile cfgfiles
+  # Some files for bash that zsh does not use are intentionally included
+  # to help with diagnosing behavior differences between bash and zsh
   cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout 
-    $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout )
+    $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout
+    ~/.zsh-pre-oh-my-zsh
+    /etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout )
   command ls -lad $cfgfiles 2>&1
   builtin echo
   if [[ $verbose -ge 1 ]]; then
@@ -208,6 +213,7 @@ function _omz_diag_dump_one_big_text() {
       _omz_diag_dump_echo_file_w_header $cfgfile
     done
   fi
+  builtin echo
   builtin echo "Zsh compdump files:"
   local dumpfile dumpfiles
   command ls -lad $zdotdir/.zcompdump*
@@ -274,6 +280,12 @@ function _omz_diag_dump_echo_file_w_header() {
     command cat $file
     builtin echo "========== end $file =========="
     builtin echo
+  elif [[ -d $file ]]; then
+    builtin echo "File '$file' is a directory"
+  elif [[ ! -e $file ]]; then
+    builtin echo "File '$file' does not exist"
+  else
+    command ls -lad "$file"
   fi
 }
 

From afadb5a7fba061bc1b6da1df3b00e20ede4a5cba Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sat, 6 Jun 2015 11:04:14 -0400
Subject: [PATCH 1072/1378] diagnostics: add zstyle state to output

---
 lib/diagnostics.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 7991b64c8..6dede0664 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -163,6 +163,9 @@ function _omz_diag_dump_one_big_text() {
   builtin echo Zsh configuration:
   builtin echo setopt: $(builtin setopt)
   builtin echo
+  builtin echo zstyle:
+  builtin zstyle
+  builtin echo
 
   # Oh-my-zsh installation
   builtin echo oh-my-zsh installation:

From af68165207ea757e303fdbab365ac9e3f11c8530 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sat, 6 Jun 2015 11:50:05 -0400
Subject: [PATCH 1073/1378] Fix name of backed-up zshrc

---
 lib/diagnostics.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 6dede0664..023ba42b9 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -207,7 +207,7 @@ function _omz_diag_dump_one_big_text() {
   # to help with diagnosing behavior differences between bash and zsh
   cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout 
     $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout
-    ~/.zsh-pre-oh-my-zsh
+    ~/.zsh.pre-oh-my-zsh
     /etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout )
   command ls -lad $cfgfiles 2>&1
   builtin echo

From 3a77433cea136ff9d9a383866f191f66169468c9 Mon Sep 17 00:00:00 2001
From: Manfred Touron <m@42.am>
Date: Tue, 9 Jun 2015 11:29:37 +0200
Subject: [PATCH 1074/1378] Add new boot2docker options

---
 plugins/boot2docker/_boot2docker | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/boot2docker/_boot2docker b/plugins/boot2docker/_boot2docker
index baa08b26d..3116bd14c 100644
--- a/plugins/boot2docker/_boot2docker
+++ b/plugins/boot2docker/_boot2docker
@@ -35,11 +35,14 @@ _1st_arguments=(
 
 _arguments \
   '(--basevmdk)--basevmdk[Path to VMDK to use as base for persistent partition]' \
+  '(--cpus)'{-c,--cpus}'[number of CPUs for boot2docker.]' \
+  '(--clobber)--clobber[overwrite Docker client binary on boot2docker upgrade]' \
   '(--dhcp)--dhcp[enable VirtualBox host-only network DHCP.]' \
   '(--dhcpip)--dhcpip[VirtualBox host-only network DHCP server address.]' \
   '(-s --disksize)'{-s,--disksize}'[boot2docker disk image size (in MB).]' \
   '(--dockerport)--dockerport[host Docker port (forward to port 2376 in VM). (deprecated - use with care)]' \
   '(--driver)--driver[hypervisor driver.]' \
+  '(--force-upgrade-download)--force-upgrade-download[always download on boot2docker upgrade, never skip.]' \
   '(--hostip)--hostip[VirtualBox host-only network IP address.]' \
   '(--iso)--iso[path to boot2docker ISO image.]' \
   '(--iso-url)--iso-url[/api.github.com/repos/boot2docker/boot2docker/releases": source URL to provision the boot2docker ISO image.]' \

From 5770ad51f963af7b75af03fabc691492137277ef Mon Sep 17 00:00:00 2001
From: Werner Buck <wernerbuck@gmail.com>
Date: Tue, 9 Jun 2015 16:52:40 +0200
Subject: [PATCH 1075/1378] Set AWS_PROFILE and use existing RPROMPT

---
 plugins/aws/aws.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 0ae18dd56..6d93d530d 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -13,7 +13,8 @@ function agp {
 }
 function asp {
   export AWS_DEFAULT_PROFILE=$1
-  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>"
+  export AWS_PROFILE=$1
+  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>$RPROMPT"
 }
 function aws_profiles {
   reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))

From b7d041c627ab9e40c08a51932afe2d61e840de09 Mon Sep 17 00:00:00 2001
From: Rodrigo Argumedo <rodrigo.argumedo@outlook.com>
Date: Tue, 9 Jun 2015 13:41:34 -0600
Subject: [PATCH 1076/1378] Add rdrs method to reset the database(s)

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 5ed96f8cd..d3b51d8af 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -50,6 +50,7 @@ alias rdr='rake db:rollback'
 alias rdc='rake db:create'
 alias rds='rake db:seed'
 alias rdd='rake db:drop'
+alias rdrs='rake db:reset'
 alias rdtc='rake db:test:clone'
 alias rdtp='rake db:test:prepare'
 alias rdmtc='rake db:migrate db:test:clone'

From 6a1b8320fe9f087179c9ebf092bd17a782127d96 Mon Sep 17 00:00:00 2001
From: HeroCC <HeroCC@users.noreply.github.com>
Date: Mon, 20 Apr 2015 11:24:05 -0400
Subject: [PATCH 1077/1378] No input for Update Check defaults to Yes

---
 tools/check_for_upgrade.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index b2b356e0c..5afd83c1e 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -41,10 +41,9 @@ then
     then
       _upgrade_zsh
     else
-      echo "[Oh My Zsh] Would you like to check for updates?"
-      echo "Type Y to update oh-my-zsh: \c"
+      echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c"
       read line
-      if [ "$line" = Y ] || [ "$line" = y ]; then
+      if [ "$line" = Y ] || [ "$line" = y ] || [ -z "$line" ]; then
         _upgrade_zsh
       else
         _update_zsh_update

From a2f782e5f3fd3d65dfb34b7f22ec68234b2774a3 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@mekanics.ch>
Date: Wed, 21 May 2014 09:55:26 +0200
Subject: [PATCH 1078/1378] updated the command list to the latest cocoapod
 version (0.33.0)

version bumped
---
 plugins/pod/_pod | 275 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 249 insertions(+), 26 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index 8c0f4460f..eb7be52e9 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -3,29 +3,31 @@
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods (0.27.1) autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  Cocoapods (0.33.0) autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
 #       TWITTER:  @jolyAlexandre
-#       VERSION:  0.0.3
-#       LICENSE:  MIT
+#       VERSION:  0.0.4
 # -----------------------------------------------------------------------------
 
 local -a _1st_arguments
 _1st_arguments=(
-    'help:Show help for the given command'
-    'init:Generate a Podfile for the current directory'
+    'help:Show help for the given command.'
+    'init:Generate a Podfile for the current directory.'
     'install:Install project dependencies'
     'ipc:Inter-process communication'
+    'lib:Develop pods'
     'list:List pods'
     'outdated:Show outdated project dependencies'
-    'podfile-info:Shows information on installed Pods'
-    'push:Push new specifications to a spec-repo'
+    'plugins:Show available CocoaPods plugins'
+    'push:Temporary alias for the `pod repo push` command'
     'repo:Manage spec-repositories'
     'search:Searches for pods'
     'setup:Setup the CocoaPods environment'
     'spec:Manage pod specs'
+    'trunk:Interact with trunk.cocoapods.org'
+    'try:Try a Pod!'
     'update:Update outdated project dependencies'
 )
 
@@ -33,6 +35,7 @@ local -a _repo_arguments
 _repo_arguments=(
     'add:Add a spec repo'
     'lint:Validates all specs in a repo'
+    'push:Push new specifications to a spec-repo'
     'remove:Remove a spec repo.'
     'update:Update a spec repo'
 )
@@ -51,24 +54,56 @@ _ipc_arguments=(
     'list:Lists the specifications know to CocoaPods'
     'podfile:Converts a Podfile to YAML'
     'repl:The repl listens to commands on standard input'
-    'spec:Converts a podspec to YAML'
+    'spec:Converts a podspec to JSON'
     'update-search-index:Updates the search index'
 )
 
+local -a _lib_arguments
+_lib_arguments=(
+    'create:Creates a new Pod'
+    'lint:Validates a Pod'
+)
+
+local -a _plugins_arguments
+_plugins_arguments=(
+    'create:Creates a new plugin'
+    'list:List all known plugins'
+    'search:Search for known plugins'
+)
+
 local -a _list_arguments
 _list_arguments=(
     'new:Lists pods introduced in the master spec-repo since the last check'
 )
 
+local -a _trunk_arguments
+_trunk_arguments=(
+    'add-owner:Add an owner to a pod'
+    'me:Display information about your sessions'
+    'push:Publish a podspec'
+    'register:Manage sessions'
+)
+
+local -a _trunk_me_arguments
+_trunk_me_arguments=(
+    'clean-sessions:Remove sessions'
+)
+
 local -a _inherited_options
 _inherited_options=(
     '(--silent)--silent[Show nothing]' \
-    '(--version)--version[Show the version of CocoaPods]' \
-    '(--no-color)--no-color[Show output without color]' \
     '(--verbose)--verbose[Show more debugging information]' \
+    '(--no-ansi)--no-ansi[Show output without ANSI codes]' \
     '(--help)--help[Show help banner of specified command]'
 )
 
+local -a _root_options
+_root_options=(
+    '(--version)--version[Show the version of CocoaPods]' \
+    '(--completion-script)--completion-script[Print the auto-completion script]'
+
+)
+
 local -a _install_options
 _install_options=(
     '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn` intact after downloading]' \
@@ -76,6 +111,15 @@ _install_options=(
     '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]'
 )
 
+local -a _lib_lint_options
+_lib_lint_options=(
+    '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \
+    '(--only-errors)--only-errors[Lint validates even if warnings are present]' \
+    '(--subspec=NAME)--subspec=[Lint validates only the given subspec]' \
+    '(--no-subspecs)--no-subspecs[Lint skips validation of subspecs]' \
+    '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]'
+)
+
 local -a _update_options
 _update_options=(
     '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn intact after downloading]' \
@@ -93,7 +137,8 @@ _search_options=(
     '(--full)--full[Search by name, summary, and description]' \
     '(--stats)--stats[Show additional stats (like GitHub watchers and forks)]' \
     '(--ios)--ios[Restricts the search to Pods supported on iOS]' \
-    '(--osx)--osx[Restricts the search to Pods supported on OS X]'
+    '(--osx)--osx[Restricts the search to Pods supported on OS X]' \
+    '(--web)--web[Searches on cocoapods.org]'
 )
 
 local -a _list_options
@@ -101,20 +146,23 @@ _list_options=(
     '(--update)--update[Run `pod repo update` before listing]'
 )
 
-local -a _podfile_info_options
-_podfile_info_options=(
-    '(--all)--all[Show information about all Pods with dependencies that are used in a project]' \
-    '(--md)--md[Output information in Markdown format]' \
-    '*:script or directory:_files'
+local -a _plugins_search_options
+_plugins_search_options=(
+    '(--full)--full[Search by name, author, and description]'
 )
 
-local -a _push_options
-_push_options=(
+local -a _repo_push_options
+_repo_push_options=(
     '(--allow-warnings)--allow-warnings[Allows pushing even if there are warnings]' \
     '(--local-only)--local-only[Does not perform the step of pushing REPO to its remote]' \
     '*:script or directory:_files'
 )
 
+local -a _repo_add_options
+_repo_add_options=(
+    '(--shallow)--shallow[Create a shallow clone (fast clone, but no push capabilities)]'
+)
+
 local -a _repo_lint_options
 _repo_lint_options=(
     '(--only-errors)--only-errors[Lint presents only the errors]'
@@ -122,6 +170,7 @@ _repo_lint_options=(
 
 local -a _setup_options
 _setup_options=(
+    '(--no-shallow)--no-shallow[Clone full history so push will work]'
     '(--push)--push[Use this option to enable push access once granted]'
 )
 
@@ -129,6 +178,8 @@ local -a _spec_lint_options
 _spec_lint_options=(
     '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \
     '(--only-errors)--only-errors[Lint validates even if warnings are present]' \
+    '(--subspec=NAME)--subspec=[Lint validates only the given subspec]' \
+    '(--no-subspecs)--no-subspecs[Lint skips validation of subspecs]' \
     '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]' \
     '*:script or directory:_files'
 )
@@ -148,6 +199,11 @@ _spec_edit_options=(
     '(--show-all)--show-all[Pick which spec to edit from all available versions of the given podspec]'
 )
 
+local -a _trunk_register_options
+_trunk_register_options=(
+    '(--description=DESCRIPTION)--description=[An arbitrary description to easily identify your session later on.]'
+)
+
 
 __first_command_list ()
 {
@@ -192,9 +248,17 @@ __pod-repo() {
                         ':feature:__repo_list'
                 ;;
 
+                (push)
+                    _arguments \
+                        $_inherited_options \
+                        $_repo_push_options \
+                        ':feature:__repo_list'
+                ;;
+
                 (add)
                     _arguments \
-                        $_inherited_options
+                        $_inherited_options \
+                        $_repo_add_options
 
                 (remove)
                     _arguments \
@@ -211,6 +275,7 @@ __pod-spec() {
     typeset -A opt_args
 
     _arguments -C \
+        $_inherited_options \
         ':command:->command' \
         '*::options:->options'
 
@@ -278,6 +343,145 @@ __pod-ipc() {
     esac
 }
 
+__pod-lib() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "pod lib" _lib_arguments
+            return
+        ;;
+
+        (options)
+            case $line[1] in
+                (create)
+                    _arguments \
+                        $_inherited_options
+                ;;
+
+                (lint)
+                    _arguments \
+                        $_inherited_options \
+                        $_lib_lint_options
+                ;;
+            esac
+            return
+        ;;
+    esac
+}
+
+__pod-plugins() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        $_inherited_options \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "pod plugins" _plugins_arguments
+            return
+        ;;
+
+        (options)
+            case $line[1] in
+                (create)
+                    _arguments \
+                        $_inherited_options
+                ;;
+
+                (list)
+                    _arguments \
+                        $_inherited_options
+                ;;
+
+                (search)
+                    _arguments \
+                        $_inherited_options \
+                        $_plugins_search_options
+                ;;
+            esac
+            return
+        ;;
+    esac
+}
+
+__pod-trunk() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        $_inherited_options \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "pod trunk" _trunk_arguments
+            return
+        ;;
+
+        (options)
+            case $line[1] in
+                (add-owner)
+                    _arguments \
+                        $_inherited_options
+                ;;
+
+                (me)
+                    __pod-trunk-me
+                ;;
+
+                (push)
+                    _arguments \
+                        $_inherited_options
+                ;;
+
+                (register)
+                    _arguments \
+                        $_inherited_options \
+                        $_trunk_register_options
+                ;;
+            esac
+            return
+        ;;
+    esac
+}
+
+__pod-trunk-me() {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        $_inherited_options \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+        (command)
+            _describe -t commands "pod trunk me" _trunk_me_arguments
+            return
+        ;;
+
+        (options)
+            case $line[1] in
+                (clean-sessions)
+                    _arguments \
+                        $_inherited_options
+                ;;
+            esac
+            return
+        ;;
+    esac
+}
+
 __pod-list() {
     local curcontext="$curcontext" state line
     typeset -A opt_args
@@ -314,6 +518,9 @@ _arguments -C \
 case $state in
   (command)
       _describe -t commands "pod" _1st_arguments
+      _arguments \
+            $_inherited_options \
+            $_root_options
       return
   ;;
 
@@ -325,10 +532,15 @@ case $state in
                 ':help:__first_command_list'
         ;;
 
+        (init)
+            _arguments \
+                $_inherited_options
+        ;;
+
         (push)
             _arguments \
                 $_inherited_options \
-                $_push_options \
+                $_repo_push_options \
                 ':repo:__repo_list'
         ;;
 
@@ -344,6 +556,10 @@ case $state in
             __pod-ipc
         ;;
 
+        (lib)
+            __pod-lib
+        ;;
+
         (list)
             __pod-list
         ;;
@@ -366,18 +582,25 @@ case $state in
                 $_outdated_options
         ;;
 
+        (plugins)
+            __pod-plugins
+        ;;
+
+        (trunk)
+            __pod-trunk
+        ;;
+
+        (try)
+            _arguments \
+                $_inherited_options
+        ;;
+
         (search)
             _arguments \
                 $_inherited_options \
                 $_search_options
         ;;
 
-        (podfile-info)
-            _arguments \
-                $_inherited_options \
-                $_podfile_info_options
-        ;;
-
         (setup)
             _arguments \
                 $_inherited_options \

From d686f8a8d0aa4ee42be6a9663c05374344e2c649 Mon Sep 17 00:00:00 2001
From: Alexandre Joly <alexandre.joly@mekanics.ch>
Date: Wed, 28 May 2014 16:16:30 +0200
Subject: [PATCH 1079/1378] generate with 'pod --completion-script' /cc thx to
 @ajmccall

version bumped
---
 plugins/pod/_pod | 1260 ++++++++++++++++++++++++----------------------
 1 file changed, 665 insertions(+), 595 deletions(-)

diff --git a/plugins/pod/_pod b/plugins/pod/_pod
index eb7be52e9..508a47102 100644
--- a/plugins/pod/_pod
+++ b/plugins/pod/_pod
@@ -1,612 +1,682 @@
 #compdef pod
 #autoload
+# setopt XTRACE VERBOSE
+# vim: ft=zsh sw=2 ts=2 et
+
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods (0.33.0) autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  Cocoapods (0.33.1) autocomplete plugin for Oh-My-Zsh
 #                 http://cocoapods.org
+#                 Generated with `pod --completion-script
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics
 #       TWITTER:  @jolyAlexandre
-#       VERSION:  0.0.4
+#       VERSION:  0.0.5
 # -----------------------------------------------------------------------------
 
-local -a _1st_arguments
-_1st_arguments=(
-    'help:Show help for the given command.'
-    'init:Generate a Podfile for the current directory.'
-    'install:Install project dependencies'
-    'ipc:Inter-process communication'
-    'lib:Develop pods'
-    'list:List pods'
-    'outdated:Show outdated project dependencies'
-    'plugins:Show available CocoaPods plugins'
-    'push:Temporary alias for the `pod repo push` command'
-    'repo:Manage spec-repositories'
-    'search:Searches for pods'
-    'setup:Setup the CocoaPods environment'
-    'spec:Manage pod specs'
-    'trunk:Interact with trunk.cocoapods.org'
-    'try:Try a Pod!'
-    'update:Update outdated project dependencies'
-)
+local -a _subcommands
+local -a _options
 
-local -a _repo_arguments
-_repo_arguments=(
-    'add:Add a spec repo'
-    'lint:Validates all specs in a repo'
-    'push:Push new specifications to a spec-repo'
-    'remove:Remove a spec repo.'
-    'update:Update a spec repo'
-)
-
-local -a _spec_arguments
-_spec_arguments=(
-    'cat:Prints a spec file'
-    'create:Create spec file stub'
-    'edit:Edit a spec file'
-    'lint:Validates a spec file'
-    'which:Prints the path of the given spec'
-)
-
-local -a _ipc_arguments
-_ipc_arguments=(
-    'list:Lists the specifications know to CocoaPods'
-    'podfile:Converts a Podfile to YAML'
-    'repl:The repl listens to commands on standard input'
-    'spec:Converts a podspec to JSON'
-    'update-search-index:Updates the search index'
-)
-
-local -a _lib_arguments
-_lib_arguments=(
-    'create:Creates a new Pod'
-    'lint:Validates a Pod'
-)
-
-local -a _plugins_arguments
-_plugins_arguments=(
-    'create:Creates a new plugin'
-    'list:List all known plugins'
-    'search:Search for known plugins'
-)
-
-local -a _list_arguments
-_list_arguments=(
-    'new:Lists pods introduced in the master spec-repo since the last check'
-)
-
-local -a _trunk_arguments
-_trunk_arguments=(
-    'add-owner:Add an owner to a pod'
-    'me:Display information about your sessions'
-    'push:Publish a podspec'
-    'register:Manage sessions'
-)
-
-local -a _trunk_me_arguments
-_trunk_me_arguments=(
-    'clean-sessions:Remove sessions'
-)
-
-local -a _inherited_options
-_inherited_options=(
-    '(--silent)--silent[Show nothing]' \
-    '(--verbose)--verbose[Show more debugging information]' \
-    '(--no-ansi)--no-ansi[Show output without ANSI codes]' \
-    '(--help)--help[Show help banner of specified command]'
-)
-
-local -a _root_options
-_root_options=(
-    '(--version)--version[Show the version of CocoaPods]' \
-    '(--completion-script)--completion-script[Print the auto-completion script]'
-
-)
-
-local -a _install_options
-_install_options=(
-    '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn` intact after downloading]' \
-    '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
-    '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]'
-)
-
-local -a _lib_lint_options
-_lib_lint_options=(
-    '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \
-    '(--only-errors)--only-errors[Lint validates even if warnings are present]' \
-    '(--subspec=NAME)--subspec=[Lint validates only the given subspec]' \
-    '(--no-subspecs)--no-subspecs[Lint skips validation of subspecs]' \
-    '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]'
-)
-
-local -a _update_options
-_update_options=(
-    '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn intact after downloading]' \
-    '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \
-    '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]'
-)
-
-local -a _outdated_options
-_outdated_options=(
-    '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]'
-)
-
-local -a _search_options
-_search_options=(
-    '(--full)--full[Search by name, summary, and description]' \
-    '(--stats)--stats[Show additional stats (like GitHub watchers and forks)]' \
-    '(--ios)--ios[Restricts the search to Pods supported on iOS]' \
-    '(--osx)--osx[Restricts the search to Pods supported on OS X]' \
-    '(--web)--web[Searches on cocoapods.org]'
-)
-
-local -a _list_options
-_list_options=(
-    '(--update)--update[Run `pod repo update` before listing]'
-)
-
-local -a _plugins_search_options
-_plugins_search_options=(
-    '(--full)--full[Search by name, author, and description]'
-)
-
-local -a _repo_push_options
-_repo_push_options=(
-    '(--allow-warnings)--allow-warnings[Allows pushing even if there are warnings]' \
-    '(--local-only)--local-only[Does not perform the step of pushing REPO to its remote]' \
-    '*:script or directory:_files'
-)
-
-local -a _repo_add_options
-_repo_add_options=(
-    '(--shallow)--shallow[Create a shallow clone (fast clone, but no push capabilities)]'
-)
-
-local -a _repo_lint_options
-_repo_lint_options=(
-    '(--only-errors)--only-errors[Lint presents only the errors]'
-)
-
-local -a _setup_options
-_setup_options=(
-    '(--no-shallow)--no-shallow[Clone full history so push will work]'
-    '(--push)--push[Use this option to enable push access once granted]'
-)
-
-local -a _spec_lint_options
-_spec_lint_options=(
-    '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \
-    '(--only-errors)--only-errors[Lint validates even if warnings are present]' \
-    '(--subspec=NAME)--subspec=[Lint validates only the given subspec]' \
-    '(--no-subspecs)--no-subspecs[Lint skips validation of subspecs]' \
-    '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]' \
-    '*:script or directory:_files'
-)
-
-local -a _spec_cat_options
-_spec_cat_options=(
-    '(--show-all)--show-all[Pick from all versions of the given podspec]'
-)
-
-local -a _spec_which_options
-_spec_which_options=(
-    '(--show-all)--show-all[Print all versions of the given podspec]'
-)
-
-local -a _spec_edit_options
-_spec_edit_options=(
-    '(--show-all)--show-all[Pick which spec to edit from all available versions of the given podspec]'
-)
-
-local -a _trunk_register_options
-_trunk_register_options=(
-    '(--description=DESCRIPTION)--description=[An arbitrary description to easily identify your session later on.]'
-)
-
-
-__first_command_list ()
-{
-    local expl
-    declare -a tasks
-
-    tasks=(install ipc list outdated podfile-info push repo search setup spec update)
-
-    _wanted tasks expl 'help' compadd $tasks
-}
-
-__repo_list() {
-    _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods/repos 2>/dev/null | sed -e 's/ /\\ /g')
-}
-
-__pod-repo() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        ':command:->command' \
-        '*::options:->options'
-
-    case $state in
-        (command)
-            _describe -t commands "pod repo" _repo_arguments
-            return
-        ;;
-
-        (options)
-            case $line[1] in
-                (lint)
-                    _arguments \
-                        $_inherited_options \
-                        $_repo_lint_options \
-                        ':feature:__repo_list'
-                ;;
-
-                (update)
-                    _arguments \
-                        $_inherited_options \
-                        ':feature:__repo_list'
-                ;;
-
-                (push)
-                    _arguments \
-                        $_inherited_options \
-                        $_repo_push_options \
-                        ':feature:__repo_list'
-                ;;
-
-                (add)
-                    _arguments \
-                        $_inherited_options \
-                        $_repo_add_options
-
-                (remove)
-                    _arguments \
-                        $_inherited_options \
-                        ':feature:__repo_list'
-                ;;
-            esac
-        ;;
+case "$words[2]" in
+  help)
+    case "$words[3]" in
+      *) # pod help
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod help options" _options
+      ;;
     esac
-}
-
-__pod-spec() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        $_inherited_options \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod spec" _spec_arguments
-            return
-        ;;
-
-        (options)
-            case $line[1] in
-                (create)
-                    _arguments \
-                        $_inherited_options
-                ;;
-
-                (lint)
-                    _arguments \
-                        $_inherited_options \
-                        $_spec_lint_options
-                ;;
-
-                (cat)
-                    _arguments \
-                        $_inherited_options \
-                        $_spec_cat_options
-                ;;
-
-                (which)
-                    _arguments \
-                        $_inherited_options \
-                        $_spec_which_options
-                ;;
-
-                (edit)
-                    _arguments \
-                        $_inherited_options \
-                        $_spec_edit_options
-                ;;
-            esac
-            return
-        ;;
-    esac
-}
-
-__pod-ipc() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod ipc" _ipc_arguments
-            return
-        ;;
-
-        (options)
-            _arguments -C \
-                $_inherited_options
-            return
-        ;;
-    esac
-}
-
-__pod-lib() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod lib" _lib_arguments
-            return
-        ;;
-
-        (options)
-            case $line[1] in
-                (create)
-                    _arguments \
-                        $_inherited_options
-                ;;
-
-                (lint)
-                    _arguments \
-                        $_inherited_options \
-                        $_lib_lint_options
-                ;;
-            esac
-            return
-        ;;
-    esac
-}
-
-__pod-plugins() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        $_inherited_options \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod plugins" _plugins_arguments
-            return
-        ;;
-
-        (options)
-            case $line[1] in
-                (create)
-                    _arguments \
-                        $_inherited_options
-                ;;
-
-                (list)
-                    _arguments \
-                        $_inherited_options
-                ;;
-
-                (search)
-                    _arguments \
-                        $_inherited_options \
-                        $_plugins_search_options
-                ;;
-            esac
-            return
-        ;;
-    esac
-}
-
-__pod-trunk() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        $_inherited_options \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod trunk" _trunk_arguments
-            return
-        ;;
-
-        (options)
-            case $line[1] in
-                (add-owner)
-                    _arguments \
-                        $_inherited_options
-                ;;
-
-                (me)
-                    __pod-trunk-me
-                ;;
-
-                (push)
-                    _arguments \
-                        $_inherited_options
-                ;;
-
-                (register)
-                    _arguments \
-                        $_inherited_options \
-                        $_trunk_register_options
-                ;;
-            esac
-            return
-        ;;
-    esac
-}
-
-__pod-trunk-me() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        $_inherited_options \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod trunk me" _trunk_me_arguments
-            return
-        ;;
-
-        (options)
-            case $line[1] in
-                (clean-sessions)
-                    _arguments \
-                        $_inherited_options
-                ;;
-            esac
-            return
-        ;;
-    esac
-}
-
-__pod-list() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-        $_inherited_options \
-        $_list_options \
-        ':command:->command' \
-        '*::options:->options'
-
-   case $state in
-        (command)
-            _describe -t commands "pod list" _list_arguments
-            return
-        ;;
-
-        (options)
-            _arguments -C \
-                $_inherited_options \
-                $_list_options
-            return
-        ;;
-    esac
-}
-
-local curcontext="$curcontext" state line
-typeset -A opt_args
-
-_arguments -C \
-    $_inherited_options \
-    ':command:->command' \
-    '*::options:->options'
-
-case $state in
-  (command)
-      _describe -t commands "pod" _1st_arguments
-      _arguments \
-            $_inherited_options \
-            $_root_options
-      return
   ;;
-
-  (options)
-    case $line[1] in
-        (help)
-            _arguments \
-                $_inherited_options \
-                ':help:__first_command_list'
-        ;;
-
-        (init)
-            _arguments \
-                $_inherited_options
-        ;;
-
-        (push)
-            _arguments \
-                $_inherited_options \
-                $_repo_push_options \
-                ':repo:__repo_list'
-        ;;
-
-        (repo)
-            __pod-repo
-        ;;
-
-        (spec)
-            __pod-spec
-        ;;
-
-        (ipc)
-            __pod-ipc
-        ;;
-
-        (lib)
-            __pod-lib
-        ;;
-
-        (list)
-            __pod-list
-        ;;
-
-        (install)
-            _arguments \
-                $_inherited_options \
-                $_install_options
-        ;;
-
-        (update)
-            _arguments \
-                $_inherited_options \
-                $_update_options
-        ;;
-
-        (outdated)
-            _arguments \
-                $_inherited_options \
-                $_outdated_options
-        ;;
-
-        (plugins)
-            __pod-plugins
-        ;;
-
-        (trunk)
-            __pod-trunk
-        ;;
-
-        (try)
-            _arguments \
-                $_inherited_options
-        ;;
-
-        (search)
-            _arguments \
-                $_inherited_options \
-                $_search_options
-        ;;
-
-        (setup)
-            _arguments \
-                $_inherited_options \
-                $_setup_options
-        ;;
-
+  ipc)
+    case "$words[3]" in
+      list)
+        case "$words[4]" in
+          *) # pod ipc list
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod ipc list options" _options
+          ;;
+        esac
+      ;;
+      podfile)
+        case "$words[4]" in
+          *) # pod ipc podfile
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod ipc podfile options" _options
+          ;;
+        esac
+      ;;
+      repl)
+        case "$words[4]" in
+          *) # pod ipc repl
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod ipc repl options" _options
+          ;;
+        esac
+      ;;
+      spec)
+        case "$words[4]" in
+          *) # pod ipc spec
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod ipc spec options" _options
+          ;;
+        esac
+      ;;
+      update-search-index)
+        case "$words[4]" in
+          *) # pod ipc update-search-index
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod ipc update-search-index options" _options
+          ;;
+        esac
+      ;;
+      *) # pod ipc
+        _subcommands=(
+          "list:Lists the specifications known to CocoaPods."
+          "podfile:Converts a Podfile to YAML."
+          "repl:The repl listens to commands on standard input."
+          "spec:Converts a podspec to JSON."
+          "update-search-index:Updates the search index."
+        )
+        _describe -t commands "pod ipc subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod ipc options" _options
+      ;;
     esac
   ;;
+  init)
+    case "$words[3]" in
+      *) # pod init
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod init options" _options
+      ;;
+    esac
+  ;;
+  install)
+    case "$words[3]" in
+      *) # pod install
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--no-clean:Leave SCM dirs like \`.git\` and \`.svn\` intact after downloading"
+          "--no-integrate:Skip integration of the Pods libraries in the Xcode project(s)"
+          "--no-repo-update:Skip running \`pod repo update\` before install"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod install options" _options
+      ;;
+    esac
+  ;;
+  lib)
+    case "$words[3]" in
+      create)
+        case "$words[4]" in
+          *) # pod lib create
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod lib create options" _options
+          ;;
+        esac
+      ;;
+      lint)
+        case "$words[4]" in
+          *) # pod lib lint
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--no-clean:Lint leaves the build directory intact for inspection"
+              "--no-subspecs:Lint skips validation of subspecs"
+              "--only-errors:Lint validates even if warnings are present"
+              "--quick:Lint skips checks that would require to download and build the spec"
+              "--silent:Show nothing"
+              "--subspec=NAME:Lint validates only the given subspec"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod lib lint options" _options
+          ;;
+        esac
+      ;;
+      *) # pod lib
+        _subcommands=(
+          "create:Creates a new Pod"
+          "lint:Validates a Pod"
+        )
+        _describe -t commands "pod lib subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod lib options" _options
+      ;;
+    esac
+  ;;
+  list)
+    case "$words[3]" in
+      new)
+        case "$words[4]" in
+          *) # pod list new
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--update:Run \`pod repo update\` before listing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod list new options" _options
+          ;;
+        esac
+      ;;
+      *) # pod list
+        _subcommands=(
+          "new:Lists pods introduced in the master spec-repo since the last check"
+        )
+        _describe -t commands "pod list subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--update:Run \`pod repo update\` before listing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod list options" _options
+      ;;
+    esac
+  ;;
+  outdated)
+    case "$words[3]" in
+      *) # pod outdated
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--no-repo-update:Skip running \`pod repo update\` before install"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod outdated options" _options
+      ;;
+    esac
+  ;;
+  plugins)
+    case "$words[3]" in
+      create)
+        case "$words[4]" in
+          *) # pod plugins create
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod plugins create options" _options
+          ;;
+        esac
+      ;;
+      list)
+        case "$words[4]" in
+          *) # pod plugins list
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod plugins list options" _options
+          ;;
+        esac
+      ;;
+      search)
+        case "$words[4]" in
+          *) # pod plugins search
+            _options=(
+              "--full:Search by name, author, and description"
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod plugins search options" _options
+          ;;
+        esac
+      ;;
+      *) # pod plugins
+        _subcommands=(
+          "create:Creates a new plugin"
+          "list:List all known plugins"
+          "search:Search for known plugins"
+        )
+        _describe -t commands "pod plugins subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod plugins options" _options
+      ;;
+    esac
+  ;;
+  push)
+    case "$words[3]" in
+      *) # pod push
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod push options" _options
+      ;;
+    esac
+  ;;
+  repo)
+    case "$words[3]" in
+      add)
+        case "$words[4]" in
+          *) # pod repo add
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--shallow:Create a shallow clone (fast clone, but no push capabilities)"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod repo add options" _options
+          ;;
+        esac
+      ;;
+      lint)
+        case "$words[4]" in
+          *) # pod repo lint
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--only-errors:Lint presents only the errors"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod repo lint options" _options
+          ;;
+        esac
+      ;;
+      push)
+        case "$words[4]" in
+          *) # pod repo push
+            _options=(
+              "--allow-warnings:Allows pushing even if there are warnings"
+              "--help:Show help banner of specified command"
+              "--local-only:Does not perform the step of pushing REPO to its remote"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod repo push options" _options
+          ;;
+        esac
+      ;;
+      remove)
+        case "$words[4]" in
+          *) # pod repo remove
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod repo remove options" _options
+          ;;
+        esac
+      ;;
+      update)
+        case "$words[4]" in
+          *) # pod repo update
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod repo update options" _options
+          ;;
+        esac
+      ;;
+      *) # pod repo
+        _subcommands=(
+          "add:Add a spec repo."
+          "lint:Validates all specs in a repo."
+          "push:Push new specifications to a spec-repo"
+          "remove:Remove a spec repo"
+          "update:Update a spec repo."
+        )
+        _describe -t commands "pod repo subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod repo options" _options
+      ;;
+    esac
+  ;;
+  search)
+    case "$words[3]" in
+      *) # pod search
+        _options=(
+          "--full:Search by name, summary, and description"
+          "--help:Show help banner of specified command"
+          "--ios:Restricts the search to Pods supported on iOS"
+          "--no-ansi:Show output without ANSI codes"
+          "--osx:Restricts the search to Pods supported on OS X"
+          "--stats:Show additional stats (like GitHub watchers and forks)"
+          "--verbose:Show more debugging information"
+          "--web:Searches on cocoapods.org"
+        )
+        _describe -t options "pod search options" _options
+      ;;
+    esac
+  ;;
+  setup)
+    case "$words[3]" in
+      *) # pod setup
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--no-shallow:Clone full history so push will work"
+          "--push:Use this option to enable push access once granted"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod setup options" _options
+      ;;
+    esac
+  ;;
+  spec)
+    case "$words[3]" in
+      cat)
+        case "$words[4]" in
+          *) # pod spec cat
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--show-all:Pick from all versions of the given podspec"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod spec cat options" _options
+          ;;
+        esac
+      ;;
+      create)
+        case "$words[4]" in
+          *) # pod spec create
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod spec create options" _options
+          ;;
+        esac
+      ;;
+      edit)
+        case "$words[4]" in
+          *) # pod spec edit
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--show-all:Pick which spec to edit from all available versions of the given podspec"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod spec edit options" _options
+          ;;
+        esac
+      ;;
+      lint)
+        case "$words[4]" in
+          *) # pod spec lint
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--no-clean:Lint leaves the build directory intact for inspection"
+              "--no-subspecs:Lint skips validation of subspecs"
+              "--only-errors:Lint validates even if warnings are present"
+              "--quick:Lint skips checks that would require to download and build the spec"
+              "--silent:Show nothing"
+              "--subspec=NAME:Lint validates only the given subspec"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod spec lint options" _options
+          ;;
+        esac
+      ;;
+      which)
+        case "$words[4]" in
+          *) # pod spec which
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--show-all:Print all versions of the given podspec"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod spec which options" _options
+          ;;
+        esac
+      ;;
+      *) # pod spec
+        _subcommands=(
+          "cat:Prints a spec file."
+          "create:Create spec file stub."
+          "edit:Edit a spec file."
+          "lint:Validates a spec file."
+          "which:Prints the path of the given spec."
+        )
+        _describe -t commands "pod spec subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod spec options" _options
+      ;;
+    esac
+  ;;
+  trunk)
+    case "$words[3]" in
+      add-owner)
+        case "$words[4]" in
+          *) # pod trunk add-owner
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod trunk add-owner options" _options
+          ;;
+        esac
+      ;;
+      me)
+        case "$words[4]" in
+          clean-sessions)
+            case "$words[5]" in
+              *) # pod trunk me clean-sessions
+                _options=(
+                  "--all:Removes all your sessions, except for the current one"
+                  "--help:Show help banner of specified command"
+                  "--no-ansi:Show output without ANSI codes"
+                  "--silent:Show nothing"
+                  "--verbose:Show more debugging information"
+                )
+                _describe -t options "pod trunk me clean-sessions options" _options
+              ;;
+            esac
+          ;;
+          *) # pod trunk me
+            _subcommands=(
+              "clean-sessions:Remove sessions"
+            )
+            _describe -t commands "pod trunk me subcommands" _subcommands
+            _options=(
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod trunk me options" _options
+          ;;
+        esac
+      ;;
+      push)
+        case "$words[4]" in
+          *) # pod trunk push
+            _options=(
+              "--allow-warnings:Allows push even if there are lint warnings"
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod trunk push options" _options
+          ;;
+        esac
+      ;;
+      register)
+        case "$words[4]" in
+          *) # pod trunk register
+            _options=(
+              "--description=DESCRIPTION:An arbitrary description to easily identify your session later on."
+              "--help:Show help banner of specified command"
+              "--no-ansi:Show output without ANSI codes"
+              "--silent:Show nothing"
+              "--verbose:Show more debugging information"
+            )
+            _describe -t options "pod trunk register options" _options
+          ;;
+        esac
+      ;;
+      *) # pod trunk
+        _subcommands=(
+          "add-owner:Add an owner to a pod"
+          "me:Display information about your sessions"
+          "push:Publish a podspec"
+          "register:Manage sessions"
+        )
+        _describe -t commands "pod trunk subcommands" _subcommands
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod trunk options" _options
+      ;;
+    esac
+  ;;
+  try)
+    case "$words[3]" in
+      *) # pod try
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod try options" _options
+      ;;
+    esac
+  ;;
+  update)
+    case "$words[3]" in
+      *) # pod update
+        _options=(
+          "--help:Show help banner of specified command"
+          "--no-ansi:Show output without ANSI codes"
+          "--no-clean:Leave SCM dirs like \`.git\` and \`.svn\` intact after downloading"
+          "--no-integrate:Skip integration of the Pods libraries in the Xcode project(s)"
+          "--no-repo-update:Skip running \`pod repo update\` before install"
+          "--silent:Show nothing"
+          "--verbose:Show more debugging information"
+        )
+        _describe -t options "pod update options" _options
+      ;;
+    esac
+  ;;
+  *) # pod
+    _subcommands=(
+      "help:Show help for the given command."
+      "ipc:Inter-process communication"
+      "init:Generate a Podfile for the current directory."
+      "install:Install project dependencies"
+      "lib:Develop pods"
+      "list:List pods"
+      "outdated:Show outdated project dependencies"
+      "plugins:Show available CocoaPods plugins"
+      "push:Temporary alias for the \`pod repo push\` command"
+      "repo:Manage spec-repositories"
+      "search:Searches for pods"
+      "setup:Setup the CocoaPods environment"
+      "spec:Manage pod specs"
+      "trunk:Interact with the CocoaPods API (e.g. publishing new specs)"
+      "try:Try a Pod!"
+      "update:Update outdated project dependencies"
+    )
+    _describe -t commands "pod subcommands" _subcommands
+    _options=(
+      "--completion-script:Print the auto-completion script"
+      "--help:Show help banner of specified command"
+      "--no-ansi:Show output without ANSI codes"
+      "--silent:Show nothing"
+      "--verbose:Show more debugging information"
+      "--version:Show the version of the tool"
+    )
+    _describe -t options "pod options" _options
+  ;;
 esac

From a98501d2ce76152f1601aad0d2be23fcda230c0a Mon Sep 17 00:00:00 2001
From: Mark Mendoza <mendoza.mark.a@gmail.com>
Date: Mon, 20 Apr 2015 01:29:16 -0700
Subject: [PATCH 1080/1378] Grep bug in Agnoster

---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 8c7be6e01..b8d0b5872 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -126,7 +126,7 @@ prompt_hg() {
       if `hg st | grep -q "^\?"`; then
         prompt_segment red black
         st='±'
-      elif `hg st | grep -q "^(M|A)"`; then
+      elif `hg st | grep -q "^[MA]"`; then
         prompt_segment yellow black
         st='±'
       else

From 3cc3084f5fadcd9fedb5f633e2e207e8150e9451 Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Wed, 18 Mar 2015 01:02:09 -0400
Subject: [PATCH 1081/1378] Fix typo in $VCS_CLEAN_COLOR in adben theme

---
 themes/adben.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index 212b823a5..e4774cf0e 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -42,7 +42,7 @@ GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN
 GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} "
 DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}"
 VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}"
-Vcs_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
+VCS_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
 VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}"
 # ########## COLOR ###########
 # ########## SVN ###########

From 45e3f623cc5c80eff68449a7db66829bc08d9a18 Mon Sep 17 00:00:00 2001
From: liuxiang <liuxiang921@gmail.com>
Date: Wed, 25 Feb 2015 10:45:13 +0800
Subject: [PATCH 1082/1378] Add README for httpie plugin

---
 plugins/httpie/README.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/httpie/README.md

diff --git a/plugins/httpie/README.md b/plugins/httpie/README.md
new file mode 100644
index 000000000..1d4ec48bd
--- /dev/null
+++ b/plugins/httpie/README.md
@@ -0,0 +1,6 @@
+## HTTPie
+**Maintainer:** [lululau](https://github.com/lululau)
+
+This plugin adds completion for HTTPie, which is a command line HTTP client, a user-friendly cURL replacement. 
+
+[HTTPie Homepage](http://httpie.org)

From 729b19c0852b7efe7d9c63e08b676883794b90ec Mon Sep 17 00:00:00 2001
From: Wayne <waynelkh0@gmail.com>
Date: Sun, 26 Apr 2015 03:52:00 +0800
Subject: [PATCH 1083/1378] Remove docker insert command

Remove the docker insert command of autocomplete
---
 plugins/docker/_docker | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index fd459a0ca..e95a22bfd 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -100,11 +100,6 @@ __info() {
     # no arguments
 }
 
-__insert() {
-    __docker_images
-    _arguments '*:files:_files'
-}
-
 __inspect() {
     __docker_images
     __docker_all_containers
@@ -278,7 +273,6 @@ _1st_arguments=(
     "images":"List images"
     "import":"Create a new filesystem image from the contents of a tarball"
     "info":"Display system-wide information"
-    "insert":"Insert a file in an image"
     "inspect":"Return low-level information on a container"
     "kill":"Kill a running container"
     "load":"Load an image from a tar archive"
@@ -335,8 +329,6 @@ case "$words[1]" in
         __import ;;
     info)
         __info ;;
-    insert)
-        __insert ;;
     inspect)
         __inspect ;;
     kill)

From de56943a0ee120fdc0ba9f2c3929f8bb1742e3b4 Mon Sep 17 00:00:00 2001
From: Samuel Parkinson <sam.parkinson@graze.com>
Date: Wed, 2 Jul 2014 18:22:32 +0100
Subject: [PATCH 1084/1378] Improved the `_git_time_since_commit` function.

Check for at least one commit using a `git log` limit of one.

Improves the performance inside git repos with a large history.
---
 themes/avit.zsh-theme | 47 ++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index a21a9c8c4..65466b82f 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -38,34 +38,32 @@ function _ruby_version() {
 # Determine the time since last commit. If branch is clean,
 # use a neutral color, otherwise colors will vary according to time.
 function _git_time_since_commit() {
-  if git rev-parse --git-dir > /dev/null 2>&1; then
-    # Only proceed if there is actually a commit.
-    if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
-      # Get the last commit.
-      last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null)
-      now=$(date +%s)
-      seconds_since_last_commit=$((now-last_commit))
+# Only proceed if there is actually a commit.
+  if git log -1 > /dev/null 2>&1; then
+    # Get the last commit.
+    last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null)
+    now=$(date +%s)
+    seconds_since_last_commit=$((now-last_commit))
 
-      # Totals
-      minutes=$((seconds_since_last_commit / 60))
-      hours=$((seconds_since_last_commit/3600))
+    # Totals
+    minutes=$((seconds_since_last_commit / 60))
+    hours=$((seconds_since_last_commit/3600))
 
-      # Sub-hours and sub-minutes
-      days=$((seconds_since_last_commit / 86400))
-      sub_hours=$((hours % 24))
-      sub_minutes=$((minutes % 60))
+    # Sub-hours and sub-minutes
+    days=$((seconds_since_last_commit / 86400))
+    sub_hours=$((hours % 24))
+    sub_minutes=$((minutes % 60))
 
-      if [ $hours -gt 24 ]; then
-          commit_age="${days}d"
-      elif [ $minutes -gt 60 ]; then
-          commit_age="${sub_hours}h${sub_minutes}m"
-      else
-          commit_age="${minutes}m"
-      fi
-
-      color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL
-      echo "$color$commit_age%{$reset_color%}"
+    if [ $hours -gt 24 ]; then
+      commit_age="${days}d"
+    elif [ $minutes -gt 60 ]; then
+      commit_age="${sub_hours}h${sub_minutes}m"
+    else
+      commit_age="${minutes}m"
     fi
+
+    color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL
+    echo "$color$commit_age%{$reset_color%}"
   fi
 }
 
@@ -99,4 +97,3 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[grey]%}"
 export LSCOLORS="exfxcxdxbxegedabagacad"
 export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
 export GREP_COLOR='1;33'
-

From 8652fd64efe7bcf950494856fd10ef1f5627a9ea Mon Sep 17 00:00:00 2001
From: David Hartmann <dh@thesilverlogic.com>
Date: Sun, 22 Jun 2014 03:10:53 +0200
Subject: [PATCH 1085/1378] added comment functionality

added commenting functionality by appending 'm' after the issue key (regular JIRA shortcut)
---
 plugins/jira/jira.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 4a36b882d..8ad60b8fe 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -49,6 +49,20 @@ open_jira_issue () {
     else
       $open_cmd  "$jira_url/browse/$jira_prefix$1"
     fi
+  else 
+    local addcomment=''
+    if [[ "$2" == "m" ]]; then
+      addcomment="#add-comment"
+      echo "Add comment to issue #$1"
+    else
+      echo "Opening issue #$1"
+    fi
+    
+    if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
+      $open_cmd  "$jira_url/issues/$1$addcomment"
+    else
+      $open_cmd  "$jira_url/browse/$1$addcomment"
+    fi
   fi
 }
 

From a28dbc83937cbe624ec726199b4bbe7b65b2b2a0 Mon Sep 17 00:00:00 2001
From: Matthew Hager <matthew@poeticsystems.com>
Date: Sat, 21 Feb 2015 12:33:38 -0600
Subject: [PATCH 1086/1378] Move custon *.zsh file sourcing up so that they can
 load plugins and other things that come after.

---
 oh-my-zsh.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bc7a8e496..71716f77f 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -29,6 +29,11 @@ for config_file ($ZSH/lib/*.zsh); do
   source $config_file
 done
 
+# Load all of your custom configurations from custom/
+for config_file ($ZSH_CUSTOM/*.zsh(N)); do
+  source $config_file
+done
+unset config_file
 
 is_plugin() {
   local base_dir=$1
@@ -72,12 +77,6 @@ for plugin ($plugins); do
   fi
 done
 
-# Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
-  source $config_file
-done
-unset config_file
-
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]; then
   themes=($ZSH/themes/*zsh-theme)

From 16535452829d36f5382b176216a9ad312b2be1e5 Mon Sep 17 00:00:00 2001
From: Tejas Bubane <tejas.bubane@infibeam.net>
Date: Tue, 23 Dec 2014 12:48:09 +0530
Subject: [PATCH 1087/1378] Recognize comments by default.

---
 lib/misc.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 0b7cb2696..c9a8e9e8f 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -20,3 +20,6 @@ alias afind='ack-grep -il'
 if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then
 	export LC_CTYPE=${LANG%%:*} # pick the first entry from LANG
 fi
+
+# recognize comments
+setopt interactivecomments

From 41104f8af842cd9ba441255808053a36ef4fcd6b Mon Sep 17 00:00:00 2001
From: Andrew Purcell <andrew.purcell@grandroundshealth.com>
Date: Mon, 1 Dec 2014 12:29:59 -0800
Subject: [PATCH 1088/1378] Fix homebrew directory in aws plugin.

Sometimes the output of ``homebrew --prefix`` and ``homebrew --prefix
awscli`` don't match, and the second is the correct call.
---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 0ae18dd56..e5e3f1236 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -22,7 +22,7 @@ function aws_profiles {
 compctl -K aws_profiles asp
 
 if _homebrew-installed && _awscli-homebrew-installed ; then
-  _aws_zsh_completer_path=$(brew --prefix)/opt/awscli/libexec/bin/aws_zsh_completer.sh
+  _aws_zsh_completer_path=$(brew --prefix awscli)/libexec/bin/aws_zsh_completer.sh
 else
   _aws_zsh_completer_path=$(which aws_zsh_completer.sh)
 fi

From 70c4a27fd6048c3213dd2f3bae21bff26005bc16 Mon Sep 17 00:00:00 2001
From: "leif.hanack" <strug@web.de>
Date: Wed, 4 Jun 2014 00:37:33 +0200
Subject: [PATCH 1089/1378] Added a possibility to display the remote branch
 and the number of commits you are ahead or behind

---
 lib/git.zsh            | 20 +++++++++++++++-----
 themes/strug.zsh-theme | 25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 themes/strug.zsh-theme

diff --git a/lib/git.zsh b/lib/git.zsh
index 118841f06..733492ba0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -36,16 +36,26 @@ git_remote_status() {
         ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
         behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
 
-        if [ $ahead -eq 0 ] && [ $behind -gt 0 ]
+        if [ $ahead -gt 0 ] && [ $behind -eq 0 ]
         then
-            echo "$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
-        elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
+            git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}"
+        elif [ $behind -gt 0 ] && [ $ahead -eq 0 ] 
         then
-            echo "$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
+            git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
         elif [ $ahead -gt 0 ] && [ $behind -gt 0 ]
         then
-            echo "$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
+            git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}"
         fi
+
+        if [ $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]
+        then
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
+        fi
+
+        echo $git_remote_status
     fi
 }
 
diff --git a/themes/strug.zsh-theme b/themes/strug.zsh-theme
new file mode 100644
index 000000000..89b56b008
--- /dev/null
+++ b/themes/strug.zsh-theme
@@ -0,0 +1,25 @@
+# terminal coloring
+export CLICOLOR=1
+export LSCOLORS=dxFxCxDxBxegedabagacad
+
+local git_branch='$(git_prompt_info)%{$reset_color%}$(git_remote_status)'
+
+PROMPT="%{$fg[green]%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch}
+%{$fg[green]%}╰\$ %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}on "
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}%{$fg[red]%} ✘ %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔ %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED=true
+ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX="%{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX="%{$fg[yellow]%})%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=" +"
+ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR=%{$fg[green]%}
+
+ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE=" -"
+ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR=%{$fg[red]%}
+

From f21a672fed1e1455c8341c972f3ba5a408726053 Mon Sep 17 00:00:00 2001
From: Sean Escriva <sean.escriva@gmail.com>
Date: Sat, 24 May 2014 14:24:56 -0400
Subject: [PATCH 1090/1378] add kitchen completion plugin from @petere

---
 plugins/kitchen/_kitchen | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 plugins/kitchen/_kitchen

diff --git a/plugins/kitchen/_kitchen b/plugins/kitchen/_kitchen
new file mode 100644
index 000000000..54105b61a
--- /dev/null
+++ b/plugins/kitchen/_kitchen
@@ -0,0 +1,41 @@
+# author: Peter Eisentraut
+# source: https://gist.github.com/petere/10307599
+# compdef kitchen
+
+_kitchen() {
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments '1: :->cmds'\
+	           '2: :->args'
+
+	case $state in
+		cmds)
+			_arguments "1:Commands:(console converge create destroy diagnose driver help init list login setup test verify version)"
+			;;
+		args)
+			case $line[1] in
+				converge|create|destroy|diagnose|list|setup|test|verify)
+					compadd "$@" all
+					_kitchen_instances
+					;;
+				login)
+					_kitchen_instances
+					;;
+			esac
+			;;
+	esac
+}
+
+_kitchen_instances() {
+	if [[ $_kitchen_instances_cache_dir != $PWD ]]; then
+		unset _kitchen_instances_cache
+	fi
+	if [[ ${+_kitchen_instances_cache} -eq 0 ]]; then
+		_kitchen_instances_cache=(${(f)"$(bundle exec kitchen list -b 2>/dev/null || kitchen list -b 2>/dev/null)"})
+		_kitchen_instances_cache_dir=$PWD
+	fi
+	compadd -a _kitchen_instances_cache
+}
+
+_kitchen "$@"

From 2d40cc0bb315a92368e35c15c92f955bd901c7c3 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <hello@alind.io>
Date: Wed, 16 Apr 2014 10:34:45 +0200
Subject: [PATCH 1091/1378] Add git_prompt_behind and git_prompt_exists

This adds two new theme functions for git:
* `git_prompt_behind` works in a identical fashion to `git_prompt_ahead`
  and will output a format variable (`ZSH_THEME_GIT_PROMPT_BEHIND`) if
  the branch is behind.
* `git_prompt_remote` will output one format variable if the branch
  exists on remote (`ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS`), and another
  if the branch is unpublished (`ZSH_THEME_GIT_PROMPT_REMOTE_MISSING`).

The old `git_prompt_ahead` has been changed. Using git log is subject
to formatting in .gitconfig, which can be overridden and will break
this function. Relying on rev-list is much more stable.
---
 lib/git.zsh | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 733492ba0..caa7e6329 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -59,13 +59,6 @@ git_remote_status() {
     fi
 }
 
-# Checks if there are commits ahead from remote
-function git_prompt_ahead() {
-  if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
-    echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
-  fi
-}
-
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
   if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
@@ -74,6 +67,29 @@ function git_commits_ahead() {
   fi
 }
 
+# Outputs if current branch is ahead of remote
+function git_prompt_ahead() {
+  if [[ -n "$(command git rev-list origin/$(current_branch)..HEAD 2> /dev/null)" ]]; then
+    echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
+  fi
+}
+
+# Outputs if current branch is behind remote
+function git_prompt_behind() {
+  if [[ -n "$(command git rev-list HEAD..origin/$(current_branch) 2> /dev/null)" ]]; then
+    echo "$ZSH_THEME_GIT_PROMPT_BEHIND"
+  fi
+}
+
+# Outputs if current branch exists on remote or not
+function git_prompt_remote() {
+  if [[ -n "$(command git show-ref origin/$(current_branch) 2> /dev/null)" ]]; then
+    echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS"
+  else
+    echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING"
+  fi
+}
+
 # Formats prompt string for current git commit short SHA
 function git_prompt_short_sha() {
   SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"

From 25df9f3998359832667db206774a18cb45153a15 Mon Sep 17 00:00:00 2001
From: Blake Watters <blakewatters@gmail.com>
Date: Tue, 26 Feb 2013 11:29:19 -0500
Subject: [PATCH 1092/1378] Disable globbing when executing `zeus rake` aliases
 to enable use of square brackets without escaping

---
 plugins/zeus/zeus.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index 5ec9fa579..0c01083a5 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -19,8 +19,8 @@ alias zsr='zeus server'
 alias zerver='zeus server'
 
 # Rake
-alias zr='zeus rake'
-alias zake='zeus rake'
+alias zr='noglob zeus rake'
+alias zake='noglob zeus rake'
 
 # Generate
 alias zg='zeus generate'

From 2fb326513a9e2cec473cff88669da890ad4ae834 Mon Sep 17 00:00:00 2001
From: Dan Mills <evilhamsterman@gmail.com>
Date: Wed, 10 Jun 2015 15:49:47 -0700
Subject: [PATCH 1093/1378] Only load url-quote-magic if it is available.
 Partially fixes #3614

---
 lib/misc.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 0b7cb2696..92e336b64 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,6 +1,10 @@
-## smart urls
-autoload -U url-quote-magic
-zle -N self-insert url-quote-magic
+## Load smart urls if available
+for d in $fpath; do
+	if [[ -e "$d/url-quote-magic"]]; then
+		autoload -U url-quote-magic
+		zle -N self-insert url-quote-magic
+	fi
+done
 
 ## jobs
 setopt long_list_jobs

From 557dc09d71e489790742ed8603e929edb48fb071 Mon Sep 17 00:00:00 2001
From: UserTaken <elysian@live.com>
Date: Thu, 11 Jun 2015 00:21:45 -0700
Subject: [PATCH 1094/1378] More run and create options

---
 plugins/docker/_docker | 90 +++++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 19 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index fd459a0ca..bd494ecaa 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -36,7 +36,7 @@ __docker_images() {
 # ---------------------------
 __attach() {
     _arguments \
-        '--no-stdin[Do not attach stdin]' \
+        '--no-stdin[Do not attach STDIN]' \
         '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]'
     __docker_containers
 }
@@ -55,6 +55,7 @@ __commit() {
         '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \
         '(-m,--message=)'{-m,--message=}'[Commit message]' \
         '--run=[Config automatically applied when the image is run.]'
+        '(-p,--pause=)'{-p,--pause=}'[Pause container during commit]' \
     __docker_containers
 }
 
@@ -62,6 +63,48 @@ __cp() {
     __docker_containers
 }
 
+__create() {
+    _arguments \
+        '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
+        '(-a,--attach=)'{-a,--attach=}'[Attach to STDIN, STDOUT or STDERR]' \
+        '--add-host=[Add a custom host-to-IP mapping]' \
+        '--cap-add=[Add Linux capabilities]' \
+        '--cap-drop=[Drop Linux capabilities]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}':[CPU shares (relative weight)]' \
+        '--cidfile=[Write the container ID to the file]' \
+        '--device=[Add a host device to the container]' \
+        '--dns=[Set custom dns servers]' \
+        '--dns-search=[Set custom DNS search domains]' \
+        '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
+        '--env-file=[Read in a file of environment variables]' \
+        '--entrypoint=[Overwrite the default entrypoint of the image]' \
+        '--expose=[Expose a port from the container without publishing it to your host]' \
+        '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
+        '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \
+        '--ipc=[IPC namespace to use]' \
+        '(-l,--label=)'{-l,--label=}'[Set meta data on a container]' \
+        '--link=[Add link to another container (name:alias)]' \
+        '--log-driver=[Logging driver for the container]' \
+        '--lxc-conf=[Add custom LXC options]' \
+        '--mac-address=[Container MAC address (e.g. 92:d0:c6:0a:29:33)]' \
+        '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \
+        '--net=[Set the Network mode for the container]' \
+        '--name=[Assign a name to the container]' \
+        '--pid=[PID namespace to use]' \
+        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort/protocol)]' \
+        '--privileged=[Give extended privileges to this container]' \
+        '--restart=[Restart policy to apply when a container exits]' \
+        '--security-opt=[Security Options]' \
+        '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \
+        '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \
+        '(-u,--user=)'{-u,--user=}'[Username or UID]' \
+        '--ulimit=[Ulimit options]' \
+        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. -v /host:/container or -v /container)]' \
+        '--volumes-from=[Mount volumes from the specified container(s)]' \
+        '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]'
+    __docker_images
+}
+
 __diff() {
     __docker_containers
 }
@@ -100,11 +143,6 @@ __info() {
     # no arguments
 }
 
-__insert() {
-    __docker_images
-    _arguments '*:files:_files'
-}
-
 __inspect() {
     __docker_images
     __docker_all_containers
@@ -185,28 +223,42 @@ __rmi() {
 __run() {
     _arguments \
         '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
-        '(-a,--attach=)'{-a,--attach=}'[Attach to stdin, stdout or stderr.]' \
-        '(-c,--cpu-shares=)'{-c,--cpu-shares=}': CPU shares (relative weight)]' \
+        '(-a,--attach=)'{-a,--attach=}'[Attach to STDIN, STDOUT or STDERR]' \
+        '--add-host=[Add a custom host-to-IP mapping]' \
+        '--cap-add=[Add Linux capabilities]' \
+        '--cap-drop=[Drop Linux capabilities]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}':[CPU shares (relative weight)]' \
         '--cidfile=[Write the container ID to the file]' \
-        '(-d,--detach=)'{-d,--detach=}'[Detached mode: Run container in the background, print new container id]' \
+        '(-d,--detach=)'{-d,--detach=}'[Run container in the background, print new container id]' \
+        '--device=[Add a host device to the container]' \
         '--dns=[Set custom dns servers]' \
+        '--dns-search=[Set custom DNS search domains]' \
         '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
+        '--env-file=[Read in a file of environment variables]' \
         '--entrypoint=[Overwrite the default entrypoint of the image]' \
         '--expose=[Expose a port from the container without publishing it to your host]' \
         '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
-        '(-i,--interactive=)'{-i,--interactive=}'[Keep stdin open even if not attached]' \
+        '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \
+        '--ipc=[IPC namespace to use]' \
+        '(-l,--label=)'{-l,--label=}'[Set meta data on a container]' \
         '--link=[Add link to another container (name:alias)]' \
-        '--lxc-conf=[Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"]' \
+        '--log-driver=[Logging driver for the container]' \
+        '--lxc-conf=[Add custom LXC options]' \
+        '--mac-address=[Container MAC address (e.g. 92:d0:c6:0a:29:33)]' \
         '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \
-        '(-n,--networking=)'{-n,--networking=}'[Enable networking for this container]' \
+        '--net=[Set the Network mode for the container]' \
         '--name=[Assign a name to the container]' \
-        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use "docker port" to see the actual mapping)]' \
+        '--pid=[PID namespace to use]' \
+        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort/protocol)]' \
         '--privileged=[Give extended privileges to this container]' \
+        '--restart=[Restart policy to apply when a container exits]' \
         '--rm=[Automatically remove the container when it exits (incompatible with -d)]' \
+        '--security-opt=[Security Options]' \
         '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \
         '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \
         '(-u,--user=)'{-u,--user=}'[Username or UID]' \
-        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \
+        '--ulimit=[Ulimit options]' \
+        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. -v /host:/container or -v /container)]' \
         '--volumes-from=[Mount volumes from the specified container(s)]' \
         '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]'
     __docker_images
@@ -225,8 +277,8 @@ __save() {
 
 __start() {
     _arguments \
-        '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \
-        '(-i,--interactive=)'{-i,--interactive=}'[Attach container''s stdin]'
+        '(-a,--attach=)'{-a,--attach=}'[Attach container''s STDOUT/STDERR and forward all signals to the process]' \
+        '(-i,--interactive=)'{-i,--interactive=}'[Attach container''s STDIN]'
     __docker_all_containers
 }
 
@@ -271,6 +323,7 @@ _1st_arguments=(
     "build":"Build a container from a Dockerfile"
     "commit":"Create a new image from a container's changes"
     "cp":"Copy files/folders from the containers filesystem to the host path"
+    "create":"Create new container without running it"
     "diff":"Inspect changes on a container's filesystem"
     "events":"Get real time events from the server"
     "export":"Stream the contents of a container as a tar archive"
@@ -278,7 +331,6 @@ _1st_arguments=(
     "images":"List images"
     "import":"Create a new filesystem image from the contents of a tarball"
     "info":"Display system-wide information"
-    "insert":"Insert a file in an image"
     "inspect":"Return low-level information on a container"
     "kill":"Kill a running container"
     "load":"Load an image from a tar archive"
@@ -321,6 +373,8 @@ case "$words[1]" in
         __commit ;;
     cp)
         __cp ;;
+    create)
+        __create ;;
     diff)
         __diff ;;
     events)
@@ -335,8 +389,6 @@ case "$words[1]" in
         __import ;;
     info)
         __info ;;
-    insert)
-        __insert ;;
     inspect)
         __inspect ;;
     kill)

From 10c92cc083203d757a257f8d13731e2556a99246 Mon Sep 17 00:00:00 2001
From: Eubene Sa <eubene.sa@gmail.com>
Date: Thu, 11 Jun 2015 01:09:44 -0700
Subject: [PATCH 1095/1378] Updates to ember-cli plugin

---
 plugins/ember-cli/README.md            | 31 ++++++++++++--------------
 plugins/ember-cli/ember-cli.plugin.zsh |  7 ++----
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md
index d1dedf884..482c347d2 100644
--- a/plugins/ember-cli/README.md
+++ b/plugins/ember-cli/README.md
@@ -1,22 +1,19 @@
-# Ember-cli
+# Ember CLI
 
-**Maintainer:** [BilalBudhani](http://www.github.com/BilalBudhani)
+**Maintainers:** [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa)
 
-Ember-cli (http://www.ember-cli.com/)
+Ember CLI (http://www.ember-cli.com/)
 
 ### List of Aliases
 
-alias es='ember serve'
-alias ea='ember addon'
-alias eb='ember build'
-alias ed='ember destroy'
-alias eg='ember generate'
-alias eh='ember help'
-alias ein='ember init'
-alias eia='ember install:addon'
-alias eib='ember install:bower'
-alias ein='ember install:npm'
-alias ei='ember install'
-alias et='ember test'
-alias eu='ember update'
-alias ev='ember version'
+    alias es='ember serve'
+    alias ea='ember addon'
+    alias eb='ember build'
+    alias ed='ember destroy'
+    alias eg='ember generate'
+    alias eh='ember help'
+    alias ein='ember init'
+    alias ei='ember install'
+    alias et='ember test'
+    alias eu='ember update'
+    alias ev='ember version'
diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh
index 044a2c043..a0f346829 100644
--- a/plugins/ember-cli/ember-cli.plugin.zsh
+++ b/plugins/ember-cli/ember-cli.plugin.zsh
@@ -1,5 +1,5 @@
-# Ember ClI 
-# visit http://www.ember-cli.com/ to view user guid 
+# Ember CLI
+# Visit http://www.ember-cli.com/ to view user guide
 
 alias es='ember serve'
 alias ea='ember addon'
@@ -8,9 +8,6 @@ alias ed='ember destroy'
 alias eg='ember generate'
 alias eh='ember help'
 alias ein='ember init'
-alias eia='ember install:addon'
-alias eib='ember install:bower'
-alias ein='ember install:npm'
 alias ei='ember install'
 alias et='ember test'
 alias eu='ember update'

From a570f4b7f332d6a1f7b25e1d5fd9a3954e379065 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 11 Jun 2015 11:04:54 +0200
Subject: [PATCH 1096/1378] git plugin: bring back olg gg aliases by popular
 demand, see #3972

---
 plugins/git/git.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e42e09688..28227dcb1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -104,11 +104,15 @@ ggl() {
 git pull origin "${b:=$1}"
 }
 compdef _git ggl=git-checkout
+alias ggpull='ggl'
+compdef _git ggpull=git-checkout
 ggp() {
 [[ "$#" != 1 ]] && b="$(current_branch)"
 git push origin "${b:=$1}"
 }
 compdef _git ggp=git-checkout
+alias ggpush='ggp'
+compdef _git ggpush=git-checkout
 ggpnp() {
 ggl "$1" && ggp "$1"
 }
@@ -119,6 +123,8 @@ ggu() {
 git pull --rebase origin "${b:=$1}"
 }
 compdef _git ggu=git-checkout
+alias ggpur='ggu'
+compdef _git ggpur=git-checkout
 
 alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'

From 6c29041af73fc3668f6a3256ebc7ab532a2bbba9 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 11 Jun 2015 15:12:28 +0200
Subject: [PATCH 1097/1378] git plugin: global var for git command due to
 issues like #3962 until a proper plugin-loading system is implemented

---
 plugins/git/git.plugin.zsh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 28227dcb1..154a7bb9c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,7 +1,6 @@
 # Query/use custom command for `git`.
-local git_cmd
-zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd
-: ${git_cmd:=git}
+zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd
+: ${_omz_git_git_cmd:=git}
 
 #
 # Functions
@@ -13,20 +12,20 @@ zstyle -s ":vcs_info:git:*:-all-" "command" git_cmd
 # it's not a symbolic ref, but in a Git repo.
 function current_branch() {
   local ref
-  ref=$($git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
+  ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null)
   local ret=$?
   if [[ $ret != 0 ]]; then
     [[ $ret == 128 ]] && return  # no git repo.
-    ref=$($git_cmd rev-parse --short HEAD 2> /dev/null) || return
+    ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return
   fi
   echo ${ref#refs/heads/}
 }
 # The list of remotes
 function current_repository() {
-  if ! $git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
+  if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then
     return
   fi
-  echo $($git_cmd remote -v | cut -d':' -f 2)
+  echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2)
 }
 # Pretty log messages
 function _git_log_prettily(){

From 6ff96dab36865ab208b08a004903338bfd405eac Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 11 Jun 2015 16:16:12 +0200
Subject: [PATCH 1098/1378] git plugin: fix error msg in gwip alias because git
 rm will fail when no files were deleted

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 154a7bb9c..7db43351a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -204,4 +204,4 @@ alias gupv='git pull --rebase -v'
 alias gvt='git verify-tag'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted); git commit -m "--wip--"'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit -m "--wip--"'

From f513999a4dbfea3a15287368848a718543fcaf7b Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 11 Jun 2015 17:14:35 +0200
Subject: [PATCH 1099/1378] git plugin: make b local in gg* functions because
 it leaked, and led to #3991

---
 plugins/git/git.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 7db43351a..dec787a8c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -94,19 +94,19 @@ alias gfo='git fetch origin'
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 ggf() {
-[[ "$#" != 1 ]] && b="$(current_branch)"
+[[ "$#" != 1 ]] && local b="$(current_branch)"
 git push --force origin "${b:=$1}"
 }
 compdef _git ggf=git-checkout
 ggl() {
-[[ "$#" != 1 ]] && b="$(current_branch)"
+[[ "$#" != 1 ]] && local b="$(current_branch)"
 git pull origin "${b:=$1}"
 }
 compdef _git ggl=git-checkout
 alias ggpull='ggl'
 compdef _git ggpull=git-checkout
 ggp() {
-[[ "$#" != 1 ]] && b="$(current_branch)"
+[[ "$#" != 1 ]] && local b="$(current_branch)"
 git push origin "${b:=$1}"
 }
 compdef _git ggp=git-checkout
@@ -118,7 +118,7 @@ ggl "$1" && ggp "$1"
 compdef _git ggpnp=git-checkout
 alias ggsup='git branch --set-upstream-to=origin/$(current_branch)'
 ggu() {
-[[ "$#" != 1 ]] && b="$(current_branch)"
+[[ "$#" != 1 ]] && local b="$(current_branch)"
 git pull --rebase origin "${b:=$1}"
 }
 compdef _git ggu=git-checkout

From 83c3316cf4c4f11c15b8a9df488d629cf4bc23dc Mon Sep 17 00:00:00 2001
From: DimitriSteyaert <github@dimitri.eu>
Date: Mon, 27 Apr 2015 22:26:30 +0200
Subject: [PATCH 1100/1378] Added the tugboat autocompletion plugin

---
 plugins/tugboat/_tugboat | 106 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 plugins/tugboat/_tugboat

diff --git a/plugins/tugboat/_tugboat b/plugins/tugboat/_tugboat
new file mode 100644
index 000000000..6bf736920
--- /dev/null
+++ b/plugins/tugboat/_tugboat
@@ -0,0 +1,106 @@
+#compdef tugboat
+#autoload
+
+# Tugboat zsh autocompletion
+
+
+local -a _commands
+_commands=(
+  'add-key:[NAME] Upload an ssh public key.'
+  'authorize:Authorize a DigitalOcean account with tugboat.'
+  'create:[NAME] Create a droplet.'
+  'destroy:[FUZZY_NAME] Destroy a droplet.'
+  'destroy_image:[FUZZY_NAME] Destroy an image.'
+  'droplets:Retrieve a list of your droplets.'
+  'halt:[FUZZY_NAME] Shutdown a droplet.'
+  'help:[COMMAND] Describe commands or a specific command.'
+  'images:Retrieve a list of your images.'
+  'info:[FUZZY_NAME] [OPTIONS] Show a droplets information.'
+  'info_image:[FUZZY_NAME] [OPTIONS] Show an images information.'
+  'keys:Show available SSH keys.'
+  'password-reset:[FUZZY_NAME] Reset root password.'
+  'rebuild:[FUZZY_NAME] [IMAGE_NAME] Rebuild a droplet.'
+  'regions:Show regions.'
+  'resize:[FUZZY_NAME -s, --size=N] Resize a droplet.'
+  'restart:[FUZZY_NAME] Restart a droplet.'
+  'sizes:Show available droplet sizes.'
+  'snapshot:[SNAPSHOT_NAME] [FUZZY_NAME] [OPTIONS] Queue a snapshot of the droplet.'
+  'ssh:[FUZZY_NAME] SSH into a droplet.'
+  'start:[FUZZY_NAME] Start a droplet.'
+  'verify:Check your DigitalOcean credentials.'
+  'version:Show version.'
+  'wait:[FUZZY_NAME] Wait for a droplet to reach a state.'
+)
+
+local -a _create_arguments
+_create_arguments=(
+  '-s:[--size=N] The size_id of the droplet'
+  '-i:[--image=N] The image_id of the droplet'
+  '-r:[--region=N] The region_id of the droplet'
+  '-k:[--keys=KEYS] A comma separated list of SSH key ids to add to the droplet'
+  '-p:[--private-networking] Enable private networking on the droplet'
+  '-b:[--backups-enabled] Enable backups on the droplet'
+  '-q:[--quiet]'
+)
+
+__task_list ()
+{
+  local expl
+  declare -a tasks
+
+  arguments=(add-key authorize create destroy destroy_image droplets halt help images info info_image keys password-reset rebuild regions resize restart sizes snapshot ssh start verify version wait)
+
+  _wanted tasks expl 'help' compadd $arguments
+}
+
+__droplets_list ()
+{
+    _wanted application expl 'command' compadd $(command tugboat droplets | cut -d " " -f1)
+}
+
+__tugboat-create ()
+{
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+    case $state in
+        (command)
+            _describe -t commands "gem subcommand" _create_arguments
+            return
+        ;;
+    esac
+}
+
+local curcontext="$curcontext" state line
+typeset -A opt_args
+
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+case $state in
+  (command)
+    _describe -t commands "gem subcommand" _commands
+    return
+  ;;
+
+  (options)
+    case $line[1] in
+      (help)
+        _arguments ':feature:__task_list'
+      ;;
+
+      (ssh)
+        _arguments ':feature:__droplets_list'
+      ;;
+
+      (create)
+        _arguments ':feature:__tugboat-create'
+      ;;
+    esac
+  ;;
+esac

From 6bec3c6719f17898b6504a6189424bc23cc10c65 Mon Sep 17 00:00:00 2001
From: Matheus Cruz Rocha <matheus.rocha89@gmail.com>
Date: Sat, 2 May 2015 12:59:18 -0300
Subject: [PATCH 1101/1378] Update history-substring-search README

This Change remove the .zsh on the plugin activate example, cause with the .zsh at the end the plugin won't be activated
---
 plugins/history-substring-search/README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/history-substring-search/README.markdown b/plugins/history-substring-search/README.markdown
index 143b813a1..c154afdce 100644
--- a/plugins/history-substring-search/README.markdown
+++ b/plugins/history-substring-search/README.markdown
@@ -1,6 +1,6 @@
 To activate this script, please include it the `plugins` variable within `~/.zshrc`
 
-  `plugins=(git history-substring-search.zsh)`
+  `plugins=(git history-substring-search)`
 
 See the "history-substring-search.zsh" file for more information:
 

From e8ac8b9b5f82369635d719408f8b4adc5d97bcf9 Mon Sep 17 00:00:00 2001
From: Jonathan Roemer <jon@roemersoftworks.com>
Date: Fri, 1 May 2015 17:44:50 -0400
Subject: [PATCH 1102/1378] Added support for detecting Sublime Text 3 on Arch
 Linux

---
 plugins/sublime/sublime.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 38a7596fd..4d9979960 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -5,6 +5,7 @@ if [[ $('uname') == 'Linux' ]]; then
     _sublime_linux_paths=(
         "$HOME/bin/sublime_text"
         "/opt/sublime_text/sublime_text"
+        "/opt/sublime_text_3/sublime_text"
         "/usr/bin/sublime_text"
         "/usr/local/bin/sublime_text"
         "/usr/bin/subl"

From 4c409b0de918e62f9354cbc604c6ae65da611caf Mon Sep 17 00:00:00 2001
From: Paul Melnikow <paul.melnikow@bodylabs.com>
Date: Mon, 29 Dec 2014 14:48:24 -0500
Subject: [PATCH 1103/1378] sublime: Make subl a function so it can be called
 from functions in other modules

Without this change, whether a function can invoke 'subl' depends on the order in which modules are loaded. With this change, the order doesn't matter.

zsh resolves aliases at parse time not run time, which means if you invoke an alias from a function, the alias must be defined before the function.

See http://stackoverflow.com/a/25532276/893113 which refers to an explanation of this limitation.

For code which may be used non-interactively, the recommend workaround is to use functions instead of aliases.
---
 plugins/sublime/sublime.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 4d9979960..3e338e4d3 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -34,7 +34,7 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
 
     for _sublime_path in $_sublime_darwin_paths; do
         if [[ -a $_sublime_path ]]; then
-            alias subl="'$_sublime_path'"
+            subl () { "$_sublime_path" $* }
             alias st=subl
             break
         fi

From 23ac32d34680785c678ee64a915d11e12253d206 Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@phonations.com>
Date: Mon, 30 Mar 2015 11:23:00 +0200
Subject: [PATCH 1104/1378] add help link to install zsh

---
 README.markdown | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 9f96e315d..4723d3486 100644
--- a/README.markdown
+++ b/README.markdown
@@ -15,8 +15,7 @@ To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com
 __Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
 
 * Unix-based operating system (Mac OS X or Linux)
-* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent)
-  * This is commonly pre-installed. (`zsh --version` to confirm)
+* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing-ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
 
 ### Basic Installation

From 4ab430025c97902a28c0fa7aad45e14d0a7852e9 Mon Sep 17 00:00:00 2001
From: Kevin Ndung'u <kevgathuku@users.noreply.github.com>
Date: Sat, 18 Apr 2015 15:47:08 +0300
Subject: [PATCH 1105/1378] Add git to prerequisites

Resolves #3786
---
 README.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.markdown b/README.markdown
index 4723d3486..31cbc810b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -17,6 +17,7 @@ __Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
 * Unix-based operating system (Mac OS X or Linux)
 * [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing-ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
+* `git` should be installed
 
 ### Basic Installation
 

From 563e1052c723739b25b34706a9c689b77435e5a2 Mon Sep 17 00:00:00 2001
From: Oleksandr Shybystyi <oleksandr.shybystyi@gmail.com>
Date: Mon, 4 May 2015 14:04:25 +0300
Subject: [PATCH 1106/1378] Added README for mercurial plugin

---
 plugins/mercurial/README.md | 64 +++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 plugins/mercurial/README.md

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
new file mode 100644
index 000000000..89e1c1743
--- /dev/null
+++ b/plugins/mercurial/README.md
@@ -0,0 +1,64 @@
+# Mercurial plugin
+### Usage
+Update .zshrc:
+
+1. Add name to the list of plugins, e.g. `plugins = (..., mercurial, ...)`
+   (that is pretty obvious).
+2. Change PROMPT variable of current theme to contain current folder mercurial repo info:
+
+   robbyrussel theme is used by default, so you need to modify PROMPT var
+   from [this file](https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/robbyrussell.zsh-theme)
+   by adding `$(hg_prompt_info)` after `$(git_prompt_info)`, so currently it
+   looks next:
+
+   ```diff
+   - PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+   + PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(hg_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+   ```
+   
+   and put modified var at the end of **.zshrc**.
+3. Initialize additional vars used in plugin. So in short put next in **.zshrc**:
+   
+   ```
+   ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[magenta]%}hg:(%{$fg[red]%}"
+   ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}"
+   ZSH_THEME_HG_PROMPT_DIRTY="%{$fg[magenta]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+   ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[magenta]%})"
+   ```
+
+### What's inside?
+#### Adds handy aliases:
+###### general
+* `hgc` - `hg commit`
+* `hgb` - `hg branch`
+* `hgba` - `hg branches`
+* `hgbk` - `hg bookmarks`
+* `hgco` - `hg checkout`
+* `hgd`  - `hg diff`
+* `hged` - `hg diffmerge`
+
+###### pull and update
+* `hgi` - `hg incoming`
+* `hgl` - `hg pull -u`
+* `hglr` - `hg pull --rebase`
+* `hgo` - `hg outgoing`
+* `hgp` - `hg push`
+* `hgs` - `hg status`
+* `hgsl` - `hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"`
+
+###### this is the 'git commit --amend' equivalent
+* `hgca` - `hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip`
+
+###### list unresolved files (since hg does not list unmerged files in the status command)
+* `hgun` - `hg resolve --list`
+
+#### Displays repo branch and directory status in prompt
+This is the same as git plugin does.
+
+**Note**: additional changes to **.zshrc** are required in order for this to
+work.
+
+### Mantainers
+[ptrv](https://github.com/ptrv) - original creator
+
+[oshybystyi](https://github.com/oshybystyi) - created this README and know how most of code works

From fb5b83d10d5b1640fbd2035d5a7419cb5b25c32a Mon Sep 17 00:00:00 2001
From: Octavian Neamtu <octavian.neamtu@annkissam.com>
Date: Sat, 9 May 2015 19:12:14 -0400
Subject: [PATCH 1107/1378] Fixed jump pluging to display the right mark name
 on 'mark . '

---
 plugins/jump/jump.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh
index d082c11e5..e58e7373d 100644
--- a/plugins/jump/jump.plugin.zsh
+++ b/plugins/jump/jump.plugin.zsh
@@ -13,7 +13,7 @@ jump() {
 }
 
 mark() {
-	if (( $# == 0 )); then
+	if [[ ( $# == 0 ) || ( "$1" == "." ) ]]; then
 		MARK=$(basename "$PWD")
 	else
 		MARK="$1"

From c838b9a112e1569bcc5af069d8283057f7d4208a Mon Sep 17 00:00:00 2001
From: Diego Rabatone Oliveira <diraol@diraol.eng.br>
Date: Sat, 9 May 2015 17:38:34 -0300
Subject: [PATCH 1108/1378] Update README.markdown

Updating the install instructions as proposed in: https://github.com/robbyrussell/oh-my-zsh/issues/3516#issuecomment-76506726
---
 README.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.markdown b/README.markdown
index 31cbc810b..88ef356fd 100644
--- a/README.markdown
+++ b/README.markdown
@@ -25,11 +25,11 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 
 #### via curl
 
-`curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh`
+`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"`
 
 #### via wget
 
-`wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh`
+`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"`
 
 ## Using Oh My Zsh
 

From af4ffe56eae27c85ed472307554fd7347966d316 Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Thu, 7 May 2015 13:24:33 +0200
Subject: [PATCH 1109/1378] adb: add more commands

---
 plugins/adb/_adb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/adb/_adb b/plugins/adb/_adb
index 22089581a..f30f3247f 100644
--- a/plugins/adb/_adb
+++ b/plugins/adb/_adb
@@ -16,14 +16,22 @@ _1st_arguments=(
 'help:show the help message'
 'install:push this package file to the device and install it'
 'jdwp:list PIDs of processes hosting a JDWP transport'
-'logcat:View device log'
+'kill-server:kill the server if it is running'
+'logcat:view device log'
 'pull:copy file/dir from device'
 'push:copy file/dir to device'
+'reboot:reboots the device, optionally into the bootloader or recovery program'
+'reboot-bootloader:reboots the device into the bootloader'
+'remount:remounts the partitions on the device read-write'
+'root:restarts the adbd daemon with root permissions'
+'sideload:push a ZIP to device and install it'
 'shell:run remote shell interactively'
 'sync:copy host->device only if changed (-l means list but dont copy)'
-‘tcpip:restart host adb in tcpip mode’
+'start-server:ensure that there is a server running'
+'tcpip:restart host adb in tcpip mode'
 'uninstall:remove this app package from the device'
 'version:show version num'
+'wait-for-device:block until device is online'
 )
 
 local expl

From 980528f9fa33780499d625bbbb8ea2cada78530d Mon Sep 17 00:00:00 2001
From: Archie <isntall@users.noreply.github.com>
Date: Sat, 23 May 2015 10:22:03 -0700
Subject: [PATCH 1110/1378] fix typo

---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 71716f77f..ec64c240f 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,7 +14,7 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-# Set ZSH_CACHE_DIR to the path where cache files sould be created
+# Set ZSH_CACHE_DIR to the path where cache files should be created
 # or else we will use the default cache/
 if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache/"

From 8791d7e09ea28335a60db7bd2f5c0d771d7910fc Mon Sep 17 00:00:00 2001
From: Paul <pavel.finkelshtein@gmail.com>
Date: Tue, 9 Jun 2015 07:35:38 +0300
Subject: [PATCH 1111/1378] Update bgnotify.plugin.zsh

Fixed error with spaces in commands
---
 plugins/bgnotify/bgnotify.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index 14ca4c817..b70b42f98 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -33,9 +33,9 @@ bgnotify () {
   if hash terminal-notifier 2>/dev/null; then #osx
     terminal-notifier -message "$2" -title "$1"
   elif hash growlnotify 2>/dev/null; then #osx growl
-    growlnotify -m $1 $2
+    growlnotify -m "$1" "$2"
   elif hash notify-send 2>/dev/null; then #ubuntu!
-    notify-send $1 $2
+    notify-send "$1" "$2"
   elif hash notifu 2>/dev/null; then #cygwyn support!
     notifu /m "$2" /p "$1"
   fi

From 69dee6538155cb604434363ba243e540a6104fe6 Mon Sep 17 00:00:00 2001
From: asaph <ace@dontletgo.com>
Date: Tue, 19 May 2015 13:24:16 -0700
Subject: [PATCH 1112/1378] Fixed typo in README

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 88ef356fd..5d4819d76 100644
--- a/README.markdown
+++ b/README.markdown
@@ -51,7 +51,7 @@ Most plugins (should! we're working on this) include a __README__, which documen
 
 ### Themes
 
-We'll admit it. Early in the Oh My Zsh world... we may have gotten a far too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
+We'll admit it. Early in the Oh My Zsh world... we may have gotten far too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
 
 #### Selecting a Theme
 

From 1a4dc0d2db56c2abf5244f1fca975ea887eb6bbb Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Fri, 19 Sep 2014 12:30:24 +0200
Subject: [PATCH 1113/1378] Renamed 'ss' alias to 'sstat' (to avoid collision
 with /bin/ss).

---
 plugins/rails/rails.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 5ed96f8cd..52aabab72 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -59,7 +59,7 @@ alias rn='rake notes'
 alias rr='rake routes'
 
 # legacy stuff
-alias ss='thin --stats "/thin/stats" start'
+alias sstat='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
 alias sp='ruby script/plugin'

From 266894c6a138eb8a248ce8aa428fcabeabd7ffa4 Mon Sep 17 00:00:00 2001
From: regagain <regagainsttheregis@gmail.com>
Date: Sun, 17 May 2015 16:26:18 +0200
Subject: [PATCH 1114/1378] Update taskwarrior.plugin.zsh

Corrected documentation to avoid confusion (see https://github.com/robbyrussell/oh-my-zsh/issues/3796)
---
 plugins/taskwarrior/taskwarrior.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/taskwarrior/taskwarrior.plugin.zsh b/plugins/taskwarrior/taskwarrior.plugin.zsh
index c1830042e..5d1e6ffea 100644
--- a/plugins/taskwarrior/taskwarrior.plugin.zsh
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
@@ -8,7 +8,7 @@
 # TaskWarrior<http://taskwarrior.org/>. It uses the zsh tab completion
 # script (_task) distributed with TaskWarrior for the completion definitions.
 #
-# Typing task[tabtab] will give you a list of current tasks, task 66[tabtab]
+# Typing task [tabtab] will give you a list of current tasks, task 66[tabtab]
 # gives a list of available modifications for that task, etc.
 ################################################################################
 

From 02c2b74918b237f936ea51f14b38463221ec59dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Gonz=C3=A1lez?= <scrub.mx@gmail.com>
Date: Sat, 6 Jun 2015 21:08:59 -0400
Subject: [PATCH 1115/1378] Update aliases in laravel5.plugin.zsh file

Some minor changes to the aliases.
* removed php artisan dump-autoload since is no longer a command in laravel 5
* updated the la5routes alias to the new version of the command
* added a la5vendor alias to publish assets from vendor packages
---
 plugins/laravel5/laravel5.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/laravel5/laravel5.plugin.zsh b/plugins/laravel5/laravel5.plugin.zsh
index 2afa99317..38454f40d 100644
--- a/plugins/laravel5/laravel5.plugin.zsh
+++ b/plugins/laravel5/laravel5.plugin.zsh
@@ -15,6 +15,6 @@ compdef _laravel5 la5
 #Alias
 alias la5='php artisan'
 
-alias la5dump='php artisan dump-autoload'
 alias la5cache='php artisan cache:clear'
-alias la5routes='php artisan routes'
+alias la5routes='php artisan route:list'
+alias la5vendor='php artisan vendor:publish'

From 1f008b4113cd4586423c4ecc54f65f12e8a61145 Mon Sep 17 00:00:00 2001
From: "Mikhail S. Pobolovets" <styx.mp@gmail.com>
Date: Thu, 30 Apr 2015 14:03:31 +0300
Subject: [PATCH 1116/1378] Update Mix complition upto 1.0.4

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
---
 plugins/mix/_mix | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index b7c982e0a..319932b3f 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -1,28 +1,43 @@
-#compdef mix 
+#compdef mix
 #autoload
 
 # Elixir mix zsh completion
 
 local -a _1st_arguments
 _1st_arguments=(
-    'archive:Archive this project into a .ez file'
-    'clean:Clean generated application files'
+    'app.start:Start all registered apps'
+    'archive:List all archives'
+    'archive.build:Archive this project into a .ez file'
+    'archive.install:Install an archive locally'
+    'archive.uninstall:Uninstall archives'
+    'clean:Delete generated application files'
+    'cmd:Executes the given command'
     'compile:Compile source files'
+    'compile.protocols:Consolidates all protocols in all paths'
     'deps:List dependencies and their status'
-    "deps.clean:Remove dependencies' files"
+    "deps.clean:Remove the given dependencies' files"
     'deps.compile:Compile dependencies'
     'deps.get:Get all out of date dependencies'
     'deps.unlock:Unlock the given dependencies'
-    'deps.update:Update dependencies'
-    'do:Executes the commands separated by comma'
-    'escriptize:Generates an escript for the project'
+    'deps.update:Update the given dependencies'
+    'do:Executes the tasks separated by comma'
+    'escript.build:Builds an escript for the project'
     'help:Print help information for tasks'
+    'hex:Print hex help information'
+    'hex.config:Read or update hex config'
+    'hex.docs:Publish docs for package'
+    'hex.info:Print hex information'
+    'hex.key:Hex API key tasks'
+    'hex.outdated:Shows outdated hex deps for the current project'
+    'hex.owner:Hex package ownership tasks'
+    'hex.publish:Publish a new package version'
+    'hex.search:Search for package names'
+    'hex.user:Hex user tasks'
+    'loadconfig:Loads and persists the given configuration'
     'local:List local tasks'
-    'local.install:Install a task or an archive locally'
+    'local.hex:Install hex locally'
     'local.rebar:Install rebar locally'
-    'local.uninstall:Uninstall local tasks or archives'
-    'local.hex:Install Hex locally'
-    'new:Creates a new Elixir project'
+    'new:Create a new Elixir project'
     'run:Run the given file or expression'
     "test:Run a project's tests"
     '--help:Describe available tasks'
@@ -34,7 +49,7 @@ __task_list ()
     local expl
     declare -a tasks
 
-    tasks=(archive clean compile deps deps.clean deps.compile deps.get deps.unlock deps.update do escriptize help local local.install local.rebar local.uninstall new run test)
+    tasks=(app.start archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.unlock deps.update do escript.build help hex hex.config hex.docs hex.info hex.key hex.outdated hex.owner hex.publish hex.search hex.user loadconfig local local.hex local.rebar new run test)
 
     _wanted tasks expl 'help' compadd $tasks
 }
@@ -57,7 +72,7 @@ case $state in
   (options)
     case $line[1] in
       (help)
-         _arguments ':feature:__task_list' 
+         _arguments ':feature:__task_list'
     esac
   ;;
 esac

From 81eec406c8186a8f15763cf21230e0f1164942c9 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Thu, 28 May 2015 16:25:49 +0200
Subject: [PATCH 1117/1378] * Added header with help and information * Moved
 git information to left prompt, with   support for:     *
 +ZSH_THEME_GIT_PROMPT_UNTRACKED, MODIFIED,     STASHED, ADDED, UPSTREAM
 STATUS     (if applicable) * Removed right prompt * Refactored following
 Google's guidelines for   scripts [ http://goo.gl/oJSXH2 ]     * Using local
 variables where applicable

---
 themes/michelebologna.zsh-theme | 102 +++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 36 deletions(-)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index a7599c8f5..fec243873 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -1,44 +1,74 @@
-# reference colors
-GREEN="%{$fg_bold[green]%}"
-RED="%{$fg_bold[red]%}"
-CYAN="%{$fg_bold[cyan]%}"
-YELLOW="%{$fg_bold[yellow]%}"
-BLUE="%{$fg_bold[blue]%}"
-MAGENTA="%{$fg_bold[magenta]%}"
-WHITE="%{$fg_bold[white]%}"
+# Michele Bologna's theme
+# http://michelebologna.net
+#
+# This a theme for oh-my-zsh. Features a colored prompt with:
+# * username@host: [jobs] [git] workdir % 
+# * hostname color is based on hostname characters. When using as root, the 
+# prompt shows only the hostname in red color.
+# * [jobs], if applicable, counts the number of suspended jobs tty
+# * [git], if applicable, represents the status of your git repo (more on that
+# later)
+# * '%' prompt will be green if last command return value is 0, yellow otherwise.
+# 
+# git prompt is inspired by official git contrib prompt: 
+# https://github.com/git/git/tree/master/contrib/completion/git-prompt.sh
+# and it adds:
+# * the current branch
+# * '%' if there are untracked files
+# * '$' if there are stashed changes
+# * '*' if there are modified files
+# * '+' if there are added files
+# * '<' if local repo is behind remote repo
+# * '>' if local repo is ahead remote repo
+# * '=' if local repo is equal to remote repo (in sync)
+# * '<>' if local repo is diverged
 
-COLOR_ARRAY=($GREEN $RED $CYAN $YELLOW $BLUE $MAGENTA $WHITE)
+local green="%{$fg_bold[green]%}"
+local red="%{$fg_bold[red]%}"
+local cyan="%{$fg_bold[cyan]%}"
+local yellow="%{$fg_bold[yellow]%}"
+local blue="%{$fg_bold[blue]%}"
+local magenta="%{$fg_bold[magenta]%}"
+local white="%{$fg_bold[white]%}"
+local reset="%{$reset_color%}"
 
-# color reset
-RESET_COLOR="%{$reset_color%}"
+local -a color_array
+color_array=($green $red $cyan $yellow $blue $magenta $white)
 
-# which color should be applied?
-USERNAME_NORMAL_COLOR=$WHITE
-USERNAME_ROOT_COLOR=$RED
-HOSTNAME_NORMAL_COLOR=$BLUE
-# uncomment next line if you want auto-generated hostname color
-#for i in $HOST; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]]
-HOSTNAME_ROOT_COLOR=$RED
-HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR)
-CURRENT_DIR_COLOR=$CYAN
+local username_normal_color=$white
+local username_root_color=$red
+local hostname_root_color=$red
 
-# zsh commands
-USERNAME_COMMAND="%n"
-HOSTNAME_COMMAND="%m"
-CURRENT_DIR="%~"
+# calculating hostname color with hostname characters
+for i in `hostname`; local hostname_normal_color=$color_array[$[((#i))%7+1]]
+local -a hostname_color
+hostname_color=%(!.$hostname_root_color.$hostname_normal_color)
 
-# output: colors + commands
-USERNAME_OUTPUT="%(!..$USERNAME_NORMAL_COLOR$USERNAME_COMMAND$RESET_COLOR@)"
-HOSTNAME_OUTPUT="$HOSTNAME_COLOR$HOSTNAME_COMMAND$RESET_COLOR"
-CURRENT_DIR_OUTPUT="$CURRENT_DIR_COLOR$CURRENT_DIR"
-LAST_COMMAND_OUTPUT="%(?.%(!.$RED.$GREEN).$YELLOW)"
+local current_dir_color=$blue
+local username_command="%n"
+local hostname_command="%m"
+local current_dir="%~"
 
-# git theming
-ZSH_THEME_GIT_PROMPT_PREFIX="("
+local username_output="%(!..$username_normal_color$username_command$reset@)"
+local hostname_output="$hostname_color$hostname_command$reset"
+local current_dir_output="$current_dir_color$current_dir$reset"
+local jobs_bg="${red}fg: %j$reset"
+local last_command_output="%(?.%(!.$red.$green).$yellow)"
+
+ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY=")$RED*"
-ZSH_THEME_GIT_PROMPT_CLEAN=")"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
+ZSH_THEME_GIT_PROMPT_MODIFIED="*"
+ZSH_THEME_GIT_PROMPT_ADDED="+"
+ZSH_THEME_GIT_PROMPT_STASHED="$"
+ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="="
+ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
+ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<"
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="<>"
 
-# wrap all together
-PROMPT='$USERNAME_OUTPUT$HOSTNAME_OUTPUT:$CURRENT_DIR_OUTPUT $LAST_COMMAND_OUTPUT%#$RESET_COLOR '
-RPROMPT='%1(j.fg: [%j].) $GREEN$(git_prompt_info)$RESET_COLOR [%@]'
+PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)'
+PROMPT+='$(__git_ps1)'
+PROMPT+=" $last_command_output%#$reset "
+RPROMPT=''

From 8eb31a6f9a053ea22ea88ccba3d91a4694674300 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 11 Jun 2015 23:34:18 +0200
Subject: [PATCH 1118/1378] git plugin: fix ggpnp when called without argument
 also allow multiple arguments for ggp and ggl aliases

---
 plugins/git/git.plugin.zsh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index dec787a8c..5cceb8d25 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -99,21 +99,29 @@ git push --force origin "${b:=$1}"
 }
 compdef _git ggf=git-checkout
 ggl() {
-[[ "$#" != 1 ]] && local b="$(current_branch)"
-git pull origin "${b:=$1}"
+[[ "$#" == 0 ]] && local b="$(current_branch)"
+git pull origin "${b:=$1}" "${*[2,-1]}"
 }
 compdef _git ggl=git-checkout
 alias ggpull='ggl'
 compdef _git ggpull=git-checkout
 ggp() {
-[[ "$#" != 1 ]] && local b="$(current_branch)"
+if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
+git push origin "${*}"
+else
+[[ "$#" == 0 ]] && local b="$(current_branch)"
 git push origin "${b:=$1}"
+fi
 }
 compdef _git ggp=git-checkout
 alias ggpush='ggp'
 compdef _git ggpush=git-checkout
 ggpnp() {
-ggl "$1" && ggp "$1"
+if [[ "$#" == 0 ]]; then
+ggl && ggp
+else
+ggl "${*}" && ggp "${*}"
+fi
 }
 compdef _git ggpnp=git-checkout
 alias ggsup='git branch --set-upstream-to=origin/$(current_branch)'

From 3f9298514e22d6e5923f14f98b825f1688158781 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Mon, 25 May 2015 01:15:37 +0200
Subject: [PATCH 1119/1378] Added references to the `external themes` wiki
 page.

---
 README.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 5d4819d76..3805d1eb4 100644
--- a/README.markdown
+++ b/README.markdown
@@ -67,6 +67,8 @@ To use a different theme, simple change the value to match the name of your desi
 
 Open up a new terminal window and your prompt should look something like...
 
+In case you did not find a suitable theme for your needs, please have a look at the wiki for [more themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes).
+
 ## Advanced Topics
 
 If you're the type that likes to get their hands dirty... these sections might resonate.
@@ -154,7 +156,7 @@ We also need people to test out pull-requests. So take a look through [the open
 
 ### Do NOT Send Us Themes
 
-We have (more than) enough themes for the time being. Please fork the project and add one in there – you can let people know how to grab it from there.
+We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page.
 
 ## Contributors
 

From e0ce87632d1d8ecb609bb96202a8fb3151f6be4f Mon Sep 17 00:00:00 2001
From: KhasMek <Boushh@gmail.com>
Date: Fri, 8 May 2015 15:42:26 -0600
Subject: [PATCH 1120/1378] Plugins: apache2-macports - add README

---
 plugins/apache2-macports/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 plugins/apache2-macports/README.md

diff --git a/plugins/apache2-macports/README.md b/plugins/apache2-macports/README.md
new file mode 100644
index 000000000..099fc8da3
--- /dev/null
+++ b/plugins/apache2-macports/README.md
@@ -0,0 +1,19 @@
+## APACHE2 MACPORTS PLUGIN
+
+
+---
+
+### FEATURES
+
+| Alias          | Function                                                                       | Description           |
+|:--------------:|:-------------------------------------------------------------------------------|----------------------:|
+| apache2restart | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper restart | Restart apache daemon |
+| apache2start   | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper start   | Start apache daemon   |
+| apache2stop    | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper stop    | Stop apache daemon    |
+
+---
+
+### CONTRIBUTORS
+ - Alexander Rinass (alex@rinass.net)
+
+---

From e5929680fdd4adb7b0942f16b58f99e1695ce8b8 Mon Sep 17 00:00:00 2001
From: KhasMek <Boushh@gmail.com>
Date: Fri, 8 May 2015 13:18:06 -0600
Subject: [PATCH 1121/1378] Plugins: archlinux - use command -v in favor of
 which

  The command 'which' launches an external process that isn't
  really necessary.
---
 plugins/archlinux/archlinux.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 6330a2152..b83c24560 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -2,7 +2,7 @@
 # Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins
 
 # Look for yaourt, and add some useful functions if we have it.
-if [[ -x `which yaourt` ]]; then
+if [[ -x `command -v yaourt` ]]; then
   upgrade () {
     yaourt -Syu
   }
@@ -21,11 +21,11 @@ if [[ -x `which yaourt` ]]; then
   alias yalst='yaourt -Qe'         # List installed packages, even those installed from AUR (they're tagged as "local")
   alias yaorph='yaourt -Qtd'       # Remove orphans using yaourt
   # Additional yaourt alias examples
-  if [[ -x `which abs` && -x `which aur` ]]; then
+  if [[ -x `command -v abs` && -x `command -v aur` ]]; then
     alias yaupd='yaourt -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
-  elif [[ -x `which abs` ]]; then
+  elif [[ -x `command -v abs` ]]; then
     alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories
-  elif [[ -x `which aur` ]]; then
+  elif [[ -x `command -v aur` ]]; then
     alias yaupd='yaourt -Sy && sudo aur'   # Update and refresh the local package and AUR databases against repositories
   else
     alias yaupd='yaourt -Sy'               # Update and refresh the local package database against repositories
@@ -49,11 +49,11 @@ alias pacreps='pacman -Ss'             # Search for package(s) in the repositori
 alias pacloc='pacman -Qi'              # Display information about a given package in the local database
 alias paclocs='pacman -Qs'             # Search for package(s) in the local database
 # Additional pacman alias examples
-if [[ -x `which abs` && -x `which aur` ]]; then
+if [[ -x `command -v abs` && -x `command -v aur` ]]; then
   alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'  # Update and refresh the local package, ABS and AUR databases against repositories
-elif [[ -x `which abs` ]]; then
+elif [[ -x `command -v abs` ]]; then
   alias pacupd='sudo pacman -Sy && sudo abs'              # Update and refresh the local package and ABS databases against repositories
-elif [[ -x `which aur` ]]; then
+elif [[ -x `command -v aur` ]]; then
   alias pacupd='sudo pacman -Sy && sudo aur'              # Update and refresh the local package and AUR databases against repositories
 else
   alias pacupd='sudo pacman -Sy'     # Update and refresh the local package database against repositories

From 0f96e8e6c20c25ba6bc78c3df425aec61bfbaa3c Mon Sep 17 00:00:00 2001
From: KhasMek <Boushh@gmail.com>
Date: Fri, 8 May 2015 13:28:32 -0600
Subject: [PATCH 1122/1378] Plugins: archlinux - add basic README.

---
 plugins/archlinux/README.md | 64 +++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 plugins/archlinux/README.md

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
new file mode 100644
index 000000000..ad42d4cd2
--- /dev/null
+++ b/plugins/archlinux/README.md
@@ -0,0 +1,64 @@
+## ARCHLINUX PLUGIN
+
+
+---
+
+### FEATURES
+
+| Alias        | Function                                | Description                                                                                                         |
+|:------------:|-----------------------------------------|:--------------------------------------------------------------------------------------------------------------------|
+| pacin        | sudo pacman -S                          | Install specific package(s) from the repositories                                                                   |
+| pacins       | sudo pacman -U                          | Install specific package not from the repositories but from a file                                                  |
+| pacinsd      | sudo pacman -S --asdeps                 | Install given package(s) as dependencies of another package                                                         |
+| pacloc       | pacman -Qi                              | Display information about a given package in the local database                                                     |
+| paclocs      | pacman -Qs                              | Search for package(s) in the local database                                                                         |
+| paclsorphans | sudo pacman -Qdt'                       | List all orphaned packages                                                                                          |
+| pacmir       | sudo pacman -Syy                        | Force refresh of all package lists after updating /etc/pacman.d/mirrorlist                                          |
+| pacre        | sudo pacman -R                          | Remove the specified package(s), retaining its configuration(s) and required dependencies                           |
+| pacrem       | sudo pacman -Rns                        | Remove the specified package(s), its configuration(s) and unneeded dependencies                                     |
+| pacrep       | pacman -Si                              | Display information about a given package in the repositories                                                       |
+| pacreps      | pacman -Ss                              | Search for package(s) in the repositories                                                                           |
+| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)'        | Delete all orphaned packages                                                                                        |
+| pacupd       | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases against repositories                                    |
+| pacupd       | sudo pacman -Sy && sudo abs             | Update and refresh the local package and ABS databases against repositories                                         |
+| pacupd       | sudo pacman -Sy && sudo aur             | Update and refresh the local package and AUR databases against repositories                                         |
+| pacupd       | sudo pacman -Sy                         | Update and refresh the local package database against repositories                                                  |
+| pacupg       | sudo pacman -Syu                        | Synchronize with repositories before upgrading packages that are out of date on the local system.                   |
+| yaconf       | yaourt -C                               | Fix all configuration files with vimdiff                                                                            |
+| yain         | yaourt -S                               | Install specific package(s) from the repositories                                                                   |
+| yains        | yaourt -U                               | Install specific package not from the repositories but from a file                                                  |
+| yainsd       | yaourt -S --asdeps                      | Install given package(s) as dependencies of another package                                                         |
+| yaloc        | yaourt -Qi                              | Display information about a given package in the local database                                                     |
+| yalocs       | yaourt -Qs                              | Search for package(s) in the local database                                                                         |
+| yalst        | yaourt -Qe                              | List installed packages, even those installed from AUR (they're tagged as "local")                                  |
+| yamir        | yaourt -Syy                             | Force refresh of all package lists after updating /etc/pacman.d/mirrorlist                                          |
+| yaorph       | yaourt -Qtd                             | Remove orphans using yaourt                                                                                         |
+| yare         | yaourt -R                               | Remove the specified package(s), retaining its configuration(s) and required dependencies                           |
+| yarem        | yaourt -Rns                             | Remove the specified package(s), its configuration(s) and unneeded dependencies                                     |
+| yarep        | yaourt -Si                              | Display information about a given package in the repositories                                                       |
+| yareps       | yaourt -Ss                              | Search for package(s) in the repositories                                                                           |
+| yasu         | yaourt --sucre                          | Same as yaupg, but without confirmation                                                                             |
+| yaupd        | yaourt -Sy && sudo abs && sudo aur      | Update and refresh the local package, ABS and AUR databases against repositories                                    |
+| yaupd        | yaourt -Sy && sudo abs                  | Update and refresh the local package and ABS databases against repositories                                         |
+| yaupd        | yaourt -Sy && sudo aur                  | Update and refresh the local package and AUR databases against repositories                                         |
+| yaupd        | yaourt -Sy                              | Update and refresh the local package database against repositories                                                  |
+| yaupg        | yaourt -Syua                            | Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system |
+
+| Function       | Description                                                                                                       |
+|----------------|:------------------------------------------------------------------------------------------------------------------|
+| pacdisowned    | List all disowned files in your system                                                                            |
+| paclist        | List all installed packages with a short description - [Source](https://bbs.archlinux.org/viewtopic.php?id=93683) |
+| pacmanallkeys  | Get all keys for developers and trusted users                                                                     |
+| pacmansignkeys |                                                                                                                   |
+
+---
+
+### CONTRIBUTORS
+ - Benjamin Boudreau - dreurmail@gmail.com
+ - Celso Miranda - contacto@celsomiranda.net
+ - KhasMek - Boushh@gmail.com
+ - Martin Putniorz - mputniorz@gmail.com
+ - MatthR3D - matthr3d@gmail.com
+ - ornicar - thibault.duplessis@gmail.com
+
+---

From 0e35bd4001494782fb1956acaebadf2f81c25b42 Mon Sep 17 00:00:00 2001
From: "Daniel Campoverde [alx741]" <alx741@riseup.net>
Date: Sun, 29 Mar 2015 00:12:58 -0500
Subject: [PATCH 1123/1378] Plugins: vi-mode: Add first README file

---
 plugins/vi-mode/README.md | 75 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 plugins/vi-mode/README.md

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
new file mode 100644
index 000000000..03e67cca2
--- /dev/null
+++ b/plugins/vi-mode/README.md
@@ -0,0 +1,75 @@
+vi-mode
+=======
+This plugin increase `vi-like` zsh functionality.
+
+Use `ESC` or `CTRL-[` to enter `Normal mode`.
+
+
+History
+-------
+
+- `ctrl-p` : Previous command in history
+- `ctrl-n` : Next command in history
+- `/`      : Search backward in history
+- `n`      : Repeat the last `/`
+
+
+Mode indicators
+---------------
+
+*Normal mode* is indicated with red `<<<` mark at the right prompt, when it
+wasn't defined by theme.
+
+
+Vim edition
+-----------
+
+- `v`   : Edit current command line in Vim
+
+
+Movement
+--------
+
+- `$`   : To the end of the line
+- `^`   : To the first non-blank character of the line
+- `0`   : To the first character of the line
+- `w`   : [count] words forward
+- `W`   : [count] WORDS forward
+- `e`   : Forward to the end of word [count] inclusive
+- `E`   : Forward to the end of WORD [count] inclusive
+- `b`   : [count] words backward
+- `B`   : [count] WORDS backward
+- `t{char}`   : Till before [count]'th occurrence of {char} to the right
+- `T{char}`   : Till before [count]'th occurrence of {char} to the left
+- `f{char}`   : To [count]'th occurrence of {char} to the right
+- `F{char}`   : To [count]'th occurrence of {char} to the left
+- `;`   : Repeat latest f, t, F or T [count] times
+- `,`   : Repeat latest f, t, F or T in opposite direction
+
+
+Insertion
+---------
+
+- `i`   : Insert text before the cursor
+- `I`   : Insert text before the first character in the line
+- `a`   : Append text after the cursor
+- `A`   : Append text at the end of the line
+- `o`   : Insert new command line below the current one
+- `O`   : Insert new command line above the current one
+
+
+Delete and Insert
+-----------------
+
+- `ctrl-h`      : While in *Insert mode*: delete character after the cursor
+- `ctrl-w`      : While in *Insert mode*: delete word after the cursor
+- `d{motion}`   : Delete text that {motion} moves over
+- `dd`          : Delete line
+- `D`           : Delete characters under the cursor until the end of the line
+- `c{motion}`   : Delete {motion} text and start insert
+- `cc`          : Delete line and start insert
+- `C`           : Delete to the end of the line and start insert
+- `r{char}`     : Replace the character under the cursor with {char}
+- `R`           : Enter replace mode: Each character replaces existing one
+- `x`           : Delete [count] characters under and after the cursor
+- `X`           : Delete [count] characters before the cursor

From c28b226af2dc0843ab0f05ea4abc54c4bdfd7012 Mon Sep 17 00:00:00 2001
From: CkEsc <iamckesc@gmail.com>
Date: Tue, 3 Mar 2015 23:03:44 +0300
Subject: [PATCH 1124/1378] Fix README.md for sst command

---
 plugins/sublime/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md
index e38cf66dc..e1e666f05 100644
--- a/plugins/sublime/README.md
+++ b/plugins/sublime/README.md
@@ -14,4 +14,6 @@ Plugin for Sublime Text, a cross platform text and code editor, available for Li
 
  * If `st` is passed a file, open it in Sublime Text
 
- * if `stt` command is called, it is equivalent to `st .`, opening the current folder in Sublime Text
\ No newline at end of file
+ * If `stt` command is called, it is equivalent to `st .`, opening the current folder in Sublime Text
+ 
+ * If `sst` command is called, it is like `sudo st`, opening the file or folder in Sublime Text. Useful for editing system protected files.
\ No newline at end of file

From a2d7d36e70abbdd1dc9b0f06e8841d4f74226195 Mon Sep 17 00:00:00 2001
From: wyldphyre <craigreynolds@Claire.local>
Date: Fri, 27 Feb 2015 10:56:14 +0800
Subject: [PATCH 1125/1378] Added README.md file

---
 plugins/history/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 plugins/history/README.md

diff --git a/plugins/history/README.md b/plugins/history/README.md
new file mode 100644
index 000000000..dd9286894
--- /dev/null
+++ b/plugins/history/README.md
@@ -0,0 +1,15 @@
+## history
+
+Provides a couple of convenient aliases for using the `history` command to examine your command line history.
+
+### Requirements
+
+* None.
+
+### Usage
+
+* If `h` is called, your command history is listed. Equivalent to using `history`
+
+* If `hsi` is called with an argument, a **case insensitive** `grep` search is performed on your command history, looking for commands that match the argument provided
+
+* If `hsi` is called without an argument you will help on `grep` arguments
\ No newline at end of file

From 81da07602c8e99548ffbe4d110d40ea5873f20fe Mon Sep 17 00:00:00 2001
From: wyldphyre <craigreynolds@Claire.local>
Date: Fri, 27 Feb 2015 11:05:05 +0800
Subject: [PATCH 1126/1378] Added README.md file for atom plugin

---
 plugins/atom/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 plugins/atom/README.md

diff --git a/plugins/atom/README.md b/plugins/atom/README.md
new file mode 100644
index 000000000..75d77a0ac
--- /dev/null
+++ b/plugins/atom/README.md
@@ -0,0 +1,17 @@
+## atom
+
+Plugin for Atom, a cross platform text and code editor, available for Linux, Mac OS X, and Windows.
+
+### Requirements
+
+ * [Atom](https://atom.io/)
+
+### Usage
+
+ * If `at` command is called without an argument, launch Atom
+
+ * If `at` is passed a directory, `cd` to it and open it in Atom
+
+ * If `at` is passed a file, open it in Atom
+
+ * if `att` command is called, it is equivalent to `at .`, opening the current folder in Atom

From cf3fb873ec0cc0ec428e9c05dcac998d3b3f956c Mon Sep 17 00:00:00 2001
From: wyldphyre <craigreynolds@Claire.local>
Date: Fri, 27 Feb 2015 13:38:31 +0800
Subject: [PATCH 1127/1378] Added README.md file for ForkLift plugin

---
 plugins/forklift/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plugins/forklift/README.md

diff --git a/plugins/forklift/README.md b/plugins/forklift/README.md
new file mode 100644
index 000000000..b452a357c
--- /dev/null
+++ b/plugins/forklift/README.md
@@ -0,0 +1,13 @@
+## forklift
+
+Plugin for ForkLift, an FTP application for OS X.
+
+### Requirements
+
+* [ForkLift](http://forkliftapp.com/forklift/)
+
+### Usage
+
+* If `fl` is called without arguments then the current folder is opened in ForkLift. Is equivalent to `fl .`
+
+* If `fl` is called with a directory as the argument, then that directory is opened in ForkLift
\ No newline at end of file

From 4b76b7429a820e7eda8bed6c214d81a275be30b9 Mon Sep 17 00:00:00 2001
From: Vadim <moshasmail@gmail.com>
Date: Sun, 28 Dec 2014 01:54:18 +0200
Subject: [PATCH 1128/1378] remove trash command from osx plugin

---
 plugins/osx/osx.plugin.zsh | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index d0f9f009a..a6e3a83e6 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -138,23 +138,6 @@ function man-preview() {
   man -t "$@" | open -f -a Preview
 }
 
-function trash() {
-  local trash_dir="${HOME}/.Trash"
-  local temp_ifs="$IFS"
-  IFS=$'\n'
-  for item in "$@"; do
-    if [[ -e "$item" ]]; then
-      item_name="$(basename $item)"
-      if [[ -e "${trash_dir}/${item_name}" ]]; then
-        mv -f "$item" "${trash_dir}/${item_name} $(date "+%H-%M-%S")"
-      else
-        mv -f "$item" "${trash_dir}/"
-      fi
-    fi
-  done
-  IFS=$temp_ifs
-}
-
 function vncviewer() {
   open vnc://$@
 }

From 763cef8013c90c3ea0b1edfe8c903008a7406bce Mon Sep 17 00:00:00 2001
From: Erlend Hamberg <ehamberg@gmail.com>
Date: Mon, 20 Oct 2014 18:53:57 +0200
Subject: [PATCH 1129/1378] Add `leaves` command to `brew` completion

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index d11aa245d..4c99a383a 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -35,6 +35,7 @@ _1st_arguments=(
   'info:information about a formula'
   'install:install a formula'
   'reinstall:install a formula anew; re-using its current options'
+  'leaves:show installed formulae that are not dependencies of another installed formula'
   'link:link a formula'
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'

From e55d84f76e07785bec38d802b447df1fc93512f2 Mon Sep 17 00:00:00 2001
From: Filip Bartuzi <filip@bartuzi.me>
Date: Sun, 12 Oct 2014 12:29:33 +0200
Subject: [PATCH 1130/1378] Add reference to bundler plugin issue in README

---
 plugins/bundler/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md
index 56f0c7176..edd95ccc2 100644
--- a/plugins/bundler/README.md
+++ b/plugins/bundler/README.md
@@ -39,7 +39,7 @@ This will exclude the `foreman` and `spin` gems (i.e. their executable) from bei
 
 ## Excluded gems
 
-These gems should not be called with `bundle exec`. Please see the Issues on GitHub for clarification.
+These gems should not be called with `bundle exec`. Please see [issue #2923](https://github.com/robbyrussell/oh-my-zsh/pull/2923) on GitHub for clarification.
 
 `berks`
 `foreman`

From f1a43daa36efdbf5c75dbc07927310b25259a114 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Fri, 12 Jun 2015 11:50:30 +0200
Subject: [PATCH 1131/1378] =?UTF-8?q?git=20plugin:=20new/changed=20aliases?=
 =?UTF-8?q?=20gaa=20was=20brought=20back=20by=20popular=20demand=20?=
 =?UTF-8?q?=E2=80=94=20see=20#3535=20gap=20was=20replaced=20with=20gapa=20?=
 =?UTF-8?q?=E2=80=94=20see=20#3682=20gdc=20was=20replaced=20with=20gdca=20?=
 =?UTF-8?q?=E2=80=94=20see=20#3977?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/git/git.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5cceb8d25..d59e0ca9f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -48,6 +48,8 @@ function work_in_progress() {
 alias g='git'
 
 alias ga='git add'
+alias gaa='git add --all'
+alias gapa='git add --patch'
 
 alias gb='git branch'
 alias gba='git branch -a'
@@ -79,7 +81,7 @@ alias gcp='git cherry-pick'
 alias gcs='git commit -S'
 
 alias gd='git diff'
-alias gdc='git diff --cached'
+alias gdca='git diff --cached'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff

From d0b690b584fa48946cfd93014aa6033ec0cc7fc3 Mon Sep 17 00:00:00 2001
From: Tommy Wang <twang@joinem.com>
Date: Wed, 10 Jun 2015 10:01:38 -0500
Subject: [PATCH 1132/1378] use local options to set no_equals before sourcing
 bash completion script

---
 .../virtualenvwrapper/virtualenvwrapper.plugin.zsh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 5faa1a823..b2c804edb 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,10 +1,18 @@
 virtualenvwrapper='virtualenvwrapper.sh'
 
 if (( $+commands[$virtualenvwrapper] )); then
-  source ${${virtualenvwrapper}:c}
+  function {
+    setopt local_options
+    unsetopt equals
+    source ${${virtualenvwrapper}:c}
+  }
 elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
-  virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
-  source "/etc/bash_completion.d/virtualenvwrapper"
+  function {
+    setopt local_options
+    unsetopt equals
+    virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper"
+    source "/etc/bash_completion.d/virtualenvwrapper"
+  }
 else
   print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
         "Please install with \`pip install virtualenvwrapper\`" >&2

From 83295ec9bc0a7c16a706a76c3c1f4a6ddd91948a Mon Sep 17 00:00:00 2001
From: Christian Hoener zu Siederdissen <choener@tbi.univie.ac.at>
Date: Sat, 13 Sep 2014 20:41:47 +0200
Subject: [PATCH 1133/1378] last-working-dir working with spaces in dirnames

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index 4fa6fcc34..75041f08e 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -15,7 +15,7 @@ function chpwd() {
 
 # Changes directory to the last working directory.
 function lwd() {
-	[[ ! -r "$cache_file" ]] || cd `cat "$cache_file"`
+	[[ ! -r "$cache_file" ]] || cd "`cat "$cache_file"`"
 }
 
 # Automatically jump to last working directory unless this isn't the first time

From 8b95bdb5e0059a6007b24f2d60e1719c791c8cce Mon Sep 17 00:00:00 2001
From: Sriram Sundarraj <sriram.s.1994@gmail.com>
Date: Sun, 19 Apr 2015 22:27:03 +0530
Subject: [PATCH 1134/1378] Added github in web_search plugin.

---
 plugins/web-search/web-search.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index 572427b0b..d407edb96 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -11,6 +11,7 @@ function web_search() {
     yahoo       "https://search.yahoo.com/search?p="
     duckduckgo  "https://www.duckduckgo.com/?q="
     yandex      "https://yandex.ru/yandsearch?text="
+    github      "https://github.com/search?q="
   )
 
   # define the open command
@@ -49,6 +50,7 @@ alias google='web_search google'
 alias yahoo='web_search yahoo'
 alias ddg='web_search duckduckgo'
 alias yandex='web_search yandex'
+alias github='web_search github'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'

From 26c7adf1107043419582c3d7a7dbb204ff70cbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 5 Jun 2015 18:58:13 +0200
Subject: [PATCH 1135/1378] Revert "Added migration notification for rails
 plugin"

This reverts commit 1493d88e3f92c7034da5c1b1638ba19544aa3ccb, made
to put a deprecated notice on rails3 and rails4 plugins, so that
users would migrate to the unified rails plugin.

It's been 1.5 years since that, so everyone should be migrated to
the good one.
---
 plugins/rails3/rails3.plugin.zsh | 4 ----
 plugins/rails4/rails4.plugin.zsh | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100644 plugins/rails3/rails3.plugin.zsh
 delete mode 100644 plugins/rails4/rails4.plugin.zsh

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
deleted file mode 100644
index 261b92108..000000000
--- a/plugins/rails3/rails3.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "It looks like you have been using the 'rails3' plugin,"
-echo "which has been deprecated in favor of a newly consolidated 'rails' plugin."
-echo "You will want to modify your ~/.zshrc configuration to begin using it."
-echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240"
diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
deleted file mode 100644
index 5452c242c..000000000
--- a/plugins/rails4/rails4.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "It looks like you have been using the 'rails4' plugin,"
-echo "which has been deprecated in favor of a newly consolidated 'rails' plugin."
-echo "You will want to modify your ~/.zshrc configuration to begin using it."
-echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240"

From 4cc0a2638c46cebda5bc6616fa3f94c720c5686d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A4ntz=20Miccoli?= <frantz.miccoli@fakedomain.com>
Date: Mon, 16 Dec 2013 00:39:26 +0100
Subject: [PATCH 1136/1378] A paver (Python build and configuration utility)
 plugin

---
 plugins/paver/paver.plugin.zsh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 plugins/paver/paver.plugin.zsh

diff --git a/plugins/paver/paver.plugin.zsh b/plugins/paver/paver.plugin.zsh
new file mode 100644
index 000000000..40bdbd12f
--- /dev/null
+++ b/plugins/paver/paver.plugin.zsh
@@ -0,0 +1,16 @@
+_paver_does_target_list_need_generating () {
+  [ ! -f .paver_targets ] && return 0;
+  [ pavement.py -nt .paver_targets ] && return 0;
+  return 1;
+}
+
+_paver () {
+  if [ -f pavement.py ]; then
+    if _paver_does_target_list_need_generating; then
+      paver --help 2>&1 |grep '-'|grep -v -e '--'|awk -F '-' '{print $1}'|tr -d ' ' > .paver_targets
+    fi
+    compadd `cat .paver_targets`
+  fi
+}
+
+compdef _paver paver

From 3d670c0bfc00858aff67f6b4dc161f4c0a0a5aef Mon Sep 17 00:00:00 2001
From: Michael Okner <mike@mikeokner.com>
Date: Sat, 13 Jun 2015 08:59:10 -0500
Subject: [PATCH 1137/1378] Adding quotes to git completion discovery path

Previously, spaces in the path would result in wto separate errouneous
paths being parsed. This fixes that issue.
---
 plugins/gitfast/_git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 6b7796857..c75b0be7f 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -30,7 +30,7 @@ if [ -z "$script" ]; then
 	local -a locations
 	local e
 	locations=(
-		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
+		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
 		'/etc/bash_completion.d/git' # fedora, old debian
 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
 		'/usr/share/bash-completion/git' # gentoo

From 55b1a2befe3d041b54c6aa542bd11734db31a6d5 Mon Sep 17 00:00:00 2001
From: UserTaken <UserTaken@users.noreply.github.com>
Date: Sat, 13 Jun 2015 16:30:18 -0700
Subject: [PATCH 1138/1378] Update _docker

---
 plugins/docker/_docker | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index bd494ecaa..25f55beca 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -52,11 +52,10 @@ __build() {
 
 __commit() {
     _arguments \
-        '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \
+        '(-a,--author=)'{-a,--author=}'[Author (e.g. "John Hannibal Smith <hannibal@a-team.com>")]' \
+        '(-c,--change=)'{-c,--change=}'[Apply Dockerfile instruction to the created image]' \
         '(-m,--message=)'{-m,--message=}'[Commit message]' \
-        '--run=[Config automatically applied when the image is run.]'
         '(-p,--pause=)'{-p,--pause=}'[Pause container during commit]' \
-    __docker_containers
 }
 
 __cp() {
@@ -70,7 +69,8 @@ __create() {
         '--add-host=[Add a custom host-to-IP mapping]' \
         '--cap-add=[Add Linux capabilities]' \
         '--cap-drop=[Drop Linux capabilities]' \
-        '(-c,--cpu-shares=)'{-c,--cpu-shares=}':[CPU shares (relative weight)]' \
+        '--cpuset-cpus=[CPUs in which to allow execution (0-3, 0,1)]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}'[CPU shares (relative weight)]' \
         '--cidfile=[Write the container ID to the file]' \
         '--device=[Add a host device to the container]' \
         '--dns=[Set custom dns servers]' \
@@ -227,7 +227,8 @@ __run() {
         '--add-host=[Add a custom host-to-IP mapping]' \
         '--cap-add=[Add Linux capabilities]' \
         '--cap-drop=[Drop Linux capabilities]' \
-        '(-c,--cpu-shares=)'{-c,--cpu-shares=}':[CPU shares (relative weight)]' \
+        '--cpuset-cpus=[CPUs in which to allow execution (0-3, 0,1)]' \
+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}'[CPU shares (relative weight)]' \
         '--cidfile=[Write the container ID to the file]' \
         '(-d,--detach=)'{-d,--detach=}'[Run container in the background, print new container id]' \
         '--device=[Add a host device to the container]' \

From a7e79824f85a89cbcacbceab0277c9833dee4817 Mon Sep 17 00:00:00 2001
From: "Mikhail S. Pobolovets" <styx.mp@gmail.com>
Date: Mon, 6 Oct 2014 09:59:20 +0300
Subject: [PATCH 1139/1378] Add mix-fast plugin (similar to rake-fast)

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
---
 plugins/mix-fast/README.md           | 28 +++++++++++++++++++++++++++
 plugins/mix-fast/mix-fast.plugin.zsh | 29 ++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 plugins/mix-fast/README.md
 create mode 100644 plugins/mix-fast/mix-fast.plugin.zsh

diff --git a/plugins/mix-fast/README.md b/plugins/mix-fast/README.md
new file mode 100644
index 000000000..9a5eccc3f
--- /dev/null
+++ b/plugins/mix-fast/README.md
@@ -0,0 +1,28 @@
+# mix-fast
+
+Fast mix autocompletion plugin.
+
+This script caches the output for later usage and significantly speeds it up.
+It generates a .mix_tasks cache file for current project. Currently if you want
+to update cache you should remove .mix_tasks file
+
+Inspired by and based on rake-fast zsh plugin.
+
+This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-mix-task-completion-for-zsh/).
+
+
+## Installation
+
+Just add the plugin to your `.zshrc`:
+
+```bash
+plugins=(foo bar mix-fast)
+```
+
+You might consider adding `.mix_tasks` to your [global .gitignore](https://help.github.com/articles/ignoring-files#global-gitignore)
+
+## Usage
+
+`mix`, then press tab
+
+Currently maintained by [styx](https://github.com/styx/)
\ No newline at end of file
diff --git a/plugins/mix-fast/mix-fast.plugin.zsh b/plugins/mix-fast/mix-fast.plugin.zsh
new file mode 100644
index 000000000..3719c3525
--- /dev/null
+++ b/plugins/mix-fast/mix-fast.plugin.zsh
@@ -0,0 +1,29 @@
+_mix_refresh () {
+  if [ -f .mix_tasks ]; then
+    rm .mix_tasks
+  fi
+  echo "Generating .mix_tasks..." > /dev/stderr
+  _mix_generate
+  cat .mix_tasks
+}
+
+_mix_does_task_list_need_generating () {
+  [ ! -f .mix_tasks ];
+}
+
+_mix_generate () {
+  mix --help | grep -v 'iex -S' | tail -n +2 | cut -d " " -f 2 > .mix_tasks
+}
+
+_mix () {
+  if [ -f mix.exs ]; then
+    if _mix_does_task_list_need_generating; then
+      echo "\nGenerating .mix_tasks..." > /dev/stderr
+      _mix_generate
+    fi
+    compadd `cat .mix_tasks`
+  fi
+}
+
+compdef _mix mix
+alias mix_refresh='_mix_refresh'

From c6460ef3e73f8f26f300dd8a24a83257b3b8579b Mon Sep 17 00:00:00 2001
From: ivanfoo <sanfru.ivan@gmail.com>
Date: Mon, 15 Jun 2015 00:25:22 +0200
Subject: [PATCH 1140/1378] Fixed odd chars on mac for agnoster theme

---
 themes/agnoster.zsh-theme | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 8c7be6e01..9f67543f5 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -26,7 +26,13 @@
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 
 CURRENT_BG='NONE'
-SEGMENT_SEPARATOR=''
+
+# Fix odd char on mac
+if [[ `uname` == 'Darwin' ]]; then
+    SEGMENT_SEPARATOR='\ue0b0'
+else
+    SEGMENT_SEPARATOR=''
+fi
 
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,

From f66a54fb7862b396e3fc09e7041ca6fee4b42a4a Mon Sep 17 00:00:00 2001
From: Ali Afshar <aafshar@gmail.com>
Date: Sun, 14 Jun 2015 22:29:11 -0700
Subject: [PATCH 1141/1378] Add missing space causing parse error.

---
 lib/misc.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index e90836475..6d1a64e8d 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,6 +1,6 @@
 ## Load smart urls if available
 for d in $fpath; do
-	if [[ -e "$d/url-quote-magic"]]; then
+	if [[ -e "$d/url-quote-magic" ]]; then
 		autoload -U url-quote-magic
 		zle -N self-insert url-quote-magic
 	fi

From 01e355fb1e5dc3982efeecee699a96254f3f44e6 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Wed, 20 May 2015 17:36:46 +0200
Subject: [PATCH 1142/1378] In addition to the already existing variables
 ZSH_THEME_GIT_PROMPT for behind, ahead and diverged remote, I added
 ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE.

---
 lib/git.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index caa7e6329..baf863717 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -36,7 +36,10 @@ git_remote_status() {
         ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
         behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
 
-        if [ $ahead -gt 0 ] && [ $behind -eq 0 ]
+        if [ $ahead -eq 0 ] && [ $behind -eq 0 ]
+        then
+          echo "$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
+        elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
         then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
             git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}"

From d0670aa2bd5186357961dd90c4a97c2c3842f728 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 15 Jun 2015 16:55:25 -0400
Subject: [PATCH 1143/1378] Fix merge conflict for jira-prefix and jira add
 comment

---
 plugins/jira/jira.plugin.zsh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 8ad60b8fe..ca540c84c 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -42,13 +42,6 @@ open_jira_issue () {
     $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
     jira_query $@
-  else
-    echo "Opening issue #$1"
-    if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
-      $open_cmd  "$jira_url/issues/$jira_prefix$1"
-    else
-      $open_cmd  "$jira_url/browse/$jira_prefix$1"
-    fi
   else 
     local addcomment=''
     if [[ "$2" == "m" ]]; then
@@ -59,9 +52,9 @@ open_jira_issue () {
     fi
     
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
-      $open_cmd  "$jira_url/issues/$1$addcomment"
+      $open_cmd  "$jira_url/issues/$jira_prefix$1$addcomment"
     else
-      $open_cmd  "$jira_url/browse/$1$addcomment"
+      $open_cmd  "$jira_url/browse/$jira_prefix$1$addcomment"
     fi
   fi
 }

From 68b792bbb67958c726dd8ebe9cfe12f5e463d160 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Tue, 16 Jun 2015 10:48:24 +0200
Subject: [PATCH 1144/1378] Change to use omz git_prompt* functions

Removed references for official git __git_ps1() functions.
Change to use omz function git_prompt* functions like:
- git_prompt_info() -> branch name
- git_prompt_status() -> check if untracked, modified, added,
  stashed file are in the current git repo
- git_remote_status() -> check if current repo is ahead, behind,
  or diverged.
These functions returns string automatically added to your PS1;
these are customizable via exporting ZSH_THEME_GIT_PROMPT*
---
 themes/michelebologna.zsh-theme | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index fec243873..110e3f203 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -59,16 +59,17 @@ ZSH_THEME_GIT_PROMPT_PREFIX=""
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
-ZSH_THEME_GIT_PROMPT_MODIFIED="*"
-ZSH_THEME_GIT_PROMPT_ADDED="+"
-ZSH_THEME_GIT_PROMPT_STASHED="$"
-ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="="
+ZSH_THEME_GIT_PROMPT_UNTRACKED="$blue%%"
+ZSH_THEME_GIT_PROMPT_MODIFIED="$red*"
+ZSH_THEME_GIT_PROMPT_ADDED="$green+"
+ZSH_THEME_GIT_PROMPT_STASHED="$blue$"
+ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="$green="
 ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
 ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<"
-ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="<>"
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="$red<>"
 
 PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)'
-PROMPT+='$(__git_ps1)'
+GIT_PROMPT='$(out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status);if [[ -n $out ]]; then printf %s " $white($green$out$white)$reset";fi)'
+PROMPT+="$GIT_PROMPT"
 PROMPT+=" $last_command_output%#$reset "
 RPROMPT=''

From ed6645a2823dc6c3e0fae822186d79542682e68e Mon Sep 17 00:00:00 2001
From: Arnaud Rinquin <rinquin.arnaud@gmail.com>
Date: Wed, 17 Jun 2015 13:25:09 +0100
Subject: [PATCH 1145/1378] Fix plugin/git ggpull and ggpush backward
 compatibility

Current `ggpush` is `git push origin` instead of `git push origin $(current_branch)`
Same for `ggpull`
---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d59e0ca9f..168618760 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -105,7 +105,7 @@ ggl() {
 git pull origin "${b:=$1}" "${*[2,-1]}"
 }
 compdef _git ggl=git-checkout
-alias ggpull='ggl'
+alias ggpull='git pull origin $(current_branch)'
 compdef _git ggpull=git-checkout
 ggp() {
 if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
@@ -116,7 +116,7 @@ git push origin "${b:=$1}"
 fi
 }
 compdef _git ggp=git-checkout
-alias ggpush='ggp'
+alias ggpush='git push origin $(current_branch)'
 compdef _git ggpush=git-checkout
 ggpnp() {
 if [[ "$#" == 0 ]]; then

From d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 17 Jun 2015 22:38:31 +0200
Subject: [PATCH 1146/1378] git plugin: fix ggl to avoid empty string see
 https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330

---
 plugins/git/git.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 168618760..cc6eb1031 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -101,8 +101,12 @@ git push --force origin "${b:=$1}"
 }
 compdef _git ggf=git-checkout
 ggl() {
+if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
+git pull origin "${*}"
+else
 [[ "$#" == 0 ]] && local b="$(current_branch)"
-git pull origin "${b:=$1}" "${*[2,-1]}"
+git pull origin "${b:=$1}"
+fi
 }
 compdef _git ggl=git-checkout
 alias ggpull='git pull origin $(current_branch)'

From 4cd281ba1be0d8a2e44f96bdb1f2a98b15f54c47 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 25 Jun 2015 20:13:59 -0400
Subject: [PATCH 1147/1378] agnoster: Define Powerline chars with escape
 sequence, and use same character on all platforms. Add clarifying comments.
 This makes everything consistent with the current Powerline-patched fonts
 definitions.

---
 themes/agnoster.zsh-theme | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 3a0c58b89..3e454a0a0 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -7,6 +7,9 @@
 #
 # In order for this theme to render correctly, you will need a
 # [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts).
+# Make sure you have a recent version: the code points that Powerline
+# uses changed in 2012, and older versions will display incorrectly,
+# in confusing ways.
 #
 # In addition, I recommend the
 # [Solarized theme](https://github.com/altercation/solarized/) and, if you're
@@ -27,12 +30,19 @@
 
 CURRENT_BG='NONE'
 
-# Fix odd char on mac
-if [[ `uname` == 'Darwin' ]]; then
-    SEGMENT_SEPARATOR='\ue0b0'
-else
-    SEGMENT_SEPARATOR=''
-fi
+# Special Powerline characters
+
+# NOTE: This segment separator character is correct.  In 2012, Powerline changed
+# the code points they use for their special characters. This is the new code point.
+# If this is not working for you, you probably have an old version of the 
+# Powerline-patched fonts installed. Download and install the new version.
+# Do not submit PRs to change this unless you have reviewed the Powerline code point
+# history and have new information.
+# This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of
+# what font the user is viewing this source code in. Do not replace the
+# escape sequence with a single literal character.
+SEGMENT_SEPARATOR='\ue0b0' # 
+
 
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
@@ -73,6 +83,7 @@ prompt_context() {
 
 # Git: branch/detached head, dirty status
 prompt_git() {
+  local PL_BRANCH_CHAR='\ue0a0'         # 
   local ref dirty mode repo_path
   repo_path=$(git rev-parse --git-dir 2>/dev/null)
 
@@ -104,7 +115,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_%% }${mode}"
+    echo -n "${ref/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
   fi
 }
 

From 689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 26 Jun 2015 01:48:17 -0400
Subject: [PATCH 1148/1378] osx: fix tab* functions so cd works in iTerm2, exit
 status is correct, and error messages are not discarded.

---
 plugins/osx/osx.plugin.zsh | 84 ++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index a6e3a83e6..2cbb95977 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -5,29 +5,35 @@
 #       VERSION:  1.1.0
 # ------------------------------------------------------------------------------
 
-function tab() {
-  local command="cd \\\"$PWD\\\"; clear; "
-  (( $# > 0 )) && command="${command}; $*"
-
-  the_app=$(
+function _omz_osx_get_frontmost_app() {
+  local the_app=$(
     osascript 2>/dev/null <<EOF
       tell application "System Events"
         name of first item of (every process whose frontmost is true)
       end tell
 EOF
   )
+  echo "$the_app"
+}
 
-  [[ "$the_app" == 'Terminal' ]] && {
-    osascript 2>/dev/null <<EOF
+function tab() {
+  # Must not have trailing semicolon, for iTerm compatibility
+  local command="cd \\\"$PWD\\\"; clear"
+  (( $# > 0 )) && command="${command}; $*"
+
+  local the_app=$(_omz_osx_get_frontmost_app)
+
+  if [[ "$the_app" == 'Terminal' ]]; then
+    # Discarding stdout to quash "tab N of window id XXX" output
+    osascript >/dev/null <<EOF
       tell application "System Events"
         tell process "Terminal" to keystroke "t" using command down
-        tell application "Terminal" to do script "${command}" in front window
       end tell
+      tell application "Terminal" to do script "${command}" in front window
 EOF
-  }
 
-  [[ "$the_app" == 'iTerm' ]] && {
-    osascript 2>/dev/null <<EOF
+  elif [[ "$the_app" == 'iTerm' ]]; then
+    osascript <<EOF
       tell application "iTerm"
         set current_terminal to current terminal
         tell current_terminal
@@ -35,29 +41,27 @@ EOF
           set current_session to current session
           tell current_session
             write text "${command}"
-            keystroke return
           end tell
         end tell
       end tell
 EOF
-  }
+
+  else
+    echo "tab: unsupported terminal app: $the_app"
+    false
+
+  fi
 }
 
 function vsplit_tab() {
-  local command="cd \\\"$PWD\\\""
+  local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  the_app=$(
-    osascript 2>/dev/null <<EOF
-      tell application "System Events"
-        name of first item of (every process whose frontmost is true)
-      end tell
-EOF
-  )
+  local the_app=$(_omz_osx_get_frontmost_app)
 
-  [[ "$the_app" == 'iTerm' ]] && {
-    osascript 2>/dev/null <<EOF
-      tell application "iTerm" to activate
+  if [[ "$the_app" == 'iTerm' ]]; then
+    osascript <<EOF
+      -- tell application "iTerm" to activate
 
       tell application "System Events"
         tell process "iTerm"
@@ -65,26 +69,24 @@ EOF
             click
           end tell
         end tell
-        keystroke "${command}; clear;"
-        keystroke return
+        keystroke "${command} \n"
       end tell
 EOF
-  }
+
+  else
+    echo "$0: unsupported terminal app: $the_app" >&2
+    false
+
+  fi
 }
 
 function split_tab() {
-  local command="cd \\\"$PWD\\\""
+  local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  the_app=$(
-    osascript 2>/dev/null <<EOF
-      tell application "System Events"
-        name of first item of (every process whose frontmost is true)
-      end tell
-EOF
-  )
+  local the_app=$(_omz_osx_get_frontmost_app)
 
-  [[ "$the_app" == 'iTerm' ]] && {
+  if [[ "$the_app" == 'iTerm' ]]; then
     osascript 2>/dev/null <<EOF
       tell application "iTerm" to activate
 
@@ -94,11 +96,15 @@ EOF
             click
           end tell
         end tell
-        keystroke "${command}; clear;"
-        keystroke return
+        keystroke "${command} \n"
       end tell
 EOF
-  }
+
+  else
+    echo "$0: unsupported terminal app: $the_app" >&2
+    false
+
+  fi
 }
 
 function pfd() {

From 546b99ad4c509c6a9a4933fce2c662553f790b86 Mon Sep 17 00:00:00 2001
From: Fredrik Strandin <fredrik.strandin@telavox.se>
Date: Fri, 26 Jun 2015 15:47:00 +0200
Subject: [PATCH 1149/1378] Use 'quit all' instead of counting needed quits

---
 plugins/vundle/vundle.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index b5f1c0bbf..fa1911477 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -13,15 +13,15 @@ function vundle-init () {
 
 function vundle () {
   vundle-init
-  vim -c "execute \"PluginInstall\" | q | q"
+  vim -c "execute \"PluginInstall\" | qa"
 }
 
 function vundle-update () {
   vundle-init
-  vim -c "execute \"PluginInstall!\" | q | q"
+  vim -c "execute \"PluginInstall!\" | qa"
 }
 
 function vundle-clean () {
   vundle-init
-  vim -c "execute \"PluginClean!\" | q | q"
+  vim -c "execute \"PluginClean!\" | qa"
 }

From 0950f9c56da1f22bbddc45cf179a80a712908b19 Mon Sep 17 00:00:00 2001
From: moncho <ramon.cr@gmail.com>
Date: Sun, 28 Jun 2015 11:16:17 +0200
Subject: [PATCH 1150/1378] Plugin now uses completion script from
 docker-compose repo.

---
 plugins/docker-compose/README.md              |   4 +
 plugins/docker-compose/_docker-compose        | 308 ++++++++++++++++++
 .../docker-compose/docker-compose.plugin.zsh  |  14 -
 3 files changed, 312 insertions(+), 14 deletions(-)
 create mode 100644 plugins/docker-compose/_docker-compose
 delete mode 100644 plugins/docker-compose/docker-compose.plugin.zsh

diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
index 77b98f30d..567b82148 100644
--- a/plugins/docker-compose/README.md
+++ b/plugins/docker-compose/README.md
@@ -1 +1,5 @@
 # Docker-compose plugin for oh my zsh
+
+A copy of the completion script from the [docker-compose](1) git repo.
+
+[1]:[https://github.com/docker/compose/blob/master/contrib/completion/zsh/_docker-compose]
diff --git a/plugins/docker-compose/_docker-compose b/plugins/docker-compose/_docker-compose
new file mode 100644
index 000000000..19c06675a
--- /dev/null
+++ b/plugins/docker-compose/_docker-compose
@@ -0,0 +1,308 @@
+#compdef docker-compose
+
+# Description
+# -----------
+#  zsh completion for docker-compose
+#  https://github.com/sdurrheimer/docker-compose-zsh-completion
+# -------------------------------------------------------------------------
+# Version
+# -------
+#  0.1.0
+# -------------------------------------------------------------------------
+# Authors
+# -------
+#  * Steve Durrheimer <s.durrheimer@gmail.com>
+# -------------------------------------------------------------------------
+# Inspiration
+# -----------
+#  * @albers docker-compose bash completion script
+#  * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion
+# -------------------------------------------------------------------------
+
+# For compatibility reasons, Compose and therefore its completion supports several
+# stack compositon files as listed here, in descending priority.
+# Support for these filenames might be dropped in some future version.
+__docker-compose_compose_file() {
+    local file
+    for file in docker-compose.y{,a}ml fig.y{,a}ml ; do
+        [ -e $file ] && {
+            echo $file
+            return
+        }
+    done
+    echo docker-compose.yml
+}
+
+# Extracts all service names from docker-compose.yml.
+___docker-compose_all_services_in_compose_file() {
+    local already_selected
+    local -a services
+    already_selected=$(echo ${words[@]} | tr " " "|")
+    awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | grep -Ev "$already_selected"
+}
+
+# All services, even those without an existing container
+__docker-compose_services_all() {
+    services=$(___docker-compose_all_services_in_compose_file)
+    _alternative "args:services:($services)"
+}
+
+# All services that have an entry with the given key in their docker-compose.yml section
+___docker-compose_services_with_key() {
+    local already_selected
+    local -a buildable
+    already_selected=$(echo ${words[@]} | tr " " "|")
+    # flatten sections to one line, then filter lines containing the key and return section name.
+    awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' 2>/dev/null | grep -Ev "$already_selected"
+}
+
+# All services that are defined by a Dockerfile reference
+__docker-compose_services_from_build() {
+    buildable=$(___docker-compose_services_with_key build)
+    _alternative "args:buildable services:($buildable)"
+}
+
+# All services that are defined by an image
+__docker-compose_services_from_image() {
+    pullable=$(___docker-compose_services_with_key image)
+    _alternative "args:pullable services:($pullable)"
+}
+
+__docker-compose_get_services() {
+    local kind expl
+    declare -a running stopped lines args services
+
+    docker_status=$(docker ps > /dev/null 2>&1)
+    if [ $? -ne 0 ]; then
+        _message "Error! Docker is not running."
+        return 1
+    fi
+
+    kind=$1
+    shift
+    [[ $kind = (stopped|all) ]] && args=($args -a)
+
+    lines=(${(f)"$(_call_program commands docker ps ${args})"})
+    services=(${(f)"$(_call_program commands docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} ps -q)"})
+
+    # Parse header line to find columns
+    local i=1 j=1 k header=${lines[1]}
+    declare -A begin end
+    while (( $j < ${#header} - 1 )) {
+        i=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 1))
+        j=$(( $i + ${${header[$i,-1]}[(i)  ]} - 1))
+        k=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 2))
+        begin[${header[$i,$(($j-1))]}]=$i
+        end[${header[$i,$(($j-1))]}]=$k
+    }
+    lines=(${lines[2,-1]})
+
+    # Container ID
+    local line s name
+    local -a names
+    for line in $lines; do
+        if [[ $services == *"${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"* ]]; then
+            names=(${(ps:,:)${${line[${begin[NAMES]},-1]}%% *}})
+            for name in $names; do
+                s="${${name%_*}#*_}:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
+                s="$s, ${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"
+                s="$s, ${${${line[$begin[IMAGE],$end[IMAGE]]}/:/\\:}%% ##}"
+                if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
+                    stopped=($stopped $s)
+                else
+                    running=($running $s)
+                fi
+            done
+        fi
+    done
+
+    [[ $kind = (running|all) ]] && _describe -t services-running "running services" running
+    [[ $kind = (stopped|all) ]] && _describe -t services-stopped "stopped services" stopped
+}
+
+__docker-compose_stoppedservices() {
+    __docker-compose_get_services stopped "$@"
+}
+
+__docker-compose_runningservices() {
+    __docker-compose_get_services running "$@"
+}
+
+__docker-compose_services () {
+    __docker-compose_get_services all "$@"
+}
+
+__docker-compose_caching_policy() {
+    oldp=( "$1"(Nmh+1) )     # 1 hour
+    (( $#oldp ))
+}
+
+__docker-compose_commands () {
+    local cache_policy
+
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    if [[ -z "$cache_policy" ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy __docker-compose_caching_policy
+    fi
+
+    if ( [[ ${+_docker_compose_subcommands} -eq 0 ]] || _cache_invalid docker_compose_subcommands) \
+        && ! _retrieve_cache docker_compose_subcommands;
+    then
+        local -a lines
+        lines=(${(f)"$(_call_program commands docker-compose 2>&1)"})
+        _docker_compose_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)  *]}]}## #}/ ##/:})
+        _store_cache docker_compose_subcommands _docker_compose_subcommands
+    fi
+    _describe -t docker-compose-commands "docker-compose command" _docker_compose_subcommands
+}
+
+__docker-compose_subcommand () {
+    local -a _command_args
+    integer ret=1
+    case "$words[1]" in
+        (build)
+            _arguments \
+                '--no-cache[Do not use cache when building the image]' \
+                '*:services:__docker-compose_services_from_build' && ret=0
+            ;;
+        (help)
+            _arguments ':subcommand:__docker-compose_commands' && ret=0
+            ;;
+        (kill)
+            _arguments \
+                '-s[SIGNAL to send to the container. Default signal is SIGKILL.]:signal:_signals' \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
+        (logs)
+            _arguments \
+                '--no-color[Produce monochrome output.]' \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
+        (migrate-to-labels)
+            _arguments \
+                '(-):Recreate containers to add labels' && ret=0
+            ;;
+        (port)
+            _arguments \
+                '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \
+                '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \
+                '1:running services:__docker-compose_runningservices' \
+                '2:port:_ports' && ret=0
+            ;;
+        (ps)
+            _arguments \
+                '-q[Only display IDs]' \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
+        (pull)
+            _arguments \
+                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '*:services:__docker-compose_services_from_image' && ret=0
+            ;;
+        (rm)
+            _arguments \
+                '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \
+                '-v[Remove volumes associated with containers]' \
+                '*:stopped services:__docker-compose_stoppedservices' && ret=0
+            ;;
+        (run)
+            _arguments \
+                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '-d[Detached mode: Run container in the background, print new container name.]' \
+                '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \
+                '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \
+                '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \
+                "--no-deps[Don't start linked services.]" \
+                '--rm[Remove container after run. Ignored in detached mode.]' \
+                "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \
+                '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \
+                '(-):services:__docker-compose_services' \
+                '(-):command: _command_names -e' \
+                '*::arguments: _normal' && ret=0
+            ;;
+        (scale)
+            _arguments '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
+        (start)
+            _arguments '*:stopped services:__docker-compose_stoppedservices' && ret=0
+            ;;
+        (stop|restart)
+            _arguments \
+                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                '*:running services:__docker-compose_runningservices' && ret=0
+            ;;
+        (up)
+            _arguments \
+                '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \
+                '-d[Detached mode: Run containers in the background, print new container names.]' \
+                '--no-color[Produce monochrome output.]' \
+                "--no-deps[Don't start linked services.]" \
+                "--no-recreate[If containers already exist, don't recreate them.]" \
+                "--no-build[Don't build an image, even if it's missing]" \
+                '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \
+                "--x-smart-recreate[Only recreate containers whose configuration or image needs to be updated. (EXPERIMENTAL)]" \
+                '*:services:__docker-compose_services_all' && ret=0
+            ;;
+        (version)
+            _arguments \
+                "--short[Shows only Compose's version number.]" && ret=0
+            ;;
+        (*)
+            _message 'Unknown sub command'
+    esac
+
+    return ret
+}
+
+_docker-compose () {
+    # Support for subservices, which allows for `compdef _docker docker-shell=_docker_containers`.
+    # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`.
+    if [[ $service != docker-compose ]]; then
+        _call_function - _$service
+        return
+    fi
+
+    local curcontext="$curcontext" state line ret=1
+    typeset -A opt_args
+
+    _arguments -C \
+        '(- :)'{-h,--help}'[Get help]' \
+        '--verbose[Show more output]' \
+        '(- :)'{-v,--version}'[Print version and exit]' \
+        '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \
+        '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+        '(-): :->command' \
+        '(-)*:: :->option-or-argument' && ret=0
+
+    local counter=1
+    #local compose_file compose_project
+    while [ $counter -lt ${#words[@]} ]; do
+        case "${words[$counter]}" in
+            -f|--file)
+                (( counter++ ))
+                compose_file="${words[$counter]}"
+                ;;
+            -p|--project-name)
+                (( counter++ ))
+                compose_project="${words[$counter]}"
+                ;;
+            *)
+                ;;
+        esac
+        (( counter++ ))
+    done
+
+    case $state in
+        (command)
+            __docker-compose_commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*:*}:docker-compose-$words[1]:
+            __docker-compose_subcommand && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+_docker-compose "$@"
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
deleted file mode 100644
index 08500408d..000000000
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Authors:
-# https://github.com/tristola
-#
-# Docker-compose related zsh aliases
-
-# Aliases ###################################################################
-
-alias dcup='docker-compose up'
-alias dcb='docker-compose build'
-alias dcrm='docker-compose rm'
-alias dcps='docker-compose ps'
-alias dcstop='docker-compose stop'
-alias dcrestart='docker-compose restart'
-

From 9813ff5f24c6ce8409490d7ef8b8c4458f2a6a66 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 28 Jun 2015 16:54:04 -0400
Subject: [PATCH 1151/1378] omz_diagnostic_dump: Add umask and $fpath listing.
 This helps catch issues with compinit and insecure directories.

---
 lib/diagnostics.zsh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 023ba42b9..f5f15deaa 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -106,6 +106,7 @@ function _omz_diag_dump_one_big_text() {
   builtin echo OSTYPE=$OSTYPE
   builtin echo ZSH_VERSION=$ZSH_VERSION
   builtin echo User: $USER
+  builtin echo umask: $(umask)
   builtin echo
 
   # Installed programs
@@ -159,13 +160,19 @@ function _omz_diag_dump_one_big_text() {
   command locale
   builtin echo
 
-  # Zsh configuration
+  # Zsh installation and configuration
   builtin echo Zsh configuration:
   builtin echo setopt: $(builtin setopt)
   builtin echo
   builtin echo zstyle:
   builtin zstyle
   builtin echo
+  builtin echo 'compaudit output:'
+  compaudit
+  builtin echo 
+  builtin echo '$fpath directories:'
+  command ls -lad $fpath
+  builtin echo
 
   # Oh-my-zsh installation
   builtin echo oh-my-zsh installation:
@@ -195,7 +202,7 @@ function _omz_diag_dump_one_big_text() {
     builtin bindkey
     builtin echo
     builtin echo "infocmp:"
-    command infocmp
+    command infocmp -L
     builtin echo
   fi
 

From c1f1f91daad68fa000900dc647157bbfdb2b603f Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 29 Jun 2015 18:55:58 -0400
Subject: [PATCH 1152/1378] virtualenvwrapper: Replace "realpath" with portable
 zsh-native `:A` and `:h` modifiers

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 9fd0d3d8f..f5f37ff6f 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -30,16 +30,17 @@ if [[ "$WORKON_HOME" == "" ]]; then
 fi
 
 if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-  # Automatically activate Git projects's virtual environments based on the
+  # Automatically activate Git projects' virtual environments based on the
   # directory name of the project. Virtual environment name can be overridden
   # by placing a .venv file in the project root with a virtualenv name in it
   function workon_cwd {
     if [ ! $WORKON_CWD ]; then
       WORKON_CWD=1
       # Check if this is a Git repo
-      PROJECT_ROOT=`pwd`
+      # Get absolute path, resolving symlinks
+      PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
-        PROJECT_ROOT=`realpath $PROJECT_ROOT/..`
+        PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
       if [[ "$PROJECT_ROOT" == "/" ]]; then
         PROJECT_ROOT="."
@@ -50,7 +51,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
       elif [[ "$PROJECT_ROOT" != "." ]]; then
-        ENV_NAME=`basename "$PROJECT_ROOT"`
+        ENV_NAME="${PROJECT_ROOT:t}"
       else
         ENV_NAME=""
       fi

From efb04d66a0bc775dfb95f2bbc648935004212d48 Mon Sep 17 00:00:00 2001
From: Zhiye Li <zhiyelee@gmail.com>
Date: Tue, 30 Jun 2015 17:50:01 -0500
Subject: [PATCH 1153/1378] add git alias `gcam` -  git commit -am

add git alias `gcam` -  `git commit -am`
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index cc6eb1031..ea651d12f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -68,6 +68,7 @@ alias gc!='git commit -v --amend'
 alias gca='git commit -v -a'
 alias gca!='git commit -v -a --amend'
 alias gcan!='git commit -v -a -s --no-edit --amend'
+alias gcam='git commit -a -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recursive'

From 2e92ff8ae5e6ddbac5040bb235518a4337aeb983 Mon Sep 17 00:00:00 2001
From: nextgenthemes <nextgenthemes@users.noreply.github.com>
Date: Thu, 2 Jul 2015 17:33:30 +0200
Subject: [PATCH 1154/1378] Adds agar = apt-get autoremove

Since #3902 lacks the auto-completion I made a PR for this as well.

Also fixes some typos.
---
 plugins/ubuntu/ubuntu.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 0211d3374..85db3ce19 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -28,6 +28,7 @@ compdef _ppap ppap='sudo ppa-purge'
 
 alias ag='sudo apt-get'            # age - but without sudo
 alias aga='sudo apt-get autoclean' # aac
+alias agar='sudo apt-get autoremove'
 alias agb='sudo apt-get build-dep' # abd
 alias agc='sudo apt-get clean'     # adc
 alias agd='sudo apt-get dselect-upgrade' # ads
@@ -41,6 +42,7 @@ alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
 
 compdef _ag ag='sudo apt-get'
 compdef _aga aga='sudo apt-get autoclean'
+compdef _agar agar='sudo apt-get autoremove'
 compdef _agb agb='sudo apt-get build-dep'
 compdef _agc agc='sudo apt-get clean'
 compdef _agd agd='sudo apt-get dselect-upgrade'
@@ -65,7 +67,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 
 # apt-add-repository with automatic install/upgrade of the desired package
 # Usage: aar ppa:xxxxxx/xxxxxx [packagename]
-# If packagename is not given as 2nd arument the function will ask for it and guess the defaupt by taking
+# If packagename is not given as 2nd argument the function will ask for it and guess the default by taking
 # the part after the / from the ppa name wich is sometimes the right name for the package you want to install
 aar() {
 	if [ -n "$2" ]; then

From a2e01e9a87c0d120482cc7bbe21ccab21bf71fb1 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 2 Jul 2015 20:27:48 -0400
Subject: [PATCH 1155/1378] chucknorris: check for strfile dependency Gives a
 better error message than "command not found: strfile", because it's not
 obvious to many users that strfile is part of fortune. Also handles the weird
 /usr/sbin install location for strfile on Cygwin.

---
 plugins/chucknorris/chucknorris.plugin.zsh | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/plugins/chucknorris/chucknorris.plugin.zsh b/plugins/chucknorris/chucknorris.plugin.zsh
index 1cdc945d1..1dbb04ef0 100644
--- a/plugins/chucknorris/chucknorris.plugin.zsh
+++ b/plugins/chucknorris/chucknorris.plugin.zsh
@@ -1,11 +1,28 @@
+# chucknorris: Chuck Norris fortunes
+
 # Automatically generate or update Chuck's compiled fortune data file
-DIR=${0:h}/fortunes
+# $0 must be used outside a local function. This variable name is unlikly to collide.
+CHUCKNORRIS_PLUGIN_DIR=${0:h}
+
+() {
+local DIR=$CHUCKNORRIS_PLUGIN_DIR/fortunes
 if [[ ! -f $DIR/chucknorris.dat ]] || [[ $DIR/chucknorris.dat -ot $DIR/chucknorris ]]; then
-  strfile $DIR/chucknorris $DIR/chucknorris.dat
+  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
+  local strfile=strfile
+  if ! which strfile &>/dev/null && [[ -f /usr/sbin/strfile ]]; then
+    strfile=/usr/sbin/strfile
+  fi
+  if which $strfile &> /dev/null; then
+    $strfile $DIR/chucknorris $DIR/chucknorris.dat >/dev/null
+  else
+    echo "[oh-my-zsh] chucknorris depends on strfile, which is not installed" >&2
+    echo "[oh-my-zsh] strfile is often provided as part of the 'fortune' package" >&2
+  fi
 fi
 
 # Aliases
 alias chuck="fortune -a $DIR"
 alias chuck_cow="chuck | cowthink"
+}
 
-unset DIR
\ No newline at end of file
+unset CHUCKNORRIS_PLUGIN_DIR

From f73e642e2265601b705b6aa9d9f71878ca98644a Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 2 Jul 2015 21:42:32 -0400
Subject: [PATCH 1156/1378] virtualenvwrapper: treat git repos as project roots
 again (instead of requiring a .venv customization directory) Change error
 output to more conventional OMZ format, so it's clear the plugin is for
 oh-my-zsh and not base zsh. Use `local` variables instead of manual
 unsetting.

---
 .../virtualenvwrapper.plugin.zsh              | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index f5f37ff6f..c40ca86ac 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -14,32 +14,38 @@ elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then
     source "/etc/bash_completion.d/virtualenvwrapper"
   }
 else
-  print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
+  print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\
         "Please install with \`pip install virtualenvwrapper\`" >&2
   return
 fi
 if ! type workon &>/dev/null; then
-  print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
+  print "[oh-my-zsh] virtualenvwrapper plugin: shell function 'workon' not defined.\n"\
         "Please check ${virtualenvwrapper}" >&2
   return
 fi
 
 if [[ "$WORKON_HOME" == "" ]]; then
-  print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2
+  print "[oh-my-zsh] \$WORKON_HOME is not defined so plugin virtualenvwrapper will not work" >&2
   return
 fi
 
 if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-  # Automatically activate Git projects' virtual environments based on the
+  # Automatically activate Git projects or other customized virtualenvwrapper projects based on the
   # directory name of the project. Virtual environment name can be overridden
-  # by placing a .venv file in the project root with a virtualenv name in it
+  # by placing a .venv file in the project root with a virtualenv name in it.
   function workon_cwd {
-    if [ ! $WORKON_CWD ]; then
-      WORKON_CWD=1
+    if [[ -z "$WORKON_CWD" ]]; then
+      local WORKON_CWD=1
       # Check if this is a Git repo
+      local GIT_REPO_ROOT=""
+      local GIT_TOPLEVEL=$(git rev-parse --show-toplevel 2> /dev/null)
+      if [[ $? == 0 ]]; then
+        GIT_REPO_ROOT="$GIT_TOPLEVEL"
+      fi
       # Get absolute path, resolving symlinks
-      PROJECT_ROOT="${PWD:A}"
-      while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
+      local PROJECT_ROOT="${PWD:A}"
+      while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
+               && ! -d "$PROJECT_ROOT/.git"  && "$PROJECT_ROOT" != "$GIT_REPO_ROOT" ]]; do
         PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
       if [[ "$PROJECT_ROOT" == "/" ]]; then
@@ -47,7 +53,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       fi
       # Check for virtualenv name override
       if [[ -f "$PROJECT_ROOT/.venv" ]]; then
-        ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+        ENV_NAME=`cat "$PROJECT_ROOT/.venv"`        
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
       elif [[ "$PROJECT_ROOT" != "." ]]; then
@@ -69,8 +75,6 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
         # Note: this only happens if the virtualenv was activated automatically
         deactivate && unset CD_VIRTUAL_ENV
       fi
-      unset PROJECT_ROOT
-      unset WORKON_CWD
     fi
   }
 

From c82deedc97f7578fa0a8a2dd3c8b598a166bfd04 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 3 Jul 2015 01:44:47 -0400
Subject: [PATCH 1157/1378] agnoster: Protect Unicode esape sequences with
 local LC_* settings

---
 themes/agnoster.zsh-theme | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 3e454a0a0..6444dfa68 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -32,17 +32,19 @@ CURRENT_BG='NONE'
 
 # Special Powerline characters
 
-# NOTE: This segment separator character is correct.  In 2012, Powerline changed
-# the code points they use for their special characters. This is the new code point.
-# If this is not working for you, you probably have an old version of the 
-# Powerline-patched fonts installed. Download and install the new version.
-# Do not submit PRs to change this unless you have reviewed the Powerline code point
-# history and have new information.
-# This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of
-# what font the user is viewing this source code in. Do not replace the
-# escape sequence with a single literal character.
-SEGMENT_SEPARATOR='\ue0b0' # 
-
+() {
+  local LC_ALL="" LC_CTYPE="en_US.UTF-8"
+  # NOTE: This segment separator character is correct.  In 2012, Powerline changed
+  # the code points they use for their special characters. This is the new code point.
+  # If this is not working for you, you probably have an old version of the 
+  # Powerline-patched fonts installed. Download and install the new version.
+  # Do not submit PRs to change this unless you have reviewed the Powerline code point
+  # history and have new information.
+  # This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of
+  # what font the user is viewing this source code in. Do not replace the
+  # escape sequence with a single literal character.
+  SEGMENT_SEPARATOR=$'\ue0b0' # 
+}
 
 # Begin a segment
 # Takes two arguments, background and foreground. Both can be omitted,
@@ -83,7 +85,12 @@ prompt_context() {
 
 # Git: branch/detached head, dirty status
 prompt_git() {
-  local PL_BRANCH_CHAR='\ue0a0'         # 
+
+  local PL_BRANCH_CHAR
+  () {
+    local LC_ALL="" LC_CTYPE="en_US.UTF-8"
+    PL_BRANCH_CHAR=$'\ue0a0'         # 
+  }
   local ref dirty mode repo_path
   repo_path=$(git rev-parse --git-dir 2>/dev/null)
 

From b1da3bbc6f5e26cd0b06cd858e696d4f47f340d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Mon, 6 Jul 2015 22:00:53 +0200
Subject: [PATCH 1158/1378] Adding ability to add JIRA_PREFIX as an env
 variable (e.g. in .zshrc) and minor refactor to bash curly variable braces

---
 plugins/jira/jira.plugin.zsh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index ca540c84c..a22e19363 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -1,6 +1,7 @@
 # To use: add a .jira-url file in the base of your project
 #         You can also set JIRA_URL in your .zshrc or put .jira-url in your home directory
-#         .jira-url in the current directory takes precedence
+#         .jira-url in the current directory takes precedence. The same goes with .jira-prefix
+#         and JIRA_PREFIX.
 #
 # If you use Rapid Board, set:
 #JIRA_RAPID_BOARD="true"
@@ -22,8 +23,8 @@ open_jira_issue () {
     jira_url=$(cat .jira-url)
   elif [ -f ~/.jira-url ]; then
     jira_url=$(cat ~/.jira-url)
-  elif [[ "x$JIRA_URL" != "x" ]]; then
-    jira_url=$JIRA_URL
+  elif [[ "${JIRA_URL}" != "" ]]; then
+    jira_url=${JIRA_URL}
   else
     echo "JIRA url is not specified anywhere."
     return 1
@@ -33,6 +34,8 @@ open_jira_issue () {
     jira_prefix=$(cat .jira-prefix)
   elif [ -f ~/.jira-prefix ]; then
     jira_prefix=$(cat ~/.jira-prefix)
+  elif [[ "${JIRA_PREFIX}" != "" ]]; then
+    jira_prefix=${JIRA_PREFIX}
   else
     jira_prefix=""
   fi
@@ -51,7 +54,7 @@ open_jira_issue () {
       echo "Opening issue #$1"
     fi
     
-    if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
+    if [[ "$JIRA_RAPID_BOARD" = "true" ]]; then
       $open_cmd  "$jira_url/issues/$jira_prefix$1$addcomment"
     else
       $open_cmd  "$jira_url/browse/$jira_prefix$1$addcomment"
@@ -61,7 +64,7 @@ open_jira_issue () {
 
 jira_name () {
   if [[ -z "$1" ]]; then
-    if [[ "x${JIRA_NAME}" != "x" ]]; then
+    if [[ "${JIRA_NAME}" != "" ]]; then
       jira_name=${JIRA_NAME}
     else
       echo "JIRA_NAME not specified"

From 19ea867a3a5cc118fd84560275db05354a4aed0b Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Tue, 3 Mar 2015 21:13:46 -0500
Subject: [PATCH 1159/1378] install.sh: use portable printf instead of echo

---
 tools/install.sh | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index c83a6f23d..ff2e3e917 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,52 +1,63 @@
 set -e
 
+BLUE="\033[0;34m"
+GREEN="\033[0;32m"
+YELLOW="\033[0;33m"
+NOCOLOR="\033[0m"
+
 if [ ! -n "$ZSH" ]; then
   ZSH=~/.oh-my-zsh
 fi
 
 if [ -d "$ZSH" ]; then
-  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
+  printf "${YELLOW}You already have Oh My Zsh installed.${NOCOLOR} You'll need to remove $ZSH if you want to install\n"
   exit
 fi
 
-echo "\033[0;34mCloning Oh My Zsh...\033[0m"
+printf "${BLUE}Cloning Oh My Zsh...${NOCOLOR}\n"
 hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
-  echo "git not installed"
+  printf "git not installed\n"
   exit
 }
 
-echo "\033[0;34mLooking for an existing zsh config...\033[0m"
+printf "${BLUE}Looking for an existing zsh config...${NOCOLOR}\n"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
-  echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
+  printf "${YELLOW}Found ~/.zshrc.${NOCOLOR} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NOCOLOR}\n";
   mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
 fi
 
-echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
+printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NOCOLOR}\n"
 cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
 sed -i -e "/^export ZSH=/ c\\
 export ZSH=$ZSH
 " ~/.zshrc
 
-echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
+printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NOCOLOR}\n"
 sed -i -e "/export PATH=/ c\\
 export PATH=\"$PATH\"
 " ~/.zshrc
 
 TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
 if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
-    echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
+    printf "${BLUE}Time to change your default shell to zsh!${NOCOLOR}\n"
     chsh -s $(grep /zsh$ /etc/shells | tail -1)
 fi
 unset TEST_CURRENT_SHELL
 
-echo "\033[0;32m"'         __                                     __   '"\033[0m"
-echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
-echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
-echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
-echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
-echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
-echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
-echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
-echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
+printf "${GREEN}"
+echo '         __                                     __   '
+echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
+echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+echo '                        /____/                       ....is now installed!'
+echo ''
+echo ''
+echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
+echo ''
+echo 'p.s. Follow us at http://twitter.com/ohmyzsh.'
+echo ''
+echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
+echo ''
+printf "${NOCOLOR}"
 env zsh
-. ~/.zshrc

From 8cf610089d97cf1abbd5cf3e0fb28d63b4c25f51 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 6 Jul 2015 20:18:32 -0400
Subject: [PATCH 1160/1378] installer: use terminfo for portable escape
 sequences Do not use terminal visual effects if not connected to a terminal.

---
 tools/install.sh | 39 +++++++++++++++++++++++++++------------
 tools/upgrade.sh | 43 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index ff2e3e917..8ff1219b0 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,45 +1,60 @@
 set -e
 
-BLUE="\033[0;34m"
-GREEN="\033[0;32m"
-YELLOW="\033[0;33m"
-NOCOLOR="\033[0m"
+# Use colors, but only if connected to a terminal, and that terminal
+# supports them.
+ncolors=$(tput colors)
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+  RED=="$(tput setaf 1)"
+  GREEN="$(tput setaf 2)"
+  YELLOW="$(tput setaf 3)"
+  BLUE="$(tput setaf 4)"
+  BOLD="$(tput bold)"
+  NORMAL="$(tput sgr0)"
+else
+  RED=""
+  GREEN=""
+  YELLOW=""
+  BLUE=""
+  BOLD=""
+  NORMAL=""
+fi
 
 if [ ! -n "$ZSH" ]; then
   ZSH=~/.oh-my-zsh
 fi
 
 if [ -d "$ZSH" ]; then
-  printf "${YELLOW}You already have Oh My Zsh installed.${NOCOLOR} You'll need to remove $ZSH if you want to install\n"
+  printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n"
+  printf "You'll need to remove $ZSH if you want to re-install.\n"
   exit
 fi
 
-printf "${BLUE}Cloning Oh My Zsh...${NOCOLOR}\n"
+printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
 hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   printf "git not installed\n"
   exit
 }
 
-printf "${BLUE}Looking for an existing zsh config...${NOCOLOR}\n"
+printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
-  printf "${YELLOW}Found ~/.zshrc.${NOCOLOR} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NOCOLOR}\n";
+  printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
   mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
 fi
 
-printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NOCOLOR}\n"
+printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
 cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
 sed -i -e "/^export ZSH=/ c\\
 export ZSH=$ZSH
 " ~/.zshrc
 
-printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NOCOLOR}\n"
+printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
 sed -i -e "/export PATH=/ c\\
 export PATH=\"$PATH\"
 " ~/.zshrc
 
 TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
 if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
-    printf "${BLUE}Time to change your default shell to zsh!${NOCOLOR}\n"
+    printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n"
     chsh -s $(grep /zsh$ /etc/shells | tail -1)
 fi
 unset TEST_CURRENT_SHELL
@@ -59,5 +74,5 @@ echo 'p.s. Follow us at http://twitter.com/ohmyzsh.'
 echo ''
 echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
 echo ''
-printf "${NOCOLOR}"
+printf "${NORMAL}"
 env zsh
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 5f0a81f1d..4929054c9 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,16 +1,37 @@
-printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
+
+# Use colors, but only if connected to a terminal, and that terminal
+# supports them.
+ncolors=$(tput colors)
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+  RED=="$(tput setaf 1)"
+  GREEN="$(tput setaf 2)"
+  YELLOW="$(tput setaf 3)"
+  BLUE="$(tput setaf 4)"
+  BOLD="$(tput bold)"
+  NORMAL="$(tput sgr0)"
+else
+  RED=""
+  GREEN=""
+  YELLOW=""
+  BLUE=""
+  BOLD=""
+  NORMAL=""
+fi
+
+printf "${BLUE}%s${NORMAL}\n" "Upgrading Oh My Zsh"
 cd "$ZSH"
 if git pull --rebase --stat origin master
 then
-  printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
-  printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
-  printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
-  printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
-  printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
-  printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
-  printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
-  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest news and updates, follow us on twitter: ' 'http://twitter.com/ohmyzsh'
-  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'Get your Oh My Zsh swag at: ' 'http://shop.planetargon.com/'
+  printf '%s' "$GREEN"
+  printf '%s\n' '         __                                     __   '
+  printf '%s\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
+  printf '%s\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+  printf '%s\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+  printf '%s\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+  printf '%s\n' '                        /____/                       '
+  printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
+  printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: http://twitter.com/ohmyzsh"
+  printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at:  http://shop.planetargon.com/"
 else
-  printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
+  printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
 fi

From dff03743efa3f49f4ba4b1214d97f9746bb1a0d4 Mon Sep 17 00:00:00 2001
From: Mohnish Jadwani <mail4mohnish@gmail.com>
Date: Tue, 7 Jul 2015 09:47:49 +0530
Subject: [PATCH 1161/1378] adds an alias to search for the rails routes that
 pattern match a string

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 6824836fc..097578e23 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -58,6 +58,7 @@ alias rdmtc='rake db:migrate db:test:clone'
 alias rlc='rake log:clear'
 alias rn='rake notes'
 alias rr='rake routes'
+alias rrg='rake routes | grep '
 
 # legacy stuff
 alias sstat='thin --stats "/thin/stats" start'

From 750de22972bfa38003d38ce3a13f46bd7e41807d Mon Sep 17 00:00:00 2001
From: Headless <skv-headless@yandex.ru>
Date: Tue, 7 Jul 2015 15:44:35 +0300
Subject: [PATCH 1162/1378] rails rake test

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 6824836fc..4c250369b 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -58,6 +58,7 @@ alias rdmtc='rake db:migrate db:test:clone'
 alias rlc='rake log:clear'
 alias rn='rake notes'
 alias rr='rake routes'
+alias rt='rake test'
 
 # legacy stuff
 alias sstat='thin --stats "/thin/stats" start'

From 88a30a3e2f3089556fe40c719f4cbed8426a144e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Tue, 7 Jul 2015 18:50:23 +0200
Subject: [PATCH 1163/1378] Changing string comparison for more zsh-like

---
 plugins/jira/jira.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index a22e19363..042fcd7a4 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -54,7 +54,7 @@ open_jira_issue () {
       echo "Opening issue #$1"
     fi
     
-    if [[ "$JIRA_RAPID_BOARD" = "true" ]]; then
+    if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
       $open_cmd  "$jira_url/issues/$jira_prefix$1$addcomment"
     else
       $open_cmd  "$jira_url/browse/$jira_prefix$1$addcomment"

From 1e99168627eef4c61114cb0572047473b7cb56be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Tue, 7 Jul 2015 19:56:22 +0200
Subject: [PATCH 1164/1378] Changing indents to be more consistent (2 spaces)

---
 plugins/jira/jira.plugin.zsh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 042fcd7a4..769bf2367 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -76,24 +76,24 @@ jira_name () {
 }
 
 jira_query () {
-    verb="$1"
-    if [[ "${verb}" = "reported" ]]; then
-      lookup=reporter
-      preposition=by
-    elif [[ "${verb}" = "assigned" ]]; then
-      lookup=assignee
-      preposition=to
-    else
-      echo "not a valid lookup $verb"
-      return 1
-    fi
-    shift 1
-    jira_name $@
-    if [[ $? = 1 ]]; then
-        return 1
-    fi
-    echo "Browsing issues ${verb} ${preposition} ${jira_name}"
-    $open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
+  verb="$1"
+  if [[ "${verb}" = "reported" ]]; then
+    lookup=reporter
+    preposition=by
+  elif [[ "${verb}" = "assigned" ]]; then
+    lookup=assignee
+    preposition=to
+  else
+    echo "not a valid lookup $verb"
+    return 1
+  fi
+  shift 1
+  jira_name $@
+  if [[ $? = 1 ]]; then
+    return 1
+  fi
+  echo "Browsing issues ${verb} ${preposition} ${jira_name}"
+  $open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
 }
 
 alias jira='open_jira_issue'

From 37f45eb621b04a1286ac1667b7474111e6e0b4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Tue, 7 Jul 2015 20:03:58 +0200
Subject: [PATCH 1165/1378] Making variables local in jira plugin

---
 plugins/jira/jira.plugin.zsh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 769bf2367..7839e2a80 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -19,6 +19,7 @@ open_jira_issue () {
     open_cmd='xdg-open'
   fi
 
+  local jira_url
   if [ -f .jira-url ]; then
     jira_url=$(cat .jira-url)
   elif [ -f ~/.jira-url ]; then
@@ -30,6 +31,7 @@ open_jira_issue () {
     return 1
   fi
 
+  local jira_prefix
   if [ -f .jira-prefix ]; then
     jira_prefix=$(cat .jira-prefix)
   elif [ -f ~/.jira-prefix ]; then
@@ -45,7 +47,7 @@ open_jira_issue () {
     $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
     jira_query $@
-  else 
+  else
     local addcomment=''
     if [[ "$2" == "m" ]]; then
       addcomment="#add-comment"
@@ -53,11 +55,11 @@ open_jira_issue () {
     else
       echo "Opening issue #$1"
     fi
-    
+
     if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-      $open_cmd  "$jira_url/issues/$jira_prefix$1$addcomment"
+      $open_cmd "$jira_url/issues/$jira_prefix$1$addcomment"
     else
-      $open_cmd  "$jira_url/browse/$jira_prefix$1$addcomment"
+      $open_cmd "$jira_url/browse/$jira_prefix$1$addcomment"
     fi
   fi
 }
@@ -76,7 +78,11 @@ jira_name () {
 }
 
 jira_query () {
+  local jira_name
+  local verb
   verb="$1"
+  local lookup
+  local preposition
   if [[ "${verb}" = "reported" ]]; then
     lookup=reporter
     preposition=by

From b1772c5333fcc43610ade75384d9cf87c8ccde61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Tue, 7 Jul 2015 20:07:13 +0200
Subject: [PATCH 1166/1378] More consistent curly braces variables

---
 plugins/jira/jira.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 7839e2a80..566e1f1f4 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -57,9 +57,9 @@ open_jira_issue () {
     fi
 
     if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-      $open_cmd "$jira_url/issues/$jira_prefix$1$addcomment"
+      $open_cmd "${jira_url}/issues/${jira_prefix}${1}${addcomment}"
     else
-      $open_cmd "$jira_url/browse/$jira_prefix$1$addcomment"
+      $open_cmd "${jira_url}/browse/${jira_prefix}${1}${addcomment}"
     fi
   fi
 }

From ad4675cb0a8f732abef7b9a2b3df2141afbf79aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Tue, 7 Jul 2015 20:26:00 +0200
Subject: [PATCH 1167/1378] Concise local variables declarations

---
 plugins/jira/jira.plugin.zsh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 566e1f1f4..22984549b 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -78,11 +78,8 @@ jira_name () {
 }
 
 jira_query () {
-  local jira_name
-  local verb
-  verb="$1"
-  local lookup
-  local preposition
+  local verb="$1"
+  local jira_name lookup preposition
   if [[ "${verb}" = "reported" ]]; then
     lookup=reporter
     preposition=by

From 1e8196de8289a69268a9631ddf4d3b3519ade5c1 Mon Sep 17 00:00:00 2001
From: Takumi IINO <trot.thunder@gmail.com>
Date: Wed, 8 Jul 2015 11:16:44 +0900
Subject: [PATCH 1168/1378] passing the first argument with double quote

---
 plugins/coffee/coffee.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh
index 1a7bedd87..4e98e0228 100644
--- a/plugins/coffee/coffee.plugin.zsh
+++ b/plugins/coffee/coffee.plugin.zsh
@@ -2,11 +2,11 @@
 
 # compile a string of coffeescript and print to output
 cf () {
-  coffee -peb $1
+  coffee -peb "$1"
 }
 # compile & copy to clipboard
 cfc () {
-  cf $1 | pbcopy
+  cf "$1" | pbcopy
 }
 
 # compile from pasteboard & print

From bca720fa9549f7fe4687acd1aaf91720428657e9 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 9 Jul 2015 20:50:57 -0400
Subject: [PATCH 1169/1378] diagnostics: include detailed OS version info if
 possible

---
 lib/diagnostics.zsh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index f5f15deaa..53c6548de 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -55,6 +55,8 @@
 function omz_diagnostic_dump() {
   emulate -L zsh
 
+  builtin echo "Generating diagnostic dump; please be patient..."
+  
   local thisfcn=omz_diagnostic_dump
   local -A opts
   local opt_verbose opt_noverbose opt_outfile
@@ -108,6 +110,8 @@ function _omz_diag_dump_one_big_text() {
   builtin echo User: $USER
   builtin echo umask: $(umask)
   builtin echo
+  _omz_diag_dump_os_specific_version
+  builtin echo
 
   # Installed programs
   programs=(sh zsh ksh bash sed cat grep ls find git posh)
@@ -299,4 +303,28 @@ function _omz_diag_dump_echo_file_w_header() {
   fi
 }
 
+function _omz_diag_dump_os_specific_version() {
+  local osname osver version_file version_files
+  case "$OSTYPE" in
+    darwin*)
+      osname=$(command sw_vers -productName)
+      osver=$(command sw_vers -productVersion)      
+      builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
+      ;;
+    cygwin)
+      command systeminfo | command grep "^OS Name\|^OS Version"
+      ;;
+  esac
+
+  if builtin which lsb_release >/dev/null; then
+    builtin echo "OS Release: $(command lsb_release -s -d)"
+  fi
+
+  version_files=( /etc/*-release(N) /etc/*-version(N) /etc/*_version(N) )
+  for version_file in $version_files; do
+    builtin echo "$version_file:"
+    command cat "$version_file"
+    builtin echo
+  done
+}
 

From ffe8e5465cdf6b9c1bad34df3f826f34cfbb59f8 Mon Sep 17 00:00:00 2001
From: Paul Robertson <t.paulrobertson@gmail.com>
Date: Thu, 9 Jul 2015 23:40:35 -0400
Subject: [PATCH 1170/1378] add '--help' to heroku commands

---
 plugins/heroku/_heroku | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index bb2f7403f..fd72e530e 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -143,5 +143,6 @@ _arguments \
   $_command_args \
   '(--app)--app[the app name]' \
   '(--remote)--remote[the remote name]' \
+  '(--help)--help[help about the current command]' \
   &&  return 0
 

From b7617b35ffd56243fa6d310886d8effe9f27bfc1 Mon Sep 17 00:00:00 2001
From: Jonathan Cremin <jonathan@crem.in>
Date: Fri, 10 Jul 2015 14:03:55 +0100
Subject: [PATCH 1171/1378] Check for autoenv_init function before trying to
 source autoenv.

---
 plugins/autoenv/autoenv.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index a8271849e..edc16a4ca 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,7 +1,7 @@
 # Activates autoenv or reports its failure
-if ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
+if ! type autoenv_init &>/dev/null && ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
   echo '-------- AUTOENV ---------'
-  echo 'Could not find ~/.autoenv/activate.sh.'
+  echo 'Could not find autoenv_init function or ~/.autoenv/activate.sh.'
   echo 'Please check if autoenv is correctly installed.'
   echo 'In the meantime the autoenv plugin is DISABLED.'
   echo '--------------------------'

From 775ac3ad9fefd524f217dedaf09f7fb40a18b6ee Mon Sep 17 00:00:00 2001
From: Bin Huang <huangbin88@foxmail.com>
Date: Sat, 11 Jul 2015 09:32:05 +0800
Subject: [PATCH 1172/1378] The executable command on Mac OSX is 'ack' rather
 than 'ack-grep'.

---
 lib/misc.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 6d1a64e8d..9d458ab28 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -18,7 +18,12 @@ alias _='sudo'
 alias please='sudo'
 
 ## more intelligent acking for ubuntu users
-alias afind='ack-grep -il'
+if which ack-grep > /dev/null;
+then
+  alias afind='ack-grep -il'
+else
+  alias afind='ack -il'
+fi
 
 # only define LC_CTYPE if undefined
 if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then

From dcb175d4309a41723ebeb561a8089115d9e7126b Mon Sep 17 00:00:00 2001
From: leycec <leycec@gmail.com>
Date: Sat, 11 Jul 2015 01:20:23 -0400
Subject: [PATCH 1173/1378] Insecure completion handler added.

A new "lib/compfix.zsh" script defining a new handle_completion_insecurities()
function has been added, which handles insecure completion directories by
notifying users of said insecurities and moving away all existing completion
caches to a temporary directory. While intended to be called at startup, this
function is generally callable at any time (e.g., for testing).
---
 lib/compfix.zsh | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 lib/compfix.zsh

diff --git a/lib/compfix.zsh b/lib/compfix.zsh
new file mode 100644
index 000000000..208aaadb1
--- /dev/null
+++ b/lib/compfix.zsh
@@ -0,0 +1,60 @@
+# Handle completions insecurities (i.e., completion-dependent directories with
+# insecure ownership or permissions) by:
+#
+# * Human-readably notifying the user of these insecurities.
+# * Moving away all existing completion caches to a temporary directory. Since
+#   any of these caches may have been generated from insecure directories, they
+#   are all suspect now. Failing to do so typically causes subsequent compinit()
+#   calls to fail with "command not found: compdef" errors. (That's bad.)
+function handle_completion_insecurities() {
+  # List of the absolute paths of all unique insecure directories, split on
+  # newline from compaudit()'s output resembling:
+  #
+  #     There are insecure directories:
+  #     /usr/share/zsh/site-functions
+  #     /usr/share/zsh/5.0.6/functions
+  #     /usr/share/zsh
+  #     /usr/share/zsh/5.0.6
+  #
+  # Since the ignorable first line is printed to stderr and thus not captured,
+  # stderr is squelched to prevent this output from leaking to the user. 
+  local -aU insecure_dirs
+  insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} )
+
+  # If no such directories exist, get us out of here.
+  if (( ! ${#insecure_dirs} )); then
+      print "[oh-my-zsh] No insecure completion-dependent directories detected."
+      return
+  fi
+
+  # List ownership and permissions of all insecure directories.
+  print "[oh-my-zsh] Insecure completion-dependent directories detected:"
+  ls -ld "${(@)insecure_dirs}"
+  print "[oh-my-zsh] For safety, completions will be disabled until you manually fix all"
+  print "[oh-my-zsh] insecure directory permissions and ownership and restart oh-my-zsh."
+  print "[oh-my-zsh] See the above list for directories with group or other writability.\n"
+
+  # Locally enable the "NULL_GLOB" option, thus removing unmatched filename
+  # globs from argument lists *AND* printing no warning when doing so. Failing
+  # to do so prints an unreadable warning if no completion caches exist below.
+  setopt local_options null_glob
+
+  # List of the absolute paths of all unique existing completion caches.
+  local -aU zcompdump_files
+  zcompdump_files=( "${ZSH_COMPDUMP}"(.) "${ZDOTDIR:-${HOME}}"/.zcompdump* )
+
+  # Move such caches to a temporary directory.
+  if (( ${#zcompdump_files} )); then
+    # Absolute path of the directory to which such files will be moved.
+    local ZSH_ZCOMPDUMP_BAD_DIR="${ZSH_CACHE_DIR}/zcompdump-bad"
+
+    # List such files first.
+    print "[oh-my-zsh] Insecure completion caches also detected:"
+    ls -l "${(@)zcompdump_files}"
+
+    # For safety, move rather than permanently remove such files.
+    print "[oh-my-zsh] Moving to \"${ZSH_ZCOMPDUMP_BAD_DIR}/\"...\n"
+    mkdir -p "${ZSH_ZCOMPDUMP_BAD_DIR}"
+    mv "${(@)zcompdump_files}" "${ZSH_ZCOMPDUMP_BAD_DIR}/"
+  fi
+}

From ff8d799594d0fd127058455b194b27d00a323d68 Mon Sep 17 00:00:00 2001
From: Fabio Strozzi <fabio.strozzi@gmail.com>
Date: Sun, 12 Jul 2015 17:01:34 +0200
Subject: [PATCH 1174/1378] Esc-esc now toggles sudo.

Press esc-esc once to add sudo (normal behaviour), press it twice
to remove it from the beginning of the line.
---
 plugins/sudo/sudo.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index e3ba39918..0ba8bed5b 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -14,7 +14,11 @@
 
 sudo-command-line() {
     [[ -z $BUFFER ]] && zle up-history
-    [[ $BUFFER != sudo\ * ]] && LBUFFER="sudo $LBUFFER"
+    if [[ $BUFFER == sudo\ * ]]; then
+        LBUFFER="${LBUFFER#sudo }"
+    else
+        LBUFFER="sudo $LBUFFER"
+    fi
 }
 zle -N sudo-command-line
 # Defined shortcut keys: [Esc] [Esc]

From 46d13384db11634257aa803fc1e05f1ac6e10a1b Mon Sep 17 00:00:00 2001
From: Hongxin Liang <hxliang1982@gmail.com>
Date: Mon, 13 Jul 2015 18:43:00 +0200
Subject: [PATCH 1175/1378] [theme] Fix color problem of steeef theme

steeef theme sets colors depending on $TERM, however if %F is
used, it must be closed by %f instead of %{$reset_color%}.

Further on, all %f directives have been replaced by %F and color
support of current TERM is checked more properly.
---
 themes/steeef.zsh-theme | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 13728ca9a..13dc3ad2f 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -10,7 +10,7 @@
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
 function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('$fg[blue]`basename $VIRTUAL_ENV`%{$reset_color%}') '
+    [ $VIRTUAL_ENV ] && echo '('%F{blue}`basename $VIRTUAL_ENV`%f') '
 }
 PR_GIT_UPDATE=1
 
@@ -20,18 +20,18 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
+if [[ $terminfo[colors] -ge 256 ]]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"
     hotpink="%F{161}"
     limegreen="%F{118}"
 else
-    turquoise="$fg[cyan]"
-    orange="$fg[yellow]"
-    purple="$fg[magenta]"
-    hotpink="$fg[red]"
-    limegreen="$fg[green]"
+    turquoise="%F{cyan}"
+    orange="%F{yellow}"
+    purple="%F{magenta}"
+    hotpink="%F{red}"
+    limegreen="%F{green}"
 fi
 
 # enable VCS systems you use
@@ -48,7 +48,7 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 # %a - action (e.g. rebase-i)
 # %R - repository path
 # %S - path in the repository
-PR_RST="%{${reset_color}%}"
+PR_RST="%f"
 FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
 FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
 FMT_UNSTAGED="%{$orange%}●"
@@ -96,5 +96,5 @@ function steeef_precmd {
 add-zsh-hook precmd steeef_precmd
 
 PROMPT=$'
-%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_$(virtualenv_info)%{$reset_color%}
+%{$purple%}%n${PR_RST} at %{$orange%}%m${PR_RST} in %{$limegreen%}%~${PR_RST} $vcs_info_msg_0_$(virtualenv_info)
 $ '

From afa30572f522969e07b0f85f0cf0fe0e32dd8831 Mon Sep 17 00:00:00 2001
From: Andrew Stuart <andrew.stuart2@gmail.com>
Date: Mon, 13 Jul 2015 13:08:18 -0700
Subject: [PATCH 1176/1378] Add jira_url_help

---
 plugins/jira/jira.plugin.zsh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index ca540c84c..f624648ae 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -25,7 +25,7 @@ open_jira_issue () {
   elif [[ "x$JIRA_URL" != "x" ]]; then
     jira_url=$JIRA_URL
   else
-    echo "JIRA url is not specified anywhere."
+    jira_url_help
     return 1
   fi
 
@@ -59,6 +59,16 @@ open_jira_issue () {
   fi
 }
 
+jira_url_help() {
+  cat << EOF
+JIRA url is not specified anywhere.
+Valid options, in order of preference:
+  .jira-url file
+  $HOME/.jira-url file
+  JIRA_URL environment variable
+EOF
+}
+
 jira_name () {
   if [[ -z "$1" ]]; then
     if [[ "x${JIRA_NAME}" != "x" ]]; then

From 6d618ef70e5abfc5e18656ba8064ead0c8974386 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Wed, 15 Jul 2015 02:56:48 -0400
Subject: [PATCH 1177/1378] emoji plugin: generate char map from Unicode UTR51
 data files

Refactor the functions and group listings to have fewer functions,
but have them take group names as parameters.
Pull group definitions in to a single associative array.
---
 plugins/emoji/README.md                  |  135 +++
 plugins/emoji/emoji-char-definitions.zsh | 1294 +++++++++++++++++++++
 plugins/emoji/emoji-data.txt             | 1308 ++++++++++++++++++++++
 plugins/emoji/emoji.plugin.zsh           | 1096 +++---------------
 plugins/emoji/update_emoji.pl            |  113 ++
 5 files changed, 3026 insertions(+), 920 deletions(-)
 create mode 100644 plugins/emoji/README.md
 create mode 100644 plugins/emoji/emoji-char-definitions.zsh
 create mode 100644 plugins/emoji/emoji-data.txt
 create mode 100644 plugins/emoji/update_emoji.pl

diff --git a/plugins/emoji/README.md b/plugins/emoji/README.md
new file mode 100644
index 000000000..889e567e6
--- /dev/null
+++ b/plugins/emoji/README.md
@@ -0,0 +1,135 @@
+# emoji plugin
+
+Support for conveniently working with Unicode emoji in Zsh.
+
+## Features
+
+This plugin provides support for working with Unicode emoji characters in `zsh` using human-readable identifiers. It provides global variables which map emoji names to the actual characters, country names to their flags, and some named groupings of emoji. It also provides associated functions for displaying them.
+
+#### Variables
+
+Variable          | Description
+----------------- | --------------------------------
+  $emoji          | Maps emoji names to characters
+  $emoji_flags    | Maps country names to flag characters (using region indicators)
+  $emoji_groups   | Named groups of emoji. Keys are group names; values are whitespace-separated lists of character names
+
+You may define new emoji groups at run time by modifying `$emoji_groups`. The special group name `all` is reserved for use by the plugin. You should not modify `$emoji` or `$emoji_flags`.
+
+#### Functions
+
+Function         | Description
+---------------- | -------------------------------
+  random_emoji   | Prints a random emoji character
+  display_emoji  | Displays emoji, along with their names
+
+## Usage and Examples
+
+To output a specific emoji, use:
+```
+$> echo $emoji[<name>]
+```
+E.g.:
+```
+$> echo $emoji[mouse_face]
+```
+
+To output a random emoji, use:
+```
+$> random_emoji
+```
+To output a random emoji from a particular group, use:
+```
+$> random_emoji <group>
+```
+E.g.:
+```
+$> random_emoji fruits
+$> random_emoji animals
+$> random_emoji vehicles
+$> random_emoji faces
+```
+
+The defined group names can be found with `echo ${(k)emoji_groups}`.
+
+To list all available emoji with their names, use:
+```
+$> display_emoji
+$> display_emoji fruits
+$> display_emoji animals
+$> display_emoji vehicles
+$> display_emoji faces
+```
+
+To use emoji in a prompt:
+```
+PROMPT="$emoji[penguin]  > ""
+PROMPT='$(random_emoji fruits)  > '
+surfer=$emoji[surfer]
+PROMPT="$surfer  > "
+```
+
+##  Technical Details
+
+The emoji names and codes are sourced from Unicode Technical Report \#51, which provides information on emoji support in Unicode. It can be found at http://www.unicode.org/reports/tr51/index.html.
+
+The group definitions are added by this OMZ plugin. They are not based on external definitions. (As far as I can tell. -apjanke)
+
+The values in the `$emoji*` maps are the emoji characters themselves, not escape sequences or other forms that require interpretation. They can be used in any context and do not require escape sequence support from commands like `echo` or `print`.
+
+The emoji in the main `$emoji` map are standalone character sequences which can all be output on their own, without worrying about combining characters. The values may actually be multi-code-point sequences, instead of a single code point, and may include combining characters in those sequences. But they're arranged so their effects do not extend beyond that sequence.
+
+The exception to this is the skin tone variation selectors. These are included in the main `$emoji` map because they can be displayed on their own, as well as used as combining characters. (If they follow a character that is not one of the emoji characters they combine with, they are displayed as color swatches.)
+
+
+##  Experimental Features
+
+This defines some additional variables and functions, but these are experimental and subject to change at any time. You shouldn't rely on them being available. They're mostly for the use of emoji plugin developers to help decide what to include in future revisions.
+
+Variables:
+
+Variable          | Description
+----------------- | --------------------------------
+  $emoji2         | Auxiliary and combining characters
+  $emoji_skintone | Skin tone modifiers (from Unicode 8.0)
+
+
+#### Skin Tone Variation Selection
+
+This includes experimental support for the skin tone Variation Selectors introduced with Unicode 8.0, which let you select different skin tones for emoji involving humans.
+
+NOTE: This really is experimental. The skin tone selectors are a relatively new feature and may not be supported by all systems. And the support in this plugin is a work in progress. It may not work in all places. In fact, I haven't gotten it to work anywhere yet. -apjanke
+
+The "variation selectors" are combining characters which change the appearance of the preceding character. A variation selector character can be output immediately following a human emoji to change its skin tone color. You can also output a variation selector on its own to display a color swatch of that skin tone.
+
+The `$emoji_skintone` associative array maps skin tone IDs to the variation selector characters. To use one, output it immediately following a smiley or other human emoji.
+
+```
+echo "$emoji[smiling_face_with_open_mouth]$emoji_skintone[4]"
+```
+
+Note that `$emoji_skintone` is an associative array, and its keys are the *names* of "Fitzpatrick Skin Type" groups, not linear indexes into a normal array. The names are `1_2`, `3`, `4`, `5`, and `6`. (Types 1 and 2 are combined into a single color.) See the [Diversity section in Unicode TR 51](http://www.unicode.org/reports/tr51/index.html#Diversity) for details.
+
+##  TODO
+
+These are things that could be enhanced in future revisions of the plugin.
+
+* Incorporate CLDR data for ordering and groupings
+* Short :bracket: style names (from gemoji)
+* Incorporate `gemoji` data
+* Country codes for flags
+* ZWJ combining function?
+
+####  Gemoji support
+
+The [gemoji project](https://github.com/github/gemoji) seems to be the de facto main source for short names and other emoji-related metadata that isn't included in the official Unicode reports. (I'm saying this just from looking at the google results for "emoji short names" and related searches. -apjanke)
+
+If this plugin is updated to provide short names, CLDR sorting data, and similar stuff, it should probably be changed to use the Gemoji project, and the `update_emoji.pl` script be rewritten in Ruby so it can use the Gemoji library directly instead of parsing its data files.
+
+This does *not* mean that it should use Gemoji at run time. None of the `zsh` plugin stuff should call Gemoji or Ruby code. Rather, the "build time" `update_emoji.pl` script should be rewritten to use Gemoji to generate a pure-native-`zsh` character definition file which would be checked in to the repo and can be called by OMZ users without having Gemoji installed.
+
+####  ZWJ combining function
+
+One of the newer features of Unicode emoji is the ability to use the "Zero-Width Joiner" character to compose multiple emoji characters in to a single "emoji ligature" glyph. For example, this is [how Apple supports "family" emoji with various genders and skin tones](http://www.unicode.org/reports/tr51/index.html#ZWJ_Sequences).
+
+These are a pain to write out (and probably worse to read), and it might be convenient to have a couple functions for concisely composing them, if wider support for them appears.
diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh
new file mode 100644
index 000000000..7d110603c
--- /dev/null
+++ b/plugins/emoji/emoji-char-definitions.zsh
@@ -0,0 +1,1294 @@
+
+# emoji-char-definitions.zsh - Emoji character definitions for oh-my-zsh emoji plugin
+#
+# This file is auto-generated by update_emoji.pl. Do not edit it manually.
+#
+# This contains the definition for:
+#   $emoji         - which maps character names to Unicode characters
+#   $emoji_flags   - maps country names to Unicode flag characters using region indicators 
+
+typeset -gAH emoji
+typeset -gAH emoji_flags
+
+emoji[copyright_sign]=$'\U00A9'
+emoji[registered_sign]=$'\U00AE'
+emoji[double_exclamation_mark]=$'\U203C'
+emoji[exclamation_question_mark]=$'\U2049'
+emoji[trade_mark_sign]=$'\U2122'
+emoji[information_source]=$'\U2139'
+emoji[left_right_arrow]=$'\U2194'
+emoji[up_down_arrow]=$'\U2195'
+emoji[north_west_arrow]=$'\U2196'
+emoji[north_east_arrow]=$'\U2197'
+emoji[south_east_arrow]=$'\U2198'
+emoji[south_west_arrow]=$'\U2199'
+emoji[leftwards_arrow_with_hook]=$'\U21A9'
+emoji[rightwards_arrow_with_hook]=$'\U21AA'
+emoji[watch]=$'\U231A'
+emoji[hourglass]=$'\U231B'
+emoji[keyboard]=$'\U2328'
+emoji[eject_symbol]=$'\U23CF'
+emoji[black_right_pointing_double_triangle]=$'\U23E9'
+emoji[black_left_pointing_double_triangle]=$'\U23EA'
+emoji[black_up_pointing_double_triangle]=$'\U23EB'
+emoji[black_down_pointing_double_triangle]=$'\U23EC'
+emoji[black_right_pointing_double_triangle_with_vertical_bar]=$'\U23ED'
+emoji[black_left_pointing_double_triangle_with_vertical_bar]=$'\U23EE'
+emoji[black_right_pointing_triangle_with_double_vertical_bar]=$'\U23EF'
+emoji[alarm_clock]=$'\U23F0'
+emoji[stopwatch]=$'\U23F1'
+emoji[timer_clock]=$'\U23F2'
+emoji[hourglass_with_flowing_sand]=$'\U23F3'
+emoji[double_vertical_bar]=$'\U23F8'
+emoji[black_square_for_stop]=$'\U23F9'
+emoji[black_circle_for_record]=$'\U23FA'
+emoji[circled_latin_capital_letter_m]=$'\U24C2'
+emoji[black_small_square]=$'\U25AA'
+emoji[white_small_square]=$'\U25AB'
+emoji[black_right_pointing_triangle]=$'\U25B6'
+emoji[black_left_pointing_triangle]=$'\U25C0'
+emoji[white_medium_square]=$'\U25FB'
+emoji[black_medium_square]=$'\U25FC'
+emoji[white_medium_small_square]=$'\U25FD'
+emoji[black_medium_small_square]=$'\U25FE'
+emoji[black_sun_with_rays]=$'\U2600'
+emoji[cloud]=$'\U2601'
+emoji[umbrella]=$'\U2602'
+emoji[snowman]=$'\U2603'
+emoji[comet]=$'\U2604'
+emoji[black_telephone]=$'\U260E'
+emoji[ballot_box_with_check]=$'\U2611'
+emoji[umbrella_with_rain_drops]=$'\U2614'
+emoji[hot_beverage]=$'\U2615'
+emoji[shamrock]=$'\U2618'
+emoji[white_up_pointing_index]=$'\U261D'
+emoji[skull_and_crossbones]=$'\U2620'
+emoji[radioactive_sign]=$'\U2622'
+emoji[biohazard_sign]=$'\U2623'
+emoji[orthodox_cross]=$'\U2626'
+emoji[star_and_crescent]=$'\U262A'
+emoji[peace_symbol]=$'\U262E'
+emoji[yin_yang]=$'\U262F'
+emoji[wheel_of_dharma]=$'\U2638'
+emoji[white_frowning_face]=$'\U2639'
+emoji[white_smiling_face]=$'\U263A'
+emoji[aries]=$'\U2648'
+emoji[taurus]=$'\U2649'
+emoji[gemini]=$'\U264A'
+emoji[cancer]=$'\U264B'
+emoji[leo]=$'\U264C'
+emoji[virgo]=$'\U264D'
+emoji[libra]=$'\U264E'
+emoji[scorpius]=$'\U264F'
+emoji[sagittarius]=$'\U2650'
+emoji[capricorn]=$'\U2651'
+emoji[aquarius]=$'\U2652'
+emoji[pisces]=$'\U2653'
+emoji[black_spade_suit]=$'\U2660'
+emoji[black_club_suit]=$'\U2663'
+emoji[black_heart_suit]=$'\U2665'
+emoji[black_diamond_suit]=$'\U2666'
+emoji[hot_springs]=$'\U2668'
+emoji[black_universal_recycling_symbol]=$'\U267B'
+emoji[wheelchair_symbol]=$'\U267F'
+emoji[hammer_and_pick]=$'\U2692'
+emoji[anchor]=$'\U2693'
+emoji[crossed_swords]=$'\U2694'
+emoji[scales]=$'\U2696'
+emoji[alembic]=$'\U2697'
+emoji[gear]=$'\U2699'
+emoji[atom_symbol]=$'\U269B'
+emoji[fleur_de_lis]=$'\U269C'
+emoji[warning_sign]=$'\U26A0'
+emoji[high_voltage_sign]=$'\U26A1'
+emoji[medium_white_circle]=$'\U26AA'
+emoji[medium_black_circle]=$'\U26AB'
+emoji[coffin]=$'\U26B0'
+emoji[funeral_urn]=$'\U26B1'
+emoji[soccer_ball]=$'\U26BD'
+emoji[baseball]=$'\U26BE'
+emoji[snowman_without_snow]=$'\U26C4'
+emoji[sun_behind_cloud]=$'\U26C5'
+emoji[thunder_cloud_and_rain]=$'\U26C8'
+emoji[ophiuchus]=$'\U26CE'
+emoji[pick]=$'\U26CF'
+emoji[helmet_with_white_cross]=$'\U26D1'
+emoji[chains]=$'\U26D3'
+emoji[no_entry]=$'\U26D4'
+emoji[shinto_shrine]=$'\U26E9'
+emoji[church]=$'\U26EA'
+emoji[mountain]=$'\U26F0'
+emoji[umbrella_on_ground]=$'\U26F1'
+emoji[fountain]=$'\U26F2'
+emoji[flag_in_hole]=$'\U26F3'
+emoji[ferry]=$'\U26F4'
+emoji[sailboat]=$'\U26F5'
+emoji[skier]=$'\U26F7'
+emoji[ice_skate]=$'\U26F8'
+emoji[person_with_ball]=$'\U26F9'
+emoji[tent]=$'\U26FA'
+emoji[fuel_pump]=$'\U26FD'
+emoji[black_scissors]=$'\U2702'
+emoji[white_heavy_check_mark]=$'\U2705'
+emoji[airplane]=$'\U2708'
+emoji[envelope]=$'\U2709'
+emoji[raised_fist]=$'\U270A'
+emoji[raised_hand]=$'\U270B'
+emoji[victory_hand]=$'\U270C'
+emoji[writing_hand]=$'\U270D'
+emoji[pencil]=$'\U270F'
+emoji[black_nib]=$'\U2712'
+emoji[heavy_check_mark]=$'\U2714'
+emoji[heavy_multiplication_x]=$'\U2716'
+emoji[latin_cross]=$'\U271D'
+emoji[star_of_david]=$'\U2721'
+emoji[sparkles]=$'\U2728'
+emoji[eight_spoked_asterisk]=$'\U2733'
+emoji[eight_pointed_black_star]=$'\U2734'
+emoji[snowflake]=$'\U2744'
+emoji[sparkle]=$'\U2747'
+emoji[cross_mark]=$'\U274C'
+emoji[negative_squared_cross_mark]=$'\U274E'
+emoji[black_question_mark_ornament]=$'\U2753'
+emoji[white_question_mark_ornament]=$'\U2754'
+emoji[white_exclamation_mark_ornament]=$'\U2755'
+emoji[heavy_exclamation_mark_symbol]=$'\U2757'
+emoji[heavy_heart_exclamation_mark_ornament]=$'\U2763'
+emoji[heavy_black_heart]=$'\U2764'
+emoji[heavy_plus_sign]=$'\U2795'
+emoji[heavy_minus_sign]=$'\U2796'
+emoji[heavy_division_sign]=$'\U2797'
+emoji[black_rightwards_arrow]=$'\U27A1'
+emoji[curly_loop]=$'\U27B0'
+emoji[double_curly_loop]=$'\U27BF'
+emoji[arrow_pointing_rightwards_then_curving_upwards]=$'\U2934'
+emoji[arrow_pointing_rightwards_then_curving_downwards]=$'\U2935'
+emoji[leftwards_black_arrow]=$'\U2B05'
+emoji[upwards_black_arrow]=$'\U2B06'
+emoji[downwards_black_arrow]=$'\U2B07'
+emoji[black_large_square]=$'\U2B1B'
+emoji[white_large_square]=$'\U2B1C'
+emoji[white_medium_star]=$'\U2B50'
+emoji[heavy_large_circle]=$'\U2B55'
+emoji[wavy_dash]=$'\U3030'
+emoji[part_alternation_mark]=$'\U303D'
+emoji[circled_ideograph_congratulation]=$'\U3297'
+emoji[circled_ideograph_secret]=$'\U3299'
+emoji[mahjong_tile_red_dragon]=$'\U1F004'
+emoji[playing_card_black_joker]=$'\U1F0CF'
+emoji[negative_squared_latin_capital_letter_a]=$'\U1F170'
+emoji[negative_squared_latin_capital_letter_b]=$'\U1F171'
+emoji[negative_squared_latin_capital_letter_o]=$'\U1F17E'
+emoji[negative_squared_latin_capital_letter_p]=$'\U1F17F'
+emoji[negative_squared_ab]=$'\U1F18E'
+emoji[squared_cl]=$'\U1F191'
+emoji[squared_cool]=$'\U1F192'
+emoji[squared_free]=$'\U1F193'
+emoji[squared_id]=$'\U1F194'
+emoji[squared_new]=$'\U1F195'
+emoji[squared_ng]=$'\U1F196'
+emoji[squared_ok]=$'\U1F197'
+emoji[squared_sos]=$'\U1F198'
+emoji[squared_up_with_exclamation_mark]=$'\U1F199'
+emoji[squared_vs]=$'\U1F19A'
+emoji[squared_katakana_koko]=$'\U1F201'
+emoji[squared_katakana_sa]=$'\U1F202'
+emoji[squared_cjk_unified_ideograph_7121]=$'\U1F21A'
+emoji[squared_cjk_unified_ideograph_6307]=$'\U1F22F'
+emoji[squared_cjk_unified_ideograph_7981]=$'\U1F232'
+emoji[squared_cjk_unified_ideograph_7a7a]=$'\U1F233'
+emoji[squared_cjk_unified_ideograph_5408]=$'\U1F234'
+emoji[squared_cjk_unified_ideograph_6e80]=$'\U1F235'
+emoji[squared_cjk_unified_ideograph_6709]=$'\U1F236'
+emoji[squared_cjk_unified_ideograph_6708]=$'\U1F237'
+emoji[squared_cjk_unified_ideograph_7533]=$'\U1F238'
+emoji[squared_cjk_unified_ideograph_5272]=$'\U1F239'
+emoji[squared_cjk_unified_ideograph_55b6]=$'\U1F23A'
+emoji[circled_ideograph_advantage]=$'\U1F250'
+emoji[circled_ideograph_accept]=$'\U1F251'
+emoji[cyclone]=$'\U1F300'
+emoji[foggy]=$'\U1F301'
+emoji[closed_umbrella]=$'\U1F302'
+emoji[night_with_stars]=$'\U1F303'
+emoji[sunrise_over_mountains]=$'\U1F304'
+emoji[sunrise]=$'\U1F305'
+emoji[cityscape_at_dusk]=$'\U1F306'
+emoji[sunset_over_buildings]=$'\U1F307'
+emoji[rainbow]=$'\U1F308'
+emoji[bridge_at_night]=$'\U1F309'
+emoji[water_wave]=$'\U1F30A'
+emoji[volcano]=$'\U1F30B'
+emoji[milky_way]=$'\U1F30C'
+emoji[earth_globe_europe_africa]=$'\U1F30D'
+emoji[earth_globe_americas]=$'\U1F30E'
+emoji[earth_globe_asia_australia]=$'\U1F30F'
+emoji[globe_with_meridians]=$'\U1F310'
+emoji[new_moon_symbol]=$'\U1F311'
+emoji[waxing_crescent_moon_symbol]=$'\U1F312'
+emoji[first_quarter_moon_symbol]=$'\U1F313'
+emoji[waxing_gibbous_moon_symbol]=$'\U1F314'
+emoji[full_moon_symbol]=$'\U1F315'
+emoji[waning_gibbous_moon_symbol]=$'\U1F316'
+emoji[last_quarter_moon_symbol]=$'\U1F317'
+emoji[waning_crescent_moon_symbol]=$'\U1F318'
+emoji[crescent_moon]=$'\U1F319'
+emoji[new_moon_with_face]=$'\U1F31A'
+emoji[first_quarter_moon_with_face]=$'\U1F31B'
+emoji[last_quarter_moon_with_face]=$'\U1F31C'
+emoji[full_moon_with_face]=$'\U1F31D'
+emoji[sun_with_face]=$'\U1F31E'
+emoji[glowing_star]=$'\U1F31F'
+emoji[shooting_star]=$'\U1F320'
+emoji[thermometer]=$'\U1F321'
+emoji[white_sun_with_small_cloud]=$'\U1F324'
+emoji[white_sun_behind_cloud]=$'\U1F325'
+emoji[white_sun_behind_cloud_with_rain]=$'\U1F326'
+emoji[cloud_with_rain]=$'\U1F327'
+emoji[cloud_with_snow]=$'\U1F328'
+emoji[cloud_with_lightning]=$'\U1F329'
+emoji[cloud_with_tornado]=$'\U1F32A'
+emoji[fog]=$'\U1F32B'
+emoji[wind_blowing_face]=$'\U1F32C'
+emoji[hot_dog]=$'\U1F32D'
+emoji[taco]=$'\U1F32E'
+emoji[burrito]=$'\U1F32F'
+emoji[chestnut]=$'\U1F330'
+emoji[seedling]=$'\U1F331'
+emoji[evergreen_tree]=$'\U1F332'
+emoji[deciduous_tree]=$'\U1F333'
+emoji[palm_tree]=$'\U1F334'
+emoji[cactus]=$'\U1F335'
+emoji[hot_pepper]=$'\U1F336'
+emoji[tulip]=$'\U1F337'
+emoji[cherry_blossom]=$'\U1F338'
+emoji[rose]=$'\U1F339'
+emoji[hibiscus]=$'\U1F33A'
+emoji[sunflower]=$'\U1F33B'
+emoji[blossom]=$'\U1F33C'
+emoji[ear_of_maize]=$'\U1F33D'
+emoji[ear_of_rice]=$'\U1F33E'
+emoji[herb]=$'\U1F33F'
+emoji[four_leaf_clover]=$'\U1F340'
+emoji[maple_leaf]=$'\U1F341'
+emoji[fallen_leaf]=$'\U1F342'
+emoji[leaf_fluttering_in_wind]=$'\U1F343'
+emoji[mushroom]=$'\U1F344'
+emoji[tomato]=$'\U1F345'
+emoji[aubergine]=$'\U1F346'
+emoji[grapes]=$'\U1F347'
+emoji[melon]=$'\U1F348'
+emoji[watermelon]=$'\U1F349'
+emoji[tangerine]=$'\U1F34A'
+emoji[lemon]=$'\U1F34B'
+emoji[banana]=$'\U1F34C'
+emoji[pineapple]=$'\U1F34D'
+emoji[red_apple]=$'\U1F34E'
+emoji[green_apple]=$'\U1F34F'
+emoji[pear]=$'\U1F350'
+emoji[peach]=$'\U1F351'
+emoji[cherries]=$'\U1F352'
+emoji[strawberry]=$'\U1F353'
+emoji[hamburger]=$'\U1F354'
+emoji[slice_of_pizza]=$'\U1F355'
+emoji[meat_on_bone]=$'\U1F356'
+emoji[poultry_leg]=$'\U1F357'
+emoji[rice_cracker]=$'\U1F358'
+emoji[rice_ball]=$'\U1F359'
+emoji[cooked_rice]=$'\U1F35A'
+emoji[curry_and_rice]=$'\U1F35B'
+emoji[steaming_bowl]=$'\U1F35C'
+emoji[spaghetti]=$'\U1F35D'
+emoji[bread]=$'\U1F35E'
+emoji[french_fries]=$'\U1F35F'
+emoji[roasted_sweet_potato]=$'\U1F360'
+emoji[dango]=$'\U1F361'
+emoji[oden]=$'\U1F362'
+emoji[sushi]=$'\U1F363'
+emoji[fried_shrimp]=$'\U1F364'
+emoji[fish_cake_with_swirl_design]=$'\U1F365'
+emoji[soft_ice_cream]=$'\U1F366'
+emoji[shaved_ice]=$'\U1F367'
+emoji[ice_cream]=$'\U1F368'
+emoji[doughnut]=$'\U1F369'
+emoji[cookie]=$'\U1F36A'
+emoji[chocolate_bar]=$'\U1F36B'
+emoji[candy]=$'\U1F36C'
+emoji[lollipop]=$'\U1F36D'
+emoji[custard]=$'\U1F36E'
+emoji[honey_pot]=$'\U1F36F'
+emoji[shortcake]=$'\U1F370'
+emoji[bento_box]=$'\U1F371'
+emoji[pot_of_food]=$'\U1F372'
+emoji[cooking]=$'\U1F373'
+emoji[fork_and_knife]=$'\U1F374'
+emoji[teacup_without_handle]=$'\U1F375'
+emoji[sake_bottle_and_cup]=$'\U1F376'
+emoji[wine_glass]=$'\U1F377'
+emoji[cocktail_glass]=$'\U1F378'
+emoji[tropical_drink]=$'\U1F379'
+emoji[beer_mug]=$'\U1F37A'
+emoji[clinking_beer_mugs]=$'\U1F37B'
+emoji[baby_bottle]=$'\U1F37C'
+emoji[fork_and_knife_with_plate]=$'\U1F37D'
+emoji[bottle_with_popping_cork]=$'\U1F37E'
+emoji[popcorn]=$'\U1F37F'
+emoji[ribbon]=$'\U1F380'
+emoji[wrapped_present]=$'\U1F381'
+emoji[birthday_cake]=$'\U1F382'
+emoji[jack_o_lantern]=$'\U1F383'
+emoji[christmas_tree]=$'\U1F384'
+emoji[father_christmas]=$'\U1F385'
+emoji[fireworks]=$'\U1F386'
+emoji[firework_sparkler]=$'\U1F387'
+emoji[balloon]=$'\U1F388'
+emoji[party_popper]=$'\U1F389'
+emoji[confetti_ball]=$'\U1F38A'
+emoji[tanabata_tree]=$'\U1F38B'
+emoji[crossed_flags]=$'\U1F38C'
+emoji[pine_decoration]=$'\U1F38D'
+emoji[japanese_dolls]=$'\U1F38E'
+emoji[carp_streamer]=$'\U1F38F'
+emoji[wind_chime]=$'\U1F390'
+emoji[moon_viewing_ceremony]=$'\U1F391'
+emoji[school_satchel]=$'\U1F392'
+emoji[graduation_cap]=$'\U1F393'
+emoji[military_medal]=$'\U1F396'
+emoji[reminder_ribbon]=$'\U1F397'
+emoji[studio_microphone]=$'\U1F399'
+emoji[level_slider]=$'\U1F39A'
+emoji[control_knobs]=$'\U1F39B'
+emoji[film_frames]=$'\U1F39E'
+emoji[admission_tickets]=$'\U1F39F'
+emoji[carousel_horse]=$'\U1F3A0'
+emoji[ferris_wheel]=$'\U1F3A1'
+emoji[roller_coaster]=$'\U1F3A2'
+emoji[fishing_pole_and_fish]=$'\U1F3A3'
+emoji[microphone]=$'\U1F3A4'
+emoji[movie_camera]=$'\U1F3A5'
+emoji[cinema]=$'\U1F3A6'
+emoji[headphone]=$'\U1F3A7'
+emoji[artist_palette]=$'\U1F3A8'
+emoji[top_hat]=$'\U1F3A9'
+emoji[circus_tent]=$'\U1F3AA'
+emoji[ticket]=$'\U1F3AB'
+emoji[clapper_board]=$'\U1F3AC'
+emoji[performing_arts]=$'\U1F3AD'
+emoji[video_game]=$'\U1F3AE'
+emoji[direct_hit]=$'\U1F3AF'
+emoji[slot_machine]=$'\U1F3B0'
+emoji[billiards]=$'\U1F3B1'
+emoji[game_die]=$'\U1F3B2'
+emoji[bowling]=$'\U1F3B3'
+emoji[flower_playing_cards]=$'\U1F3B4'
+emoji[musical_note]=$'\U1F3B5'
+emoji[multiple_musical_notes]=$'\U1F3B6'
+emoji[saxophone]=$'\U1F3B7'
+emoji[guitar]=$'\U1F3B8'
+emoji[musical_keyboard]=$'\U1F3B9'
+emoji[trumpet]=$'\U1F3BA'
+emoji[violin]=$'\U1F3BB'
+emoji[musical_score]=$'\U1F3BC'
+emoji[running_shirt_with_sash]=$'\U1F3BD'
+emoji[tennis_racquet_and_ball]=$'\U1F3BE'
+emoji[ski_and_ski_boot]=$'\U1F3BF'
+emoji[basketball_and_hoop]=$'\U1F3C0'
+emoji[chequered_flag]=$'\U1F3C1'
+emoji[snowboarder]=$'\U1F3C2'
+emoji[runner]=$'\U1F3C3'
+emoji[surfer]=$'\U1F3C4'
+emoji[sports_medal]=$'\U1F3C5'
+emoji[trophy]=$'\U1F3C6'
+emoji[horse_racing]=$'\U1F3C7'
+emoji[american_football]=$'\U1F3C8'
+emoji[rugby_football]=$'\U1F3C9'
+emoji[swimmer]=$'\U1F3CA'
+emoji[weight_lifter]=$'\U1F3CB'
+emoji[golfer]=$'\U1F3CC'
+emoji[racing_motorcycle]=$'\U1F3CD'
+emoji[racing_car]=$'\U1F3CE'
+emoji[cricket_bat_and_ball]=$'\U1F3CF'
+emoji[volleyball]=$'\U1F3D0'
+emoji[field_hockey_stick_and_ball]=$'\U1F3D1'
+emoji[ice_hockey_stick_and_puck]=$'\U1F3D2'
+emoji[table_tennis_paddle_and_ball]=$'\U1F3D3'
+emoji[snow_capped_mountain]=$'\U1F3D4'
+emoji[camping]=$'\U1F3D5'
+emoji[beach_with_umbrella]=$'\U1F3D6'
+emoji[building_construction]=$'\U1F3D7'
+emoji[house_buildings]=$'\U1F3D8'
+emoji[cityscape]=$'\U1F3D9'
+emoji[derelict_house_building]=$'\U1F3DA'
+emoji[classical_building]=$'\U1F3DB'
+emoji[desert]=$'\U1F3DC'
+emoji[desert_island]=$'\U1F3DD'
+emoji[national_park]=$'\U1F3DE'
+emoji[stadium]=$'\U1F3DF'
+emoji[house_building]=$'\U1F3E0'
+emoji[house_with_garden]=$'\U1F3E1'
+emoji[office_building]=$'\U1F3E2'
+emoji[japanese_post_office]=$'\U1F3E3'
+emoji[european_post_office]=$'\U1F3E4'
+emoji[hospital]=$'\U1F3E5'
+emoji[bank]=$'\U1F3E6'
+emoji[automated_teller_machine]=$'\U1F3E7'
+emoji[hotel]=$'\U1F3E8'
+emoji[love_hotel]=$'\U1F3E9'
+emoji[convenience_store]=$'\U1F3EA'
+emoji[school]=$'\U1F3EB'
+emoji[department_store]=$'\U1F3EC'
+emoji[factory]=$'\U1F3ED'
+emoji[izakaya_lantern]=$'\U1F3EE'
+emoji[japanese_castle]=$'\U1F3EF'
+emoji[european_castle]=$'\U1F3F0'
+emoji[waving_white_flag]=$'\U1F3F3'
+emoji[waving_black_flag]=$'\U1F3F4'
+emoji[rosette]=$'\U1F3F5'
+emoji[label]=$'\U1F3F7'
+emoji[badminton_racquet_and_shuttlecock]=$'\U1F3F8'
+emoji[bow_and_arrow]=$'\U1F3F9'
+emoji[amphora]=$'\U1F3FA'
+emoji[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
+emoji[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
+emoji[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
+emoji[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
+emoji[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
+emoji[rat]=$'\U1F400'
+emoji[mouse]=$'\U1F401'
+emoji[ox]=$'\U1F402'
+emoji[water_buffalo]=$'\U1F403'
+emoji[cow]=$'\U1F404'
+emoji[tiger]=$'\U1F405'
+emoji[leopard]=$'\U1F406'
+emoji[rabbit]=$'\U1F407'
+emoji[cat]=$'\U1F408'
+emoji[dragon]=$'\U1F409'
+emoji[crocodile]=$'\U1F40A'
+emoji[whale]=$'\U1F40B'
+emoji[snail]=$'\U1F40C'
+emoji[snake]=$'\U1F40D'
+emoji[horse]=$'\U1F40E'
+emoji[ram]=$'\U1F40F'
+emoji[goat]=$'\U1F410'
+emoji[sheep]=$'\U1F411'
+emoji[monkey]=$'\U1F412'
+emoji[rooster]=$'\U1F413'
+emoji[chicken]=$'\U1F414'
+emoji[dog]=$'\U1F415'
+emoji[pig]=$'\U1F416'
+emoji[boar]=$'\U1F417'
+emoji[elephant]=$'\U1F418'
+emoji[octopus]=$'\U1F419'
+emoji[spiral_shell]=$'\U1F41A'
+emoji[bug]=$'\U1F41B'
+emoji[ant]=$'\U1F41C'
+emoji[honeybee]=$'\U1F41D'
+emoji[lady_beetle]=$'\U1F41E'
+emoji[fish]=$'\U1F41F'
+emoji[tropical_fish]=$'\U1F420'
+emoji[blowfish]=$'\U1F421'
+emoji[turtle]=$'\U1F422'
+emoji[hatching_chick]=$'\U1F423'
+emoji[baby_chick]=$'\U1F424'
+emoji[front_facing_baby_chick]=$'\U1F425'
+emoji[bird]=$'\U1F426'
+emoji[penguin]=$'\U1F427'
+emoji[koala]=$'\U1F428'
+emoji[poodle]=$'\U1F429'
+emoji[dromedary_camel]=$'\U1F42A'
+emoji[bactrian_camel]=$'\U1F42B'
+emoji[dolphin]=$'\U1F42C'
+emoji[mouse_face]=$'\U1F42D'
+emoji[cow_face]=$'\U1F42E'
+emoji[tiger_face]=$'\U1F42F'
+emoji[rabbit_face]=$'\U1F430'
+emoji[cat_face]=$'\U1F431'
+emoji[dragon_face]=$'\U1F432'
+emoji[spouting_whale]=$'\U1F433'
+emoji[horse_face]=$'\U1F434'
+emoji[monkey_face]=$'\U1F435'
+emoji[dog_face]=$'\U1F436'
+emoji[pig_face]=$'\U1F437'
+emoji[frog_face]=$'\U1F438'
+emoji[hamster_face]=$'\U1F439'
+emoji[wolf_face]=$'\U1F43A'
+emoji[bear_face]=$'\U1F43B'
+emoji[panda_face]=$'\U1F43C'
+emoji[pig_nose]=$'\U1F43D'
+emoji[paw_prints]=$'\U1F43E'
+emoji[chipmunk]=$'\U1F43F'
+emoji[eyes]=$'\U1F440'
+emoji[eye]=$'\U1F441'
+emoji[ear]=$'\U1F442'
+emoji[nose]=$'\U1F443'
+emoji[mouth]=$'\U1F444'
+emoji[tongue]=$'\U1F445'
+emoji[white_up_pointing_backhand_index]=$'\U1F446'
+emoji[white_down_pointing_backhand_index]=$'\U1F447'
+emoji[white_left_pointing_backhand_index]=$'\U1F448'
+emoji[white_right_pointing_backhand_index]=$'\U1F449'
+emoji[fisted_hand_sign]=$'\U1F44A'
+emoji[waving_hand_sign]=$'\U1F44B'
+emoji[ok_hand_sign]=$'\U1F44C'
+emoji[thumbs_up_sign]=$'\U1F44D'
+emoji[thumbs_down_sign]=$'\U1F44E'
+emoji[clapping_hands_sign]=$'\U1F44F'
+emoji[open_hands_sign]=$'\U1F450'
+emoji[crown]=$'\U1F451'
+emoji[womans_hat]=$'\U1F452'
+emoji[eyeglasses]=$'\U1F453'
+emoji[necktie]=$'\U1F454'
+emoji[t_shirt]=$'\U1F455'
+emoji[jeans]=$'\U1F456'
+emoji[dress]=$'\U1F457'
+emoji[kimono]=$'\U1F458'
+emoji[bikini]=$'\U1F459'
+emoji[womans_clothes]=$'\U1F45A'
+emoji[purse]=$'\U1F45B'
+emoji[handbag]=$'\U1F45C'
+emoji[pouch]=$'\U1F45D'
+emoji[mans_shoe]=$'\U1F45E'
+emoji[athletic_shoe]=$'\U1F45F'
+emoji[high_heeled_shoe]=$'\U1F460'
+emoji[womans_sandal]=$'\U1F461'
+emoji[womans_boots]=$'\U1F462'
+emoji[footprints]=$'\U1F463'
+emoji[bust_in_silhouette]=$'\U1F464'
+emoji[busts_in_silhouette]=$'\U1F465'
+emoji[boy]=$'\U1F466'
+emoji[girl]=$'\U1F467'
+emoji[man]=$'\U1F468'
+emoji[woman]=$'\U1F469'
+emoji[family]=$'\U1F46A'
+emoji[man_and_woman_holding_hands]=$'\U1F46B'
+emoji[two_men_holding_hands]=$'\U1F46C'
+emoji[two_women_holding_hands]=$'\U1F46D'
+emoji[police_officer]=$'\U1F46E'
+emoji[woman_with_bunny_ears]=$'\U1F46F'
+emoji[bride_with_veil]=$'\U1F470'
+emoji[person_with_blond_hair]=$'\U1F471'
+emoji[man_with_gua_pi_mao]=$'\U1F472'
+emoji[man_with_turban]=$'\U1F473'
+emoji[older_man]=$'\U1F474'
+emoji[older_woman]=$'\U1F475'
+emoji[baby]=$'\U1F476'
+emoji[construction_worker]=$'\U1F477'
+emoji[princess]=$'\U1F478'
+emoji[japanese_ogre]=$'\U1F479'
+emoji[japanese_goblin]=$'\U1F47A'
+emoji[ghost]=$'\U1F47B'
+emoji[baby_angel]=$'\U1F47C'
+emoji[extraterrestrial_alien]=$'\U1F47D'
+emoji[alien_monster]=$'\U1F47E'
+emoji[imp]=$'\U1F47F'
+emoji[skull]=$'\U1F480'
+emoji[information_desk_person]=$'\U1F481'
+emoji[guardsman]=$'\U1F482'
+emoji[dancer]=$'\U1F483'
+emoji[lipstick]=$'\U1F484'
+emoji[nail_polish]=$'\U1F485'
+emoji[face_massage]=$'\U1F486'
+emoji[haircut]=$'\U1F487'
+emoji[barber_pole]=$'\U1F488'
+emoji[syringe]=$'\U1F489'
+emoji[pill]=$'\U1F48A'
+emoji[kiss_mark]=$'\U1F48B'
+emoji[love_letter]=$'\U1F48C'
+emoji[ring]=$'\U1F48D'
+emoji[gem_stone]=$'\U1F48E'
+emoji[kiss]=$'\U1F48F'
+emoji[bouquet]=$'\U1F490'
+emoji[couple_with_heart]=$'\U1F491'
+emoji[wedding]=$'\U1F492'
+emoji[beating_heart]=$'\U1F493'
+emoji[broken_heart]=$'\U1F494'
+emoji[two_hearts]=$'\U1F495'
+emoji[sparkling_heart]=$'\U1F496'
+emoji[growing_heart]=$'\U1F497'
+emoji[heart_with_arrow]=$'\U1F498'
+emoji[blue_heart]=$'\U1F499'
+emoji[green_heart]=$'\U1F49A'
+emoji[yellow_heart]=$'\U1F49B'
+emoji[purple_heart]=$'\U1F49C'
+emoji[heart_with_ribbon]=$'\U1F49D'
+emoji[revolving_hearts]=$'\U1F49E'
+emoji[heart_decoration]=$'\U1F49F'
+emoji[diamond_shape_with_a_dot_inside]=$'\U1F4A0'
+emoji[electric_light_bulb]=$'\U1F4A1'
+emoji[anger_symbol]=$'\U1F4A2'
+emoji[bomb]=$'\U1F4A3'
+emoji[sleeping_symbol]=$'\U1F4A4'
+emoji[collision_symbol]=$'\U1F4A5'
+emoji[splashing_sweat_symbol]=$'\U1F4A6'
+emoji[droplet]=$'\U1F4A7'
+emoji[dash_symbol]=$'\U1F4A8'
+emoji[pile_of_poo]=$'\U1F4A9'
+emoji[flexed_biceps]=$'\U1F4AA'
+emoji[dizzy_symbol]=$'\U1F4AB'
+emoji[speech_balloon]=$'\U1F4AC'
+emoji[thought_balloon]=$'\U1F4AD'
+emoji[white_flower]=$'\U1F4AE'
+emoji[hundred_points_symbol]=$'\U1F4AF'
+emoji[money_bag]=$'\U1F4B0'
+emoji[currency_exchange]=$'\U1F4B1'
+emoji[heavy_dollar_sign]=$'\U1F4B2'
+emoji[credit_card]=$'\U1F4B3'
+emoji[banknote_with_yen_sign]=$'\U1F4B4'
+emoji[banknote_with_dollar_sign]=$'\U1F4B5'
+emoji[banknote_with_euro_sign]=$'\U1F4B6'
+emoji[banknote_with_pound_sign]=$'\U1F4B7'
+emoji[money_with_wings]=$'\U1F4B8'
+emoji[chart_with_upwards_trend_and_yen_sign]=$'\U1F4B9'
+emoji[seat]=$'\U1F4BA'
+emoji[personal_computer]=$'\U1F4BB'
+emoji[briefcase]=$'\U1F4BC'
+emoji[minidisc]=$'\U1F4BD'
+emoji[floppy_disk]=$'\U1F4BE'
+emoji[optical_disc]=$'\U1F4BF'
+emoji[dvd]=$'\U1F4C0'
+emoji[file_folder]=$'\U1F4C1'
+emoji[open_file_folder]=$'\U1F4C2'
+emoji[page_with_curl]=$'\U1F4C3'
+emoji[page_facing_up]=$'\U1F4C4'
+emoji[calendar]=$'\U1F4C5'
+emoji[tear_off_calendar]=$'\U1F4C6'
+emoji[card_index]=$'\U1F4C7'
+emoji[chart_with_upwards_trend]=$'\U1F4C8'
+emoji[chart_with_downwards_trend]=$'\U1F4C9'
+emoji[bar_chart]=$'\U1F4CA'
+emoji[clipboard]=$'\U1F4CB'
+emoji[pushpin]=$'\U1F4CC'
+emoji[round_pushpin]=$'\U1F4CD'
+emoji[paperclip]=$'\U1F4CE'
+emoji[straight_ruler]=$'\U1F4CF'
+emoji[triangular_ruler]=$'\U1F4D0'
+emoji[bookmark_tabs]=$'\U1F4D1'
+emoji[ledger]=$'\U1F4D2'
+emoji[notebook]=$'\U1F4D3'
+emoji[notebook_with_decorative_cover]=$'\U1F4D4'
+emoji[closed_book]=$'\U1F4D5'
+emoji[open_book]=$'\U1F4D6'
+emoji[green_book]=$'\U1F4D7'
+emoji[blue_book]=$'\U1F4D8'
+emoji[orange_book]=$'\U1F4D9'
+emoji[books]=$'\U1F4DA'
+emoji[name_badge]=$'\U1F4DB'
+emoji[scroll]=$'\U1F4DC'
+emoji[memo]=$'\U1F4DD'
+emoji[telephone_receiver]=$'\U1F4DE'
+emoji[pager]=$'\U1F4DF'
+emoji[fax_machine]=$'\U1F4E0'
+emoji[satellite_antenna]=$'\U1F4E1'
+emoji[public_address_loudspeaker]=$'\U1F4E2'
+emoji[cheering_megaphone]=$'\U1F4E3'
+emoji[outbox_tray]=$'\U1F4E4'
+emoji[inbox_tray]=$'\U1F4E5'
+emoji[package]=$'\U1F4E6'
+emoji[e_mail_symbol]=$'\U1F4E7'
+emoji[incoming_envelope]=$'\U1F4E8'
+emoji[envelope_with_downwards_arrow_above]=$'\U1F4E9'
+emoji[closed_mailbox_with_lowered_flag]=$'\U1F4EA'
+emoji[closed_mailbox_with_raised_flag]=$'\U1F4EB'
+emoji[open_mailbox_with_raised_flag]=$'\U1F4EC'
+emoji[open_mailbox_with_lowered_flag]=$'\U1F4ED'
+emoji[postbox]=$'\U1F4EE'
+emoji[postal_horn]=$'\U1F4EF'
+emoji[newspaper]=$'\U1F4F0'
+emoji[mobile_phone]=$'\U1F4F1'
+emoji[mobile_phone_with_rightwards_arrow_at_left]=$'\U1F4F2'
+emoji[vibration_mode]=$'\U1F4F3'
+emoji[mobile_phone_off]=$'\U1F4F4'
+emoji[no_mobile_phones]=$'\U1F4F5'
+emoji[antenna_with_bars]=$'\U1F4F6'
+emoji[camera]=$'\U1F4F7'
+emoji[camera_with_flash]=$'\U1F4F8'
+emoji[video_camera]=$'\U1F4F9'
+emoji[television]=$'\U1F4FA'
+emoji[radio]=$'\U1F4FB'
+emoji[videocassette]=$'\U1F4FC'
+emoji[film_projector]=$'\U1F4FD'
+emoji[prayer_beads]=$'\U1F4FF'
+emoji[twisted_rightwards_arrows]=$'\U1F500'
+emoji[clockwise_rightwards_and_leftwards_open_circle_arrows]=$'\U1F501'
+emoji[clockwise_rightwards_and_leftwards_open_circle_arrows_with_circled_one_overlay]=$'\U1F502'
+emoji[clockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F503'
+emoji[anticlockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F504'
+emoji[low_brightness_symbol]=$'\U1F505'
+emoji[high_brightness_symbol]=$'\U1F506'
+emoji[speaker_with_cancellation_stroke]=$'\U1F507'
+emoji[speaker]=$'\U1F508'
+emoji[speaker_with_one_sound_wave]=$'\U1F509'
+emoji[speaker_with_three_sound_waves]=$'\U1F50A'
+emoji[battery]=$'\U1F50B'
+emoji[electric_plug]=$'\U1F50C'
+emoji[left_pointing_magnifying_glass]=$'\U1F50D'
+emoji[right_pointing_magnifying_glass]=$'\U1F50E'
+emoji[lock_with_ink_pen]=$'\U1F50F'
+emoji[closed_lock_with_key]=$'\U1F510'
+emoji[key]=$'\U1F511'
+emoji[lock]=$'\U1F512'
+emoji[open_lock]=$'\U1F513'
+emoji[bell]=$'\U1F514'
+emoji[bell_with_cancellation_stroke]=$'\U1F515'
+emoji[bookmark]=$'\U1F516'
+emoji[link_symbol]=$'\U1F517'
+emoji[radio_button]=$'\U1F518'
+emoji[back_with_leftwards_arrow_above]=$'\U1F519'
+emoji[end_with_leftwards_arrow_above]=$'\U1F51A'
+emoji[on_with_exclamation_mark_with_left_right_arrow_above]=$'\U1F51B'
+emoji[soon_with_rightwards_arrow_above]=$'\U1F51C'
+emoji[top_with_upwards_arrow_above]=$'\U1F51D'
+emoji[no_one_under_eighteen_symbol]=$'\U1F51E'
+emoji[keycap_ten]=$'\U1F51F'
+emoji[input_symbol_for_latin_capital_letters]=$'\U1F520'
+emoji[input_symbol_for_latin_small_letters]=$'\U1F521'
+emoji[input_symbol_for_numbers]=$'\U1F522'
+emoji[input_symbol_for_symbols]=$'\U1F523'
+emoji[input_symbol_for_latin_letters]=$'\U1F524'
+emoji[fire]=$'\U1F525'
+emoji[electric_torch]=$'\U1F526'
+emoji[wrench]=$'\U1F527'
+emoji[hammer]=$'\U1F528'
+emoji[nut_and_bolt]=$'\U1F529'
+emoji[hocho]=$'\U1F52A'
+emoji[pistol]=$'\U1F52B'
+emoji[microscope]=$'\U1F52C'
+emoji[telescope]=$'\U1F52D'
+emoji[crystal_ball]=$'\U1F52E'
+emoji[six_pointed_star_with_middle_dot]=$'\U1F52F'
+emoji[japanese_symbol_for_beginner]=$'\U1F530'
+emoji[trident_emblem]=$'\U1F531'
+emoji[black_square_button]=$'\U1F532'
+emoji[white_square_button]=$'\U1F533'
+emoji[large_red_circle]=$'\U1F534'
+emoji[large_blue_circle]=$'\U1F535'
+emoji[large_orange_diamond]=$'\U1F536'
+emoji[large_blue_diamond]=$'\U1F537'
+emoji[small_orange_diamond]=$'\U1F538'
+emoji[small_blue_diamond]=$'\U1F539'
+emoji[up_pointing_red_triangle]=$'\U1F53A'
+emoji[down_pointing_red_triangle]=$'\U1F53B'
+emoji[up_pointing_small_red_triangle]=$'\U1F53C'
+emoji[down_pointing_small_red_triangle]=$'\U1F53D'
+emoji[om_symbol]=$'\U1F549'
+emoji[dove_of_peace]=$'\U1F54A'
+emoji[kaaba]=$'\U1F54B'
+emoji[mosque]=$'\U1F54C'
+emoji[synagogue]=$'\U1F54D'
+emoji[menorah_with_nine_branches]=$'\U1F54E'
+emoji[clock_face_one_oclock]=$'\U1F550'
+emoji[clock_face_two_oclock]=$'\U1F551'
+emoji[clock_face_three_oclock]=$'\U1F552'
+emoji[clock_face_four_oclock]=$'\U1F553'
+emoji[clock_face_five_oclock]=$'\U1F554'
+emoji[clock_face_six_oclock]=$'\U1F555'
+emoji[clock_face_seven_oclock]=$'\U1F556'
+emoji[clock_face_eight_oclock]=$'\U1F557'
+emoji[clock_face_nine_oclock]=$'\U1F558'
+emoji[clock_face_ten_oclock]=$'\U1F559'
+emoji[clock_face_eleven_oclock]=$'\U1F55A'
+emoji[clock_face_twelve_oclock]=$'\U1F55B'
+emoji[clock_face_one_thirty]=$'\U1F55C'
+emoji[clock_face_two_thirty]=$'\U1F55D'
+emoji[clock_face_three_thirty]=$'\U1F55E'
+emoji[clock_face_four_thirty]=$'\U1F55F'
+emoji[clock_face_five_thirty]=$'\U1F560'
+emoji[clock_face_six_thirty]=$'\U1F561'
+emoji[clock_face_seven_thirty]=$'\U1F562'
+emoji[clock_face_eight_thirty]=$'\U1F563'
+emoji[clock_face_nine_thirty]=$'\U1F564'
+emoji[clock_face_ten_thirty]=$'\U1F565'
+emoji[clock_face_eleven_thirty]=$'\U1F566'
+emoji[clock_face_twelve_thirty]=$'\U1F567'
+emoji[candle]=$'\U1F56F'
+emoji[mantelpiece_clock]=$'\U1F570'
+emoji[hole]=$'\U1F573'
+emoji[man_in_business_suit_levitating]=$'\U1F574'
+emoji[sleuth_or_spy]=$'\U1F575'
+emoji[dark_sunglasses]=$'\U1F576'
+emoji[spider]=$'\U1F577'
+emoji[spider_web]=$'\U1F578'
+emoji[joystick]=$'\U1F579'
+emoji[linked_paperclips]=$'\U1F587'
+emoji[lower_left_ballpoint_pen]=$'\U1F58A'
+emoji[lower_left_fountain_pen]=$'\U1F58B'
+emoji[lower_left_paintbrush]=$'\U1F58C'
+emoji[lower_left_crayon]=$'\U1F58D'
+emoji[raised_hand_with_fingers_splayed]=$'\U1F590'
+emoji[reversed_hand_with_middle_finger_extended]=$'\U1F595'
+emoji[raised_hand_with_part_between_middle_and_ring_fingers]=$'\U1F596'
+emoji[desktop_computer]=$'\U1F5A5'
+emoji[printer]=$'\U1F5A8'
+emoji[three_button_mouse]=$'\U1F5B1'
+emoji[trackball]=$'\U1F5B2'
+emoji[frame_with_picture]=$'\U1F5BC'
+emoji[card_index_dividers]=$'\U1F5C2'
+emoji[card_file_box]=$'\U1F5C3'
+emoji[file_cabinet]=$'\U1F5C4'
+emoji[wastebasket]=$'\U1F5D1'
+emoji[spiral_note_pad]=$'\U1F5D2'
+emoji[spiral_calendar_pad]=$'\U1F5D3'
+emoji[compression]=$'\U1F5DC'
+emoji[old_key]=$'\U1F5DD'
+emoji[rolled_up_newspaper]=$'\U1F5DE'
+emoji[dagger_knife]=$'\U1F5E1'
+emoji[speaking_head_in_silhouette]=$'\U1F5E3'
+emoji[right_anger_bubble]=$'\U1F5EF'
+emoji[ballot_box_with_ballot]=$'\U1F5F3'
+emoji[world_map]=$'\U1F5FA'
+emoji[mount_fuji]=$'\U1F5FB'
+emoji[tokyo_tower]=$'\U1F5FC'
+emoji[statue_of_liberty]=$'\U1F5FD'
+emoji[silhouette_of_japan]=$'\U1F5FE'
+emoji[moyai]=$'\U1F5FF'
+emoji[grinning_face]=$'\U1F600'
+emoji[grinning_face_with_smiling_eyes]=$'\U1F601'
+emoji[face_with_tears_of_joy]=$'\U1F602'
+emoji[smiling_face_with_open_mouth]=$'\U1F603'
+emoji[smiling_face_with_open_mouth_and_smiling_eyes]=$'\U1F604'
+emoji[smiling_face_with_open_mouth_and_cold_sweat]=$'\U1F605'
+emoji[smiling_face_with_open_mouth_and_tightly_closed_eyes]=$'\U1F606'
+emoji[smiling_face_with_halo]=$'\U1F607'
+emoji[smiling_face_with_horns]=$'\U1F608'
+emoji[winking_face]=$'\U1F609'
+emoji[smiling_face_with_smiling_eyes]=$'\U1F60A'
+emoji[face_savouring_delicious_food]=$'\U1F60B'
+emoji[relieved_face]=$'\U1F60C'
+emoji[smiling_face_with_heart_shaped_eyes]=$'\U1F60D'
+emoji[smiling_face_with_sunglasses]=$'\U1F60E'
+emoji[smirking_face]=$'\U1F60F'
+emoji[neutral_face]=$'\U1F610'
+emoji[expressionless_face]=$'\U1F611'
+emoji[unamused_face]=$'\U1F612'
+emoji[face_with_cold_sweat]=$'\U1F613'
+emoji[pensive_face]=$'\U1F614'
+emoji[confused_face]=$'\U1F615'
+emoji[confounded_face]=$'\U1F616'
+emoji[kissing_face]=$'\U1F617'
+emoji[face_throwing_a_kiss]=$'\U1F618'
+emoji[kissing_face_with_smiling_eyes]=$'\U1F619'
+emoji[kissing_face_with_closed_eyes]=$'\U1F61A'
+emoji[face_with_stuck_out_tongue]=$'\U1F61B'
+emoji[face_with_stuck_out_tongue_and_winking_eye]=$'\U1F61C'
+emoji[face_with_stuck_out_tongue_and_tightly_closed_eyes]=$'\U1F61D'
+emoji[disappointed_face]=$'\U1F61E'
+emoji[worried_face]=$'\U1F61F'
+emoji[angry_face]=$'\U1F620'
+emoji[pouting_face]=$'\U1F621'
+emoji[crying_face]=$'\U1F622'
+emoji[persevering_face]=$'\U1F623'
+emoji[face_with_look_of_triumph]=$'\U1F624'
+emoji[disappointed_but_relieved_face]=$'\U1F625'
+emoji[frowning_face_with_open_mouth]=$'\U1F626'
+emoji[anguished_face]=$'\U1F627'
+emoji[fearful_face]=$'\U1F628'
+emoji[weary_face]=$'\U1F629'
+emoji[sleepy_face]=$'\U1F62A'
+emoji[tired_face]=$'\U1F62B'
+emoji[grimacing_face]=$'\U1F62C'
+emoji[loudly_crying_face]=$'\U1F62D'
+emoji[face_with_open_mouth]=$'\U1F62E'
+emoji[hushed_face]=$'\U1F62F'
+emoji[face_with_open_mouth_and_cold_sweat]=$'\U1F630'
+emoji[face_screaming_in_fear]=$'\U1F631'
+emoji[astonished_face]=$'\U1F632'
+emoji[flushed_face]=$'\U1F633'
+emoji[sleeping_face]=$'\U1F634'
+emoji[dizzy_face]=$'\U1F635'
+emoji[face_without_mouth]=$'\U1F636'
+emoji[face_with_medical_mask]=$'\U1F637'
+emoji[grinning_cat_face_with_smiling_eyes]=$'\U1F638'
+emoji[cat_face_with_tears_of_joy]=$'\U1F639'
+emoji[smiling_cat_face_with_open_mouth]=$'\U1F63A'
+emoji[smiling_cat_face_with_heart_shaped_eyes]=$'\U1F63B'
+emoji[cat_face_with_wry_smile]=$'\U1F63C'
+emoji[kissing_cat_face_with_closed_eyes]=$'\U1F63D'
+emoji[pouting_cat_face]=$'\U1F63E'
+emoji[crying_cat_face]=$'\U1F63F'
+emoji[weary_cat_face]=$'\U1F640'
+emoji[slightly_frowning_face]=$'\U1F641'
+emoji[slightly_smiling_face]=$'\U1F642'
+emoji[upside_down_face]=$'\U1F643'
+emoji[face_with_rolling_eyes]=$'\U1F644'
+emoji[face_with_no_good_gesture]=$'\U1F645'
+emoji[face_with_ok_gesture]=$'\U1F646'
+emoji[person_bowing_deeply]=$'\U1F647'
+emoji[see_no_evil_monkey]=$'\U1F648'
+emoji[hear_no_evil_monkey]=$'\U1F649'
+emoji[speak_no_evil_monkey]=$'\U1F64A'
+emoji[happy_person_raising_one_hand]=$'\U1F64B'
+emoji[person_raising_both_hands_in_celebration]=$'\U1F64C'
+emoji[person_frowning]=$'\U1F64D'
+emoji[person_with_pouting_face]=$'\U1F64E'
+emoji[person_with_folded_hands]=$'\U1F64F'
+emoji[rocket]=$'\U1F680'
+emoji[helicopter]=$'\U1F681'
+emoji[steam_locomotive]=$'\U1F682'
+emoji[railway_car]=$'\U1F683'
+emoji[high_speed_train]=$'\U1F684'
+emoji[high_speed_train_with_bullet_nose]=$'\U1F685'
+emoji[train]=$'\U1F686'
+emoji[metro]=$'\U1F687'
+emoji[light_rail]=$'\U1F688'
+emoji[station]=$'\U1F689'
+emoji[tram]=$'\U1F68A'
+emoji[tram_car]=$'\U1F68B'
+emoji[bus]=$'\U1F68C'
+emoji[oncoming_bus]=$'\U1F68D'
+emoji[trolleybus]=$'\U1F68E'
+emoji[bus_stop]=$'\U1F68F'
+emoji[minibus]=$'\U1F690'
+emoji[ambulance]=$'\U1F691'
+emoji[fire_engine]=$'\U1F692'
+emoji[police_car]=$'\U1F693'
+emoji[oncoming_police_car]=$'\U1F694'
+emoji[taxi]=$'\U1F695'
+emoji[oncoming_taxi]=$'\U1F696'
+emoji[automobile]=$'\U1F697'
+emoji[oncoming_automobile]=$'\U1F698'
+emoji[recreational_vehicle]=$'\U1F699'
+emoji[delivery_truck]=$'\U1F69A'
+emoji[articulated_lorry]=$'\U1F69B'
+emoji[tractor]=$'\U1F69C'
+emoji[monorail]=$'\U1F69D'
+emoji[mountain_railway]=$'\U1F69E'
+emoji[suspension_railway]=$'\U1F69F'
+emoji[mountain_cableway]=$'\U1F6A0'
+emoji[aerial_tramway]=$'\U1F6A1'
+emoji[ship]=$'\U1F6A2'
+emoji[rowboat]=$'\U1F6A3'
+emoji[speedboat]=$'\U1F6A4'
+emoji[horizontal_traffic_light]=$'\U1F6A5'
+emoji[vertical_traffic_light]=$'\U1F6A6'
+emoji[construction_sign]=$'\U1F6A7'
+emoji[police_cars_revolving_light]=$'\U1F6A8'
+emoji[triangular_flag_on_post]=$'\U1F6A9'
+emoji[door]=$'\U1F6AA'
+emoji[no_entry_sign]=$'\U1F6AB'
+emoji[smoking_symbol]=$'\U1F6AC'
+emoji[no_smoking_symbol]=$'\U1F6AD'
+emoji[put_litter_in_its_place_symbol]=$'\U1F6AE'
+emoji[do_not_litter_symbol]=$'\U1F6AF'
+emoji[potable_water_symbol]=$'\U1F6B0'
+emoji[non_potable_water_symbol]=$'\U1F6B1'
+emoji[bicycle]=$'\U1F6B2'
+emoji[no_bicycles]=$'\U1F6B3'
+emoji[bicyclist]=$'\U1F6B4'
+emoji[mountain_bicyclist]=$'\U1F6B5'
+emoji[pedestrian]=$'\U1F6B6'
+emoji[no_pedestrians]=$'\U1F6B7'
+emoji[children_crossing]=$'\U1F6B8'
+emoji[mens_symbol]=$'\U1F6B9'
+emoji[womens_symbol]=$'\U1F6BA'
+emoji[restroom]=$'\U1F6BB'
+emoji[baby_symbol]=$'\U1F6BC'
+emoji[toilet]=$'\U1F6BD'
+emoji[water_closet]=$'\U1F6BE'
+emoji[shower]=$'\U1F6BF'
+emoji[bath]=$'\U1F6C0'
+emoji[bathtub]=$'\U1F6C1'
+emoji[passport_control]=$'\U1F6C2'
+emoji[customs]=$'\U1F6C3'
+emoji[baggage_claim]=$'\U1F6C4'
+emoji[left_luggage]=$'\U1F6C5'
+emoji[couch_and_lamp]=$'\U1F6CB'
+emoji[sleeping_accommodation]=$'\U1F6CC'
+emoji[shopping_bags]=$'\U1F6CD'
+emoji[bellhop_bell]=$'\U1F6CE'
+emoji[bed]=$'\U1F6CF'
+emoji[place_of_worship]=$'\U1F6D0'
+emoji[hammer_and_wrench]=$'\U1F6E0'
+emoji[shield]=$'\U1F6E1'
+emoji[oil_drum]=$'\U1F6E2'
+emoji[motorway]=$'\U1F6E3'
+emoji[railway_track]=$'\U1F6E4'
+emoji[motor_boat]=$'\U1F6E5'
+emoji[small_airplane]=$'\U1F6E9'
+emoji[airplane_departure]=$'\U1F6EB'
+emoji[airplane_arriving]=$'\U1F6EC'
+emoji[satellite]=$'\U1F6F0'
+emoji[passenger_ship]=$'\U1F6F3'
+emoji[zipper_mouth_face]=$'\U1F910'
+emoji[money_mouth_face]=$'\U1F911'
+emoji[face_with_thermometer]=$'\U1F912'
+emoji[nerd_face]=$'\U1F913'
+emoji[thinking_face]=$'\U1F914'
+emoji[face_with_head_bandage]=$'\U1F915'
+emoji[robot_face]=$'\U1F916'
+emoji[hugging_face]=$'\U1F917'
+emoji[sign_of_the_horns]=$'\U1F918'
+emoji[crab]=$'\U1F980'
+emoji[lion_face]=$'\U1F981'
+emoji[scorpion]=$'\U1F982'
+emoji[turkey]=$'\U1F983'
+emoji[unicorn_face]=$'\U1F984'
+emoji[cheese_wedge]=$'\U1F9C0'
+emoji[keycap_number_sign]=$'\U0023\U20E3'
+emoji[keycap_asterisk]=$'\U002A\U20E3'
+emoji[keycap_digit_zero]=$'\U0030\U20E3'
+emoji[keycap_digit_one]=$'\U0031\U20E3'
+emoji[keycap_digit_two]=$'\U0032\U20E3'
+emoji[keycap_digit_three]=$'\U0033\U20E3'
+emoji[keycap_digit_four]=$'\U0034\U20E3'
+emoji[keycap_digit_five]=$'\U0035\U20E3'
+emoji[keycap_digit_six]=$'\U0036\U20E3'
+emoji[keycap_digit_seven]=$'\U0037\U20E3'
+emoji[keycap_digit_eight]=$'\U0038\U20E3'
+emoji[keycap_digit_nine]=$'\U0039\U20E3'
+emoji_flags[Ascension_Island]=$'\U1F1E6\U1F1E8'
+emoji_flags[Andorra]=$'\U1F1E6\U1F1E9'
+emoji_flags[United_Arab_Emirates]=$'\U1F1E6\U1F1EA'
+emoji_flags[Afghanistan]=$'\U1F1E6\U1F1EB'
+emoji_flags[Antigua___Barbuda]=$'\U1F1E6\U1F1EC'
+emoji_flags[Anguilla]=$'\U1F1E6\U1F1EE'
+emoji_flags[Albania]=$'\U1F1E6\U1F1F1'
+emoji_flags[Armenia]=$'\U1F1E6\U1F1F2'
+emoji_flags[Angola]=$'\U1F1E6\U1F1F4'
+emoji_flags[Antarctica]=$'\U1F1E6\U1F1F6'
+emoji_flags[Argentina]=$'\U1F1E6\U1F1F7'
+emoji_flags[American_Samoa]=$'\U1F1E6\U1F1F8'
+emoji_flags[Austria]=$'\U1F1E6\U1F1F9'
+emoji_flags[Australia]=$'\U1F1E6\U1F1FA'
+emoji_flags[Aruba]=$'\U1F1E6\U1F1FC'
+emoji_flags[�_land_Islands]=$'\U1F1E6\U1F1FD'
+emoji_flags[Azerbaijan]=$'\U1F1E6\U1F1FF'
+emoji_flags[Bosnia___Herzegovina]=$'\U1F1E7\U1F1E6'
+emoji_flags[Barbados]=$'\U1F1E7\U1F1E7'
+emoji_flags[Bangladesh]=$'\U1F1E7\U1F1E9'
+emoji_flags[Belgium]=$'\U1F1E7\U1F1EA'
+emoji_flags[Burkina_Faso]=$'\U1F1E7\U1F1EB'
+emoji_flags[Bulgaria]=$'\U1F1E7\U1F1EC'
+emoji_flags[Bahrain]=$'\U1F1E7\U1F1ED'
+emoji_flags[Burundi]=$'\U1F1E7\U1F1EE'
+emoji_flags[Benin]=$'\U1F1E7\U1F1EF'
+emoji_flags[St__Barth�_lemy]=$'\U1F1E7\U1F1F1'
+emoji_flags[Bermuda]=$'\U1F1E7\U1F1F2'
+emoji_flags[Brunei]=$'\U1F1E7\U1F1F3'
+emoji_flags[Bolivia]=$'\U1F1E7\U1F1F4'
+emoji_flags[Caribbean_Netherlands]=$'\U1F1E7\U1F1F6'
+emoji_flags[Brazil]=$'\U1F1E7\U1F1F7'
+emoji_flags[Bahamas]=$'\U1F1E7\U1F1F8'
+emoji_flags[Bhutan]=$'\U1F1E7\U1F1F9'
+emoji_flags[Bouvet_Island]=$'\U1F1E7\U1F1FB'
+emoji_flags[Botswana]=$'\U1F1E7\U1F1FC'
+emoji_flags[Belarus]=$'\U1F1E7\U1F1FE'
+emoji_flags[Belize]=$'\U1F1E7\U1F1FF'
+emoji_flags[Canada]=$'\U1F1E8\U1F1E6'
+emoji_flags[Cocos__Islands]=$'\U1F1E8\U1F1E8'
+emoji_flags[Congo___Kinshasa]=$'\U1F1E8\U1F1E9'
+emoji_flags[Central_African_Republic]=$'\U1F1E8\U1F1EB'
+emoji_flags[Congo___Brazzaville]=$'\U1F1E8\U1F1EC'
+emoji_flags[Switzerland]=$'\U1F1E8\U1F1ED'
+emoji_flags[C�_te_d�__Ivoire]=$'\U1F1E8\U1F1EE'
+emoji_flags[Cook_Islands]=$'\U1F1E8\U1F1F0'
+emoji_flags[Chile]=$'\U1F1E8\U1F1F1'
+emoji_flags[Cameroon]=$'\U1F1E8\U1F1F2'
+emoji_flags[China]=$'\U1F1E8\U1F1F3'
+emoji_flags[Colombia]=$'\U1F1E8\U1F1F4'
+emoji_flags[Clipperton_Island]=$'\U1F1E8\U1F1F5'
+emoji_flags[Costa_Rica]=$'\U1F1E8\U1F1F7'
+emoji_flags[Cuba]=$'\U1F1E8\U1F1FA'
+emoji_flags[Cape_Verde]=$'\U1F1E8\U1F1FB'
+emoji_flags[Cura�_ao]=$'\U1F1E8\U1F1FC'
+emoji_flags[Christmas_Island]=$'\U1F1E8\U1F1FD'
+emoji_flags[Cyprus]=$'\U1F1E8\U1F1FE'
+emoji_flags[Czech_Republic]=$'\U1F1E8\U1F1FF'
+emoji_flags[Germany]=$'\U1F1E9\U1F1EA'
+emoji_flags[Diego_Garcia]=$'\U1F1E9\U1F1EC'
+emoji_flags[Djibouti]=$'\U1F1E9\U1F1EF'
+emoji_flags[Denmark]=$'\U1F1E9\U1F1F0'
+emoji_flags[Dominica]=$'\U1F1E9\U1F1F2'
+emoji_flags[Dominican_Republic]=$'\U1F1E9\U1F1F4'
+emoji_flags[Algeria]=$'\U1F1E9\U1F1FF'
+emoji_flags[Ceuta___Melilla]=$'\U1F1EA\U1F1E6'
+emoji_flags[Ecuador]=$'\U1F1EA\U1F1E8'
+emoji_flags[Estonia]=$'\U1F1EA\U1F1EA'
+emoji_flags[Egypt]=$'\U1F1EA\U1F1EC'
+emoji_flags[Western_Sahara]=$'\U1F1EA\U1F1ED'
+emoji_flags[Eritrea]=$'\U1F1EA\U1F1F7'
+emoji_flags[Spain]=$'\U1F1EA\U1F1F8'
+emoji_flags[Ethiopia]=$'\U1F1EA\U1F1F9'
+emoji_flags[European_Union]=$'\U1F1EA\U1F1FA'
+emoji_flags[Finland]=$'\U1F1EB\U1F1EE'
+emoji_flags[Fiji]=$'\U1F1EB\U1F1EF'
+emoji_flags[Falkland_Islands]=$'\U1F1EB\U1F1F0'
+emoji_flags[Micronesia]=$'\U1F1EB\U1F1F2'
+emoji_flags[Faroe_Islands]=$'\U1F1EB\U1F1F4'
+emoji_flags[France]=$'\U1F1EB\U1F1F7'
+emoji_flags[Gabon]=$'\U1F1EC\U1F1E6'
+emoji_flags[United_Kingdom]=$'\U1F1EC\U1F1E7'
+emoji_flags[Grenada]=$'\U1F1EC\U1F1E9'
+emoji_flags[Georgia]=$'\U1F1EC\U1F1EA'
+emoji_flags[French_Guiana]=$'\U1F1EC\U1F1EB'
+emoji_flags[Guernsey]=$'\U1F1EC\U1F1EC'
+emoji_flags[Ghana]=$'\U1F1EC\U1F1ED'
+emoji_flags[Gibraltar]=$'\U1F1EC\U1F1EE'
+emoji_flags[Greenland]=$'\U1F1EC\U1F1F1'
+emoji_flags[Gambia]=$'\U1F1EC\U1F1F2'
+emoji_flags[Guinea]=$'\U1F1EC\U1F1F3'
+emoji_flags[Guadeloupe]=$'\U1F1EC\U1F1F5'
+emoji_flags[Equatorial_Guinea]=$'\U1F1EC\U1F1F6'
+emoji_flags[Greece]=$'\U1F1EC\U1F1F7'
+emoji_flags[South_Georgia___South_Sandwich_Islands]=$'\U1F1EC\U1F1F8'
+emoji_flags[Guatemala]=$'\U1F1EC\U1F1F9'
+emoji_flags[Guam]=$'\U1F1EC\U1F1FA'
+emoji_flags[Guinea_Bissau]=$'\U1F1EC\U1F1FC'
+emoji_flags[Guyana]=$'\U1F1EC\U1F1FE'
+emoji_flags[Hong_Kong]=$'\U1F1ED\U1F1F0'
+emoji_flags[Heard___McDonald_Islands]=$'\U1F1ED\U1F1F2'
+emoji_flags[Honduras]=$'\U1F1ED\U1F1F3'
+emoji_flags[Croatia]=$'\U1F1ED\U1F1F7'
+emoji_flags[Haiti]=$'\U1F1ED\U1F1F9'
+emoji_flags[Hungary]=$'\U1F1ED\U1F1FA'
+emoji_flags[Canary_Islands]=$'\U1F1EE\U1F1E8'
+emoji_flags[Indonesia]=$'\U1F1EE\U1F1E9'
+emoji_flags[Ireland]=$'\U1F1EE\U1F1EA'
+emoji_flags[Israel]=$'\U1F1EE\U1F1F1'
+emoji_flags[Isle_of_Man]=$'\U1F1EE\U1F1F2'
+emoji_flags[India]=$'\U1F1EE\U1F1F3'
+emoji_flags[British_Indian_Ocean_Territory]=$'\U1F1EE\U1F1F4'
+emoji_flags[Iraq]=$'\U1F1EE\U1F1F6'
+emoji_flags[Iran]=$'\U1F1EE\U1F1F7'
+emoji_flags[Iceland]=$'\U1F1EE\U1F1F8'
+emoji_flags[Italy]=$'\U1F1EE\U1F1F9'
+emoji_flags[Jersey]=$'\U1F1EF\U1F1EA'
+emoji_flags[Jamaica]=$'\U1F1EF\U1F1F2'
+emoji_flags[Jordan]=$'\U1F1EF\U1F1F4'
+emoji_flags[Japan]=$'\U1F1EF\U1F1F5'
+emoji_flags[Kenya]=$'\U1F1F0\U1F1EA'
+emoji_flags[Kyrgyzstan]=$'\U1F1F0\U1F1EC'
+emoji_flags[Cambodia]=$'\U1F1F0\U1F1ED'
+emoji_flags[Kiribati]=$'\U1F1F0\U1F1EE'
+emoji_flags[Comoros]=$'\U1F1F0\U1F1F2'
+emoji_flags[St__Kitts___Nevis]=$'\U1F1F0\U1F1F3'
+emoji_flags[North_Korea]=$'\U1F1F0\U1F1F5'
+emoji_flags[South_Korea]=$'\U1F1F0\U1F1F7'
+emoji_flags[Kuwait]=$'\U1F1F0\U1F1FC'
+emoji_flags[Cayman_Islands]=$'\U1F1F0\U1F1FE'
+emoji_flags[Kazakhstan]=$'\U1F1F0\U1F1FF'
+emoji_flags[Laos]=$'\U1F1F1\U1F1E6'
+emoji_flags[Lebanon]=$'\U1F1F1\U1F1E7'
+emoji_flags[St__Lucia]=$'\U1F1F1\U1F1E8'
+emoji_flags[Liechtenstein]=$'\U1F1F1\U1F1EE'
+emoji_flags[Sri_Lanka]=$'\U1F1F1\U1F1F0'
+emoji_flags[Liberia]=$'\U1F1F1\U1F1F7'
+emoji_flags[Lesotho]=$'\U1F1F1\U1F1F8'
+emoji_flags[Lithuania]=$'\U1F1F1\U1F1F9'
+emoji_flags[Luxembourg]=$'\U1F1F1\U1F1FA'
+emoji_flags[Latvia]=$'\U1F1F1\U1F1FB'
+emoji_flags[Libya]=$'\U1F1F1\U1F1FE'
+emoji_flags[Morocco]=$'\U1F1F2\U1F1E6'
+emoji_flags[Monaco]=$'\U1F1F2\U1F1E8'
+emoji_flags[Moldova]=$'\U1F1F2\U1F1E9'
+emoji_flags[Montenegro]=$'\U1F1F2\U1F1EA'
+emoji_flags[St__Martin]=$'\U1F1F2\U1F1EB'
+emoji_flags[Madagascar]=$'\U1F1F2\U1F1EC'
+emoji_flags[Marshall_Islands]=$'\U1F1F2\U1F1ED'
+emoji_flags[Macedonia]=$'\U1F1F2\U1F1F0'
+emoji_flags[Mali]=$'\U1F1F2\U1F1F1'
+emoji_flags[Myanmar]=$'\U1F1F2\U1F1F2'
+emoji_flags[Mongolia]=$'\U1F1F2\U1F1F3'
+emoji_flags[Macau]=$'\U1F1F2\U1F1F4'
+emoji_flags[Northern_Mariana_Islands]=$'\U1F1F2\U1F1F5'
+emoji_flags[Martinique]=$'\U1F1F2\U1F1F6'
+emoji_flags[Mauritania]=$'\U1F1F2\U1F1F7'
+emoji_flags[Montserrat]=$'\U1F1F2\U1F1F8'
+emoji_flags[Malta]=$'\U1F1F2\U1F1F9'
+emoji_flags[Mauritius]=$'\U1F1F2\U1F1FA'
+emoji_flags[Maldives]=$'\U1F1F2\U1F1FB'
+emoji_flags[Malawi]=$'\U1F1F2\U1F1FC'
+emoji_flags[Mexico]=$'\U1F1F2\U1F1FD'
+emoji_flags[Malaysia]=$'\U1F1F2\U1F1FE'
+emoji_flags[Mozambique]=$'\U1F1F2\U1F1FF'
+emoji_flags[Namibia]=$'\U1F1F3\U1F1E6'
+emoji_flags[New_Caledonia]=$'\U1F1F3\U1F1E8'
+emoji_flags[Niger]=$'\U1F1F3\U1F1EA'
+emoji_flags[Norfolk_Island]=$'\U1F1F3\U1F1EB'
+emoji_flags[Nigeria]=$'\U1F1F3\U1F1EC'
+emoji_flags[Nicaragua]=$'\U1F1F3\U1F1EE'
+emoji_flags[Netherlands]=$'\U1F1F3\U1F1F1'
+emoji_flags[Norway]=$'\U1F1F3\U1F1F4'
+emoji_flags[Nepal]=$'\U1F1F3\U1F1F5'
+emoji_flags[Nauru]=$'\U1F1F3\U1F1F7'
+emoji_flags[Niue]=$'\U1F1F3\U1F1FA'
+emoji_flags[New_Zealand]=$'\U1F1F3\U1F1FF'
+emoji_flags[Oman]=$'\U1F1F4\U1F1F2'
+emoji_flags[Panama]=$'\U1F1F5\U1F1E6'
+emoji_flags[Peru]=$'\U1F1F5\U1F1EA'
+emoji_flags[French_Polynesia]=$'\U1F1F5\U1F1EB'
+emoji_flags[Papua_New_Guinea]=$'\U1F1F5\U1F1EC'
+emoji_flags[Philippines]=$'\U1F1F5\U1F1ED'
+emoji_flags[Pakistan]=$'\U1F1F5\U1F1F0'
+emoji_flags[Poland]=$'\U1F1F5\U1F1F1'
+emoji_flags[St__Pierre___Miquelon]=$'\U1F1F5\U1F1F2'
+emoji_flags[Pitcairn_Islands]=$'\U1F1F5\U1F1F3'
+emoji_flags[Puerto_Rico]=$'\U1F1F5\U1F1F7'
+emoji_flags[Palestinian_Territories]=$'\U1F1F5\U1F1F8'
+emoji_flags[Portugal]=$'\U1F1F5\U1F1F9'
+emoji_flags[Palau]=$'\U1F1F5\U1F1FC'
+emoji_flags[Paraguay]=$'\U1F1F5\U1F1FE'
+emoji_flags[Qatar]=$'\U1F1F6\U1F1E6'
+emoji_flags[R�_union]=$'\U1F1F7\U1F1EA'
+emoji_flags[Romania]=$'\U1F1F7\U1F1F4'
+emoji_flags[Serbia]=$'\U1F1F7\U1F1F8'
+emoji_flags[Russia]=$'\U1F1F7\U1F1FA'
+emoji_flags[Rwanda]=$'\U1F1F7\U1F1FC'
+emoji_flags[Saudi_Arabia]=$'\U1F1F8\U1F1E6'
+emoji_flags[Solomon_Islands]=$'\U1F1F8\U1F1E7'
+emoji_flags[Seychelles]=$'\U1F1F8\U1F1E8'
+emoji_flags[Sudan]=$'\U1F1F8\U1F1E9'
+emoji_flags[Sweden]=$'\U1F1F8\U1F1EA'
+emoji_flags[Singapore]=$'\U1F1F8\U1F1EC'
+emoji_flags[St__Helena]=$'\U1F1F8\U1F1ED'
+emoji_flags[Slovenia]=$'\U1F1F8\U1F1EE'
+emoji_flags[Svalbard___Jan_Mayen]=$'\U1F1F8\U1F1EF'
+emoji_flags[Slovakia]=$'\U1F1F8\U1F1F0'
+emoji_flags[Sierra_Leone]=$'\U1F1F8\U1F1F1'
+emoji_flags[San_Marino]=$'\U1F1F8\U1F1F2'
+emoji_flags[Senegal]=$'\U1F1F8\U1F1F3'
+emoji_flags[Somalia]=$'\U1F1F8\U1F1F4'
+emoji_flags[Suriname]=$'\U1F1F8\U1F1F7'
+emoji_flags[South_Sudan]=$'\U1F1F8\U1F1F8'
+emoji_flags[S�_o_Tom�____Pr�_ncipe]=$'\U1F1F8\U1F1F9'
+emoji_flags[El_Salvador]=$'\U1F1F8\U1F1FB'
+emoji_flags[Sint_Maarten]=$'\U1F1F8\U1F1FD'
+emoji_flags[Syria]=$'\U1F1F8\U1F1FE'
+emoji_flags[Swaziland]=$'\U1F1F8\U1F1FF'
+emoji_flags[Tristan_da_Cunha]=$'\U1F1F9\U1F1E6'
+emoji_flags[Turks___Caicos_Islands]=$'\U1F1F9\U1F1E8'
+emoji_flags[Chad]=$'\U1F1F9\U1F1E9'
+emoji_flags[French_Southern_Territories]=$'\U1F1F9\U1F1EB'
+emoji_flags[Togo]=$'\U1F1F9\U1F1EC'
+emoji_flags[Thailand]=$'\U1F1F9\U1F1ED'
+emoji_flags[Tajikistan]=$'\U1F1F9\U1F1EF'
+emoji_flags[Tokelau]=$'\U1F1F9\U1F1F0'
+emoji_flags[Timor_Leste]=$'\U1F1F9\U1F1F1'
+emoji_flags[Turkmenistan]=$'\U1F1F9\U1F1F2'
+emoji_flags[Tunisia]=$'\U1F1F9\U1F1F3'
+emoji_flags[Tonga]=$'\U1F1F9\U1F1F4'
+emoji_flags[Turkey]=$'\U1F1F9\U1F1F7'
+emoji_flags[Trinidad___Tobago]=$'\U1F1F9\U1F1F9'
+emoji_flags[Tuvalu]=$'\U1F1F9\U1F1FB'
+emoji_flags[Taiwan]=$'\U1F1F9\U1F1FC'
+emoji_flags[Tanzania]=$'\U1F1F9\U1F1FF'
+emoji_flags[Ukraine]=$'\U1F1FA\U1F1E6'
+emoji_flags[Uganda]=$'\U1F1FA\U1F1EC'
+emoji_flags[U_S__Outlying_Islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[United_States]=$'\U1F1FA\U1F1F8'
+emoji_flags[Uruguay]=$'\U1F1FA\U1F1FE'
+emoji_flags[Uzbekistan]=$'\U1F1FA\U1F1FF'
+emoji_flags[Vatican_City]=$'\U1F1FB\U1F1E6'
+emoji_flags[St__Vincent___Grenadines]=$'\U1F1FB\U1F1E8'
+emoji_flags[Venezuela]=$'\U1F1FB\U1F1EA'
+emoji_flags[British_Virgin_Islands]=$'\U1F1FB\U1F1EC'
+emoji_flags[U_S__Virgin_Islands]=$'\U1F1FB\U1F1EE'
+emoji_flags[Vietnam]=$'\U1F1FB\U1F1F3'
+emoji_flags[Vanuatu]=$'\U1F1FB\U1F1FA'
+emoji_flags[Wallis___Futuna]=$'\U1F1FC\U1F1EB'
+emoji_flags[Samoa]=$'\U1F1FC\U1F1F8'
+emoji_flags[Kosovo]=$'\U1F1FD\U1F1F0'
+emoji_flags[Yemen]=$'\U1F1FE\U1F1EA'
+emoji_flags[Mayotte]=$'\U1F1FE\U1F1F9'
+emoji_flags[South_Africa]=$'\U1F1FF\U1F1E6'
+emoji_flags[Zambia]=$'\U1F1FF\U1F1F2'
+emoji_flags[Zimbabwe]=$'\U1F1FF\U1F1FC'
+
diff --git a/plugins/emoji/emoji-data.txt b/plugins/emoji/emoji-data.txt
new file mode 100644
index 000000000..7b4c015f7
--- /dev/null
+++ b/plugins/emoji/emoji-data.txt
@@ -0,0 +1,1308 @@
+# DRAFT emoji-data.txt
+# For details about the format and other information, see /../../../reports/tr51/index.html#Data_Files.
+#
+# Format: Code ; Default_Emoji_Style ; Emoji_Level ; Emoji_Modifier_Status ; Emoji_Sources # Comment
+#
+#   Field 1 — Default_Emoji_Style:
+#             text:      default text presentation
+#             emoji:     default emoji presentation
+#   Field 2 — Emoji_Level:
+#             L1:        level 1 emoji
+#             L2:        level 2 emoji
+#             NA:        not applicable
+#   Field 3 — Emoji_Modifier_Status:
+#             modifier:  an emoji modifier
+#             primary:   a primary emoji modifier base
+#             secondary: a secondary emoji modifier base
+#             none:      not applicable
+#   Field 4 — Emoji_Sources:
+#             one or more values from {z, a, j, w, x}
+#             see the key in http://www.unicode.org/draft/reports/tr51/tr51.html#Major_Sources
+#             NA:        not applicable
+#   Comment — currently contains the version where the character was first encoded,
+#             followed by:
+#             - a character name in uppercase (for a single character),
+#             - a keycap name,
+#             - an associated flag, where is associated with value unicode region code
+#
+00A9 ;	text ;	L1 ;	none ;	j	# V1.1 (©) COPYRIGHT SIGN
+00AE ;	text ;	L1 ;	none ;	j	# V1.1 (®) REGISTERED SIGN
+203C ;	text ;	L1 ;	none ;	a j	# V1.1 (‼) DOUBLE EXCLAMATION MARK
+2049 ;	text ;	L1 ;	none ;	a j	# V3.0 (⁉) EXCLAMATION QUESTION MARK
+2122 ;	text ;	L1 ;	none ;	j	# V1.1 (™) TRADE MARK SIGN
+2139 ;	text ;	L1 ;	none ;	j	# V3.0 (ℹ) INFORMATION SOURCE
+2194 ;	text ;	L1 ;	none ;	z j	# V1.1 (↔) LEFT RIGHT ARROW
+2195 ;	text ;	L1 ;	none ;	z j	# V1.1 (↕) UP DOWN ARROW
+2196 ;	text ;	L1 ;	none ;	j	# V1.1 (↖) NORTH WEST ARROW
+2197 ;	text ;	L1 ;	none ;	j	# V1.1 (↗) NORTH EAST ARROW
+2198 ;	text ;	L1 ;	none ;	j	# V1.1 (↘) SOUTH EAST ARROW
+2199 ;	text ;	L1 ;	none ;	j	# V1.1 (↙) SOUTH WEST ARROW
+21A9 ;	text ;	L1 ;	none ;	j	# V1.1 (↩) LEFTWARDS ARROW WITH HOOK
+21AA ;	text ;	L1 ;	none ;	j	# V1.1 (↪) RIGHTWARDS ARROW WITH HOOK
+231A ;	emoji ;	L1 ;	none ;	j	# V1.1 (⌚) WATCH
+231B ;	emoji ;	L1 ;	none ;	j	# V1.1 (⌛) HOURGLASS
+2328 ;	text ;	L2 ;	none ;	x	# V1.1 (⌨) KEYBOARD
+23CF ;	text ;	L2 ;	none ;	x	# V4.0 (⏏) EJECT SYMBOL
+23E9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏩) BLACK RIGHT-POINTING DOUBLE TRIANGLE
+23EA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏪) BLACK LEFT-POINTING DOUBLE TRIANGLE
+23EB ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏫) BLACK UP-POINTING DOUBLE TRIANGLE
+23EC ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏬) BLACK DOWN-POINTING DOUBLE TRIANGLE
+23ED ;	text ;	L2 ;	none ;	w	# V6.0 (⏭) BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
+23EE ;	text ;	L2 ;	none ;	w	# V6.0 (⏮) BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
+23EF ;	text ;	L2 ;	none ;	x	# V6.0 (⏯) BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR
+23F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏰) ALARM CLOCK
+23F1 ;	text ;	L2 ;	none ;	x	# V6.0 (⏱) STOPWATCH
+23F2 ;	text ;	L2 ;	none ;	x	# V6.0 (⏲) TIMER CLOCK
+23F3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏳) HOURGLASS WITH FLOWING SAND
+23F8 ;	text ;	L2 ;	none ;	w	# V7.0 (⏸) DOUBLE VERTICAL BAR
+23F9 ;	text ;	L2 ;	none ;	w	# V7.0 (⏹) BLACK SQUARE FOR STOP
+23FA ;	text ;	L2 ;	none ;	w	# V7.0 (⏺) BLACK CIRCLE FOR RECORD
+24C2 ;	text ;	L1 ;	none ;	j	# V1.1 (Ⓜ) CIRCLED LATIN CAPITAL LETTER M
+25AA ;	text ;	L1 ;	none ;	j w	# V1.1 (▪) BLACK SMALL SQUARE
+25AB ;	text ;	L1 ;	none ;	j	# V1.1 (▫) WHITE SMALL SQUARE
+25B6 ;	text ;	L1 ;	none ;	a j w	# V1.1 (▶) BLACK RIGHT-POINTING TRIANGLE
+25C0 ;	text ;	L1 ;	none ;	a j w	# V1.1 (◀) BLACK LEFT-POINTING TRIANGLE
+25FB ;	text ;	L1 ;	none ;	j	# V3.2 (◻) WHITE MEDIUM SQUARE
+25FC ;	text ;	L1 ;	none ;	j w	# V3.2 (◼) BLACK MEDIUM SQUARE
+25FD ;	emoji ;	L1 ;	none ;	j	# V3.2 (◽) WHITE MEDIUM SMALL SQUARE
+25FE ;	emoji ;	L1 ;	none ;	j w	# V3.2 (◾) BLACK MEDIUM SMALL SQUARE
+2600 ;	text ;	L1 ;	none ;	a j	# V1.1 (☀) BLACK SUN WITH RAYS
+2601 ;	text ;	L1 ;	none ;	a j w	# V1.1 (☁) CLOUD
+2602 ;	text ;	L2 ;	none ;	a	# V1.1 (☂) UMBRELLA
+2603 ;	text ;	L2 ;	none ;	a	# V1.1 (☃) SNOWMAN
+2604 ;	text ;	L2 ;	none ;	x	# V1.1 (☄) COMET
+260E ;	text ;	L1 ;	none ;	z a j	# V1.1 (☎) BLACK TELEPHONE
+2611 ;	text ;	L1 ;	none ;	j w	# V1.1 (☑) BALLOT BOX WITH CHECK
+2614 ;	emoji ;	L1 ;	none ;	a j	# V4.0 (☔) UMBRELLA WITH RAIN DROPS
+2615 ;	emoji ;	L1 ;	none ;	j	# V4.0 (☕) HOT BEVERAGE
+2618 ;	text ;	L2 ;	none ;	x	# V4.1 (☘) SHAMROCK
+261D ;	text ;	L1 ;	secondary ;	j w	# V1.1 (☝) WHITE UP POINTING INDEX
+2620 ;	text ;	L2 ;	none ;	x	# V1.1 (☠) SKULL AND CROSSBONES
+2622 ;	text ;	L2 ;	none ;	x	# V1.1 (☢) RADIOACTIVE SIGN
+2623 ;	text ;	L2 ;	none ;	x	# V1.1 (☣) BIOHAZARD SIGN
+2626 ;	text ;	L2 ;	none ;	x	# V1.1 (☦) ORTHODOX CROSS
+262A ;	text ;	L2 ;	none ;	w	# V1.1 (☪) STAR AND CRESCENT
+262E ;	text ;	L2 ;	none ;	x	# V1.1 (☮) PEACE SYMBOL
+262F ;	text ;	L2 ;	none ;	w	# V1.1 (☯) YIN YANG
+2638 ;	text ;	L2 ;	none ;	w	# V1.1 (☸) WHEEL OF DHARMA
+2639 ;	text ;	L2 ;	secondary ;	w	# V1.1 (☹) WHITE FROWNING FACE
+263A ;	text ;	L1 ;	secondary ;	j w	# V1.1 (☺) WHITE SMILING FACE
+2648 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♈) ARIES
+2649 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♉) TAURUS
+264A ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♊) GEMINI
+264B ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♋) CANCER
+264C ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♌) LEO
+264D ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♍) VIRGO
+264E ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♎) LIBRA
+264F ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♏) SCORPIUS
+2650 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♐) SAGITTARIUS
+2651 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♑) CAPRICORN
+2652 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♒) AQUARIUS
+2653 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♓) PISCES
+2660 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♠) BLACK SPADE SUIT
+2663 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♣) BLACK CLUB SUIT
+2665 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♥) BLACK HEART SUIT
+2666 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♦) BLACK DIAMOND SUIT
+2668 ;	text ;	L1 ;	none ;	a j	# V1.1 (♨) HOT SPRINGS
+267B ;	text ;	L1 ;	none ;	j	# V3.2 (♻) BLACK UNIVERSAL RECYCLING SYMBOL
+267F ;	emoji ;	L1 ;	none ;	j w	# V4.1 (♿) WHEELCHAIR SYMBOL
+2692 ;	text ;	L2 ;	none ;	x	# V4.1 (⚒) HAMMER AND PICK
+2693 ;	emoji ;	L1 ;	none ;	a j	# V4.1 (⚓) ANCHOR
+2694 ;	text ;	L2 ;	none ;	x	# V4.1 (⚔) CROSSED SWORDS
+2696 ;	text ;	L2 ;	none ;	x	# V4.1 (⚖) SCALES
+2697 ;	text ;	L2 ;	none ;	x	# V4.1 (⚗) ALEMBIC
+2699 ;	text ;	L2 ;	none ;	x	# V4.1 (⚙) GEAR
+269B ;	text ;	L2 ;	none ;	x	# V4.1 (⚛) ATOM SYMBOL
+269C ;	text ;	L2 ;	none ;	x	# V4.1 (⚜) FLEUR-DE-LIS
+26A0 ;	text ;	L1 ;	none ;	j	# V4.0 (⚠) WARNING SIGN
+26A1 ;	emoji ;	L1 ;	none ;	a j	# V4.0 (⚡) HIGH VOLTAGE SIGN
+26AA ;	emoji ;	L1 ;	none ;	j	# V4.1 (⚪) MEDIUM WHITE CIRCLE
+26AB ;	emoji ;	L1 ;	none ;	j w	# V4.1 (⚫) MEDIUM BLACK CIRCLE
+26B0 ;	text ;	L2 ;	none ;	x	# V4.1 (⚰) COFFIN
+26B1 ;	text ;	L2 ;	none ;	x	# V4.1 (⚱) FUNERAL URN
+26BD ;	emoji ;	L1 ;	none ;	j	# V5.2 (⚽) SOCCER BALL
+26BE ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⚾) BASEBALL
+26C4 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛄) SNOWMAN WITHOUT SNOW
+26C5 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛅) SUN BEHIND CLOUD
+26C8 ;	text ;	L2 ;	none ;	a	# V5.2 (⛈) THUNDER CLOUD AND RAIN
+26CE ;	emoji ;	L1 ;	none ;	a j	# V6.0 (⛎) OPHIUCHUS
+26CF ;	text ;	L2 ;	none ;	a	# V5.2 (⛏) PICK
+26D1 ;	text ;	L2 ;	none ;	a	# V5.2 (⛑) HELMET WITH WHITE CROSS
+26D3 ;	text ;	L2 ;	none ;	a	# V5.2 (⛓) CHAINS
+26D4 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛔) NO ENTRY
+26E9 ;	text ;	L2 ;	none ;	a	# V5.2 (⛩) SHINTO SHRINE
+26EA ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛪) CHURCH
+26F0 ;	text ;	L2 ;	none ;	a	# V5.2 (⛰) MOUNTAIN
+26F1 ;	text ;	L2 ;	none ;	a	# V5.2 (⛱) UMBRELLA ON GROUND
+26F2 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛲) FOUNTAIN
+26F3 ;	emoji ;	L1 ;	none ;	a j w	# V5.2 (⛳) FLAG IN HOLE
+26F4 ;	text ;	L2 ;	none ;	a	# V5.2 (⛴) FERRY
+26F5 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛵) SAILBOAT
+26F7 ;	text ;	L2 ;	none ;	a w	# V5.2 (⛷) SKIER
+26F8 ;	text ;	L2 ;	none ;	a	# V5.2 (⛸) ICE SKATE
+26F9 ;	text ;	L2 ;	none ;	a	# V5.2 (⛹) PERSON WITH BALL
+26FA ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛺) TENT
+26FD ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛽) FUEL PUMP
+2702 ;	text ;	L1 ;	none ;	z j w	# V1.1 (✂) BLACK SCISSORS
+2705 ;	emoji ;	L1 ;	none ;	j	# V6.0 (✅) WHITE HEAVY CHECK MARK
+2708 ;	text ;	L1 ;	none ;	z a j w	# V1.1 (✈) AIRPLANE
+2709 ;	text ;	L1 ;	none ;	z j	# V1.1 (✉) ENVELOPE
+270A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (✊) RAISED FIST
+270B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (✋) RAISED HAND
+270C ;	text ;	L1 ;	secondary ;	z j w	# V1.1 (✌) VICTORY HAND
+270D ;	text ;	L2 ;	secondary ;	z w	# V1.1 (✍) WRITING HAND
+270F ;	text ;	L1 ;	none ;	z j	# V1.1 (✏) PENCIL
+2712 ;	text ;	L1 ;	none ;	z j	# V1.1 (✒) BLACK NIB
+2714 ;	text ;	L1 ;	none ;	z j w	# V1.1 (✔) HEAVY CHECK MARK
+2716 ;	text ;	L1 ;	none ;	z j	# V1.1 (✖) HEAVY MULTIPLICATION X
+271D ;	text ;	L2 ;	none ;	w	# V1.1 (✝) LATIN CROSS
+2721 ;	text ;	L2 ;	none ;	w	# V1.1 (✡) STAR OF DAVID
+2728 ;	emoji ;	L1 ;	none ;	j	# V6.0 (✨) SPARKLES
+2733 ;	text ;	L1 ;	none ;	z j	# V1.1 (✳) EIGHT SPOKED ASTERISK
+2734 ;	text ;	L1 ;	none ;	z j	# V1.1 (✴) EIGHT POINTED BLACK STAR
+2744 ;	text ;	L1 ;	none ;	z j w	# V1.1 (❄) SNOWFLAKE
+2747 ;	text ;	L1 ;	none ;	z j	# V1.1 (❇) SPARKLE
+274C ;	emoji ;	L1 ;	none ;	j	# V6.0 (❌) CROSS MARK
+274E ;	emoji ;	L1 ;	none ;	j	# V6.0 (❎) NEGATIVE SQUARED CROSS MARK
+2753 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (❓) BLACK QUESTION MARK ORNAMENT
+2754 ;	emoji ;	L1 ;	none ;	j	# V6.0 (❔) WHITE QUESTION MARK ORNAMENT
+2755 ;	emoji ;	L1 ;	none ;	j	# V6.0 (❕) WHITE EXCLAMATION MARK ORNAMENT
+2757 ;	emoji ;	L1 ;	none ;	j	# V5.2 (❗) HEAVY EXCLAMATION MARK SYMBOL
+2763 ;	text ;	L2 ;	none ;	z	# V1.1 (❣) HEAVY HEART EXCLAMATION MARK ORNAMENT
+2764 ;	text ;	L1 ;	none ;	z j	# V1.1 (❤) HEAVY BLACK HEART
+2795 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➕) HEAVY PLUS SIGN
+2796 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➖) HEAVY MINUS SIGN
+2797 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➗) HEAVY DIVISION SIGN
+27A1 ;	text ;	L1 ;	none ;	z a j	# V1.1 (➡) BLACK RIGHTWARDS ARROW
+27B0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➰) CURLY LOOP
+27BF ;	emoji ;	L1 ;	none ;	x	# V6.0 (➿) DOUBLE CURLY LOOP
+2934 ;	text ;	L1 ;	none ;	j	# V3.2 (⤴) ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
+2935 ;	text ;	L1 ;	none ;	j	# V3.2 (⤵) ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
+2B05 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬅) LEFTWARDS BLACK ARROW
+2B06 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬆) UPWARDS BLACK ARROW
+2B07 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬇) DOWNWARDS BLACK ARROW
+2B1B ;	emoji ;	L1 ;	none ;	a j w	# V5.1 (⬛) BLACK LARGE SQUARE
+2B1C ;	emoji ;	L1 ;	none ;	j w	# V5.1 (⬜) WHITE LARGE SQUARE
+2B50 ;	emoji ;	L1 ;	none ;	j	# V5.1 (⭐) WHITE MEDIUM STAR
+2B55 ;	emoji ;	L1 ;	none ;	j	# V5.2 (⭕) HEAVY LARGE CIRCLE
+3030 ;	text ;	L1 ;	none ;	j	# V1.1 (〰) WAVY DASH
+303D ;	text ;	L1 ;	none ;	j	# V3.2 (〽) PART ALTERNATION MARK
+3297 ;	text ;	L1 ;	none ;	j	# V1.1 (㊗) CIRCLED IDEOGRAPH CONGRATULATION
+3299 ;	text ;	L1 ;	none ;	a j	# V1.1 (㊙) CIRCLED IDEOGRAPH SECRET
+1F004 ;	emoji ;	L1 ;	none ;	j	# V5.1 (🀄) MAHJONG TILE RED DRAGON
+1F0CF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🃏) PLAYING CARD BLACK JOKER
+1F170 ;	text ;	L1 ;	none ;	j	# V6.0 (🅰) NEGATIVE SQUARED LATIN CAPITAL LETTER A
+1F171 ;	text ;	L1 ;	none ;	j	# V6.0 (🅱) NEGATIVE SQUARED LATIN CAPITAL LETTER B
+1F17E ;	text ;	L1 ;	none ;	j	# V6.0 (🅾) NEGATIVE SQUARED LATIN CAPITAL LETTER O
+1F17F ;	text ;	L1 ;	none ;	a j	# V5.2 (🅿) NEGATIVE SQUARED LATIN CAPITAL LETTER P
+1F18E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆎) NEGATIVE SQUARED AB
+1F191 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆑) SQUARED CL
+1F192 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆒) SQUARED COOL
+1F193 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆓) SQUARED FREE
+1F194 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆔) SQUARED ID
+1F195 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆕) SQUARED NEW
+1F196 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆖) SQUARED NG
+1F197 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆗) SQUARED OK
+1F198 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆘) SQUARED SOS
+1F199 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆙) SQUARED UP WITH EXCLAMATION MARK
+1F19A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆚) SQUARED VS
+1F201 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈁) SQUARED KATAKANA KOKO
+1F202 ;	text ;	L1 ;	none ;	j	# V6.0 (🈂) SQUARED KATAKANA SA
+1F21A ;	emoji ;	L1 ;	none ;	a j	# V5.2 (🈚) SQUARED CJK UNIFIED IDEOGRAPH-7121
+1F22F ;	emoji ;	L1 ;	none ;	a j	# V5.2 (🈯) SQUARED CJK UNIFIED IDEOGRAPH-6307
+1F232 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈲) SQUARED CJK UNIFIED IDEOGRAPH-7981
+1F233 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈳) SQUARED CJK UNIFIED IDEOGRAPH-7A7A
+1F234 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈴) SQUARED CJK UNIFIED IDEOGRAPH-5408
+1F235 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈵) SQUARED CJK UNIFIED IDEOGRAPH-6E80
+1F236 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈶) SQUARED CJK UNIFIED IDEOGRAPH-6709
+1F237 ;	text ;	L1 ;	none ;	j	# V6.0 (🈷) SQUARED CJK UNIFIED IDEOGRAPH-6708
+1F238 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈸) SQUARED CJK UNIFIED IDEOGRAPH-7533
+1F239 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈹) SQUARED CJK UNIFIED IDEOGRAPH-5272
+1F23A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈺) SQUARED CJK UNIFIED IDEOGRAPH-55B6
+1F250 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🉐) CIRCLED IDEOGRAPH ADVANTAGE
+1F251 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🉑) CIRCLED IDEOGRAPH ACCEPT
+1F300 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌀) CYCLONE
+1F301 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌁) FOGGY
+1F302 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌂) CLOSED UMBRELLA
+1F303 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌃) NIGHT WITH STARS
+1F304 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌄) SUNRISE OVER MOUNTAINS
+1F305 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌅) SUNRISE
+1F306 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌆) CITYSCAPE AT DUSK
+1F307 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌇) SUNSET OVER BUILDINGS
+1F308 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌈) RAINBOW
+1F309 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌉) BRIDGE AT NIGHT
+1F30A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌊) WATER WAVE
+1F30B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌋) VOLCANO
+1F30C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌌) MILKY WAY
+1F30D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌍) EARTH GLOBE EUROPE-AFRICA
+1F30E ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌎) EARTH GLOBE AMERICAS
+1F30F ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🌏) EARTH GLOBE ASIA-AUSTRALIA
+1F310 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌐) GLOBE WITH MERIDIANS
+1F311 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌑) NEW MOON SYMBOL
+1F312 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌒) WAXING CRESCENT MOON SYMBOL
+1F313 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌓) FIRST QUARTER MOON SYMBOL
+1F314 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌔) WAXING GIBBOUS MOON SYMBOL
+1F315 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🌕) FULL MOON SYMBOL
+1F316 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌖) WANING GIBBOUS MOON SYMBOL
+1F317 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌗) LAST QUARTER MOON SYMBOL
+1F318 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌘) WANING CRESCENT MOON SYMBOL
+1F319 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌙) CRESCENT MOON
+1F31A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌚) NEW MOON WITH FACE
+1F31B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌛) FIRST QUARTER MOON WITH FACE
+1F31C ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌜) LAST QUARTER MOON WITH FACE
+1F31D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌝) FULL MOON WITH FACE
+1F31E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌞) SUN WITH FACE
+1F31F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌟) GLOWING STAR
+1F320 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌠) SHOOTING STAR
+1F321 ;	text ;	L2 ;	none ;	w	# V7.0 (🌡) THERMOMETER
+1F324 ;	text ;	L2 ;	none ;	w	# V7.0 (🌤) WHITE SUN WITH SMALL CLOUD
+1F325 ;	text ;	L2 ;	none ;	w	# V7.0 (🌥) WHITE SUN BEHIND CLOUD
+1F326 ;	text ;	L2 ;	none ;	w	# V7.0 (🌦) WHITE SUN BEHIND CLOUD WITH RAIN
+1F327 ;	text ;	L2 ;	none ;	w	# V7.0 (🌧) CLOUD WITH RAIN
+1F328 ;	text ;	L2 ;	none ;	w	# V7.0 (🌨) CLOUD WITH SNOW
+1F329 ;	text ;	L2 ;	none ;	w	# V7.0 (🌩) CLOUD WITH LIGHTNING
+1F32A ;	text ;	L2 ;	none ;	w	# V7.0 (🌪) CLOUD WITH TORNADO
+1F32B ;	text ;	L2 ;	none ;	w	# V7.0 (🌫) FOG
+1F32C ;	text ;	L2 ;	none ;	w	# V7.0 (🌬) WIND BLOWING FACE
+1F32D ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌭) HOT DOG
+1F32E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌮) TACO
+1F32F ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌯) BURRITO
+1F330 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌰) CHESTNUT
+1F331 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌱) SEEDLING
+1F332 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌲) EVERGREEN TREE
+1F333 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌳) DECIDUOUS TREE
+1F334 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌴) PALM TREE
+1F335 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌵) CACTUS
+1F336 ;	text ;	L2 ;	none ;	w	# V7.0 (🌶) HOT PEPPER
+1F337 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌷) TULIP
+1F338 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌸) CHERRY BLOSSOM
+1F339 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌹) ROSE
+1F33A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌺) HIBISCUS
+1F33B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌻) SUNFLOWER
+1F33C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌼) BLOSSOM
+1F33D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌽) EAR OF MAIZE
+1F33E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌾) EAR OF RICE
+1F33F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌿) HERB
+1F340 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍀) FOUR LEAF CLOVER
+1F341 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍁) MAPLE LEAF
+1F342 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍂) FALLEN LEAF
+1F343 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍃) LEAF FLUTTERING IN WIND
+1F344 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍄) MUSHROOM
+1F345 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍅) TOMATO
+1F346 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍆) AUBERGINE
+1F347 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍇) GRAPES
+1F348 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍈) MELON
+1F349 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍉) WATERMELON
+1F34A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍊) TANGERINE
+1F34B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍋) LEMON
+1F34C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍌) BANANA
+1F34D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍍) PINEAPPLE
+1F34E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍎) RED APPLE
+1F34F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍏) GREEN APPLE
+1F350 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍐) PEAR
+1F351 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍑) PEACH
+1F352 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍒) CHERRIES
+1F353 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍓) STRAWBERRY
+1F354 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍔) HAMBURGER
+1F355 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍕) SLICE OF PIZZA
+1F356 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍖) MEAT ON BONE
+1F357 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍗) POULTRY LEG
+1F358 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍘) RICE CRACKER
+1F359 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍙) RICE BALL
+1F35A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍚) COOKED RICE
+1F35B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍛) CURRY AND RICE
+1F35C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍜) STEAMING BOWL
+1F35D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍝) SPAGHETTI
+1F35E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍞) BREAD
+1F35F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍟) FRENCH FRIES
+1F360 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍠) ROASTED SWEET POTATO
+1F361 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍡) DANGO
+1F362 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍢) ODEN
+1F363 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍣) SUSHI
+1F364 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍤) FRIED SHRIMP
+1F365 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍥) FISH CAKE WITH SWIRL DESIGN
+1F366 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍦) SOFT ICE CREAM
+1F367 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍧) SHAVED ICE
+1F368 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍨) ICE CREAM
+1F369 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍩) DOUGHNUT
+1F36A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍪) COOKIE
+1F36B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍫) CHOCOLATE BAR
+1F36C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍬) CANDY
+1F36D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍭) LOLLIPOP
+1F36E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍮) CUSTARD
+1F36F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍯) HONEY POT
+1F370 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍰) SHORTCAKE
+1F371 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍱) BENTO BOX
+1F372 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍲) POT OF FOOD
+1F373 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍳) COOKING
+1F374 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍴) FORK AND KNIFE
+1F375 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍵) TEACUP WITHOUT HANDLE
+1F376 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍶) SAKE BOTTLE AND CUP
+1F377 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍷) WINE GLASS
+1F378 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🍸) COCKTAIL GLASS
+1F379 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍹) TROPICAL DRINK
+1F37A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍺) BEER MUG
+1F37B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍻) CLINKING BEER MUGS
+1F37C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍼) BABY BOTTLE
+1F37D ;	text ;	L2 ;	none ;	w	# V7.0 (🍽) FORK AND KNIFE WITH PLATE
+1F37E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🍾) BOTTLE WITH POPPING CORK
+1F37F ;	emoji ;	L2 ;	none ;	x	# V8.0 (🍿) POPCORN
+1F380 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎀) RIBBON
+1F381 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎁) WRAPPED PRESENT
+1F382 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎂) BIRTHDAY CAKE
+1F383 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎃) JACK-O-LANTERN
+1F384 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎄) CHRISTMAS TREE
+1F385 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🎅) FATHER CHRISTMAS
+1F386 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎆) FIREWORKS
+1F387 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎇) FIREWORK SPARKLER
+1F388 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎈) BALLOON
+1F389 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎉) PARTY POPPER
+1F38A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎊) CONFETTI BALL
+1F38B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎋) TANABATA TREE
+1F38C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎌) CROSSED FLAGS
+1F38D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎍) PINE DECORATION
+1F38E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎎) JAPANESE DOLLS
+1F38F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎏) CARP STREAMER
+1F390 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎐) WIND CHIME
+1F391 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎑) MOON VIEWING CEREMONY
+1F392 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎒) SCHOOL SATCHEL
+1F393 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎓) GRADUATION CAP
+1F396 ;	text ;	L2 ;	none ;	w	# V7.0 (🎖) MILITARY MEDAL
+1F397 ;	text ;	L2 ;	none ;	w	# V7.0 (🎗) REMINDER RIBBON
+1F399 ;	text ;	L2 ;	none ;	w	# V7.0 (🎙) STUDIO MICROPHONE
+1F39A ;	text ;	L2 ;	none ;	w	# V7.0 (🎚) LEVEL SLIDER
+1F39B ;	text ;	L2 ;	none ;	w	# V7.0 (🎛) CONTROL KNOBS
+1F39E ;	text ;	L2 ;	none ;	w	# V7.0 (🎞) FILM FRAMES
+1F39F ;	text ;	L2 ;	none ;	w	# V7.0 (🎟) ADMISSION TICKETS
+1F3A0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎠) CAROUSEL HORSE
+1F3A1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎡) FERRIS WHEEL
+1F3A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎢) ROLLER COASTER
+1F3A3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎣) FISHING POLE AND FISH
+1F3A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎤) MICROPHONE
+1F3A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎥) MOVIE CAMERA
+1F3A6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎦) CINEMA
+1F3A7 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎧) HEADPHONE
+1F3A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎨) ARTIST PALETTE
+1F3A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎩) TOP HAT
+1F3AA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎪) CIRCUS TENT
+1F3AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎫) TICKET
+1F3AC ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎬) CLAPPER BOARD
+1F3AD ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎭) PERFORMING ARTS
+1F3AE ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎮) VIDEO GAME
+1F3AF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎯) DIRECT HIT
+1F3B0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎰) SLOT MACHINE
+1F3B1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎱) BILLIARDS
+1F3B2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎲) GAME DIE
+1F3B3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎳) BOWLING
+1F3B4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎴) FLOWER PLAYING CARDS
+1F3B5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎵) MUSICAL NOTE
+1F3B6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎶) MULTIPLE MUSICAL NOTES
+1F3B7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎷) SAXOPHONE
+1F3B8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎸) GUITAR
+1F3B9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎹) MUSICAL KEYBOARD
+1F3BA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎺) TRUMPET
+1F3BB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎻) VIOLIN
+1F3BC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎼) MUSICAL SCORE
+1F3BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎽) RUNNING SHIRT WITH SASH
+1F3BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎾) TENNIS RACQUET AND BALL
+1F3BF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎿) SKI AND SKI BOOT
+1F3C0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏀) BASKETBALL AND HOOP
+1F3C1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏁) CHEQUERED FLAG
+1F3C2 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏂) SNOWBOARDER
+1F3C3 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🏃) RUNNER
+1F3C4 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏄) SURFER
+1F3C5 ;	emoji ;	L2 ;	none ;	x	# V7.0 (🏅) SPORTS MEDAL
+1F3C6 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏆) TROPHY
+1F3C7 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🏇) HORSE RACING
+1F3C8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏈) AMERICAN FOOTBALL
+1F3C9 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🏉) RUGBY FOOTBALL
+1F3CA ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏊) SWIMMER
+1F3CB ;	text ;	L2 ;	none ;	w	# V7.0 (🏋) WEIGHT LIFTER
+1F3CC ;	text ;	L2 ;	none ;	w	# V7.0 (🏌) GOLFER
+1F3CD ;	text ;	L2 ;	none ;	w	# V7.0 (🏍) RACING MOTORCYCLE
+1F3CE ;	text ;	L2 ;	none ;	w	# V7.0 (🏎) RACING CAR
+1F3CF ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏏) CRICKET BAT AND BALL
+1F3D0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏐) VOLLEYBALL
+1F3D1 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏑) FIELD HOCKEY STICK AND BALL
+1F3D2 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏒) ICE HOCKEY STICK AND PUCK
+1F3D3 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏓) TABLE TENNIS PADDLE AND BALL
+1F3D4 ;	text ;	L2 ;	none ;	w	# V7.0 (🏔) SNOW CAPPED MOUNTAIN
+1F3D5 ;	text ;	L2 ;	none ;	w	# V7.0 (🏕) CAMPING
+1F3D6 ;	text ;	L2 ;	none ;	w	# V7.0 (🏖) BEACH WITH UMBRELLA
+1F3D7 ;	text ;	L2 ;	none ;	w	# V7.0 (🏗) BUILDING CONSTRUCTION
+1F3D8 ;	text ;	L2 ;	none ;	w	# V7.0 (🏘) HOUSE BUILDINGS
+1F3D9 ;	text ;	L2 ;	none ;	w	# V7.0 (🏙) CITYSCAPE
+1F3DA ;	text ;	L2 ;	none ;	w	# V7.0 (🏚) DERELICT HOUSE BUILDING
+1F3DB ;	text ;	L2 ;	none ;	w	# V7.0 (🏛) CLASSICAL BUILDING
+1F3DC ;	text ;	L2 ;	none ;	w	# V7.0 (🏜) DESERT
+1F3DD ;	text ;	L2 ;	none ;	w	# V7.0 (🏝) DESERT ISLAND
+1F3DE ;	text ;	L2 ;	none ;	w	# V7.0 (🏞) NATIONAL PARK
+1F3DF ;	text ;	L2 ;	none ;	w	# V7.0 (🏟) STADIUM
+1F3E0 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏠) HOUSE BUILDING
+1F3E1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏡) HOUSE WITH GARDEN
+1F3E2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏢) OFFICE BUILDING
+1F3E3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏣) JAPANESE POST OFFICE
+1F3E4 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🏤) EUROPEAN POST OFFICE
+1F3E5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏥) HOSPITAL
+1F3E6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏦) BANK
+1F3E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏧) AUTOMATED TELLER MACHINE
+1F3E8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏨) HOTEL
+1F3E9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏩) LOVE HOTEL
+1F3EA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏪) CONVENIENCE STORE
+1F3EB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏫) SCHOOL
+1F3EC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏬) DEPARTMENT STORE
+1F3ED ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏭) FACTORY
+1F3EE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏮) IZAKAYA LANTERN
+1F3EF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏯) JAPANESE CASTLE
+1F3F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏰) EUROPEAN CASTLE
+1F3F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🏳) WAVING WHITE FLAG
+1F3F4 ;	emoji ;	L2 ;	none ;	x	# V7.0 (🏴) WAVING BLACK FLAG
+1F3F5 ;	text ;	L2 ;	none ;	w	# V7.0 (🏵) ROSETTE
+1F3F7 ;	text ;	L2 ;	none ;	w	# V7.0 (🏷) LABEL
+1F3F8 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏸) BADMINTON RACQUET AND SHUTTLECOCK
+1F3F9 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏹) BOW AND ARROW
+1F3FA ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏺) AMPHORA
+1F3FB ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏻) EMOJI MODIFIER FITZPATRICK TYPE-1-2
+1F3FC ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏼) EMOJI MODIFIER FITZPATRICK TYPE-3
+1F3FD ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏽) EMOJI MODIFIER FITZPATRICK TYPE-4
+1F3FE ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏾) EMOJI MODIFIER FITZPATRICK TYPE-5
+1F3FF ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏿) EMOJI MODIFIER FITZPATRICK TYPE-6
+1F400 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐀) RAT
+1F401 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐁) MOUSE
+1F402 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐂) OX
+1F403 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐃) WATER BUFFALO
+1F404 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐄) COW
+1F405 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐅) TIGER
+1F406 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐆) LEOPARD
+1F407 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐇) RABBIT
+1F408 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🐈) CAT
+1F409 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐉) DRAGON
+1F40A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐊) CROCODILE
+1F40B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐋) WHALE
+1F40C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐌) SNAIL
+1F40D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐍) SNAKE
+1F40E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐎) HORSE
+1F40F ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐏) RAM
+1F410 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐐) GOAT
+1F411 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐑) SHEEP
+1F412 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐒) MONKEY
+1F413 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐓) ROOSTER
+1F414 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐔) CHICKEN
+1F415 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🐕) DOG
+1F416 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐖) PIG
+1F417 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐗) BOAR
+1F418 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐘) ELEPHANT
+1F419 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐙) OCTOPUS
+1F41A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐚) SPIRAL SHELL
+1F41B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐛) BUG
+1F41C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐜) ANT
+1F41D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐝) HONEYBEE
+1F41E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐞) LADY BEETLE
+1F41F ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🐟) FISH
+1F420 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐠) TROPICAL FISH
+1F421 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐡) BLOWFISH
+1F422 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐢) TURTLE
+1F423 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐣) HATCHING CHICK
+1F424 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐤) BABY CHICK
+1F425 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐥) FRONT-FACING BABY CHICK
+1F426 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🐦) BIRD
+1F427 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐧) PENGUIN
+1F428 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐨) KOALA
+1F429 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐩) POODLE
+1F42A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐪) DROMEDARY CAMEL
+1F42B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐫) BACTRIAN CAMEL
+1F42C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐬) DOLPHIN
+1F42D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐭) MOUSE FACE
+1F42E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐮) COW FACE
+1F42F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐯) TIGER FACE
+1F430 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐰) RABBIT FACE
+1F431 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐱) CAT FACE
+1F432 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐲) DRAGON FACE
+1F433 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐳) SPOUTING WHALE
+1F434 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐴) HORSE FACE
+1F435 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐵) MONKEY FACE
+1F436 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐶) DOG FACE
+1F437 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐷) PIG FACE
+1F438 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐸) FROG FACE
+1F439 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐹) HAMSTER FACE
+1F43A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐺) WOLF FACE
+1F43B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐻) BEAR FACE
+1F43C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐼) PANDA FACE
+1F43D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐽) PIG NOSE
+1F43E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐾) PAW PRINTS
+1F43F ;	text ;	L2 ;	none ;	w	# V7.0 (🐿) CHIPMUNK
+1F440 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👀) EYES
+1F441 ;	text ;	L2 ;	none ;	w	# V7.0 (👁) EYE
+1F442 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👂) EAR
+1F443 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👃) NOSE
+1F444 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👄) MOUTH
+1F445 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👅) TONGUE
+1F446 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👆) WHITE UP POINTING BACKHAND INDEX
+1F447 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👇) WHITE DOWN POINTING BACKHAND INDEX
+1F448 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👈) WHITE LEFT POINTING BACKHAND INDEX
+1F449 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👉) WHITE RIGHT POINTING BACKHAND INDEX
+1F44A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👊) FISTED HAND SIGN
+1F44B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👋) WAVING HAND SIGN
+1F44C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👌) OK HAND SIGN
+1F44D ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👍) THUMBS UP SIGN
+1F44E ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👎) THUMBS DOWN SIGN
+1F44F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👏) CLAPPING HANDS SIGN
+1F450 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👐) OPEN HANDS SIGN
+1F451 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👑) CROWN
+1F452 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👒) WOMANS HAT
+1F453 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👓) EYEGLASSES
+1F454 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👔) NECKTIE
+1F455 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👕) T-SHIRT
+1F456 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👖) JEANS
+1F457 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👗) DRESS
+1F458 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👘) KIMONO
+1F459 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👙) BIKINI
+1F45A ;	emoji ;	L1 ;	none ;	j	# V6.0 (👚) WOMANS CLOTHES
+1F45B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👛) PURSE
+1F45C ;	emoji ;	L1 ;	none ;	j	# V6.0 (👜) HANDBAG
+1F45D ;	emoji ;	L1 ;	none ;	j	# V6.0 (👝) POUCH
+1F45E ;	emoji ;	L1 ;	none ;	j	# V6.0 (👞) MANS SHOE
+1F45F ;	emoji ;	L1 ;	none ;	j	# V6.0 (👟) ATHLETIC SHOE
+1F460 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👠) HIGH-HEELED SHOE
+1F461 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👡) WOMANS SANDAL
+1F462 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👢) WOMANS BOOTS
+1F463 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👣) FOOTPRINTS
+1F464 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👤) BUST IN SILHOUETTE
+1F465 ;	emoji ;	L1 ;	none ;	x	# V6.0 (👥) BUSTS IN SILHOUETTE
+1F466 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👦) BOY
+1F467 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👧) GIRL
+1F468 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👨) MAN
+1F469 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👩) WOMAN
+1F46A ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👪) FAMILY
+1F46B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👫) MAN AND WOMAN HOLDING HANDS
+1F46C ;	emoji ;	L1 ;	none ;	x	# V6.0 (👬) TWO MEN HOLDING HANDS
+1F46D ;	emoji ;	L1 ;	none ;	x	# V6.0 (👭) TWO WOMEN HOLDING HANDS
+1F46E ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👮) POLICE OFFICER
+1F46F ;	emoji ;	L1 ;	none ;	j	# V6.0 (👯) WOMAN WITH BUNNY EARS
+1F470 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👰) BRIDE WITH VEIL
+1F471 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👱) PERSON WITH BLOND HAIR
+1F472 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👲) MAN WITH GUA PI MAO
+1F473 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👳) MAN WITH TURBAN
+1F474 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👴) OLDER MAN
+1F475 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👵) OLDER WOMAN
+1F476 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👶) BABY
+1F477 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👷) CONSTRUCTION WORKER
+1F478 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👸) PRINCESS
+1F479 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👹) JAPANESE OGRE
+1F47A ;	emoji ;	L1 ;	none ;	j	# V6.0 (👺) JAPANESE GOBLIN
+1F47B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👻) GHOST
+1F47C ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👼) BABY ANGEL
+1F47D ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👽) EXTRATERRESTRIAL ALIEN
+1F47E ;	emoji ;	L1 ;	none ;	j	# V6.0 (👾) ALIEN MONSTER
+1F47F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👿) IMP
+1F480 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💀) SKULL
+1F481 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💁) INFORMATION DESK PERSON
+1F482 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💂) GUARDSMAN
+1F483 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💃) DANCER
+1F484 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💄) LIPSTICK
+1F485 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💅) NAIL POLISH
+1F486 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💆) FACE MASSAGE
+1F487 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💇) HAIRCUT
+1F488 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💈) BARBER POLE
+1F489 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💉) SYRINGE
+1F48A ;	emoji ;	L1 ;	none ;	j	# V6.0 (💊) PILL
+1F48B ;	emoji ;	L1 ;	none ;	j	# V6.0 (💋) KISS MARK
+1F48C ;	emoji ;	L1 ;	none ;	j	# V6.0 (💌) LOVE LETTER
+1F48D ;	emoji ;	L1 ;	none ;	j	# V6.0 (💍) RING
+1F48E ;	emoji ;	L1 ;	none ;	j	# V6.0 (💎) GEM STONE
+1F48F ;	emoji ;	L1 ;	none ;	j	# V6.0 (💏) KISS
+1F490 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💐) BOUQUET
+1F491 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💑) COUPLE WITH HEART
+1F492 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💒) WEDDING
+1F493 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💓) BEATING HEART
+1F494 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💔) BROKEN HEART
+1F495 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💕) TWO HEARTS
+1F496 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💖) SPARKLING HEART
+1F497 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💗) GROWING HEART
+1F498 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💘) HEART WITH ARROW
+1F499 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💙) BLUE HEART
+1F49A ;	emoji ;	L1 ;	none ;	j	# V6.0 (💚) GREEN HEART
+1F49B ;	emoji ;	L1 ;	none ;	j	# V6.0 (💛) YELLOW HEART
+1F49C ;	emoji ;	L1 ;	none ;	j	# V6.0 (💜) PURPLE HEART
+1F49D ;	emoji ;	L1 ;	none ;	j	# V6.0 (💝) HEART WITH RIBBON
+1F49E ;	emoji ;	L1 ;	none ;	j	# V6.0 (💞) REVOLVING HEARTS
+1F49F ;	emoji ;	L1 ;	none ;	j	# V6.0 (💟) HEART DECORATION
+1F4A0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💠) DIAMOND SHAPE WITH A DOT INSIDE
+1F4A1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💡) ELECTRIC LIGHT BULB
+1F4A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💢) ANGER SYMBOL
+1F4A3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💣) BOMB
+1F4A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💤) SLEEPING SYMBOL
+1F4A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💥) COLLISION SYMBOL
+1F4A6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💦) SPLASHING SWEAT SYMBOL
+1F4A7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💧) DROPLET
+1F4A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💨) DASH SYMBOL
+1F4A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💩) PILE OF POO
+1F4AA ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💪) FLEXED BICEPS
+1F4AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (💫) DIZZY SYMBOL
+1F4AC ;	emoji ;	L1 ;	none ;	j	# V6.0 (💬) SPEECH BALLOON
+1F4AD ;	emoji ;	L1 ;	none ;	x	# V6.0 (💭) THOUGHT BALLOON
+1F4AE ;	emoji ;	L1 ;	none ;	j	# V6.0 (💮) WHITE FLOWER
+1F4AF ;	emoji ;	L1 ;	none ;	j	# V6.0 (💯) HUNDRED POINTS SYMBOL
+1F4B0 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💰) MONEY BAG
+1F4B1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💱) CURRENCY EXCHANGE
+1F4B2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💲) HEAVY DOLLAR SIGN
+1F4B3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💳) CREDIT CARD
+1F4B4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💴) BANKNOTE WITH YEN SIGN
+1F4B5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💵) BANKNOTE WITH DOLLAR SIGN
+1F4B6 ;	emoji ;	L1 ;	none ;	x	# V6.0 (💶) BANKNOTE WITH EURO SIGN
+1F4B7 ;	emoji ;	L1 ;	none ;	x	# V6.0 (💷) BANKNOTE WITH POUND SIGN
+1F4B8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💸) MONEY WITH WINGS
+1F4B9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💹) CHART WITH UPWARDS TREND AND YEN SIGN
+1F4BA ;	emoji ;	L1 ;	none ;	j	# V6.0 (💺) SEAT
+1F4BB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💻) PERSONAL COMPUTER
+1F4BC ;	emoji ;	L1 ;	none ;	j	# V6.0 (💼) BRIEFCASE
+1F4BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (💽) MINIDISC
+1F4BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (💾) FLOPPY DISK
+1F4BF ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💿) OPTICAL DISC
+1F4C0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📀) DVD
+1F4C1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📁) FILE FOLDER
+1F4C2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📂) OPEN FILE FOLDER
+1F4C3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📃) PAGE WITH CURL
+1F4C4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📄) PAGE FACING UP
+1F4C5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📅) CALENDAR
+1F4C6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📆) TEAR-OFF CALENDAR
+1F4C7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📇) CARD INDEX
+1F4C8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📈) CHART WITH UPWARDS TREND
+1F4C9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📉) CHART WITH DOWNWARDS TREND
+1F4CA ;	emoji ;	L1 ;	none ;	j	# V6.0 (📊) BAR CHART
+1F4CB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📋) CLIPBOARD
+1F4CC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📌) PUSHPIN
+1F4CD ;	emoji ;	L1 ;	none ;	j	# V6.0 (📍) ROUND PUSHPIN
+1F4CE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📎) PAPERCLIP
+1F4CF ;	emoji ;	L1 ;	none ;	j	# V6.0 (📏) STRAIGHT RULER
+1F4D0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📐) TRIANGULAR RULER
+1F4D1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📑) BOOKMARK TABS
+1F4D2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📒) LEDGER
+1F4D3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📓) NOTEBOOK
+1F4D4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📔) NOTEBOOK WITH DECORATIVE COVER
+1F4D5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📕) CLOSED BOOK
+1F4D6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📖) OPEN BOOK
+1F4D7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📗) GREEN BOOK
+1F4D8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📘) BLUE BOOK
+1F4D9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📙) ORANGE BOOK
+1F4DA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📚) BOOKS
+1F4DB ;	emoji ;	L1 ;	none ;	j	# V6.0 (📛) NAME BADGE
+1F4DC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📜) SCROLL
+1F4DD ;	emoji ;	L1 ;	none ;	j	# V6.0 (📝) MEMO
+1F4DE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📞) TELEPHONE RECEIVER
+1F4DF ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📟) PAGER
+1F4E0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📠) FAX MACHINE
+1F4E1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📡) SATELLITE ANTENNA
+1F4E2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📢) PUBLIC ADDRESS LOUDSPEAKER
+1F4E3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📣) CHEERING MEGAPHONE
+1F4E4 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📤) OUTBOX TRAY
+1F4E5 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📥) INBOX TRAY
+1F4E6 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📦) PACKAGE
+1F4E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📧) E-MAIL SYMBOL
+1F4E8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📨) INCOMING ENVELOPE
+1F4E9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📩) ENVELOPE WITH DOWNWARDS ARROW ABOVE
+1F4EA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📪) CLOSED MAILBOX WITH LOWERED FLAG
+1F4EB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📫) CLOSED MAILBOX WITH RAISED FLAG
+1F4EC ;	emoji ;	L1 ;	none ;	w	# V6.0 (📬) OPEN MAILBOX WITH RAISED FLAG
+1F4ED ;	emoji ;	L1 ;	none ;	w	# V6.0 (📭) OPEN MAILBOX WITH LOWERED FLAG
+1F4EE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📮) POSTBOX
+1F4EF ;	emoji ;	L1 ;	none ;	x	# V6.0 (📯) POSTAL HORN
+1F4F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📰) NEWSPAPER
+1F4F1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📱) MOBILE PHONE
+1F4F2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📲) MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT
+1F4F3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📳) VIBRATION MODE
+1F4F4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📴) MOBILE PHONE OFF
+1F4F5 ;	emoji ;	L1 ;	none ;	x	# V6.0 (📵) NO MOBILE PHONES
+1F4F6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📶) ANTENNA WITH BARS
+1F4F7 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📷) CAMERA
+1F4F8 ;	emoji ;	L2 ;	none ;	x	# V7.0 (📸) CAMERA WITH FLASH
+1F4F9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📹) VIDEO CAMERA
+1F4FA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📺) TELEVISION
+1F4FB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📻) RADIO
+1F4FC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📼) VIDEOCASSETTE
+1F4FD ;	text ;	L2 ;	none ;	w	# V7.0 (📽) FILM PROJECTOR
+1F4FF ;	emoji ;	L2 ;	none ;	x	# V8.0 (📿) PRAYER BEADS
+1F500 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔀) TWISTED RIGHTWARDS ARROWS
+1F501 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔁) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS
+1F502 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔂) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY
+1F503 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔃) CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
+1F504 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔄) ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
+1F505 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔅) LOW BRIGHTNESS SYMBOL
+1F506 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔆) HIGH BRIGHTNESS SYMBOL
+1F507 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔇) SPEAKER WITH CANCELLATION STROKE
+1F508 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🔈) SPEAKER
+1F509 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔉) SPEAKER WITH ONE SOUND WAVE
+1F50A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔊) SPEAKER WITH THREE SOUND WAVES
+1F50B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔋) BATTERY
+1F50C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔌) ELECTRIC PLUG
+1F50D ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔍) LEFT-POINTING MAGNIFYING GLASS
+1F50E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔎) RIGHT-POINTING MAGNIFYING GLASS
+1F50F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔏) LOCK WITH INK PEN
+1F510 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔐) CLOSED LOCK WITH KEY
+1F511 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔑) KEY
+1F512 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔒) LOCK
+1F513 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔓) OPEN LOCK
+1F514 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔔) BELL
+1F515 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔕) BELL WITH CANCELLATION STROKE
+1F516 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔖) BOOKMARK
+1F517 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔗) LINK SYMBOL
+1F518 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔘) RADIO BUTTON
+1F519 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔙) BACK WITH LEFTWARDS ARROW ABOVE
+1F51A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔚) END WITH LEFTWARDS ARROW ABOVE
+1F51B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔛) ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE
+1F51C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔜) SOON WITH RIGHTWARDS ARROW ABOVE
+1F51D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔝) TOP WITH UPWARDS ARROW ABOVE
+1F51E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔞) NO ONE UNDER EIGHTEEN SYMBOL
+1F51F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔟) KEYCAP TEN
+1F520 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔠) INPUT SYMBOL FOR LATIN CAPITAL LETTERS
+1F521 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔡) INPUT SYMBOL FOR LATIN SMALL LETTERS
+1F522 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔢) INPUT SYMBOL FOR NUMBERS
+1F523 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔣) INPUT SYMBOL FOR SYMBOLS
+1F524 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔤) INPUT SYMBOL FOR LATIN LETTERS
+1F525 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔥) FIRE
+1F526 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔦) ELECTRIC TORCH
+1F527 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔧) WRENCH
+1F528 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔨) HAMMER
+1F529 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔩) NUT AND BOLT
+1F52A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔪) HOCHO
+1F52B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔫) PISTOL
+1F52C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔬) MICROSCOPE
+1F52D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔭) TELESCOPE
+1F52E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔮) CRYSTAL BALL
+1F52F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔯) SIX POINTED STAR WITH MIDDLE DOT
+1F530 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔰) JAPANESE SYMBOL FOR BEGINNER
+1F531 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔱) TRIDENT EMBLEM
+1F532 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔲) BLACK SQUARE BUTTON
+1F533 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔳) WHITE SQUARE BUTTON
+1F534 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔴) LARGE RED CIRCLE
+1F535 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔵) LARGE BLUE CIRCLE
+1F536 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔶) LARGE ORANGE DIAMOND
+1F537 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔷) LARGE BLUE DIAMOND
+1F538 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔸) SMALL ORANGE DIAMOND
+1F539 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔹) SMALL BLUE DIAMOND
+1F53A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔺) UP-POINTING RED TRIANGLE
+1F53B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔻) DOWN-POINTING RED TRIANGLE
+1F53C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔼) UP-POINTING SMALL RED TRIANGLE
+1F53D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔽) DOWN-POINTING SMALL RED TRIANGLE
+1F549 ;	text ;	L2 ;	none ;	w	# V7.0 (🕉) OM SYMBOL
+1F54A ;	text ;	L2 ;	none ;	w	# V7.0 (🕊) DOVE OF PEACE
+1F54B ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕋) KAABA
+1F54C ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕌) MOSQUE
+1F54D ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕍) SYNAGOGUE
+1F54E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕎) MENORAH WITH NINE BRANCHES
+1F550 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕐) CLOCK FACE ONE OCLOCK
+1F551 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕑) CLOCK FACE TWO OCLOCK
+1F552 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕒) CLOCK FACE THREE OCLOCK
+1F553 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕓) CLOCK FACE FOUR OCLOCK
+1F554 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕔) CLOCK FACE FIVE OCLOCK
+1F555 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕕) CLOCK FACE SIX OCLOCK
+1F556 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕖) CLOCK FACE SEVEN OCLOCK
+1F557 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕗) CLOCK FACE EIGHT OCLOCK
+1F558 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕘) CLOCK FACE NINE OCLOCK
+1F559 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕙) CLOCK FACE TEN OCLOCK
+1F55A ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕚) CLOCK FACE ELEVEN OCLOCK
+1F55B ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕛) CLOCK FACE TWELVE OCLOCK
+1F55C ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕜) CLOCK FACE ONE-THIRTY
+1F55D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕝) CLOCK FACE TWO-THIRTY
+1F55E ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕞) CLOCK FACE THREE-THIRTY
+1F55F ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕟) CLOCK FACE FOUR-THIRTY
+1F560 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕠) CLOCK FACE FIVE-THIRTY
+1F561 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕡) CLOCK FACE SIX-THIRTY
+1F562 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕢) CLOCK FACE SEVEN-THIRTY
+1F563 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕣) CLOCK FACE EIGHT-THIRTY
+1F564 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕤) CLOCK FACE NINE-THIRTY
+1F565 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕥) CLOCK FACE TEN-THIRTY
+1F566 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕦) CLOCK FACE ELEVEN-THIRTY
+1F567 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕧) CLOCK FACE TWELVE-THIRTY
+1F56F ;	text ;	L2 ;	none ;	w	# V7.0 (🕯) CANDLE
+1F570 ;	text ;	L2 ;	none ;	w	# V7.0 (🕰) MANTELPIECE CLOCK
+1F573 ;	text ;	L2 ;	none ;	w	# V7.0 (🕳) HOLE
+1F574 ;	text ;	L2 ;	none ;	w	# V7.0 (🕴) MAN IN BUSINESS SUIT LEVITATING
+1F575 ;	text ;	L2 ;	none ;	w	# V7.0 (🕵) SLEUTH OR SPY
+1F576 ;	text ;	L2 ;	none ;	w	# V7.0 (🕶) DARK SUNGLASSES
+1F577 ;	text ;	L2 ;	none ;	w	# V7.0 (🕷) SPIDER
+1F578 ;	text ;	L2 ;	none ;	w	# V7.0 (🕸) SPIDER WEB
+1F579 ;	text ;	L2 ;	none ;	w	# V7.0 (🕹) JOYSTICK
+1F587 ;	text ;	L2 ;	none ;	w	# V7.0 (🖇) LINKED PAPERCLIPS
+1F58A ;	text ;	L2 ;	none ;	w	# V7.0 (🖊) LOWER LEFT BALLPOINT PEN
+1F58B ;	text ;	L2 ;	none ;	w	# V7.0 (🖋) LOWER LEFT FOUNTAIN PEN
+1F58C ;	text ;	L2 ;	none ;	w	# V7.0 (🖌) LOWER LEFT PAINTBRUSH
+1F58D ;	text ;	L2 ;	none ;	w	# V7.0 (🖍) LOWER LEFT CRAYON
+1F590 ;	text ;	L2 ;	secondary ;	w	# V7.0 (🖐) RAISED HAND WITH FINGERS SPLAYED
+1F595 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🖕) REVERSED HAND WITH MIDDLE FINGER EXTENDED
+1F596 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🖖) RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+1F5A5 ;	text ;	L2 ;	none ;	w	# V7.0 (🖥) DESKTOP COMPUTER
+1F5A8 ;	text ;	L2 ;	none ;	w	# V7.0 (🖨) PRINTER
+1F5B1 ;	text ;	L2 ;	none ;	w	# V7.0 (🖱) THREE BUTTON MOUSE
+1F5B2 ;	text ;	L2 ;	none ;	w	# V7.0 (🖲) TRACKBALL
+1F5BC ;	text ;	L2 ;	none ;	w	# V7.0 (🖼) FRAME WITH PICTURE
+1F5C2 ;	text ;	L2 ;	none ;	w	# V7.0 (🗂) CARD INDEX DIVIDERS
+1F5C3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗃) CARD FILE BOX
+1F5C4 ;	text ;	L2 ;	none ;	w	# V7.0 (🗄) FILE CABINET
+1F5D1 ;	text ;	L2 ;	none ;	w	# V7.0 (🗑) WASTEBASKET
+1F5D2 ;	text ;	L2 ;	none ;	w	# V7.0 (🗒) SPIRAL NOTE PAD
+1F5D3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗓) SPIRAL CALENDAR PAD
+1F5DC ;	text ;	L2 ;	none ;	w	# V7.0 (🗜) COMPRESSION
+1F5DD ;	text ;	L2 ;	none ;	w	# V7.0 (🗝) OLD KEY
+1F5DE ;	text ;	L2 ;	none ;	w	# V7.0 (🗞) ROLLED-UP NEWSPAPER
+1F5E1 ;	text ;	L2 ;	none ;	w	# V7.0 (🗡) DAGGER KNIFE
+1F5E3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗣) SPEAKING HEAD IN SILHOUETTE
+1F5EF ;	text ;	L2 ;	none ;	w	# V7.0 (🗯) RIGHT ANGER BUBBLE
+1F5F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗳) BALLOT BOX WITH BALLOT
+1F5FA ;	text ;	L2 ;	none ;	w	# V7.0 (🗺) WORLD MAP
+1F5FB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗻) MOUNT FUJI
+1F5FC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗼) TOKYO TOWER
+1F5FD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗽) STATUE OF LIBERTY
+1F5FE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗾) SILHOUETTE OF JAPAN
+1F5FF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗿) MOYAI
+1F600 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😀) GRINNING FACE
+1F601 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😁) GRINNING FACE WITH SMILING EYES
+1F602 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😂) FACE WITH TEARS OF JOY
+1F603 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😃) SMILING FACE WITH OPEN MOUTH
+1F604 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😄) SMILING FACE WITH OPEN MOUTH AND SMILING EYES
+1F605 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😅) SMILING FACE WITH OPEN MOUTH AND COLD SWEAT
+1F606 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😆) SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES
+1F607 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😇) SMILING FACE WITH HALO
+1F608 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😈) SMILING FACE WITH HORNS
+1F609 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😉) WINKING FACE
+1F60A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😊) SMILING FACE WITH SMILING EYES
+1F60B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😋) FACE SAVOURING DELICIOUS FOOD
+1F60C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😌) RELIEVED FACE
+1F60D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😍) SMILING FACE WITH HEART-SHAPED EYES
+1F60E ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😎) SMILING FACE WITH SUNGLASSES
+1F60F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😏) SMIRKING FACE
+1F610 ;	emoji ;	L1 ;	secondary ;	w	# V6.0 (😐) NEUTRAL FACE
+1F611 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😑) EXPRESSIONLESS FACE
+1F612 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😒) UNAMUSED FACE
+1F613 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😓) FACE WITH COLD SWEAT
+1F614 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😔) PENSIVE FACE
+1F615 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😕) CONFUSED FACE
+1F616 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😖) CONFOUNDED FACE
+1F617 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😗) KISSING FACE
+1F618 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😘) FACE THROWING A KISS
+1F619 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😙) KISSING FACE WITH SMILING EYES
+1F61A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😚) KISSING FACE WITH CLOSED EYES
+1F61B ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😛) FACE WITH STUCK-OUT TONGUE
+1F61C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😜) FACE WITH STUCK-OUT TONGUE AND WINKING EYE
+1F61D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😝) FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES
+1F61E ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😞) DISAPPOINTED FACE
+1F61F ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😟) WORRIED FACE
+1F620 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😠) ANGRY FACE
+1F621 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😡) POUTING FACE
+1F622 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😢) CRYING FACE
+1F623 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😣) PERSEVERING FACE
+1F624 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😤) FACE WITH LOOK OF TRIUMPH
+1F625 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😥) DISAPPOINTED BUT RELIEVED FACE
+1F626 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😦) FROWNING FACE WITH OPEN MOUTH
+1F627 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😧) ANGUISHED FACE
+1F628 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😨) FEARFUL FACE
+1F629 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😩) WEARY FACE
+1F62A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😪) SLEEPY FACE
+1F62B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😫) TIRED FACE
+1F62C ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😬) GRIMACING FACE
+1F62D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😭) LOUDLY CRYING FACE
+1F62E ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😮) FACE WITH OPEN MOUTH
+1F62F ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😯) HUSHED FACE
+1F630 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😰) FACE WITH OPEN MOUTH AND COLD SWEAT
+1F631 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😱) FACE SCREAMING IN FEAR
+1F632 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😲) ASTONISHED FACE
+1F633 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😳) FLUSHED FACE
+1F634 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😴) SLEEPING FACE
+1F635 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😵) DIZZY FACE
+1F636 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😶) FACE WITHOUT MOUTH
+1F637 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😷) FACE WITH MEDICAL MASK
+1F638 ;	emoji ;	L1 ;	none ;	j	# V6.0 (😸) GRINNING CAT FACE WITH SMILING EYES
+1F639 ;	emoji ;	L1 ;	none ;	j	# V6.0 (😹) CAT FACE WITH TEARS OF JOY
+1F63A ;	emoji ;	L1 ;	none ;	j	# V6.0 (😺) SMILING CAT FACE WITH OPEN MOUTH
+1F63B ;	emoji ;	L1 ;	none ;	j	# V6.0 (😻) SMILING CAT FACE WITH HEART-SHAPED EYES
+1F63C ;	emoji ;	L1 ;	none ;	j	# V6.0 (😼) CAT FACE WITH WRY SMILE
+1F63D ;	emoji ;	L1 ;	none ;	j	# V6.0 (😽) KISSING CAT FACE WITH CLOSED EYES
+1F63E ;	emoji ;	L1 ;	none ;	j	# V6.0 (😾) POUTING CAT FACE
+1F63F ;	emoji ;	L1 ;	none ;	j	# V6.0 (😿) CRYING CAT FACE
+1F640 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙀) WEARY CAT FACE
+1F641 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🙁) SLIGHTLY FROWNING FACE
+1F642 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🙂) SLIGHTLY SMILING FACE
+1F643 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🙃) UPSIDE-DOWN FACE
+1F644 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🙄) FACE WITH ROLLING EYES
+1F645 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙅) FACE WITH NO GOOD GESTURE
+1F646 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙆) FACE WITH OK GESTURE
+1F647 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙇) PERSON BOWING DEEPLY
+1F648 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙈) SEE-NO-EVIL MONKEY
+1F649 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙉) HEAR-NO-EVIL MONKEY
+1F64A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙊) SPEAK-NO-EVIL MONKEY
+1F64B ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙋) HAPPY PERSON RAISING ONE HAND
+1F64C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🙌) PERSON RAISING BOTH HANDS IN CELEBRATION
+1F64D ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙍) PERSON FROWNING
+1F64E ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙎) PERSON WITH POUTING FACE
+1F64F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🙏) PERSON WITH FOLDED HANDS
+1F680 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚀) ROCKET
+1F681 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚁) HELICOPTER
+1F682 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚂) STEAM LOCOMOTIVE
+1F683 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚃) RAILWAY CAR
+1F684 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚄) HIGH-SPEED TRAIN
+1F685 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚅) HIGH-SPEED TRAIN WITH BULLET NOSE
+1F686 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚆) TRAIN
+1F687 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚇) METRO
+1F688 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚈) LIGHT RAIL
+1F689 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚉) STATION
+1F68A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚊) TRAM
+1F68B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚋) TRAM CAR
+1F68C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚌) BUS
+1F68D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚍) ONCOMING BUS
+1F68E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚎) TROLLEYBUS
+1F68F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚏) BUS STOP
+1F690 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚐) MINIBUS
+1F691 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚑) AMBULANCE
+1F692 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚒) FIRE ENGINE
+1F693 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚓) POLICE CAR
+1F694 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚔) ONCOMING POLICE CAR
+1F695 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚕) TAXI
+1F696 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚖) ONCOMING TAXI
+1F697 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚗) AUTOMOBILE
+1F698 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚘) ONCOMING AUTOMOBILE
+1F699 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚙) RECREATIONAL VEHICLE
+1F69A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚚) DELIVERY TRUCK
+1F69B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚛) ARTICULATED LORRY
+1F69C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚜) TRACTOR
+1F69D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚝) MONORAIL
+1F69E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚞) MOUNTAIN RAILWAY
+1F69F ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚟) SUSPENSION RAILWAY
+1F6A0 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚠) MOUNTAIN CABLEWAY
+1F6A1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚡) AERIAL TRAMWAY
+1F6A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚢) SHIP
+1F6A3 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚣) ROWBOAT
+1F6A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚤) SPEEDBOAT
+1F6A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚥) HORIZONTAL TRAFFIC LIGHT
+1F6A6 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚦) VERTICAL TRAFFIC LIGHT
+1F6A7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚧) CONSTRUCTION SIGN
+1F6A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚨) POLICE CARS REVOLVING LIGHT
+1F6A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚩) TRIANGULAR FLAG ON POST
+1F6AA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚪) DOOR
+1F6AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚫) NO ENTRY SIGN
+1F6AC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚬) SMOKING SYMBOL
+1F6AD ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚭) NO SMOKING SYMBOL
+1F6AE ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚮) PUT LITTER IN ITS PLACE SYMBOL
+1F6AF ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚯) DO NOT LITTER SYMBOL
+1F6B0 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚰) POTABLE WATER SYMBOL
+1F6B1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚱) NON-POTABLE WATER SYMBOL
+1F6B2 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚲) BICYCLE
+1F6B3 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚳) NO BICYCLES
+1F6B4 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚴) BICYCLIST
+1F6B5 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚵) MOUNTAIN BICYCLIST
+1F6B6 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🚶) PEDESTRIAN
+1F6B7 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚷) NO PEDESTRIANS
+1F6B8 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚸) CHILDREN CROSSING
+1F6B9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚹) MENS SYMBOL
+1F6BA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚺) WOMENS SYMBOL
+1F6BB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚻) RESTROOM
+1F6BC ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚼) BABY SYMBOL
+1F6BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚽) TOILET
+1F6BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚾) WATER CLOSET
+1F6BF ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚿) SHOWER
+1F6C0 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🛀) BATH
+1F6C1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛁) BATHTUB
+1F6C2 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛂) PASSPORT CONTROL
+1F6C3 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛃) CUSTOMS
+1F6C4 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛄) BAGGAGE CLAIM
+1F6C5 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛅) LEFT LUGGAGE
+1F6CB ;	text ;	L2 ;	none ;	w	# V7.0 (🛋) COUCH AND LAMP
+1F6CC ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛌) SLEEPING ACCOMMODATION
+1F6CD ;	text ;	L2 ;	none ;	w	# V7.0 (🛍) SHOPPING BAGS
+1F6CE ;	text ;	L2 ;	none ;	w	# V7.0 (🛎) BELLHOP BELL
+1F6CF ;	text ;	L2 ;	none ;	w	# V7.0 (🛏) BED
+1F6D0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🛐) PLACE OF WORSHIP
+1F6E0 ;	text ;	L2 ;	none ;	w	# V7.0 (🛠) HAMMER AND WRENCH
+1F6E1 ;	text ;	L2 ;	none ;	w	# V7.0 (🛡) SHIELD
+1F6E2 ;	text ;	L2 ;	none ;	w	# V7.0 (🛢) OIL DRUM
+1F6E3 ;	text ;	L2 ;	none ;	w	# V7.0 (🛣) MOTORWAY
+1F6E4 ;	text ;	L2 ;	none ;	w	# V7.0 (🛤) RAILWAY TRACK
+1F6E5 ;	text ;	L2 ;	none ;	w	# V7.0 (🛥) MOTOR BOAT
+1F6E9 ;	text ;	L2 ;	none ;	w	# V7.0 (🛩) SMALL AIRPLANE
+1F6EB ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛫) AIRPLANE DEPARTURE
+1F6EC ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛬) AIRPLANE ARRIVING
+1F6F0 ;	text ;	L2 ;	none ;	w	# V7.0 (🛰) SATELLITE
+1F6F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🛳) PASSENGER SHIP
+1F910 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤐) ZIPPER-MOUTH FACE
+1F911 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤑) MONEY-MOUTH FACE
+1F912 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤒) FACE WITH THERMOMETER
+1F913 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤓) NERD FACE
+1F914 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤔) THINKING FACE
+1F915 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤕) FACE WITH HEAD-BANDAGE
+1F916 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🤖) ROBOT FACE
+1F917 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤗) HUGGING FACE
+1F918 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤘) SIGN OF THE HORNS
+1F980 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦀) CRAB
+1F981 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦁) LION FACE
+1F982 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦂) SCORPION
+1F983 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦃) TURKEY
+1F984 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦄) UNICORN FACE
+1F9C0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🧀) CHEESE WEDGE
+0023 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (#⃣) keycap NUMBER SIGN
+002A 20E3 ;	text ;	L2 ;	none ;	x	# V3.0 (*⃣) keycap ASTERISK
+0030 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (0⃣) keycap DIGIT ZERO
+0031 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (1⃣) keycap DIGIT ONE
+0032 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (2⃣) keycap DIGIT TWO
+0033 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (3⃣) keycap DIGIT THREE
+0034 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (4⃣) keycap DIGIT FOUR
+0035 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (5⃣) keycap DIGIT FIVE
+0036 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (6⃣) keycap DIGIT SIX
+0037 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (7⃣) keycap DIGIT SEVEN
+0038 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (8⃣) keycap DIGIT EIGHT
+0039 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (9⃣) keycap DIGIT NINE
+1F1E6 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇨) flag for Ascension Island
+1F1E6 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇩) flag for Andorra
+1F1E6 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇪) flag for United Arab Emirates
+1F1E6 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇫) flag for Afghanistan
+1F1E6 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇬) flag for Antigua & Barbuda
+1F1E6 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇮) flag for Anguilla
+1F1E6 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇱) flag for Albania
+1F1E6 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇲) flag for Armenia
+1F1E6 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇴) flag for Angola
+1F1E6 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇶) flag for Antarctica
+1F1E6 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇷) flag for Argentina
+1F1E6 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇸) flag for American Samoa
+1F1E6 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇹) flag for Austria
+1F1E6 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇺) flag for Australia
+1F1E6 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇼) flag for Aruba
+1F1E6 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇽) flag for Åland Islands
+1F1E6 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇿) flag for Azerbaijan
+1F1E7 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇦) flag for Bosnia & Herzegovina
+1F1E7 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇧) flag for Barbados
+1F1E7 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇩) flag for Bangladesh
+1F1E7 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇪) flag for Belgium
+1F1E7 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇫) flag for Burkina Faso
+1F1E7 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇬) flag for Bulgaria
+1F1E7 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇭) flag for Bahrain
+1F1E7 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇮) flag for Burundi
+1F1E7 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇯) flag for Benin
+1F1E7 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇱) flag for St. Barthélemy
+1F1E7 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇲) flag for Bermuda
+1F1E7 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇳) flag for Brunei
+1F1E7 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇴) flag for Bolivia
+1F1E7 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇶) flag for Caribbean Netherlands
+1F1E7 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇷) flag for Brazil
+1F1E7 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇸) flag for Bahamas
+1F1E7 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇹) flag for Bhutan
+1F1E7 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇻) flag for Bouvet Island
+1F1E7 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇼) flag for Botswana
+1F1E7 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇾) flag for Belarus
+1F1E7 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇿) flag for Belize
+1F1E8 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇦) flag for Canada
+1F1E8 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇨) flag for Cocos  Islands
+1F1E8 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇩) flag for Congo - Kinshasa
+1F1E8 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇫) flag for Central African Republic
+1F1E8 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇬) flag for Congo - Brazzaville
+1F1E8 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇭) flag for Switzerland
+1F1E8 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇮) flag for Côte d’Ivoire
+1F1E8 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇰) flag for Cook Islands
+1F1E8 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇱) flag for Chile
+1F1E8 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇲) flag for Cameroon
+1F1E8 1F1F3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇨🇳) flag for China
+1F1E8 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇴) flag for Colombia
+1F1E8 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇵) flag for Clipperton Island
+1F1E8 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇷) flag for Costa Rica
+1F1E8 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇺) flag for Cuba
+1F1E8 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇻) flag for Cape Verde
+1F1E8 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇼) flag for Curaçao
+1F1E8 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇽) flag for Christmas Island
+1F1E8 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇾) flag for Cyprus
+1F1E8 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇿) flag for Czech Republic
+1F1E9 1F1EA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇩🇪) flag for Germany
+1F1E9 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇬) flag for Diego Garcia
+1F1E9 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇯) flag for Djibouti
+1F1E9 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇰) flag for Denmark
+1F1E9 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇲) flag for Dominica
+1F1E9 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇴) flag for Dominican Republic
+1F1E9 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇿) flag for Algeria
+1F1EA 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇦) flag for Ceuta & Melilla
+1F1EA 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇨) flag for Ecuador
+1F1EA 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇪) flag for Estonia
+1F1EA 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇬) flag for Egypt
+1F1EA 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇭) flag for Western Sahara
+1F1EA 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇷) flag for Eritrea
+1F1EA 1F1F8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇪🇸) flag for Spain
+1F1EA 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇹) flag for Ethiopia
+1F1EA 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇺) flag for European Union
+1F1EB 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇮) flag for Finland
+1F1EB 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇯) flag for Fiji
+1F1EB 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇰) flag for Falkland Islands
+1F1EB 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇲) flag for Micronesia
+1F1EB 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇴) flag for Faroe Islands
+1F1EB 1F1F7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇫🇷) flag for France
+1F1EC 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇦) flag for Gabon
+1F1EC 1F1E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇬🇧) flag for United Kingdom
+1F1EC 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇩) flag for Grenada
+1F1EC 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇪) flag for Georgia
+1F1EC 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇫) flag for French Guiana
+1F1EC 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇬) flag for Guernsey
+1F1EC 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇭) flag for Ghana
+1F1EC 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇮) flag for Gibraltar
+1F1EC 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇱) flag for Greenland
+1F1EC 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇲) flag for Gambia
+1F1EC 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇳) flag for Guinea
+1F1EC 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇵) flag for Guadeloupe
+1F1EC 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇶) flag for Equatorial Guinea
+1F1EC 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇷) flag for Greece
+1F1EC 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇸) flag for South Georgia & South Sandwich Islands
+1F1EC 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇹) flag for Guatemala
+1F1EC 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇺) flag for Guam
+1F1EC 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇼) flag for Guinea-Bissau
+1F1EC 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇾) flag for Guyana
+1F1ED 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇰) flag for Hong Kong
+1F1ED 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇲) flag for Heard & McDonald Islands
+1F1ED 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇳) flag for Honduras
+1F1ED 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇷) flag for Croatia
+1F1ED 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇹) flag for Haiti
+1F1ED 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇺) flag for Hungary
+1F1EE 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇨) flag for Canary Islands
+1F1EE 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇩) flag for Indonesia
+1F1EE 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇪) flag for Ireland
+1F1EE 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇱) flag for Israel
+1F1EE 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇲) flag for Isle of Man
+1F1EE 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇳) flag for India
+1F1EE 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇴) flag for British Indian Ocean Territory
+1F1EE 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇶) flag for Iraq
+1F1EE 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇷) flag for Iran
+1F1EE 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇸) flag for Iceland
+1F1EE 1F1F9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇮🇹) flag for Italy
+1F1EF 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇪) flag for Jersey
+1F1EF 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇲) flag for Jamaica
+1F1EF 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇴) flag for Jordan
+1F1EF 1F1F5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇯🇵) flag for Japan
+1F1F0 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇪) flag for Kenya
+1F1F0 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇬) flag for Kyrgyzstan
+1F1F0 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇭) flag for Cambodia
+1F1F0 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇮) flag for Kiribati
+1F1F0 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇲) flag for Comoros
+1F1F0 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇳) flag for St. Kitts & Nevis
+1F1F0 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇵) flag for North Korea
+1F1F0 1F1F7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇰🇷) flag for South Korea
+1F1F0 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇼) flag for Kuwait
+1F1F0 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇾) flag for Cayman Islands
+1F1F0 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇿) flag for Kazakhstan
+1F1F1 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇦) flag for Laos
+1F1F1 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇧) flag for Lebanon
+1F1F1 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇨) flag for St. Lucia
+1F1F1 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇮) flag for Liechtenstein
+1F1F1 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇰) flag for Sri Lanka
+1F1F1 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇷) flag for Liberia
+1F1F1 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇸) flag for Lesotho
+1F1F1 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇹) flag for Lithuania
+1F1F1 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇺) flag for Luxembourg
+1F1F1 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇻) flag for Latvia
+1F1F1 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇾) flag for Libya
+1F1F2 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇦) flag for Morocco
+1F1F2 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇨) flag for Monaco
+1F1F2 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇩) flag for Moldova
+1F1F2 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇪) flag for Montenegro
+1F1F2 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇫) flag for St. Martin
+1F1F2 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇬) flag for Madagascar
+1F1F2 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇭) flag for Marshall Islands
+1F1F2 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇰) flag for Macedonia
+1F1F2 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇱) flag for Mali
+1F1F2 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇲) flag for Myanmar 
+1F1F2 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇳) flag for Mongolia
+1F1F2 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇴) flag for Macau
+1F1F2 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇵) flag for Northern Mariana Islands
+1F1F2 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇶) flag for Martinique
+1F1F2 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇷) flag for Mauritania
+1F1F2 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇸) flag for Montserrat
+1F1F2 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇹) flag for Malta
+1F1F2 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇺) flag for Mauritius
+1F1F2 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇻) flag for Maldives
+1F1F2 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇼) flag for Malawi
+1F1F2 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇽) flag for Mexico
+1F1F2 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇾) flag for Malaysia
+1F1F2 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇿) flag for Mozambique
+1F1F3 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇦) flag for Namibia
+1F1F3 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇨) flag for New Caledonia
+1F1F3 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇪) flag for Niger
+1F1F3 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇫) flag for Norfolk Island
+1F1F3 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇬) flag for Nigeria
+1F1F3 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇮) flag for Nicaragua
+1F1F3 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇱) flag for Netherlands
+1F1F3 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇴) flag for Norway
+1F1F3 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇵) flag for Nepal
+1F1F3 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇷) flag for Nauru
+1F1F3 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇺) flag for Niue
+1F1F3 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇿) flag for New Zealand
+1F1F4 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇴🇲) flag for Oman
+1F1F5 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇦) flag for Panama
+1F1F5 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇪) flag for Peru
+1F1F5 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇫) flag for French Polynesia
+1F1F5 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇬) flag for Papua New Guinea
+1F1F5 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇭) flag for Philippines
+1F1F5 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇰) flag for Pakistan
+1F1F5 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇱) flag for Poland
+1F1F5 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇲) flag for St. Pierre & Miquelon
+1F1F5 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇳) flag for Pitcairn Islands
+1F1F5 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇷) flag for Puerto Rico
+1F1F5 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇸) flag for Palestinian Territories
+1F1F5 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇹) flag for Portugal
+1F1F5 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇼) flag for Palau
+1F1F5 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇾) flag for Paraguay
+1F1F6 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇶🇦) flag for Qatar
+1F1F7 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇪) flag for Réunion
+1F1F7 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇴) flag for Romania
+1F1F7 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇸) flag for Serbia
+1F1F7 1F1FA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇷🇺) flag for Russia
+1F1F7 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇼) flag for Rwanda
+1F1F8 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇦) flag for Saudi Arabia
+1F1F8 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇧) flag for Solomon Islands
+1F1F8 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇨) flag for Seychelles
+1F1F8 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇩) flag for Sudan
+1F1F8 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇪) flag for Sweden
+1F1F8 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇬) flag for Singapore
+1F1F8 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇭) flag for St. Helena
+1F1F8 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇮) flag for Slovenia
+1F1F8 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇯) flag for Svalbard & Jan Mayen
+1F1F8 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇰) flag for Slovakia
+1F1F8 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇱) flag for Sierra Leone
+1F1F8 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇲) flag for San Marino
+1F1F8 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇳) flag for Senegal
+1F1F8 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇴) flag for Somalia
+1F1F8 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇷) flag for Suriname
+1F1F8 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇸) flag for South Sudan
+1F1F8 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇹) flag for São Tomé & Príncipe
+1F1F8 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇻) flag for El Salvador
+1F1F8 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇽) flag for Sint Maarten
+1F1F8 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇾) flag for Syria
+1F1F8 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇿) flag for Swaziland
+1F1F9 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇦) flag for Tristan da Cunha
+1F1F9 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇨) flag for Turks & Caicos Islands
+1F1F9 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇩) flag for Chad
+1F1F9 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇫) flag for French Southern Territories
+1F1F9 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇬) flag for Togo
+1F1F9 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇭) flag for Thailand
+1F1F9 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇯) flag for Tajikistan
+1F1F9 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇰) flag for Tokelau
+1F1F9 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇱) flag for Timor-Leste
+1F1F9 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇲) flag for Turkmenistan
+1F1F9 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇳) flag for Tunisia
+1F1F9 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇴) flag for Tonga
+1F1F9 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇷) flag for Turkey
+1F1F9 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇹) flag for Trinidad & Tobago
+1F1F9 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇻) flag for Tuvalu
+1F1F9 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇼) flag for Taiwan
+1F1F9 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇿) flag for Tanzania
+1F1FA 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇦) flag for Ukraine
+1F1FA 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇬) flag for Uganda
+1F1FA 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇲) flag for U.S. Outlying Islands
+1F1FA 1F1F8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇺🇸) flag for United States
+1F1FA 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇾) flag for Uruguay
+1F1FA 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇿) flag for Uzbekistan
+1F1FB 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇦) flag for Vatican City
+1F1FB 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇨) flag for St. Vincent & Grenadines
+1F1FB 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇪) flag for Venezuela
+1F1FB 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇬) flag for British Virgin Islands
+1F1FB 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇮) flag for U.S. Virgin Islands
+1F1FB 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇳) flag for Vietnam
+1F1FB 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇺) flag for Vanuatu
+1F1FC 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇼🇫) flag for Wallis & Futuna
+1F1FC 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇼🇸) flag for Samoa
+1F1FD 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇽🇰) flag for Kosovo
+1F1FE 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇾🇪) flag for Yemen
+1F1FE 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇾🇹) flag for Mayotte
+1F1FF 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇦) flag for South Africa
+1F1FF 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇲) flag for Zambia
+1F1FF 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇼) flag for Zimbabwe
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index be761871e..dbaf2bb9e 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -1,876 +1,149 @@
-# Make emoji available within the ZSH terminal
+# emoji plugin
+#
+# Makes emoji support available within ZSH
+#
+# This plugin provides support for working with emoji characters in zsh using human-readable
+# identifiers. It provides global variables which map emoji names to the actual
+# characters, and some anmed groupings of emoji. It also provides associated functions 
+# for displaying them.
+#
+# Global variables:
+#   $emoji          - Maps emoji names to characters
+#   $emoji2         - Auxiliary and combining characters
+#   $emoji_flags    - Maps country names to flag characters (using region-indicators)
+#   $emoji_skintone - Skin tone modifiers (from Unicode 8.0)
+#   $emoji_groups   - Named groups of emoji. Keys are group names; values are whitespace-separated 
+#                       lists of character names
+#
+# Functions:
+#   random_emoji   - Prints a random emoji character
+#   display_emoji  - Displays emoji, along with their names
+#
+# The emoji names and codes are sourced from Unicode Technical Report #51, which provides
+# information on emoji support in Unicode. It can be found at http://www.unicode.org/reports/tr51/index.html.
+#
+# The group definitions are added by this OMZ plugin. They are not based on external definitions.
+#
+# The emoji in the main $emoji map are standalone character sequences which can all be output on their
+# own, without worrying about combining effects. The values may actually be multi-code-point sequences, 
+# instead of a single code point, and may include combining characters in those sequences. But they're
+# arranged so their effects do not extend beyond that sequence.
+#
+# Usage and Examples:
 #
 # To output a specific emoji, use:
 #    $> echo $emoji[<name>]
-#    ex: $> echo $emoji[mouse_face]
+# E.g.: 
+#    $> echo $emoji[mouse_face]
 #
 # To output a random emoji, use:
 #    $> random_emoji
-#    $> random_emoji_fruit
-#    $> random_emoji_animal
-#    $> random_emoji_vehicle
-#    $> random_emoji_face
+# To output a random emoji from a particular group, use:
+#    $> random_emoji <group>
+# E.g.:
+#    $> random_emoji fruits
+#    $> random_emoji animals
+#    $> random_emoji vehicles
+#    $> random_emoji faces
+# The valid group names can be found with `echo ${(k)emoji_groups}`
 #
-# To list all available emoji with names, use:
-#    $> display_all_emoji
-#    $> display_emoji_fruits
-#    $> display_emoji_animals
-#    $> display_emoji_vehicles
-#    $> display_emoji_faces
+# To list all available emoji with their names, use:
+#    $> display_emoji
+#    $> display_emoji fruits
+#    $> display_emoji animals
+#    $> display_emoji vehicles
+#    $> display_emoji faces
 #
-# To use an emoji in a prompt:
-#    PROMPT='$(echo $emoji[penguin])  > '
-#    PROMPT='$(random_emoji_fruit)  > '
-#    eval surfer=$(echo $emoji[surfer])
-#    PROMPT='$surfer  > '
+# To use emoji in a prompt:
+#    PROMPT="$emoji[penguin]  > ""
+#    PROMPT='$(random_emoji fruits)  > '
+#    surfer=$emoji[surfer]
+#    PROMPT="$surfer  > "
 #
-# emoji codes sourced from http://apps.timwhitlock.info/emoji/tables/unicode
+#
+# TODO: Move doco to a README
+# TODO: Factor out parsing from generation in update_emoji.pl
+# TODO: Incorporate CLDR data for ordering and groupings
+# TODO: Short :bracket: style names (from gemoji)
+# TODO: Country codes for flags
+# TODO: ZWJ combining function?
 
-typeset -A emoji
-emoji[grinning_face_with_smiling_eyes]='\xF0\x9F\x98\x81'
-emoji[face_with_tears_of_joy]='\xF0\x9F\x98\x82'
-emoji[smiling_face_with_open_mouth]='\xF0\x9F\x98\x83'
-emoji[smiling_face_with_open_mouth_and_smiling_eyes]='\xF0\x9F\x98\x84'
-emoji[smiling_face_with_open_mouth_and_cold_sweat]='\xF0\x9F\x98\x85'
-emoji[smiling_face_with_open_mouth_and_tightly_closed_eyes]='\xF0\x9F\x98\x86'
-emoji[winking_face]='\xF0\x9F\x98\x89'
-emoji[smiling_face_with_smiling_eyes]='\xF0\x9F\x98\x8A'
-emoji[face_savouring_delicious_food]='\xF0\x9F\x98\x8B'
-emoji[relieved_face]='\xF0\x9F\x98\x8C'
-emoji[smiling_face_with_heart_shaped_eyes]='\xF0\x9F\x98\x8D'
-emoji[smirking_face]='\xF0\x9F\x98\x8F'
-emoji[unamused_face]='\xF0\x9F\x98\x92'
-emoji[face_with_cold_sweat]='\xF0\x9F\x98\x93'
-emoji[pensive_face]='\xF0\x9F\x98\x94'
-emoji[confounded_face]='\xF0\x9F\x98\x96'
-emoji[face_throwing_a_kiss]='\xF0\x9F\x98\x98'
-emoji[kissing_face_with_closed_eyes]='\xF0\x9F\x98\x9A'
-emoji[face_with_stuck_out_tongue_and_winking_eye]='\xF0\x9F\x98\x9C'
-emoji[face_with_stuck_out_tongue_and_tightly_closed_eyes]='\xF0\x9F\x98\x9D'
-emoji[disappointed_face]='\xF0\x9F\x98\x9E'
-emoji[angry_face]='\xF0\x9F\x98\xA0'
-emoji[pouting_face]='\xF0\x9F\x98\xA1'
-emoji[crying_face]='\xF0\x9F\x98\xA2'
-emoji[persevering_face]='\xF0\x9F\x98\xA3'
-emoji[face_with_look_of_triumph]='\xF0\x9F\x98\xA4'
-emoji[disappointed_but_relieved_face]='\xF0\x9F\x98\xA5'
-emoji[fearful_face]='\xF0\x9F\x98\xA8'
-emoji[weary_face]='\xF0\x9F\x98\xA9'
-emoji[sleepy_face]='\xF0\x9F\x98\xAA'
-emoji[tired_face]='\xF0\x9F\x98\xAB'
-emoji[loudly_crying_face]='\xF0\x9F\x98\xAD'
-emoji[face_with_open_mouth_and_cold_sweat]='\xF0\x9F\x98\xB0'
-emoji[face_screaming_in_fear]='\xF0\x9F\x98\xB1'
-emoji[astonished_face]='\xF0\x9F\x98\xB2'
-emoji[flushed_face]='\xF0\x9F\x98\xB3'
-emoji[dizzy_face]='\xF0\x9F\x98\xB5'
-emoji[face_with_medical_mask]='\xF0\x9F\x98\xB7'
-emoji[grinning_cat_face_with_smiling_eyes]='\xF0\x9F\x98\xB8'
-emoji[cat_face_with_tears_of_joy]='\xF0\x9F\x98\xB9'
-emoji[smiling_cat_face_with_open_mouth]='\xF0\x9F\x98\xBA'
-emoji[smiling_cat_face_with_heart_shaped_eyes]='\xF0\x9F\x98\xBB'
-emoji[cat_face_with_wry_smile]='\xF0\x9F\x98\xBC'
-emoji[kissing_cat_face_with_closed_eyes]='\xF0\x9F\x98\xBD'
-emoji[pouting_cat_face]='\xF0\x9F\x98\xBE'
-emoji[crying_cat_face]='\xF0\x9F\x98\xBF'
-emoji[weary_cat_face]='\xF0\x9F\x99\x80'
-emoji[face_with_no_good_gesture]='\xF0\x9F\x99\x85'
-emoji[face_with_ok_gesture]='\xF0\x9F\x99\x86'
-emoji[person_bowing_deeply]='\xF0\x9F\x99\x87'
-emoji[see_no_evil_monkey]='\xF0\x9F\x99\x88'
-emoji[hear_no_evil_monkey]='\xF0\x9F\x99\x89'
-emoji[speak_no_evil_monkey]='\xF0\x9F\x99\x8A'
-emoji[happy_person_raising_one_hand]='\xF0\x9F\x99\x8B'
-emoji[person_raising_both_hands_in_celebration]='\xF0\x9F\x99\x8C'
-emoji[person_frowning]='\xF0\x9F\x99\x8D'
-emoji[person_with_pouting_face]='\xF0\x9F\x99\x8E'
-emoji[person_with_folded_hands]='\xF0\x9F\x99\x8F'
-emoji[black_scissors]='\xE2\x9C\x82'
-emoji[white_heavy_check_mark]='\xE2\x9C\x85'
-emoji[airplane]='\xE2\x9C\x88'
-emoji[envelope]='\xE2\x9C\x89'
-emoji[raised_fist]='\xE2\x9C\x8A'
-emoji[raised_hand]='\xE2\x9C\x8B'
-emoji[victory_hand]='\xE2\x9C\x8C'
-emoji[pencil]='\xE2\x9C\x8F'
-emoji[black_nib]='\xE2\x9C\x92'
-emoji[heavy_check_mark]='\xE2\x9C\x94'
-emoji[heavy_multiplication_x]='\xE2\x9C\x96'
-emoji[sparkles]='\xE2\x9C\xA8'
-emoji[eight_spoked_asterisk]='\xE2\x9C\xB3'
-emoji[eight_pointed_black_star]='\xE2\x9C\xB4'
-emoji[snowflake]='\xE2\x9D\x84'
-emoji[sparkle]='\xE2\x9D\x87'
-emoji[cross_mark]='\xE2\x9D\x8C'
-emoji[negative_squared_cross_mark]='\xE2\x9D\x8E'
-emoji[black_question_mark_ornament]='\xE2\x9D\x93'
-emoji[white_question_mark_ornament]='\xE2\x9D\x94'
-emoji[white_exclamation_mark_ornament]='\xE2\x9D\x95'
-emoji[heavy_exclamation_mark_symbol]='\xE2\x9D\x97'
-emoji[heavy_black_heart]='\xE2\x9D\xA4'
-emoji[heavy_plus_sign]='\xE2\x9E\x95'
-emoji[heavy_minus_sign]='\xE2\x9E\x96'
-emoji[heavy_division_sign]='\xE2\x9E\x97'
-emoji[black_rightwards_arrow]='\xE2\x9E\xA1'
-emoji[curly_loop]='\xE2\x9E\xB0'
-emoji[rocket]='\xF0\x9F\x9A\x80'
-emoji[railway_car]='\xF0\x9F\x9A\x83'
-emoji[high_speed_train]='\xF0\x9F\x9A\x84'
-emoji[high_speed_train_with_bullet_nose]='\xF0\x9F\x9A\x85'
-emoji[metro]='\xF0\x9F\x9A\x87'
-emoji[station]='\xF0\x9F\x9A\x89'
-emoji[bus]='\xF0\x9F\x9A\x8C'
-emoji[bus_stop]='\xF0\x9F\x9A\x8F'
-emoji[ambulance]='\xF0\x9F\x9A\x91'
-emoji[fire_engine]='\xF0\x9F\x9A\x92'
-emoji[police_car]='\xF0\x9F\x9A\x93'
-emoji[taxi]='\xF0\x9F\x9A\x95'
-emoji[automobile]='\xF0\x9F\x9A\x97'
-emoji[recreational_vehicle]='\xF0\x9F\x9A\x99'
-emoji[delivery_truck]='\xF0\x9F\x9A\x9A'
-emoji[ship]='\xF0\x9F\x9A\xA2'
-emoji[speedboat]='\xF0\x9F\x9A\xA4'
-emoji[horizontal_traffic_light]='\xF0\x9F\x9A\xA5'
-emoji[construction_sign]='\xF0\x9F\x9A\xA7'
-emoji[police_cars_revolving_light]='\xF0\x9F\x9A\xA8'
-emoji[triangular_flag_on_post]='\xF0\x9F\x9A\xA9'
-emoji[door]='\xF0\x9F\x9A\xAA'
-emoji[no_entry_sign]='\xF0\x9F\x9A\xAB'
-emoji[smoking_symbol]='\xF0\x9F\x9A\xAC'
-emoji[no_smoking_symbol]='\xF0\x9F\x9A\xAD'
-emoji[bicycle]='\xF0\x9F\x9A\xB2'
-emoji[pedestrian]='\xF0\x9F\x9A\xB6'
-emoji[mens_symbol]='\xF0\x9F\x9A\xB9'
-emoji[womens_symbol]='\xF0\x9F\x9A\xBA'
-emoji[restroom]='\xF0\x9F\x9A\xBB'
-emoji[baby_symbol]='\xF0\x9F\x9A\xBC'
-emoji[toilet]='\xF0\x9F\x9A\xBD'
-emoji[water_closet]='\xF0\x9F\x9A\xBE'
-emoji[bath]='\xF0\x9F\x9B\x80'
-emoji[circled_latin_capital_letter_m]='\xE2\x93\x82'
-emoji[negative_squared_latin_capital_letter_a]='\xF0\x9F\x85\xB0'
-emoji[negative_squared_latin_capital_letter_b]='\xF0\x9F\x85\xB1'
-emoji[negative_squared_latin_capital_letter_o]='\xF0\x9F\x85\xBE'
-emoji[negative_squared_latin_capital_letter_p]='\xF0\x9F\x85\xBF'
-emoji[negative_squared_ab]='\xF0\x9F\x86\x8E'
-emoji[squared_cl]='\xF0\x9F\x86\x91'
-emoji[squared_cool]='\xF0\x9F\x86\x92'
-emoji[squared_free]='\xF0\x9F\x86\x93'
-emoji[squared_id]='\xF0\x9F\x86\x94'
-emoji[squared_new]='\xF0\x9F\x86\x95'
-emoji[squared_ng]='\xF0\x9F\x86\x96'
-emoji[squared_ok]='\xF0\x9F\x86\x97'
-emoji[squared_sos]='\xF0\x9F\x86\x98'
-emoji[squared_up_with_exclamation_mark]='\xF0\x9F\x86\x99'
-emoji[squared_vs]='\xF0\x9F\x86\x9A'
-emoji[regional_indicator_symbol_letter_d_regional_indicator_symbol_letter_e]='\xF0\x9F\x87\xA9\xF0\x9F\x87\xAA'
-emoji[regional_indicator_symbol_letter_g_regional_indicator_symbol_letter_b]='\xF0\x9F\x87\xAC\xF0\x9F\x87\xA7'
-emoji[regional_indicator_symbol_letter_c_regional_indicator_symbol_letter_n]='\xF0\x9F\x87\xA8\xF0\x9F\x87\xB3'
-emoji[regional_indicator_symbol_letter_j_regional_indicator_symbol_letter_p]='\xF0\x9F\x87\xAF\xF0\x9F\x87\xB5'
-emoji[regional_indicator_symbol_letter_k_regional_indicator_symbol_letter_r]='\xF0\x9F\x87\xB0\xF0\x9F\x87\xB7'
-emoji[regional_indicator_symbol_letter_f_regional_indicator_symbol_letter_r]='\xF0\x9F\x87\xAB\xF0\x9F\x87\xB7'
-emoji[regional_indicator_symbol_letter_e_regional_indicator_symbol_letter_s]='\xF0\x9F\x87\xAA\xF0\x9F\x87\xB8'
-emoji[regional_indicator_symbol_letter_i_regional_indicator_symbol_letter_t]='\xF0\x9F\x87\xAE\xF0\x9F\x87\xB9'
-emoji[regional_indicator_symbol_letter_u_regional_indicator_symbol_letter_s]='\xF0\x9F\x87\xBA\xF0\x9F\x87\xB8'
-emoji[regional_indicator_symbol_letter_r_regional_indicator_symbol_letter_u]='\xF0\x9F\x87\xB7\xF0\x9F\x87\xBA'
-emoji[squared_katakana_koko]='\xF0\x9F\x88\x81'
-emoji[squared_katakana_sa]='\xF0\x9F\x88\x82'
-emoji[squared_cjk_unified_ideograph_7121]='\xF0\x9F\x88\x9A'
-emoji[squared_cjk_unified_ideograph_6307]='\xF0\x9F\x88\xAF'
-emoji[squared_cjk_unified_ideograph_7981]='\xF0\x9F\x88\xB2'
-emoji[squared_cjk_unified_ideograph_7a7a]='\xF0\x9F\x88\xB3'
-emoji[squared_cjk_unified_ideograph_5408]='\xF0\x9F\x88\xB4'
-emoji[squared_cjk_unified_ideograph_6e80]='\xF0\x9F\x88\xB5'
-emoji[squared_cjk_unified_ideograph_6709]='\xF0\x9F\x88\xB6'
-emoji[squared_cjk_unified_ideograph_6708]='\xF0\x9F\x88\xB7'
-emoji[squared_cjk_unified_ideograph_7533]='\xF0\x9F\x88\xB8'
-emoji[squared_cjk_unified_ideograph_5272]='\xF0\x9F\x88\xB9'
-emoji[squared_cjk_unified_ideograph_55b6]='\xF0\x9F\x88\xBA'
-emoji[circled_ideograph_advantage]='\xF0\x9F\x89\x90'
-emoji[circled_ideograph_accept]='\xF0\x9F\x89\x91'
-emoji[copyright_sign]='\xC2\xA9'
-emoji[registered_sign]='\xC2\xAE'
-emoji[double_exclamation_mark]='\xE2\x80\xBC'
-emoji[exclamation_question_mark]='\xE2\x81\x89'
-emoji[digit_eight_combining_enclosing_keycap]='\x38\xE2\x83\xA3'
-emoji[digit_nine_combining_enclosing_keycap]='\x39\xE2\x83\xA3'
-emoji[digit_seven_combining_enclosing_keycap]='\x37\xE2\x83\xA3'
-emoji[digit_six_combining_enclosing_keycap]='\x36\xE2\x83\xA3'
-emoji[digit_one_combining_enclosing_keycap]='\x31\xE2\x83\xA3'
-emoji[digit_zero_combining_enclosing_keycap]='\x30\xE2\x83\xA3'
-emoji[digit_two_combining_enclosing_keycap]='\x32\xE2\x83\xA3'
-emoji[digit_three_combining_enclosing_keycap]='\x33\xE2\x83\xA3'
-emoji[digit_five_combining_enclosing_keycap]='\x35\xE2\x83\xA3'
-emoji[digit_four_combining_enclosing_keycap]='\x34\xE2\x83\xA3'
-emoji[number_sign_combining_enclosing_keycap]='\x23\xE2\x83\xA3'
-emoji[trade_mark_sign]='\xE2\x84\xA2'
-emoji[information_source]='\xE2\x84\xB9'
-emoji[left_right_arrow]='\xE2\x86\x94'
-emoji[up_down_arrow]='\xE2\x86\x95'
-emoji[north_west_arrow]='\xE2\x86\x96'
-emoji[north_east_arrow]='\xE2\x86\x97'
-emoji[south_east_arrow]='\xE2\x86\x98'
-emoji[south_west_arrow]='\xE2\x86\x99'
-emoji[leftwards_arrow_with_hook]='\xE2\x86\xA9'
-emoji[rightwards_arrow_with_hook]='\xE2\x86\xAA'
-emoji[watch]='\xE2\x8C\x9A'
-emoji[hourglass]='\xE2\x8C\x9B'
-emoji[black_right_pointing_double_triangle]='\xE2\x8F\xA9'
-emoji[black_left_pointing_double_triangle]='\xE2\x8F\xAA'
-emoji[black_up_pointing_double_triangle]='\xE2\x8F\xAB'
-emoji[black_down_pointing_double_triangle]='\xE2\x8F\xAC'
-emoji[alarm_clock]='\xE2\x8F\xB0'
-emoji[hourglass_with_flowing_sand]='\xE2\x8F\xB3'
-emoji[black_small_square]='\xE2\x96\xAA'
-emoji[white_small_square]='\xE2\x96\xAB'
-emoji[black_right_pointing_triangle]='\xE2\x96\xB6'
-emoji[black_left_pointing_triangle]='\xE2\x97\x80'
-emoji[white_medium_square]='\xE2\x97\xBB'
-emoji[black_medium_square]='\xE2\x97\xBC'
-emoji[white_medium_small_square]='\xE2\x97\xBD'
-emoji[black_medium_small_square]='\xE2\x97\xBE'
-emoji[black_sun_with_rays]='\xE2\x98\x80'
-emoji[cloud]='\xE2\x98\x81'
-emoji[black_telephone]='\xE2\x98\x8E'
-emoji[ballot_box_with_check]='\xE2\x98\x91'
-emoji[umbrella_with_rain_drops]='\xE2\x98\x94'
-emoji[hot_beverage]='\xE2\x98\x95'
-emoji[white_up_pointing_index]='\xE2\x98\x9D'
-emoji[white_smiling_face]='\xE2\x98\xBA'
-emoji[aries]='\xE2\x99\x88'
-emoji[taurus]='\xE2\x99\x89'
-emoji[gemini]='\xE2\x99\x8A'
-emoji[cancer]='\xE2\x99\x8B'
-emoji[leo]='\xE2\x99\x8C'
-emoji[virgo]='\xE2\x99\x8D'
-emoji[libra]='\xE2\x99\x8E'
-emoji[scorpius]='\xE2\x99\x8F'
-emoji[sagittarius]='\xE2\x99\x90'
-emoji[capricorn]='\xE2\x99\x91'
-emoji[aquarius]='\xE2\x99\x92'
-emoji[pisces]='\xE2\x99\x93'
-emoji[black_spade_suit]='\xE2\x99\xA0'
-emoji[black_club_suit]='\xE2\x99\xA3'
-emoji[black_heart_suit]='\xE2\x99\xA5'
-emoji[black_diamond_suit]='\xE2\x99\xA6'
-emoji[hot_springs]='\xE2\x99\xA8'
-emoji[black_universal_recycling_symbol]='\xE2\x99\xBB'
-emoji[wheelchair_symbol]='\xE2\x99\xBF'
-emoji[anchor]='\xE2\x9A\x93'
-emoji[warning_sign]='\xE2\x9A\xA0'
-emoji[high_voltage_sign]='\xE2\x9A\xA1'
-emoji[medium_white_circle]='\xE2\x9A\xAA'
-emoji[medium_black_circle]='\xE2\x9A\xAB'
-emoji[soccer_ball]='\xE2\x9A\xBD'
-emoji[baseball]='\xE2\x9A\xBE'
-emoji[snowman_without_snow]='\xE2\x9B\x84'
-emoji[sun_behind_cloud]='\xE2\x9B\x85'
-emoji[ophiuchus]='\xE2\x9B\x8E'
-emoji[no_entry]='\xE2\x9B\x94'
-emoji[church]='\xE2\x9B\xAA'
-emoji[fountain]='\xE2\x9B\xB2'
-emoji[flag_in_hole]='\xE2\x9B\xB3'
-emoji[sailboat]='\xE2\x9B\xB5'
-emoji[tent]='\xE2\x9B\xBA'
-emoji[fuel_pump]='\xE2\x9B\xBD'
-emoji[arrow_pointing_rightwards_then_curving_upwards]='\xE2\xA4\xB4'
-emoji[arrow_pointing_rightwards_then_curving_downwards]='\xE2\xA4\xB5'
-emoji[leftwards_black_arrow]='\xE2\xAC\x85'
-emoji[upwards_black_arrow]='\xE2\xAC\x86'
-emoji[downwards_black_arrow]='\xE2\xAC\x87'
-emoji[black_large_square]='\xE2\xAC\x9B'
-emoji[white_large_square]='\xE2\xAC\x9C'
-emoji[white_medium_star]='\xE2\xAD\x90'
-emoji[heavy_large_circle]='\xE2\xAD\x95'
-emoji[wavy_dash]='\xE3\x80\xB0'
-emoji[part_alternation_mark]='\xE3\x80\xBD'
-emoji[circled_ideograph_congratulation]='\xE3\x8A\x97'
-emoji[circled_ideograph_secret]='\xE3\x8A\x99'
-emoji[mahjong_tile_red_dragon]='\xF0\x9F\x80\x84'
-emoji[playing_card_black_joker]='\xF0\x9F\x83\x8F'
-emoji[cyclone]='\xF0\x9F\x8C\x80'
-emoji[foggy]='\xF0\x9F\x8C\x81'
-emoji[closed_umbrella]='\xF0\x9F\x8C\x82'
-emoji[night_with_stars]='\xF0\x9F\x8C\x83'
-emoji[sunrise_over_mountains]='\xF0\x9F\x8C\x84'
-emoji[sunrise]='\xF0\x9F\x8C\x85'
-emoji[cityscape_at_dusk]='\xF0\x9F\x8C\x86'
-emoji[sunset_over_buildings]='\xF0\x9F\x8C\x87'
-emoji[rainbow]='\xF0\x9F\x8C\x88'
-emoji[bridge_at_night]='\xF0\x9F\x8C\x89'
-emoji[water_wave]='\xF0\x9F\x8C\x8A'
-emoji[volcano]='\xF0\x9F\x8C\x8B'
-emoji[milky_way]='\xF0\x9F\x8C\x8C'
-emoji[earth_globe_asia_australia]='\xF0\x9F\x8C\x8F'
-emoji[new_moon_symbol]='\xF0\x9F\x8C\x91'
-emoji[first_quarter_moon_symbol]='\xF0\x9F\x8C\x93'
-emoji[waxing_gibbous_moon_symbol]='\xF0\x9F\x8C\x94'
-emoji[full_moon_symbol]='\xF0\x9F\x8C\x95'
-emoji[crescent_moon]='\xF0\x9F\x8C\x99'
-emoji[first_quarter_moon_with_face]='\xF0\x9F\x8C\x9B'
-emoji[glowing_star]='\xF0\x9F\x8C\x9F'
-emoji[shooting_star]='\xF0\x9F\x8C\xA0'
-emoji[chestnut]='\xF0\x9F\x8C\xB0'
-emoji[seedling]='\xF0\x9F\x8C\xB1'
-emoji[palm_tree]='\xF0\x9F\x8C\xB4'
-emoji[cactus]='\xF0\x9F\x8C\xB5'
-emoji[tulip]='\xF0\x9F\x8C\xB7'
-emoji[cherry_blossom]='\xF0\x9F\x8C\xB8'
-emoji[rose]='\xF0\x9F\x8C\xB9'
-emoji[hibiscus]='\xF0\x9F\x8C\xBA'
-emoji[sunflower]='\xF0\x9F\x8C\xBB'
-emoji[blossom]='\xF0\x9F\x8C\xBC'
-emoji[ear_of_maize]='\xF0\x9F\x8C\xBD'
-emoji[ear_of_rice]='\xF0\x9F\x8C\xBE'
-emoji[herb]='\xF0\x9F\x8C\xBF'
-emoji[four_leaf_clover]='\xF0\x9F\x8D\x80'
-emoji[maple_leaf]='\xF0\x9F\x8D\x81'
-emoji[fallen_leaf]='\xF0\x9F\x8D\x82'
-emoji[leaf_fluttering_in_wind]='\xF0\x9F\x8D\x83'
-emoji[mushroom]='\xF0\x9F\x8D\x84'
-emoji[tomato]='\xF0\x9F\x8D\x85'
-emoji[aubergine]='\xF0\x9F\x8D\x86'
-emoji[grapes]='\xF0\x9F\x8D\x87'
-emoji[melon]='\xF0\x9F\x8D\x88'
-emoji[watermelon]='\xF0\x9F\x8D\x89'
-emoji[tangerine]='\xF0\x9F\x8D\x8A'
-emoji[banana]='\xF0\x9F\x8D\x8C'
-emoji[pineapple]='\xF0\x9F\x8D\x8D'
-emoji[red_apple]='\xF0\x9F\x8D\x8E'
-emoji[green_apple]='\xF0\x9F\x8D\x8F'
-emoji[peach]='\xF0\x9F\x8D\x91'
-emoji[cherries]='\xF0\x9F\x8D\x92'
-emoji[strawberry]='\xF0\x9F\x8D\x93'
-emoji[hamburger]='\xF0\x9F\x8D\x94'
-emoji[slice_of_pizza]='\xF0\x9F\x8D\x95'
-emoji[meat_on_bone]='\xF0\x9F\x8D\x96'
-emoji[poultry_leg]='\xF0\x9F\x8D\x97'
-emoji[rice_cracker]='\xF0\x9F\x8D\x98'
-emoji[rice_ball]='\xF0\x9F\x8D\x99'
-emoji[cooked_rice]='\xF0\x9F\x8D\x9A'
-emoji[curry_and_rice]='\xF0\x9F\x8D\x9B'
-emoji[steaming_bowl]='\xF0\x9F\x8D\x9C'
-emoji[spaghetti]='\xF0\x9F\x8D\x9D'
-emoji[bread]='\xF0\x9F\x8D\x9E'
-emoji[french_fries]='\xF0\x9F\x8D\x9F'
-emoji[roasted_sweet_potato]='\xF0\x9F\x8D\xA0'
-emoji[dango]='\xF0\x9F\x8D\xA1'
-emoji[oden]='\xF0\x9F\x8D\xA2'
-emoji[sushi]='\xF0\x9F\x8D\xA3'
-emoji[fried_shrimp]='\xF0\x9F\x8D\xA4'
-emoji[fish_cake_with_swirl_design]='\xF0\x9F\x8D\xA5'
-emoji[soft_ice_cream]='\xF0\x9F\x8D\xA6'
-emoji[shaved_ice]='\xF0\x9F\x8D\xA7'
-emoji[ice_cream]='\xF0\x9F\x8D\xA8'
-emoji[doughnut]='\xF0\x9F\x8D\xA9'
-emoji[cookie]='\xF0\x9F\x8D\xAA'
-emoji[chocolate_bar]='\xF0\x9F\x8D\xAB'
-emoji[candy]='\xF0\x9F\x8D\xAC'
-emoji[lollipop]='\xF0\x9F\x8D\xAD'
-emoji[custard]='\xF0\x9F\x8D\xAE'
-emoji[honey_pot]='\xF0\x9F\x8D\xAF'
-emoji[shortcake]='\xF0\x9F\x8D\xB0'
-emoji[bento_box]='\xF0\x9F\x8D\xB1'
-emoji[pot_of_food]='\xF0\x9F\x8D\xB2'
-emoji[cooking]='\xF0\x9F\x8D\xB3'
-emoji[fork_and_knife]='\xF0\x9F\x8D\xB4'
-emoji[teacup_without_handle]='\xF0\x9F\x8D\xB5'
-emoji[sake_bottle_and_cup]='\xF0\x9F\x8D\xB6'
-emoji[wine_glass]='\xF0\x9F\x8D\xB7'
-emoji[cocktail_glass]='\xF0\x9F\x8D\xB8'
-emoji[tropical_drink]='\xF0\x9F\x8D\xB9'
-emoji[beer_mug]='\xF0\x9F\x8D\xBA'
-emoji[clinking_beer_mugs]='\xF0\x9F\x8D\xBB'
-emoji[ribbon]='\xF0\x9F\x8E\x80'
-emoji[wrapped_present]='\xF0\x9F\x8E\x81'
-emoji[birthday_cake]='\xF0\x9F\x8E\x82'
-emoji[jack_o_lantern]='\xF0\x9F\x8E\x83'
-emoji[christmas_tree]='\xF0\x9F\x8E\x84'
-emoji[father_christmas]='\xF0\x9F\x8E\x85'
-emoji[fireworks]='\xF0\x9F\x8E\x86'
-emoji[firework_sparkler]='\xF0\x9F\x8E\x87'
-emoji[balloon]='\xF0\x9F\x8E\x88'
-emoji[party_popper]='\xF0\x9F\x8E\x89'
-emoji[confetti_ball]='\xF0\x9F\x8E\x8A'
-emoji[tanabata_tree]='\xF0\x9F\x8E\x8B'
-emoji[crossed_flags]='\xF0\x9F\x8E\x8C'
-emoji[pine_decoration]='\xF0\x9F\x8E\x8D'
-emoji[japanese_dolls]='\xF0\x9F\x8E\x8E'
-emoji[carp_streamer]='\xF0\x9F\x8E\x8F'
-emoji[wind_chime]='\xF0\x9F\x8E\x90'
-emoji[moon_viewing_ceremony]='\xF0\x9F\x8E\x91'
-emoji[school_satchel]='\xF0\x9F\x8E\x92'
-emoji[graduation_cap]='\xF0\x9F\x8E\x93'
-emoji[carousel_horse]='\xF0\x9F\x8E\xA0'
-emoji[ferris_wheel]='\xF0\x9F\x8E\xA1'
-emoji[roller_coaster]='\xF0\x9F\x8E\xA2'
-emoji[fishing_pole_and_fish]='\xF0\x9F\x8E\xA3'
-emoji[microphone]='\xF0\x9F\x8E\xA4'
-emoji[movie_camera]='\xF0\x9F\x8E\xA5'
-emoji[cinema]='\xF0\x9F\x8E\xA6'
-emoji[headphone]='\xF0\x9F\x8E\xA7'
-emoji[artist_palette]='\xF0\x9F\x8E\xA8'
-emoji[top_hat]='\xF0\x9F\x8E\xA9'
-emoji[circus_tent]='\xF0\x9F\x8E\xAA'
-emoji[ticket]='\xF0\x9F\x8E\xAB'
-emoji[clapper_board]='\xF0\x9F\x8E\xAC'
-emoji[performing_arts]='\xF0\x9F\x8E\xAD'
-emoji[video_game]='\xF0\x9F\x8E\xAE'
-emoji[direct_hit]='\xF0\x9F\x8E\xAF'
-emoji[slot_machine]='\xF0\x9F\x8E\xB0'
-emoji[billiards]='\xF0\x9F\x8E\xB1'
-emoji[game_die]='\xF0\x9F\x8E\xB2'
-emoji[bowling]='\xF0\x9F\x8E\xB3'
-emoji[flower_playing_cards]='\xF0\x9F\x8E\xB4'
-emoji[musical_note]='\xF0\x9F\x8E\xB5'
-emoji[multiple_musical_notes]='\xF0\x9F\x8E\xB6'
-emoji[saxophone]='\xF0\x9F\x8E\xB7'
-emoji[guitar]='\xF0\x9F\x8E\xB8'
-emoji[musical_keyboard]='\xF0\x9F\x8E\xB9'
-emoji[trumpet]='\xF0\x9F\x8E\xBA'
-emoji[violin]='\xF0\x9F\x8E\xBB'
-emoji[musical_score]='\xF0\x9F\x8E\xBC'
-emoji[running_shirt_with_sash]='\xF0\x9F\x8E\xBD'
-emoji[tennis_racquet_and_ball]='\xF0\x9F\x8E\xBE'
-emoji[ski_and_ski_boot]='\xF0\x9F\x8E\xBF'
-emoji[basketball_and_hoop]='\xF0\x9F\x8F\x80'
-emoji[chequered_flag]='\xF0\x9F\x8F\x81'
-emoji[snowboarder]='\xF0\x9F\x8F\x82'
-emoji[runner]='\xF0\x9F\x8F\x83'
-emoji[surfer]='\xF0\x9F\x8F\x84'
-emoji[trophy]='\xF0\x9F\x8F\x86'
-emoji[american_football]='\xF0\x9F\x8F\x88'
-emoji[swimmer]='\xF0\x9F\x8F\x8A'
-emoji[house_building]='\xF0\x9F\x8F\xA0'
-emoji[house_with_garden]='\xF0\x9F\x8F\xA1'
-emoji[office_building]='\xF0\x9F\x8F\xA2'
-emoji[japanese_post_office]='\xF0\x9F\x8F\xA3'
-emoji[hospital]='\xF0\x9F\x8F\xA5'
-emoji[bank]='\xF0\x9F\x8F\xA6'
-emoji[automated_teller_machine]='\xF0\x9F\x8F\xA7'
-emoji[hotel]='\xF0\x9F\x8F\xA8'
-emoji[love_hotel]='\xF0\x9F\x8F\xA9'
-emoji[convenience_store]='\xF0\x9F\x8F\xAA'
-emoji[school]='\xF0\x9F\x8F\xAB'
-emoji[department_store]='\xF0\x9F\x8F\xAC'
-emoji[factory]='\xF0\x9F\x8F\xAD'
-emoji[izakaya_lantern]='\xF0\x9F\x8F\xAE'
-emoji[japanese_castle]='\xF0\x9F\x8F\xAF'
-emoji[european_castle]='\xF0\x9F\x8F\xB0'
-emoji[snail]='\xF0\x9F\x90\x8C'
-emoji[snake]='\xF0\x9F\x90\x8D'
-emoji[horse]='\xF0\x9F\x90\x8E'
-emoji[sheep]='\xF0\x9F\x90\x91'
-emoji[monkey]='\xF0\x9F\x90\x92'
-emoji[chicken]='\xF0\x9F\x90\x94'
-emoji[boar]='\xF0\x9F\x90\x97'
-emoji[elephant]='\xF0\x9F\x90\x98'
-emoji[octopus]='\xF0\x9F\x90\x99'
-emoji[spiral_shell]='\xF0\x9F\x90\x9A'
-emoji[bug]='\xF0\x9F\x90\x9B'
-emoji[ant]='\xF0\x9F\x90\x9C'
-emoji[honeybee]='\xF0\x9F\x90\x9D'
-emoji[lady_beetle]='\xF0\x9F\x90\x9E'
-emoji[fish]='\xF0\x9F\x90\x9F'
-emoji[tropical_fish]='\xF0\x9F\x90\xA0'
-emoji[blowfish]='\xF0\x9F\x90\xA1'
-emoji[turtle]='\xF0\x9F\x90\xA2'
-emoji[hatching_chick]='\xF0\x9F\x90\xA3'
-emoji[baby_chick]='\xF0\x9F\x90\xA4'
-emoji[front_facing_baby_chick]='\xF0\x9F\x90\xA5'
-emoji[bird]='\xF0\x9F\x90\xA6'
-emoji[penguin]='\xF0\x9F\x90\xA7'
-emoji[koala]='\xF0\x9F\x90\xA8'
-emoji[poodle]='\xF0\x9F\x90\xA9'
-emoji[bactrian_camel]='\xF0\x9F\x90\xAB'
-emoji[dolphin]='\xF0\x9F\x90\xAC'
-emoji[mouse_face]='\xF0\x9F\x90\xAD'
-emoji[cow_face]='\xF0\x9F\x90\xAE'
-emoji[tiger_face]='\xF0\x9F\x90\xAF'
-emoji[rabbit_face]='\xF0\x9F\x90\xB0'
-emoji[cat_face]='\xF0\x9F\x90\xB1'
-emoji[dragon_face]='\xF0\x9F\x90\xB2'
-emoji[spouting_whale]='\xF0\x9F\x90\xB3'
-emoji[horse_face]='\xF0\x9F\x90\xB4'
-emoji[monkey_face]='\xF0\x9F\x90\xB5'
-emoji[dog_face]='\xF0\x9F\x90\xB6'
-emoji[pig_face]='\xF0\x9F\x90\xB7'
-emoji[frog_face]='\xF0\x9F\x90\xB8'
-emoji[hamster_face]='\xF0\x9F\x90\xB9'
-emoji[wolf_face]='\xF0\x9F\x90\xBA'
-emoji[bear_face]='\xF0\x9F\x90\xBB'
-emoji[panda_face]='\xF0\x9F\x90\xBC'
-emoji[pig_nose]='\xF0\x9F\x90\xBD'
-emoji[paw_prints]='\xF0\x9F\x90\xBE'
-emoji[eyes]='\xF0\x9F\x91\x80'
-emoji[ear]='\xF0\x9F\x91\x82'
-emoji[nose]='\xF0\x9F\x91\x83'
-emoji[mouth]='\xF0\x9F\x91\x84'
-emoji[tongue]='\xF0\x9F\x91\x85'
-emoji[white_up_pointing_backhand_index]='\xF0\x9F\x91\x86'
-emoji[white_down_pointing_backhand_index]='\xF0\x9F\x91\x87'
-emoji[white_left_pointing_backhand_index]='\xF0\x9F\x91\x88'
-emoji[white_right_pointing_backhand_index]='\xF0\x9F\x91\x89'
-emoji[fisted_hand_sign]='\xF0\x9F\x91\x8A'
-emoji[waving_hand_sign]='\xF0\x9F\x91\x8B'
-emoji[ok_hand_sign]='\xF0\x9F\x91\x8C'
-emoji[thumbs_up_sign]='\xF0\x9F\x91\x8D'
-emoji[thumbs_down_sign]='\xF0\x9F\x91\x8E'
-emoji[clapping_hands_sign]='\xF0\x9F\x91\x8F'
-emoji[open_hands_sign]='\xF0\x9F\x91\x90'
-emoji[crown]='\xF0\x9F\x91\x91'
-emoji[womans_hat]='\xF0\x9F\x91\x92'
-emoji[eyeglasses]='\xF0\x9F\x91\x93'
-emoji[necktie]='\xF0\x9F\x91\x94'
-emoji[t_shirt]='\xF0\x9F\x91\x95'
-emoji[jeans]='\xF0\x9F\x91\x96'
-emoji[dress]='\xF0\x9F\x91\x97'
-emoji[kimono]='\xF0\x9F\x91\x98'
-emoji[bikini]='\xF0\x9F\x91\x99'
-emoji[womans_clothes]='\xF0\x9F\x91\x9A'
-emoji[purse]='\xF0\x9F\x91\x9B'
-emoji[handbag]='\xF0\x9F\x91\x9C'
-emoji[pouch]='\xF0\x9F\x91\x9D'
-emoji[mans_shoe]='\xF0\x9F\x91\x9E'
-emoji[athletic_shoe]='\xF0\x9F\x91\x9F'
-emoji[high_heeled_shoe]='\xF0\x9F\x91\xA0'
-emoji[womans_sandal]='\xF0\x9F\x91\xA1'
-emoji[womans_boots]='\xF0\x9F\x91\xA2'
-emoji[footprints]='\xF0\x9F\x91\xA3'
-emoji[bust_in_silhouette]='\xF0\x9F\x91\xA4'
-emoji[boy]='\xF0\x9F\x91\xA6'
-emoji[girl]='\xF0\x9F\x91\xA7'
-emoji[man]='\xF0\x9F\x91\xA8'
-emoji[woman]='\xF0\x9F\x91\xA9'
-emoji[family]='\xF0\x9F\x91\xAA'
-emoji[man_and_woman_holding_hands]='\xF0\x9F\x91\xAB'
-emoji[police_officer]='\xF0\x9F\x91\xAE'
-emoji[woman_with_bunny_ears]='\xF0\x9F\x91\xAF'
-emoji[bride_with_veil]='\xF0\x9F\x91\xB0'
-emoji[person_with_blond_hair]='\xF0\x9F\x91\xB1'
-emoji[man_with_gua_pi_mao]='\xF0\x9F\x91\xB2'
-emoji[man_with_turban]='\xF0\x9F\x91\xB3'
-emoji[older_man]='\xF0\x9F\x91\xB4'
-emoji[older_woman]='\xF0\x9F\x91\xB5'
-emoji[baby]='\xF0\x9F\x91\xB6'
-emoji[construction_worker]='\xF0\x9F\x91\xB7'
-emoji[princess]='\xF0\x9F\x91\xB8'
-emoji[japanese_ogre]='\xF0\x9F\x91\xB9'
-emoji[japanese_goblin]='\xF0\x9F\x91\xBA'
-emoji[ghost]='\xF0\x9F\x91\xBB'
-emoji[baby_angel]='\xF0\x9F\x91\xBC'
-emoji[extraterrestrial_alien]='\xF0\x9F\x91\xBD'
-emoji[alien_monster]='\xF0\x9F\x91\xBE'
-emoji[imp]='\xF0\x9F\x91\xBF'
-emoji[skull]='\xF0\x9F\x92\x80'
-emoji[information_desk_person]='\xF0\x9F\x92\x81'
-emoji[guardsman]='\xF0\x9F\x92\x82'
-emoji[dancer]='\xF0\x9F\x92\x83'
-emoji[lipstick]='\xF0\x9F\x92\x84'
-emoji[nail_polish]='\xF0\x9F\x92\x85'
-emoji[face_massage]='\xF0\x9F\x92\x86'
-emoji[haircut]='\xF0\x9F\x92\x87'
-emoji[barber_pole]='\xF0\x9F\x92\x88'
-emoji[syringe]='\xF0\x9F\x92\x89'
-emoji[pill]='\xF0\x9F\x92\x8A'
-emoji[kiss_mark]='\xF0\x9F\x92\x8B'
-emoji[love_letter]='\xF0\x9F\x92\x8C'
-emoji[ring]='\xF0\x9F\x92\x8D'
-emoji[gem_stone]='\xF0\x9F\x92\x8E'
-emoji[kiss]='\xF0\x9F\x92\x8F'
-emoji[bouquet]='\xF0\x9F\x92\x90'
-emoji[couple_with_heart]='\xF0\x9F\x92\x91'
-emoji[wedding]='\xF0\x9F\x92\x92'
-emoji[beating_heart]='\xF0\x9F\x92\x93'
-emoji[broken_heart]='\xF0\x9F\x92\x94'
-emoji[two_hearts]='\xF0\x9F\x92\x95'
-emoji[sparkling_heart]='\xF0\x9F\x92\x96'
-emoji[growing_heart]='\xF0\x9F\x92\x97'
-emoji[heart_with_arrow]='\xF0\x9F\x92\x98'
-emoji[blue_heart]='\xF0\x9F\x92\x99'
-emoji[green_heart]='\xF0\x9F\x92\x9A'
-emoji[yellow_heart]='\xF0\x9F\x92\x9B'
-emoji[purple_heart]='\xF0\x9F\x92\x9C'
-emoji[heart_with_ribbon]='\xF0\x9F\x92\x9D'
-emoji[revolving_hearts]='\xF0\x9F\x92\x9E'
-emoji[heart_decoration]='\xF0\x9F\x92\x9F'
-emoji[diamond_shape_with_a_dot_inside]='\xF0\x9F\x92\xA0'
-emoji[electric_light_bulb]='\xF0\x9F\x92\xA1'
-emoji[anger_symbol]='\xF0\x9F\x92\xA2'
-emoji[bomb]='\xF0\x9F\x92\xA3'
-emoji[sleeping_symbol]='\xF0\x9F\x92\xA4'
-emoji[collision_symbol]='\xF0\x9F\x92\xA5'
-emoji[splashing_sweat_symbol]='\xF0\x9F\x92\xA6'
-emoji[droplet]='\xF0\x9F\x92\xA7'
-emoji[dash_symbol]='\xF0\x9F\x92\xA8'
-emoji[pile_of_poo]='\xF0\x9F\x92\xA9'
-emoji[flexed_biceps]='\xF0\x9F\x92\xAA'
-emoji[dizzy_symbol]='\xF0\x9F\x92\xAB'
-emoji[speech_balloon]='\xF0\x9F\x92\xAC'
-emoji[white_flower]='\xF0\x9F\x92\xAE'
-emoji[hundred_points_symbol]='\xF0\x9F\x92\xAF'
-emoji[money_bag]='\xF0\x9F\x92\xB0'
-emoji[currency_exchange]='\xF0\x9F\x92\xB1'
-emoji[heavy_dollar_sign]='\xF0\x9F\x92\xB2'
-emoji[credit_card]='\xF0\x9F\x92\xB3'
-emoji[banknote_with_yen_sign]='\xF0\x9F\x92\xB4'
-emoji[banknote_with_dollar_sign]='\xF0\x9F\x92\xB5'
-emoji[money_with_wings]='\xF0\x9F\x92\xB8'
-emoji[chart_with_upwards_trend_and_yen_sign]='\xF0\x9F\x92\xB9'
-emoji[seat]='\xF0\x9F\x92\xBA'
-emoji[personal_computer]='\xF0\x9F\x92\xBB'
-emoji[briefcase]='\xF0\x9F\x92\xBC'
-emoji[minidisc]='\xF0\x9F\x92\xBD'
-emoji[floppy_disk]='\xF0\x9F\x92\xBE'
-emoji[optical_disc]='\xF0\x9F\x92\xBF'
-emoji[dvd]='\xF0\x9F\x93\x80'
-emoji[file_folder]='\xF0\x9F\x93\x81'
-emoji[open_file_folder]='\xF0\x9F\x93\x82'
-emoji[page_with_curl]='\xF0\x9F\x93\x83'
-emoji[page_facing_up]='\xF0\x9F\x93\x84'
-emoji[calendar]='\xF0\x9F\x93\x85'
-emoji[tear_off_calendar]='\xF0\x9F\x93\x86'
-emoji[card_index]='\xF0\x9F\x93\x87'
-emoji[chart_with_upwards_trend]='\xF0\x9F\x93\x88'
-emoji[chart_with_downwards_trend]='\xF0\x9F\x93\x89'
-emoji[bar_chart]='\xF0\x9F\x93\x8A'
-emoji[clipboard]='\xF0\x9F\x93\x8B'
-emoji[pushpin]='\xF0\x9F\x93\x8C'
-emoji[round_pushpin]='\xF0\x9F\x93\x8D'
-emoji[paperclip]='\xF0\x9F\x93\x8E'
-emoji[straight_ruler]='\xF0\x9F\x93\x8F'
-emoji[triangular_ruler]='\xF0\x9F\x93\x90'
-emoji[bookmark_tabs]='\xF0\x9F\x93\x91'
-emoji[ledger]='\xF0\x9F\x93\x92'
-emoji[notebook]='\xF0\x9F\x93\x93'
-emoji[notebook_with_decorative_cover]='\xF0\x9F\x93\x94'
-emoji[closed_book]='\xF0\x9F\x93\x95'
-emoji[open_book]='\xF0\x9F\x93\x96'
-emoji[green_book]='\xF0\x9F\x93\x97'
-emoji[blue_book]='\xF0\x9F\x93\x98'
-emoji[orange_book]='\xF0\x9F\x93\x99'
-emoji[books]='\xF0\x9F\x93\x9A'
-emoji[name_badge]='\xF0\x9F\x93\x9B'
-emoji[scroll]='\xF0\x9F\x93\x9C'
-emoji[memo]='\xF0\x9F\x93\x9D'
-emoji[telephone_receiver]='\xF0\x9F\x93\x9E'
-emoji[pager]='\xF0\x9F\x93\x9F'
-emoji[fax_machine]='\xF0\x9F\x93\xA0'
-emoji[satellite_antenna]='\xF0\x9F\x93\xA1'
-emoji[public_address_loudspeaker]='\xF0\x9F\x93\xA2'
-emoji[cheering_megaphone]='\xF0\x9F\x93\xA3'
-emoji[outbox_tray]='\xF0\x9F\x93\xA4'
-emoji[inbox_tray]='\xF0\x9F\x93\xA5'
-emoji[package]='\xF0\x9F\x93\xA6'
-emoji[e_mail_symbol]='\xF0\x9F\x93\xA7'
-emoji[incoming_envelope]='\xF0\x9F\x93\xA8'
-emoji[envelope_with_downwards_arrow_above]='\xF0\x9F\x93\xA9'
-emoji[closed_mailbox_with_lowered_flag]='\xF0\x9F\x93\xAA'
-emoji[closed_mailbox_with_raised_flag]='\xF0\x9F\x93\xAB'
-emoji[postbox]='\xF0\x9F\x93\xAE'
-emoji[newspaper]='\xF0\x9F\x93\xB0'
-emoji[mobile_phone]='\xF0\x9F\x93\xB1'
-emoji[mobile_phone_with_rightwards_arrow_at_left]='\xF0\x9F\x93\xB2'
-emoji[vibration_mode]='\xF0\x9F\x93\xB3'
-emoji[mobile_phone_off]='\xF0\x9F\x93\xB4'
-emoji[antenna_with_bars]='\xF0\x9F\x93\xB6'
-emoji[camera]='\xF0\x9F\x93\xB7'
-emoji[video_camera]='\xF0\x9F\x93\xB9'
-emoji[television]='\xF0\x9F\x93\xBA'
-emoji[radio]='\xF0\x9F\x93\xBB'
-emoji[videocassette]='\xF0\x9F\x93\xBC'
-emoji[clockwise_downwards_and_upwards_open_circle_arrows]='\xF0\x9F\x94\x83'
-emoji[speaker_with_three_sound_waves]='\xF0\x9F\x94\x8A'
-emoji[battery]='\xF0\x9F\x94\x8B'
-emoji[electric_plug]='\xF0\x9F\x94\x8C'
-emoji[left_pointing_magnifying_glass]='\xF0\x9F\x94\x8D'
-emoji[right_pointing_magnifying_glass]='\xF0\x9F\x94\x8E'
-emoji[lock_with_ink_pen]='\xF0\x9F\x94\x8F'
-emoji[closed_lock_with_key]='\xF0\x9F\x94\x90'
-emoji[key]='\xF0\x9F\x94\x91'
-emoji[lock]='\xF0\x9F\x94\x92'
-emoji[open_lock]='\xF0\x9F\x94\x93'
-emoji[bell]='\xF0\x9F\x94\x94'
-emoji[bookmark]='\xF0\x9F\x94\x96'
-emoji[link_symbol]='\xF0\x9F\x94\x97'
-emoji[radio_button]='\xF0\x9F\x94\x98'
-emoji[back_with_leftwards_arrow_above]='\xF0\x9F\x94\x99'
-emoji[end_with_leftwards_arrow_above]='\xF0\x9F\x94\x9A'
-emoji[on_with_exclamation_mark_with_left_right_arrow_above]='\xF0\x9F\x94\x9B'
-emoji[soon_with_rightwards_arrow_above]='\xF0\x9F\x94\x9C'
-emoji[top_with_upwards_arrow_above]='\xF0\x9F\x94\x9D'
-emoji[no_one_under_eighteen_symbol]='\xF0\x9F\x94\x9E'
-emoji[keycap_ten]='\xF0\x9F\x94\x9F'
-emoji[input_symbol_for_latin_capital_letters]='\xF0\x9F\x94\xA0'
-emoji[input_symbol_for_latin_small_letters]='\xF0\x9F\x94\xA1'
-emoji[input_symbol_for_numbers]='\xF0\x9F\x94\xA2'
-emoji[input_symbol_for_symbols]='\xF0\x9F\x94\xA3'
-emoji[input_symbol_for_latin_letters]='\xF0\x9F\x94\xA4'
-emoji[fire]='\xF0\x9F\x94\xA5'
-emoji[electric_torch]='\xF0\x9F\x94\xA6'
-emoji[wrench]='\xF0\x9F\x94\xA7'
-emoji[hammer]='\xF0\x9F\x94\xA8'
-emoji[nut_and_bolt]='\xF0\x9F\x94\xA9'
-emoji[hocho]='\xF0\x9F\x94\xAA'
-emoji[pistol]='\xF0\x9F\x94\xAB'
-emoji[crystal_ball]='\xF0\x9F\x94\xAE'
-emoji[six_pointed_star_with_middle_dot]='\xF0\x9F\x94\xAF'
-emoji[japanese_symbol_for_beginner]='\xF0\x9F\x94\xB0'
-emoji[trident_emblem]='\xF0\x9F\x94\xB1'
-emoji[black_square_button]='\xF0\x9F\x94\xB2'
-emoji[white_square_button]='\xF0\x9F\x94\xB3'
-emoji[large_red_circle]='\xF0\x9F\x94\xB4'
-emoji[large_blue_circle]='\xF0\x9F\x94\xB5'
-emoji[large_orange_diamond]='\xF0\x9F\x94\xB6'
-emoji[large_blue_diamond]='\xF0\x9F\x94\xB7'
-emoji[small_orange_diamond]='\xF0\x9F\x94\xB8'
-emoji[small_blue_diamond]='\xF0\x9F\x94\xB9'
-emoji[up_pointing_red_triangle]='\xF0\x9F\x94\xBA'
-emoji[down_pointing_red_triangle]='\xF0\x9F\x94\xBB'
-emoji[up_pointing_small_red_triangle]='\xF0\x9F\x94\xBC'
-emoji[down_pointing_small_red_triangle]='\xF0\x9F\x94\xBD'
-emoji[clock_face_one_oclock]='\xF0\x9F\x95\x90'
-emoji[clock_face_two_oclock]='\xF0\x9F\x95\x91'
-emoji[clock_face_three_oclock]='\xF0\x9F\x95\x92'
-emoji[clock_face_four_oclock]='\xF0\x9F\x95\x93'
-emoji[clock_face_five_oclock]='\xF0\x9F\x95\x94'
-emoji[clock_face_six_oclock]='\xF0\x9F\x95\x95'
-emoji[clock_face_seven_oclock]='\xF0\x9F\x95\x96'
-emoji[clock_face_eight_oclock]='\xF0\x9F\x95\x97'
-emoji[clock_face_nine_oclock]='\xF0\x9F\x95\x98'
-emoji[clock_face_ten_oclock]='\xF0\x9F\x95\x99'
-emoji[clock_face_eleven_oclock]='\xF0\x9F\x95\x9A'
-emoji[clock_face_twelve_oclock]='\xF0\x9F\x95\x9B'
-emoji[mount_fuji]='\xF0\x9F\x97\xBB'
-emoji[tokyo_tower]='\xF0\x9F\x97\xBC'
-emoji[statue_of_liberty]='\xF0\x9F\x97\xBD'
-emoji[silhouette_of_japan]='\xF0\x9F\x97\xBE'
-emoji[moyai]='\xF0\x9F\x97\xBF'
-emoji[grinning_face]='\xF0\x9F\x98\x80'
-emoji[smiling_face_with_halo]='\xF0\x9F\x98\x87'
-emoji[smiling_face_with_horns]='\xF0\x9F\x98\x88'
-emoji[smiling_face_with_sunglasses]='\xF0\x9F\x98\x8E'
-emoji[neutral_face]='\xF0\x9F\x98\x90'
-emoji[expressionless_face]='\xF0\x9F\x98\x91'
-emoji[confused_face]='\xF0\x9F\x98\x95'
-emoji[kissing_face]='\xF0\x9F\x98\x97'
-emoji[kissing_face_with_smiling_eyes]='\xF0\x9F\x98\x99'
-emoji[face_with_stuck_out_tongue]='\xF0\x9F\x98\x9B'
-emoji[worried_face]='\xF0\x9F\x98\x9F'
-emoji[frowning_face_with_open_mouth]='\xF0\x9F\x98\xA6'
-emoji[anguished_face]='\xF0\x9F\x98\xA7'
-emoji[grimacing_face]='\xF0\x9F\x98\xAC'
-emoji[face_with_open_mouth]='\xF0\x9F\x98\xAE'
-emoji[hushed_face]='\xF0\x9F\x98\xAF'
-emoji[sleeping_face]='\xF0\x9F\x98\xB4'
-emoji[face_without_mouth]='\xF0\x9F\x98\xB6'
-emoji[helicopter]='\xF0\x9F\x9A\x81'
-emoji[steam_locomotive]='\xF0\x9F\x9A\x82'
-emoji[train]='\xF0\x9F\x9A\x86'
-emoji[light_rail]='\xF0\x9F\x9A\x88'
-emoji[tram]='\xF0\x9F\x9A\x8A'
-emoji[oncoming_bus]='\xF0\x9F\x9A\x8D'
-emoji[trolleybus]='\xF0\x9F\x9A\x8E'
-emoji[minibus]='\xF0\x9F\x9A\x90'
-emoji[oncoming_police_car]='\xF0\x9F\x9A\x94'
-emoji[oncoming_taxi]='\xF0\x9F\x9A\x96'
-emoji[oncoming_automobile]='\xF0\x9F\x9A\x98'
-emoji[articulated_lorry]='\xF0\x9F\x9A\x9B'
-emoji[tractor]='\xF0\x9F\x9A\x9C'
-emoji[monorail]='\xF0\x9F\x9A\x9D'
-emoji[mountain_railway]='\xF0\x9F\x9A\x9E'
-emoji[suspension_railway]='\xF0\x9F\x9A\x9F'
-emoji[mountain_cableway]='\xF0\x9F\x9A\xA0'
-emoji[aerial_tramway]='\xF0\x9F\x9A\xA1'
-emoji[rowboat]='\xF0\x9F\x9A\xA3'
-emoji[vertical_traffic_light]='\xF0\x9F\x9A\xA6'
-emoji[put_litter_in_its_place_symbol]='\xF0\x9F\x9A\xAE'
-emoji[do_not_litter_symbol]='\xF0\x9F\x9A\xAF'
-emoji[potable_water_symbol]='\xF0\x9F\x9A\xB0'
-emoji[non_potable_water_symbol]='\xF0\x9F\x9A\xB1'
-emoji[no_bicycles]='\xF0\x9F\x9A\xB3'
-emoji[bicyclist]='\xF0\x9F\x9A\xB4'
-emoji[mountain_bicyclist]='\xF0\x9F\x9A\xB5'
-emoji[no_pedestrians]='\xF0\x9F\x9A\xB7'
-emoji[children_crossing]='\xF0\x9F\x9A\xB8'
-emoji[shower]='\xF0\x9F\x9A\xBF'
-emoji[bathtub]='\xF0\x9F\x9B\x81'
-emoji[passport_control]='\xF0\x9F\x9B\x82'
-emoji[customs]='\xF0\x9F\x9B\x83'
-emoji[baggage_claim]='\xF0\x9F\x9B\x84'
-emoji[left_luggage]='\xF0\x9F\x9B\x85'
-emoji[earth_globe_europe_africa]='\xF0\x9F\x8C\x8D'
-emoji[earth_globe_americas]='\xF0\x9F\x8C\x8E'
-emoji[globe_with_meridians]='\xF0\x9F\x8C\x90'
-emoji[waxing_crescent_moon_symbol]='\xF0\x9F\x8C\x92'
-emoji[waning_gibbous_moon_symbol]='\xF0\x9F\x8C\x96'
-emoji[last_quarter_moon_symbol]='\xF0\x9F\x8C\x97'
-emoji[waning_crescent_moon_symbol]='\xF0\x9F\x8C\x98'
-emoji[new_moon_with_face]='\xF0\x9F\x8C\x9A'
-emoji[last_quarter_moon_with_face]='\xF0\x9F\x8C\x9C'
-emoji[full_moon_with_face]='\xF0\x9F\x8C\x9D'
-emoji[sun_with_face]='\xF0\x9F\x8C\x9E'
-emoji[evergreen_tree]='\xF0\x9F\x8C\xB2'
-emoji[deciduous_tree]='\xF0\x9F\x8C\xB3'
-emoji[lemon]='\xF0\x9F\x8D\x8B'
-emoji[pear]='\xF0\x9F\x8D\x90'
-emoji[baby_bottle]='\xF0\x9F\x8D\xBC'
-emoji[horse_racing]='\xF0\x9F\x8F\x87'
-emoji[rugby_football]='\xF0\x9F\x8F\x89'
-emoji[european_post_office]='\xF0\x9F\x8F\xA4'
-emoji[rat]='\xF0\x9F\x90\x80'
-emoji[mouse]='\xF0\x9F\x90\x81'
-emoji[ox]='\xF0\x9F\x90\x82'
-emoji[water_buffalo]='\xF0\x9F\x90\x83'
-emoji[cow]='\xF0\x9F\x90\x84'
-emoji[tiger]='\xF0\x9F\x90\x85'
-emoji[leopard]='\xF0\x9F\x90\x86'
-emoji[rabbit]='\xF0\x9F\x90\x87'
-emoji[cat]='\xF0\x9F\x90\x88'
-emoji[dragon]='\xF0\x9F\x90\x89'
-emoji[crocodile]='\xF0\x9F\x90\x8A'
-emoji[whale]='\xF0\x9F\x90\x8B'
-emoji[ram]='\xF0\x9F\x90\x8F'
-emoji[goat]='\xF0\x9F\x90\x90'
-emoji[rooster]='\xF0\x9F\x90\x93'
-emoji[dog]='\xF0\x9F\x90\x95'
-emoji[pig]='\xF0\x9F\x90\x96'
-emoji[dromedary_camel]='\xF0\x9F\x90\xAA'
-emoji[busts_in_silhouette]='\xF0\x9F\x91\xA5'
-emoji[two_men_holding_hands]='\xF0\x9F\x91\xAC'
-emoji[two_women_holding_hands]='\xF0\x9F\x91\xAD'
-emoji[thought_balloon]='\xF0\x9F\x92\xAD'
-emoji[banknote_with_euro_sign]='\xF0\x9F\x92\xB6'
-emoji[banknote_with_pound_sign]='\xF0\x9F\x92\xB7'
-emoji[open_mailbox_with_raised_flag]='\xF0\x9F\x93\xAC'
-emoji[open_mailbox_with_lowered_flag]='\xF0\x9F\x93\xAD'
-emoji[postal_horn]='\xF0\x9F\x93\xAF'
-emoji[no_mobile_phones]='\xF0\x9F\x93\xB5'
-emoji[twisted_rightwards_arrows]='\xF0\x9F\x94\x80'
-emoji[clockwise_rightwards_and_leftwards_open_circle_arrows]='\xF0\x9F\x94\x81'
-emoji[clockwise_rightwards_and_leftwards_open_circle_arrows_with_circled_one_overlay]='\xF0\x9F\x94\x82'
-emoji[anticlockwise_downwards_and_upwards_open_circle_arrows]='\xF0\x9F\x94\x84'
-emoji[low_brightness_symbol]='\xF0\x9F\x94\x85'
-emoji[high_brightness_symbol]='\xF0\x9F\x94\x86'
-emoji[speaker_with_cancellation_stroke]='\xF0\x9F\x94\x87'
-emoji[speaker_with_one_sound_wave]='\xF0\x9F\x94\x89'
-emoji[bell_with_cancellation_stroke]='\xF0\x9F\x94\x95'
-emoji[microscope]='\xF0\x9F\x94\xAC'
-emoji[telescope]='\xF0\x9F\x94\xAD'
-emoji[clock_face_one_thirty]='\xF0\x9F\x95\x9C'
-emoji[clock_face_two_thirty]='\xF0\x9F\x95\x9D'
-emoji[clock_face_three_thirty]='\xF0\x9F\x95\x9E'
-emoji[clock_face_four_thirty]='\xF0\x9F\x95\x9F'
-emoji[clock_face_five_thirty]='\xF0\x9F\x95\xA0'
-emoji[clock_face_six_thirty]='\xF0\x9F\x95\xA1'
-emoji[clock_face_seven_thirty]='\xF0\x9F\x95\xA2'
-emoji[clock_face_eight_thirty]='\xF0\x9F\x95\xA3'
-emoji[clock_face_nine_thirty]='\xF0\x9F\x95\xA4'
-emoji[clock_face_ten_thirty]='\xF0\x9F\x95\xA5'
-emoji[clock_face_eleven_thirty]='\xF0\x9F\x95\xA6'
-emoji[clock_face_twelve_thirty]='\xF0\x9F\x95\xA7'
+_omz_emoji_plugin_dir="${0:h}"
 
-emoji_fruits=(
+() {
+
+local LC_ALL=en_US.UTF-8
+
+typeset -gAH emoji_groups
+typeset -gAH emoji_con
+typeset -gAH emoji2
+typeset -gAH emoji_skintone
+
+source "$_omz_emoji_plugin_dir/emoji-char-definitions.zsh"
+unset _omz_emoji_plugin_dir
+
+# These additional emoji are not in the definition file, but are useful in conjunction with it
+
+# This is a combinin character that can be placed after any other character to surround
+# it in a "keycap" symbol.
+# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. 
+# It's unclear whether this should be in the $emoji array, because those characters are all ones
+# which can be displayed on their own.
+#emoji[combining_enclosing_keycap]="\U20E3"
+
+emoji[regional_indicator_symbol_letter_d_regional_indicator_symbol_letter_e]=$'\xF0\x9F\x87\xA9\xF0\x9F\x87\xAA'
+emoji[regional_indicator_symbol_letter_g_regional_indicator_symbol_letter_b]=$'\xF0\x9F\x87\xAC\xF0\x9F\x87\xA7'
+emoji[regional_indicator_symbol_letter_c_regional_indicator_symbol_letter_n]=$'\xF0\x9F\x87\xA8\xF0\x9F\x87\xB3'
+emoji[regional_indicator_symbol_letter_j_regional_indicator_symbol_letter_p]=$'\xF0\x9F\x87\xAF\xF0\x9F\x87\xB5'
+emoji[regional_indicator_symbol_letter_k_regional_indicator_symbol_letter_r]=$'\xF0\x9F\x87\xB0\xF0\x9F\x87\xB7'
+emoji[regional_indicator_symbol_letter_f_regional_indicator_symbol_letter_r]=$'\xF0\x9F\x87\xAB\xF0\x9F\x87\xB7'
+emoji[regional_indicator_symbol_letter_e_regional_indicator_symbol_letter_s]=$'\xF0\x9F\x87\xAA\xF0\x9F\x87\xB8'
+emoji[regional_indicator_symbol_letter_i_regional_indicator_symbol_letter_t]=$'\xF0\x9F\x87\xAE\xF0\x9F\x87\xB9'
+emoji[regional_indicator_symbol_letter_u_regional_indicator_symbol_letter_s]=$'\xF0\x9F\x87\xBA\xF0\x9F\x87\xB8'
+emoji[regional_indicator_symbol_letter_r_regional_indicator_symbol_letter_u]=$'\xF0\x9F\x87\xB7\xF0\x9F\x87\xBA'
+
+# Nonstandard alias names
+emoji[vulcan_salute]=$'\U1F596'
+
+
+# Emoji combining and auxiliary characters
+
+# "Variation Selectors" for controlling text vs emoji style presentation
+# These apply to the immediately preceding character
+emoji2[text_style]=$'\UFE0E'
+emoji2[emoji_style]=$'\UFE0F'
+# Joiner that indicates a single combined-form glyph (ligature) should be used
+emoji2[zero_width_joiner]=$'\U200D'
+# Skin tone modifiers
+emoji2[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
+emoji2[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
+emoji2[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
+emoji2[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
+emoji2[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
+# Various other combining characters. (Incomplete list; I selected ones that sound useful)
+emoji2[combining_enclosing_circle]=$'\U20DD'
+emoji2[combining_enclosing_square]=$'\U20DE'
+emoji2[combining_enclosing_diamond]=$'\U20DF'
+emoji2[combining_enclosing_circle_backslash]=$'\U20E0'
+emoji2[combining_enclosing_screen]=$'\U20E2'
+emoji2[combining_enclosing_keycap]=$'\U20E3'
+emoji2[combining_enclosing_upward_pointing_triangle]=$'\U20E4'
+
+# Easier access to skin tone modifiers
+emoji_skintone[1_2]=$'\U1F3FB'
+emoji_skintone[3]=$'\U1F3FC'
+emoji_skintone[4]=$'\U1F3FD'
+emoji_skintone[5]=$'\U1F3FE'
+emoji_skintone[6]=$'\U1F3FF'
+
+# Emoji groups
+# These are stored in a single associative array, $emoji_groups, to avoid cluttering up the global
+# namespace, and to allow adding additional group definitions at run time.
+# The keys are the group names, and the values are whitespace-separated lists of emoji character names.
+#
+# These extra local arrays are used to allow more convenient formatting of the source code.
+
+emoji_groups[fruits]="
   tomato
   aubergine
   grapes
@@ -886,9 +159,9 @@ emoji_fruits=(
   strawberry
   lemon
   pear
-)
+"
 
-emoji_vehicles=(
+emoji_groups[vehicles]="
   airplane
   rocket
   railway_car
@@ -927,9 +200,9 @@ emoji_vehicles=(
   bicyclist
   mountain_bicyclist
   sailboat
-)
+"
 
-emoji_animals=(
+emoji_groups[animals]="
   snail
   snake
   horse
@@ -991,9 +264,9 @@ emoji_animals=(
   dog
   pig
   dromedary_camel
-)
+"
 
-emoji_faces=(
+emoji_groups[faces]="
   grinning_face_with_smiling_eyes
   face_with_tears_of_joy
   smiling_face_with_open_mouth
@@ -1032,66 +305,49 @@ emoji_faces=(
   flushed_face
   dizzy_face
   face_with_medical_mask
-)
+"
 
-function random_emoji(){
-  local emoji_array_size=${#emoji[@]}
-  local random_element_index=$(( ( RANDOM % $emoji_array_size ) + 1 ))
-  echo ${emoji[@][$random_element_index]}
 }
 
-function random_emoji_from_list(){
-  local array_name=$1
-  local list_size=${#${(P)array_name}[@]}
+# Prints a random emoji character
+#
+#  random_emoji [group]
+#
+function random_emoji() {
+  local group=$1
+  local names
+  if [[ -z "$group" || "$group" == "all" ]]; then
+  	names=(${(k)emoji})
+  else
+  	names=(${=emoji_groups[$group_name]})
+  fi
+  local list_size=$#names
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))
-  local key=${${(P)array_name}[@][$random_index]}
-  echo ${emoji[$key]}
+  local name=${names[$random_index]}
+  echo ${emoji[$name]}
 }
 
-function display_emoji_list(){
-  local array_name=$1
-  for i in ${${(P)array_name}[@]}; do
+# Displays a listing of emoji with their names
+#
+# display_emoji [group]
+#
+function display_emoji() {
+  local group=$1
+  local names
+  if [[ -z "$group" || "$group" == "all" ]]; then
+  	names=(${(k)emoji})
+  else
+    names=(${=emoji_groups[$group]})
+  fi
+  # The extra spaces in output here are a hack for readability, since some
+  # terminals treat these emoji chars as single-width.
+  for i in $names; do
+    printf '%s  ' "$emoji[$i]"
+  done
+  print
+  for i in $names; do
     echo "${emoji[$i]}  = $i"
   done
 }
 
-function random_emoji_fruit(){
-  random_emoji_from_list 'emoji_fruits'
-}
-
-function random_emoji_vehicle(){
-  random_emoji_from_list 'emoji_vehicles'
-}
-
-function random_emoji_animal(){
-  random_emoji_from_list 'emoji_animals'
-}
-
-function random_emoji_face(){
-  random_emoji_from_list 'emoji_faces'
-}
-
-function display_emoji_fruits(){
-  display_emoji_list 'emoji_fruits'
-}
-
-function display_emoji_vehicles(){
-  display_emoji_list 'emoji_vehicles'
-}
-
-function display_emoji_animals(){
-  display_emoji_list 'emoji_animals'
-}
-
-function display_emoji_faces(){
-  display_emoji_list 'emoji_faces'
-}
-
-function display_all_emoji(){
-  echo $emoji[@]
-  echo
-  for k in ${(k)emoji}; do
-    echo "${emoji[$k]}  = $k"
-  done
-}
 
diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl
new file mode 100644
index 000000000..d90c6e316
--- /dev/null
+++ b/plugins/emoji/update_emoji.pl
@@ -0,0 +1,113 @@
+#!/usr/bin/perl -w
+#
+# update_emoji.pl
+#
+# This script generates the emoji.plugin.zsh emoji definitions from the Unicode
+# character data for the emoji characters.
+#
+# The data file can be found at http://unicode.org/Public/emoji/latest/emoji-data.txt
+# as referenced in Unicode TR51 (http://www.unicode.org/reports/tr51/index.html).
+#
+# This is known to work with the data file from version 1.0. It may not work with later
+# versions if the format changes. In particular, this reads line comments to get the
+# emoji character name and unicode version.
+#
+# Country names have punctuation and other non-letter characters removed from their name,
+# to avoid possible complications with having to escape the strings when using them as 
+# array subscripts. The definition file seems to use some combining characters like accents
+# that get stripped during this process.
+
+use strict;
+use warnings;
+use 5.010;
+use autodie;
+
+use Path::Class;
+use File::Copy;
+
+# Parse definitions out of the data file and convert
+sub process_emoji_data_file {
+	my ( $infile, $outfilename ) = @_;
+	my $file = file($infile);
+	my $outfile = file($outfilename);
+	my $outfilebase = $outfile->basename();
+	my $tempfilename = "$outfilename.tmp";
+	my $tempfile = file($tempfilename);
+	my $outfh = $tempfile->openw();
+	$outfh->print("
+# $outfilebase - Emoji character definitions for oh-my-zsh emoji plugin
+#
+# This file is auto-generated by update_emoji.pl. Do not edit it manually.
+#
+# This contains the definition for:
+#   \$emoji         - which maps character names to Unicode characters
+#   \$emoji_flags   - maps country names to Unicode flag characters using region indicators 
+
+# Main emoji
+typeset -gAH emoji
+# National flags
+typeset -gAH emoji_flags
+# Combining modifiers
+typeset -gAH emoji_mod
+
+");
+
+	my $fh = $file->openr();
+	my $line_num = 0;
+	while ( my $line = $fh->getline() ) {
+		$line_num++;
+		$_ = $line;
+		# Skip all-comment lines (from the header) and blank lines
+		# (But don't strip comments on normal lines; we need to parse those for
+		# the emoji names.)
+		next if /^\s*#/ or /^\s*$/;
+
+		if (/^(\S.*?\S)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w.*?)\s*#\s*V(\S+)\s\(.*?\)\s*(\w.*\S)\s*$/) {
+			my ($code, $style, $level, $modifier_status, $sources, $version, $keycap_name) 
+				= ($1, $2, $3, $4, $5, $6, $7);
+			#print "code=$code style=$style level=$level modifier_status=$modifier_status sources=$sources version=$version name=$keycap_name\n";
+			my @code_points = split /\s+/, $code;
+			my @sources = split /\s+/, $sources;
+
+			my $flag_country = "";
+			if ( $keycap_name =~ /^flag for (\S.*?)\s*$/) {
+				$flag_country = $1;
+			}
+
+			my $zsh_code = join '', map { "\\U$_" } @code_points;
+			# Convert keycap names to valid associative array names that do not require any
+			# quoting. Works fine for most stuff, but is clumsy for flags.
+			my $omz_name = lc($keycap_name);
+			$omz_name =~ s/[^A-Za-z0-9]/_/g;
+			my $zsh_flag_country = $flag_country;
+			$zsh_flag_country =~ s/[^\p{Letter}]/_/g;
+			if ($flag_country) {
+				$outfh->print("emoji_flags[$zsh_flag_country]=\$'$zsh_code'\n");
+			} else {
+				$outfh->print("emoji[$omz_name]=\$'$zsh_code'\n");				
+			}
+			# Modifiers are included in both the main set and their separate map,
+			# because they have a standalone representation as a color swatch.
+			if ( $modifier_status == "modifier" ) {
+				$outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n");
+			}
+		} else {
+			die "Failed parsing line $line_num: '$_'";
+		}
+	}
+	$fh->close();
+	$outfh->print("\n");
+	$outfh->close();
+
+	move($tempfilename, $outfilename)
+		or die "Failed moving temp file to $outfilename: $!";
+}
+
+my $datafile = "emoji-data.txt";
+my $zsh_def_file = "emoji-char-definitions.zsh";
+process_emoji_data_file($datafile, $zsh_def_file);
+
+print "Updated definition file $zsh_def_file\n";
+
+
+

From 9a397254dacca687bf7d204ac9d31f02ca2af242 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Wed, 15 Jul 2015 17:16:59 -0400
Subject: [PATCH 1178/1378] Remove redundant comments from the .zsh file (since
 they're in README now).

---
 plugins/emoji/emoji.plugin.zsh | 66 +---------------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index dbaf2bb9e..a98d0b714 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -2,71 +2,7 @@
 #
 # Makes emoji support available within ZSH
 #
-# This plugin provides support for working with emoji characters in zsh using human-readable
-# identifiers. It provides global variables which map emoji names to the actual
-# characters, and some anmed groupings of emoji. It also provides associated functions 
-# for displaying them.
-#
-# Global variables:
-#   $emoji          - Maps emoji names to characters
-#   $emoji2         - Auxiliary and combining characters
-#   $emoji_flags    - Maps country names to flag characters (using region-indicators)
-#   $emoji_skintone - Skin tone modifiers (from Unicode 8.0)
-#   $emoji_groups   - Named groups of emoji. Keys are group names; values are whitespace-separated 
-#                       lists of character names
-#
-# Functions:
-#   random_emoji   - Prints a random emoji character
-#   display_emoji  - Displays emoji, along with their names
-#
-# The emoji names and codes are sourced from Unicode Technical Report #51, which provides
-# information on emoji support in Unicode. It can be found at http://www.unicode.org/reports/tr51/index.html.
-#
-# The group definitions are added by this OMZ plugin. They are not based on external definitions.
-#
-# The emoji in the main $emoji map are standalone character sequences which can all be output on their
-# own, without worrying about combining effects. The values may actually be multi-code-point sequences, 
-# instead of a single code point, and may include combining characters in those sequences. But they're
-# arranged so their effects do not extend beyond that sequence.
-#
-# Usage and Examples:
-#
-# To output a specific emoji, use:
-#    $> echo $emoji[<name>]
-# E.g.: 
-#    $> echo $emoji[mouse_face]
-#
-# To output a random emoji, use:
-#    $> random_emoji
-# To output a random emoji from a particular group, use:
-#    $> random_emoji <group>
-# E.g.:
-#    $> random_emoji fruits
-#    $> random_emoji animals
-#    $> random_emoji vehicles
-#    $> random_emoji faces
-# The valid group names can be found with `echo ${(k)emoji_groups}`
-#
-# To list all available emoji with their names, use:
-#    $> display_emoji
-#    $> display_emoji fruits
-#    $> display_emoji animals
-#    $> display_emoji vehicles
-#    $> display_emoji faces
-#
-# To use emoji in a prompt:
-#    PROMPT="$emoji[penguin]  > ""
-#    PROMPT='$(random_emoji fruits)  > '
-#    surfer=$emoji[surfer]
-#    PROMPT="$surfer  > "
-#
-#
-# TODO: Move doco to a README
-# TODO: Factor out parsing from generation in update_emoji.pl
-# TODO: Incorporate CLDR data for ordering and groupings
-# TODO: Short :bracket: style names (from gemoji)
-# TODO: Country codes for flags
-# TODO: ZWJ combining function?
+# See the README for documentation.
 
 _omz_emoji_plugin_dir="${0:h}"
 

From 7a13a407e92dc6780355f67018bb03da81a73b8f Mon Sep 17 00:00:00 2001
From: Roland Chernov <mail@9241406380.org>
Date: Sat, 18 Jul 2015 21:10:56 +0900
Subject: [PATCH 1179/1378] Added thefuck plugin
 https://github.com/nvbn/thefuck

---
 plugins/thefuck/thefuck.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/thefuck/thefuck.plugin.zsh

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
new file mode 100644
index 000000000..81461d48e
--- /dev/null
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -0,0 +1,9 @@
+fuck-command-line() {
+    FUCK=$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)
+    [ -z $FUCK ] && echo -n -e "\a" && return
+    BUFFER=$FUCK
+    zle end-of-line
+}
+zle -N fuck-command-line
+# Defined shortcut keys: [Esc] [Esc]
+bindkey "\e\e" fuck-command-line

From cd2213a0304e7f0b8fdfbb02be96f57042e2744a Mon Sep 17 00:00:00 2001
From: Roland Chernov <mail@9241406380.org>
Date: Sat, 18 Jul 2015 21:17:51 +0900
Subject: [PATCH 1180/1378] Thefuck plugin README

---
 plugins/thefuck/README.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/thefuck/README.md

diff --git a/plugins/thefuck/README.md b/plugins/thefuck/README.md
new file mode 100644
index 000000000..981b5513e
--- /dev/null
+++ b/plugins/thefuck/README.md
@@ -0,0 +1,6 @@
+# The Fuck
+
+[The Fuck](https://github.com/nvbn/thefuck) plugin — magnificent app which corrects your previous console command.
+
+## Usage
+Press `ESC` twice to correct previous console command.

From f838b56591691ad999c8ad1202f04f88350e2d73 Mon Sep 17 00:00:00 2001
From: linux_china <linux_china@hotmail.com>
Date: Sun, 19 Jul 2015 11:44:42 +0800
Subject: [PATCH 1181/1378] spring boot plugin readme

---
 plugins/spring/README.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 plugins/spring/README.md

diff --git a/plugins/spring/README.md b/plugins/spring/README.md
new file mode 100644
index 000000000..62bfd8013
--- /dev/null
+++ b/plugins/spring/README.md
@@ -0,0 +1,25 @@
+# Spring Boot oh-my-zsh plugin
+oh-my-zsh Spring Boot plugin
+
+## Spring Boot autocomplete plugin
+
+- Adds autocomplete options for all spring boot commands.
+
+## Manual Install
+
+     $ cd ~/.oh-my-zsh/plugins
+     $ git clone git@github.com:linux-china/oh-my-zsh-spring-boot-plugin.git spring
+
+Adjust your .zshrc file and add spring to plugins=(...)  
+ 
+## Tips 
+
+* Install Spring Cloud plugin: spring install org.springframework.cloud:spring-cloud-cli:1.0.2.RELEASE
+
+## Reference
+
+* Spring Boot: http://projects.spring.io/spring-boot/
+* Spring Boot CLI: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cli
+
+Maintainer : linux_china ([@linux_china](https://twitter.com/linux_china))
+

From b4a8cbf6a589a57572832714f0284e487719004a Mon Sep 17 00:00:00 2001
From: linux_china <linux_china@hotmail.com>
Date: Sun, 19 Jul 2015 11:44:51 +0800
Subject: [PATCH 1182/1378] spring boot plugin

---
 plugins/spring/_spring | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/spring/_spring

diff --git a/plugins/spring/_spring b/plugins/spring/_spring
new file mode 100644
index 000000000..93f19517d
--- /dev/null
+++ b/plugins/spring/_spring
@@ -0,0 +1,29 @@
+#compdef spring 'spring'
+#autoload
+
+_spring() {
+
+        local cword
+        let cword=CURRENT-1
+
+        local hints
+        hints=()
+
+        local reply
+        while read -r line; do
+                reply=`echo "$line" | awk '{printf $1 ":"; for (i=2; i<NF; i++) printf $i " "; print $NF}'`
+                hints+=("$reply")
+        done < <(spring hint ${cword} ${words[*]})
+
+        if ((cword == 1)) {
+                _describe -t commands 'commands' hints
+                return 0
+        }
+
+        _describe -t options 'options' hints
+        _files
+
+        return 0
+}
+
+_spring "$@"
\ No newline at end of file

From e38455bf4f9b247d3e51298d39d18a90a7294438 Mon Sep 17 00:00:00 2001
From: Roland Chernov <mail@9241406380.org>
Date: Sun, 19 Jul 2015 12:57:50 +0900
Subject: [PATCH 1183/1378] Added conflict note (thefuck plugin)

---
 plugins/thefuck/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/thefuck/README.md b/plugins/thefuck/README.md
index 981b5513e..a9b7550d7 100644
--- a/plugins/thefuck/README.md
+++ b/plugins/thefuck/README.md
@@ -4,3 +4,6 @@
 
 ## Usage
 Press `ESC` twice to correct previous console command.
+
+## Notes
+`Esc`-`Esc` key binding conflicts with [sudo](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/sudo) plugin.

From a3f0439de34ac2ce083c3d9f09b4e4f5379c158c Mon Sep 17 00:00:00 2001
From: Alex Talker <alextalker@openmailbox.org>
Date: Sun, 19 Jul 2015 13:56:10 +0300
Subject: [PATCH 1184/1378] Fix little typo that makes the statement useless.

---
 themes/candy-kingdom.zsh-theme | 2 +-
 themes/fino-time.zsh-theme     | 2 +-
 themes/fino.zsh-theme          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index adba1ad39..9d2103926 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -13,7 +13,7 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST}
+    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
 }
 
 PROMPT='
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 6e7e654ff..9b1db3a08 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -21,7 +21,7 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST}
+    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
 }
 
 
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index e4477589e..6eec097f5 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -17,7 +17,7 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-HOST}
+    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
 }
 
 local ruby_env=''

From 5a1dd14f13bfef9ca8d0d1b9683aea2b5b4e3ec9 Mon Sep 17 00:00:00 2001
From: Sharky <kaydenalthen@gmail.com>
Date: Sun, 19 Jul 2015 11:50:43 -0500
Subject: [PATCH 1185/1378] removed incorrect Devanagari conjunct symbol at end
 of Om

---
 themes/dogenpunk.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index 0bd38acc2..ea3f1b96a 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -3,7 +3,7 @@
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
 
-PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ओम् %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
+PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ओम %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
 %{$fg[red]%}%!%{$reset_color%} $(prompt_char) '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[green]%}git%{$reset_color%}@%{$bg[white]%}%{$fg[black]%}"

From cacc6c34b72ecb4593d05b66d891cf4f075e69f2 Mon Sep 17 00:00:00 2001
From: Sharky <kaydenalthen@gmail.com>
Date: Sun, 19 Jul 2015 12:33:37 -0500
Subject: [PATCH 1186/1378] replaced Om spelling so letters would not overlap

---
 themes/dogenpunk.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index ea3f1b96a..d6719281d 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -3,7 +3,7 @@
 MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
 
-PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ओम %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
+PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ॐ  %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
 %{$fg[red]%}%!%{$reset_color%} $(prompt_char) '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[green]%}git%{$reset_color%}@%{$bg[white]%}%{$fg[black]%}"

From cb55161470e051e520bad388c20e32d43cfca973 Mon Sep 17 00:00:00 2001
From: leycec <leycec@gmail.com>
Date: Tue, 12 May 2015 19:27:51 -0400
Subject: [PATCH 1187/1378] Completion insecurities handled on startup.

Completion-dependent directories with insecure permissions or ownership (e.g.,
group or other writability) are now detected, reported, and sanitized on OMZ
startup rather than unsafely ignored -- which resulted in effectively empty
completion caches and obscure compdef() errors resembling
"compdef: unknown command or service: git".

This fixes long-standing issues #630, #3356, and #3455 and related Babun issues
159, 281, and 322 -- and probably numerous other duplicates.
---
 oh-my-zsh.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index ec64c240f..9dde78caa 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -8,6 +8,9 @@ fi
 # add a function path
 fpath=($ZSH/functions $ZSH/completions $fpath)
 
+# Load all stock functions (from $fpath files) called below.
+autoload -U compaudit compinit
+
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
 if [[ -z "$ZSH_CUSTOM" ]]; then
@@ -64,9 +67,14 @@ if [ -z "$ZSH_COMPDUMP" ]; then
   ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
-# Load and run compinit
-autoload -U compinit
-compinit -i -d "${ZSH_COMPDUMP}"
+# If completion insecurities exist, warn the user without enabling completions.
+if ! compaudit &>/dev/null; then
+  # This function resides in the "lib/compfix.zsh" script sourced above.
+  handle_completion_insecurities
+# Else, enable and cache completions to the desired file.
+else
+  compinit -d "${ZSH_COMPDUMP}"
+fi
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do

From da395c583770b466b5ba83c37d313a7b1c0024c9 Mon Sep 17 00:00:00 2001
From: leycec <leycec@gmail.com>
Date: Sat, 11 Jul 2015 00:52:54 -0400
Subject: [PATCH 1188/1378] Secure umask enforced during installation.

For safety, a umask of 022 prohibiting both group and other writability is now
enforced during OMZ installation. In theory, this should reduce the likelihood
of subsequent compinit() failures due to insecure directory permissions under
all platforms except for default Cygwin installations (in which Windows ACLs
override POSIX umasks).
---
 tools/install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index c83a6f23d..405f461e9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -9,6 +9,13 @@ if [ -d "$ZSH" ]; then
   exit
 fi
 
+# Prevent the cloned repository from having insecure permissions. Failing to do
+# so causes compinit() calls to fail with "command not found: compdef" errors
+# for users with insecure umasks (e.g., "002", allowing group writability). Note
+# that this will be ignored under Cygwin by default, as Windows ACLs take
+# precedence over umasks except for filesystems mounted with option "noacl".
+umask g-w,o-w
+
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
 hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
   echo "git not installed"

From e8caf22beb8cde69f097382a75f6d1a247625030 Mon Sep 17 00:00:00 2001
From: leycec <leycec@gmail.com>
Date: Sat, 11 Jul 2015 00:54:36 -0400
Subject: [PATCH 1189/1378] Cygwin-specific "chsh" installation issue fixed.

Installation previously assumed the existence of a "chsh" command in the current
${PATH}. Since Cygwin does *NOT* provide this command, installation now tests
for the existence of this command before attempting to run it.
---
 tools/install.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 405f461e9..f5836fdf6 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -39,12 +39,17 @@ sed -i -e "/export PATH=/ c\\
 export PATH=\"$PATH\"
 " ~/.zshrc
 
-TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
-if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
+# If this user's login shell is not already "zsh", attempt to switch.
+if [ "$(expr "$SHELL" : '.*/\(.*\)')" != "zsh" ]; then
+  # If this platform provides a "chsh" command (not Cygwin), do it, man!
+  if hash chsh >/dev/null 2>&1; then
     echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
     chsh -s $(grep /zsh$ /etc/shells | tail -1)
+  # Else, suggest the user do so manually.
+  else
+    echo "\033[0;34mPlease manually change your default shell to zsh!\033[0m"
+  fi
 fi
-unset TEST_CURRENT_SHELL
 
 echo "\033[0;32m"'         __                                     __   '"\033[0m"
 echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"

From 0da9a4be25d0feb968b21645a0654ea499f0cc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20M=C4=83gheru=C8=99an-Stanciu?=
 <cristian.magherusan-stanciu@here.com>
Date: Wed, 6 May 2015 18:40:03 +0200
Subject: [PATCH 1190/1378] fuck: added a basic plugin for
 https://github.com/nvbn/thefuck

---
 plugins/fuck/fuck.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 plugins/fuck/fuck.plugin.zsh

diff --git a/plugins/fuck/fuck.plugin.zsh b/plugins/fuck/fuck.plugin.zsh
new file mode 100644
index 000000000..1a3b474fc
--- /dev/null
+++ b/plugins/fuck/fuck.plugin.zsh
@@ -0,0 +1,6 @@
+if [ $commands[thefuck] ]; then
+  alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
+  alias FUCK='fuck'
+else
+  echo 'thefuck is not installed, you should "pip install thefuck" first'
+fi

From 803e5dbb8464088a8d84509077bf6dce9ac26688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20M=C4=83gheru=C8=99an-Stanciu?=
 <cristian.magherusan-stanciu@here.com>
Date: Thu, 9 Jul 2015 17:41:43 +0200
Subject: [PATCH 1191/1378] improved the check for availability

---
 plugins/fuck/fuck.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fuck/fuck.plugin.zsh b/plugins/fuck/fuck.plugin.zsh
index 1a3b474fc..cbf8c09ce 100644
--- a/plugins/fuck/fuck.plugin.zsh
+++ b/plugins/fuck/fuck.plugin.zsh
@@ -1,4 +1,4 @@
-if [ $commands[thefuck] ]; then
+if [[ -n $commands[thefuck] ]]; then
   alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
   alias FUCK='fuck'
 else

From fa254458688acf0bede8567b2bb5793a9ed944d6 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Wed, 22 Jul 2015 12:59:39 -0400
Subject: [PATCH 1192/1378] diagnostics: include output file name in dump
 output

---
 lib/diagnostics.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 53c6548de..f38239110 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -101,7 +101,9 @@ function _omz_diag_dump_one_big_text() {
 
   builtin echo oh-my-zsh diagnostic dump
   builtin echo
-
+  builtin echo $outfile
+  builtin echo 
+  
   # Basic system and zsh information
   command date
   command uname -a

From b3ce0f36d61a1585c018d2d3602fae1d72e4b024 Mon Sep 17 00:00:00 2001
From: Qix <Qix-@users.noreply.github.com>
Date: Sun, 1 Mar 2015 00:36:33 -0500
Subject: [PATCH 1193/1378] Update README.markdown

A few spelling fixes, grammatical fixes (what's with all the ellipses?), some standardization of capitalization, and a few other tweaks.

As well, I changed all standalone code fragments into proper code blocks.

I also added a missing theme image!
---
 README.markdown | 70 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/README.markdown b/README.markdown
index 3805d1eb4..d4d3fdbaf 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,9 +3,9 @@
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
 
-__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interface with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
 
-To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter.
+To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
 
 ## Getting Started
 
@@ -43,7 +43,9 @@ If you spot a plugin (or several) that you would like to use with Oh My Zsh, you
 
 For example, this line might begin to look like...
 
-`plugins=(git bundler osx rake ruby)`
+```shell
+plugins=(git bundler osx rake ruby)
+```
 
 #### Using Plugins
 
@@ -51,7 +53,7 @@ Most plugins (should! we're working on this) include a __README__, which documen
 
 ### Themes
 
-We'll admit it. Early in the Oh My Zsh world... we may have gotten far too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
+We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out!
 
 #### Selecting a Theme
 
@@ -59,23 +61,29 @@ _Robby's theme is the default one. It's not the fanciest one. It's not the simpl
 
 Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
 
-`ZSH_THEME="robbyrussell"`
+```shell
+ZSH_THEME="robbyrussell"
+```
 
 To use a different theme, simple change the value to match the name of your desired theme. For example:
 
-`ZSH_THEME="agnoster"` (this is one of the fancy ones)
+```shell
+ZSH_THEME="agnoster" # (this is one of the fancy ones)
+```
 
 Open up a new terminal window and your prompt should look something like...
 
-In case you did not find a suitable theme for your needs, please have a look at the wiki for [more themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes).
+![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)
+
+In case you did not find a suitable theme for your needs, please have a look at the wiki for [more of them](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes).
 
 ## Advanced Topics
 
-If you're the type that likes to get their hands dirty... these sections might resonate.
+If you're the type that likes to get their hands dirty, these sections might resonate.
 
 ### Advanced Installation
 
-For those who want to install this manually and/or set custom paths.
+Some users may want to change the default path, or manually install Oh My Zsh.
 
 #### Custom Directory
 
@@ -83,27 +91,37 @@ The default location is `~/.oh-my-zsh` (hidden in your home directory)
 
 If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
 
-`curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh`
+```shell
+curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh
+```
 
 #### Manual Installation
 
 ##### 1. Clone the repository:
 
-`git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh`
+```shell
+git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+```
 
-##### 2. *Optionally*, backup your existing @~/.zshrc@ file:
+##### 2. *Optionally*, backup your existing `~/.zshrc` file:
 
-`cp ~/.zshrc ~/.zshrc.orig`
+```shell
+cp ~/.zshrc ~/.zshrc.orig
+```
 
 ##### 3. Create a new zsh configuration file
 
 You can create a new zsh config file by copying the template that we included for you.
 
-`cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc`
+```shell
+cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+```
 
 ##### 4. Change your default shell
 
-`chsh -s /bin/zsh`
+```shell
+chsh -s /bin/zsh
+```
 
 ##### 5. Initialize your new zsh configuration
 
@@ -120,7 +138,7 @@ If you have any hiccups installing, here are a few common fixes.
 
 If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory.
 
-If you have many functions that go well together, you can put them as a `abcyzeae.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin.
+If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin.
 
 If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
 
@@ -128,17 +146,23 @@ If you would like to override the functionality of a plugin distributed with Oh
 
 By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
 
-`DISABLE_UPDATE_PROMPT=true`
+```shell
+DISABLE_UPDATE_PROMPT=true
+```
 
 To disable automatic upgrades, set the following in your `~/.zshrc`:
 
-`DISABLE_AUTO_UPDATE=true`
+```shell
+DISABLE_AUTO_UPDATE=true
+```
 
 ### Manual Updates
 
-If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?)... you just need to run:
+If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
 
-`upgrade_oh_my_zsh`
+```shell
+upgrade_oh_my_zsh
+```
 
 Magic!
 
@@ -154,7 +178,7 @@ I'm far from being a [Zsh](http://www.zsh.org/) expert and suspect there are man
 
 We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can.
 
-### Do NOT Send Us Themes
+### Do NOT send us themes
 
 We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page.
 
@@ -166,12 +190,12 @@ Thank you so much!
 
 ## Follow Us
 
-We have an [ohmyzsh](https://twitter.com/ohmyzsh) account. You should follow it.
+We have an [@ohmyzsh](https://twitter.com/ohmyzsh) Twitter account. You should follow it.
 
 ## Merchandise
 
 We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town!
 
-## LICENSE
+## License
 
 Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt).

From 8e8a13398e71b969dc39189c0fedcc4733a911df Mon Sep 17 00:00:00 2001
From: Black Roland <black-roland@github.com>
Date: Wed, 22 Jul 2015 17:20:52 +0900
Subject: [PATCH 1194/1378] Thefuck: combined with @cristim plugin. Code
 formating

---
 plugins/fuck/fuck.plugin.zsh       |  6 ------
 plugins/thefuck/thefuck.plugin.zsh | 12 ++++++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 plugins/fuck/fuck.plugin.zsh

diff --git a/plugins/fuck/fuck.plugin.zsh b/plugins/fuck/fuck.plugin.zsh
deleted file mode 100644
index cbf8c09ce..000000000
--- a/plugins/fuck/fuck.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [[ -n $commands[thefuck] ]]; then
-  alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
-  alias FUCK='fuck'
-else
-  echo 'thefuck is not installed, you should "pip install thefuck" first'
-fi
diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 81461d48e..86ec9901b 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -1,6 +1,14 @@
+if [[ -z $commands[thefuck] ]]; then
+    echo 'thefuck is not installed, you should "pip install thefuck" first'
+    return -1
+fi
+
+alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
+alias FUCK='fuck'
+
 fuck-command-line() {
-    FUCK=$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)
-    [ -z $FUCK ] && echo -n -e "\a" && return
+    FUCK="$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
+    [[ -z $FUCK ]] && echo -n -e "\a" && return
     BUFFER=$FUCK
     zle end-of-line
 }

From 54e27406dcc2fea55432595f9ec01502da8e4468 Mon Sep 17 00:00:00 2001
From: Roland Chernov <mail@9241406380.org>
Date: Thu, 23 Jul 2015 20:10:31 +0900
Subject: [PATCH 1195/1378] Thefuck: replaced static alias with `eval
 "$(thefuck-alias)"`

---
 plugins/thefuck/thefuck.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 86ec9901b..10467d337 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -3,8 +3,8 @@ if [[ -z $commands[thefuck] ]]; then
     return -1
 fi
 
-alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
-alias FUCK='fuck'
+# Register alias
+eval "$(thefuck-alias)"
 
 fuck-command-line() {
     FUCK="$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"

From f534b4b321d5db4b3d42d3e2cf1f2b2af5bd3c64 Mon Sep 17 00:00:00 2001
From: Roland Chernov <mail@9241406380.org>
Date: Thu, 23 Jul 2015 20:54:51 +0900
Subject: [PATCH 1196/1378] Thefuck: fixed compability with latest version

---
 plugins/thefuck/thefuck.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 10467d337..739bb0b9a 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -7,7 +7,7 @@ fi
 eval "$(thefuck-alias)"
 
 fuck-command-line() {
-    FUCK="$(thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
+    FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
     [[ -z $FUCK ]] && echo -n -e "\a" && return
     BUFFER=$FUCK
     zle end-of-line

From b875df8970a67d02eef74f1aad0b60f42fedb356 Mon Sep 17 00:00:00 2001
From: Brian Degenhardt <bdegenhardt@twitter.com>
Date: Mon, 27 Jul 2015 14:19:23 -0700
Subject: [PATCH 1197/1378] agnoster: speed up git prompt

Problem

On detached-refs, the git prompt is very slow because it uses a command
to output all refs, which takes 32s on the twitter internal git repo.

Solution

Use git-rev-parse instead of git-show-ref to only output the head ref.
Runtime drops to 0.03 seconds.

Note

Interestingly, git-rev-parse isn't slow without the --head arguement so
I'll probably be cooking up a patch for the git team to speed this up
eventually, but it's still pointless to sigpipe git as it walks the
filesystem.
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 3a0c58b89..ee0c2afb8 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -78,7 +78,7 @@ prompt_git() {
 
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     dirty=$(parse_git_dirty)
-    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else

From c83575da3fb103af55215835c9e4add2665fbc86 Mon Sep 17 00:00:00 2001
From: Jerry Ling <jerryling315@gmail.com>
Date: Wed, 29 Jul 2015 20:05:44 +0800
Subject: [PATCH 1198/1378] Add 'man' plugin.

Inspired by sudo. But we have man-preview!
---
 plugins/man/man.zsh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 plugins/man/man.zsh

diff --git a/plugins/man/man.zsh b/plugins/man/man.zsh
new file mode 100644
index 000000000..3490b0b61
--- /dev/null
+++ b/plugins/man/man.zsh
@@ -0,0 +1,27 @@
+# ------------------------------------------------------------------------------
+# Author
+# ------
+#
+# * Jerry Ling<jerryling315@gmail.com>
+#
+# ------------------------------------------------------------------------------
+# Usgae
+# -----
+#
+# man will be inserted before the command
+#
+# ------------------------------------------------------------------------------
+
+man-command-line() {
+    [[ -z $BUFFER ]] && zle up-history
+    [[ $BUFFER != man\ * ]] && LBUFFER="man $LBUFFER"
+}
+zle -N man-command-line
+# Defined shortcut keys: [Esc]man
+bindkey "\e"man man-command-line
+
+
+# ------------------------------------------------------------------------------
+# Also, you might want to use man-preview included in 'osx' plugin
+# just substitute "man" in the function with "man-preview" after you included OS X in
+# the .zshrc
\ No newline at end of file

From 2120b2e079dbcc887a13aaf976c04edaf10fb626 Mon Sep 17 00:00:00 2001
From: Andrew Stuart <andrew.stuart2@gmail.com>
Date: Wed, 29 Jul 2015 13:58:22 -0700
Subject: [PATCH 1199/1378] Add escaped home

---
 plugins/jira/jira.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index f624648ae..ed1a1f471 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -62,9 +62,9 @@ open_jira_issue () {
 jira_url_help() {
   cat << EOF
 JIRA url is not specified anywhere.
-Valid options, in order of preference:
+Valid options, in order of precedence:
   .jira-url file
-  $HOME/.jira-url file
+  \$HOME/.jira-url file
   JIRA_URL environment variable
 EOF
 }

From a2b574bc9edc4f548ca7eb3a8116004be7252092 Mon Sep 17 00:00:00 2001
From: Matteo Giaccone <matteo.giaccone@vitsoe.com>
Date: Thu, 30 Jul 2015 12:32:41 +0100
Subject: [PATCH 1200/1378] git plugin: make gclean safer, introduce gpristine

---
 plugins/git/git.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index cc6eb1031..52f8f7515 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -71,7 +71,8 @@ alias gcan!='git commit -v -a -s --no-edit --amend'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recursive'
-alias gclean='git reset --hard && git clean -dfx'
+alias gclean='git clean -fd'
+alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
 alias gcmsg='git commit -m'
 alias gco='git checkout'

From fb8c446ea4317c391321a29dc97677bc6fdeb0cf Mon Sep 17 00:00:00 2001
From: Roland Chernov <mail@9241406380.org>
Date: Thu, 30 Jul 2015 21:04:58 +0900
Subject: [PATCH 1201/1378] Thefuck: fix global variable assignment

---
 plugins/thefuck/thefuck.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 739bb0b9a..8b1746e85 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -7,7 +7,7 @@ fi
 eval "$(thefuck-alias)"
 
 fuck-command-line() {
-    FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
+    local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
     [[ -z $FUCK ]] && echo -n -e "\a" && return
     BUFFER=$FUCK
     zle end-of-line

From 5554207279809b8232970361257ec1903f5c422d Mon Sep 17 00:00:00 2001
From: Boris Avdeev <elephant@lislon.ru>
Date: Fri, 31 Jul 2015 14:58:02 +0300
Subject: [PATCH 1202/1378] Add alias for "systemctl cat" and "systemctl edit"

---
 plugins/systemd/systemd.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index 7d3db0f8e..07eb595a6 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -1,11 +1,12 @@
 user_commands=(
   list-units is-active status show help list-unit-files
-  is-enabled list-jobs show-environment)
+  is-enabled list-jobs show-environment cat)
 
 sudo_commands=(
   start stop reload restart try-restart isolate kill
   reset-failed enable disable reenable preset mask unmask
-  link load cancel set-environment unset-environment)
+  link load cancel set-environment unset-environment
+  edit)
 
 for c in $user_commands; do; alias sc-$c="systemctl $c"; done
 for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done

From daa04bae867a12fbe8256432c3590869d8f359ea Mon Sep 17 00:00:00 2001
From: Kentaro Wada <www.kentaro.wada@gmail.com>
Date: Sat, 1 Aug 2015 03:11:58 +0900
Subject: [PATCH 1203/1378] gnu-utils: add findutils (find,xargs,locate)

---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index e59265d66..de95f7e6c 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -29,7 +29,10 @@ if [[ -x "${commands[gwhoami]}" ]]; then
     'gunexpand' 'guniq' 'gunlink' 'guptime' 'gusers' 'gvdir' 'gwc' 'gwho'
     'gwhoami' 'gyes')
 
-    # Not part of coreutils, installed separately.
+    # findutils
+    gcmds+=('gfind' 'gxargs' 'glocate')
+
+    # Not part of either coreutils or findutils, installed separately.
     gcmds+=('gsed' 'gtar' 'gtime')
 
     for gcmd in "${gcmds[@]}"; do

From 90ea67edf0982923f82905d87bda5b685089f219 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 31 Jul 2015 22:23:12 -0400
Subject: [PATCH 1204/1378] termsupport: protect title() with `emulate -L zsh`

This prevents it from malfunctioning when `setopt prompt_subst` is off.
---
 lib/termsupport.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e1c2e2f93..973c4dcf6 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -7,6 +7,9 @@
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
+  emulate -L zsh
+  setopt prompt_subst
+  
   [[ "$EMACS" == *term* ]] && return
 
   # if $2 is unset use $1 as default

From 800af047d7e5b2980c72bb5a444c1edeafc026e4 Mon Sep 17 00:00:00 2001
From: Juraj Fiala <doctorjellyface@riseup.net>
Date: Sat, 1 Aug 2015 17:45:00 +0200
Subject: [PATCH 1205/1378] Add sc-launch as a shortcut for start & enable

I've heard many people requesting systemd to add this functionality. It's very handy under Arch.
---
 plugins/systemd/systemd.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index 7d3db0f8e..503f7c138 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -9,3 +9,4 @@ sudo_commands=(
 
 for c in $user_commands; do; alias sc-$c="systemctl $c"; done
 for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done
+alias sc-launch="sudo systemctl start $c && sudo systemctl enable $c"

From e1353fce3ccd88441f97b65adaa98e15a640ed33 Mon Sep 17 00:00:00 2001
From: Ahmed Hisham Ismail <ahm3d.hisham@gmail.com>
Date: Mon, 3 Aug 2015 22:06:33 +0200
Subject: [PATCH 1206/1378] Adds npmE alias

Option to execute a command from node_modules folder
---
 plugins/npm/npm.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 68ec5fabd..6d7357622 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -12,3 +12,6 @@ alias npmS="npm i -S "
 # Install and save to dev-dependencies in your package.json
 # npmd is used by https://github.com/dominictarr/npmd
 alias npmD="npm i -D "
+# Execute command from node_modules folder based on current directory
+# i.e npmE gulp
+alias npmE="'PATH=$(npm bin):$PATH'"

From 084792b829657cdf516799e43f89c0b8c22f4ab8 Mon Sep 17 00:00:00 2001
From: xiao <xiao.h.fan@gmail.com>
Date: Mon, 3 Aug 2015 22:10:24 -0700
Subject: [PATCH 1207/1378] Don't clobber chpwd

---
 plugins/dirhistory/dirhistory.plugin.zsh             | 4 +++-
 plugins/last-working-dir/last-working-dir.plugin.zsh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index d101cfcae..a2faa9ee4 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -49,7 +49,9 @@ function push_future() {
 }
 
 # Called by zsh when directory changes
-function chpwd() {
+typeset -ga chpwd_functions
+chpwd_functions+='chpwd_dirhistory'
+function chpwd_dirhistory() {
   push_past $PWD
   # If DIRHISTORY_CD is not set...
   if [[ -z "${DIRHISTORY_CD+x}" ]]; then
diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index 75041f08e..708ae4f74 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -8,7 +8,9 @@ mkdir -p $ZSH_CACHE_DIR
 cache_file="$ZSH_CACHE_DIR/last-working-dir"
 
 # Updates the last directory once directory is changed.
-function chpwd() {
+typeset -ga chpwd_functions
+chpwd_functions+='chpwd_last_working_dir'
+function chpwd_last_working_dir() {
   # Use >| in case noclobber is set to avoid "file exists" error
 	pwd >| "$cache_file"
 }

From aac552362917fc729c80d191dd387016e39f97a0 Mon Sep 17 00:00:00 2001
From: xiao <xiao.h.fan@gmail.com>
Date: Mon, 3 Aug 2015 22:58:29 -0700
Subject: [PATCH 1208/1378] Additional chpwd clobbering fix for dirpersist

---
 plugins/dirpersist/dirpersist.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
index 88d1129d4..e4590afc6 100644
--- a/plugins/dirpersist/dirpersist.plugin.zsh
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -11,7 +11,9 @@ if [[ -f ${dirstack_file} ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then
   [[ -d $dirstack[1] ]] && cd $dirstack[1] && cd $OLDPWD
 fi
 
-chpwd() {
+typeset -ga chpwd_functions
+chpwd_functions+='chpwd_dirpersist'
+chpwd_dirpersist() {
   if (( $DIRSTACKSIZE <= 0 )) || [[ -z $dirstack_file ]]; then return; fi
   local -ax my_stack
   my_stack=( ${PWD} ${dirstack} )

From 9c741284063aff4fe6f122431c7df8b0b43c1bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Sedl=C3=A1k?= <psedlak@redhat.com>
Date: Tue, 4 Aug 2015 16:01:06 +0200
Subject: [PATCH 1209/1378] chucknorris: add missing line/quote delimiters

few quotes were missing the '%' line delimiters,
so some of the quotes were appearing at once merged together
---
 plugins/chucknorris/fortunes/chucknorris | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index b8edf9ac3..e705d1c13 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -17,9 +17,11 @@ Chuck Norris' blood type is AK+. Ass-Kicking Positive. It is compatible only wit
 Chuck Norris is 1/8th Cherokee. This has nothing to do with ancestry, the man ate a fucking Indian. 
 %
 In fine print on the last page of the Guinness Book of World Records it notes that all world records are held by Chuck Norris, and those listed in the book are simply the closest anyone else has ever gotten. 
+%
 There is no chin behind Chuck Norris' beard. There is only another fist.
 %
 Chuck Norris does not teabag the ladies. He potato-sacks them. 
+%
 Pluto is actually an orbiting group of British soldiers from the American Revolution who entered space after the Chuck gave them a roundhouse kick to the face. 
 %
 When Chuck Norris goes to donate blood, he declines the syringe, and instead requests a hand gun and a bucket. 
@@ -127,6 +129,7 @@ Chuck Norris can drink an entire gallon of milk in thirty-seven seconds.
 Little known medical fact: Chuck Norris invented the Caesarean section when he roundhouse-kicked his way out of his monther's womb. 
 %
 Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint. 
+%
 The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage. 
 %
 It takes Chuck Norris 20 minutes to watch 60 Minutes. 
@@ -281,6 +284,7 @@ In a recent survey it was discovered the 94% of American women lost their virgin
 Chuck Norris invented a language that incorporates karate and roundhouse kicks. So next time Chuck Norris is kicking your ass, don't be offended or hurt, he may be just trying to tell you he likes your hat. 
 %
 If at first you don't succeed, you're not Chuck Norris. 
+%
 If Chuck Norris were a calendar, every month would be named Chucktober, and every day he'd kick your ass. 
 %
 Fear is not the only emotion Chuck Norris can smell. He can also detect hope, as in "I hope I don't get a roundhouse kick from Chuck Norris." 
@@ -349,7 +353,7 @@ As President Roosevelt said: "We have nothing to fear but fear itself. And Chuck
 %
 Chuck Norris just says "no" to drugs. If he said "yes", it would collapse Colombia's infrastructure. 
 %
-Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.� 
+Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.? 
 %
 Crime does not pay - unless you are an undertaker following Walker, Texas Ranger, on a routine patrol. 
 %
@@ -497,7 +501,8 @@ When Chuck Norris works out on the Total Gym, the Total Gym feels like it's been
 %
 Chuck Norris can skeletize a cow in two minutes. 
 %
-The only sure things are Death and Taxes?and when Chuck Norris goes to work for the IRS, they'll be the same thing.
+The only sure things are Death and Taxes, and when Chuck Norris goes to work for the IRS, they'll be the same thing.
+%
 Chuck Norris' first job was as a paperboy. There were no survivors. 
 %
 With the rising cost of gasoline, Chuck Norris is beginning to worry about his drinking habit. 
@@ -527,8 +532,6 @@ Chuck Norris uses 8'x10' sheets of plywood as toilet paper.
 Noah was the only man notified before Chuck Norris relieved himself in the Atlantic Ocean. 
 %
 Chuck Norris once invited all of the other badasses from TV to duke it out in order to see who was the supreme badass. Only two showed up-- Jack Bauer and MacGyver. 
-%
-
 %
 MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart. 
 %

From 7f3e6143ec03fd0b2558027783b375d42ceb3e4d Mon Sep 17 00:00:00 2001
From: gkze <george.kontridze@gmail.com>
Date: Tue, 4 Aug 2015 11:42:28 -0700
Subject: [PATCH 1210/1378] Add terraform completion

---
 plugins/terraform/README.md  |  11 +++
 plugins/terraform/_terraform | 161 +++++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+)
 create mode 100644 plugins/terraform/README.md
 create mode 100644 plugins/terraform/_terraform

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
new file mode 100644
index 000000000..3f357b183
--- /dev/null
+++ b/plugins/terraform/README.md
@@ -0,0 +1,11 @@
+## atom
+
+Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently.
+
+### Requirements
+
+ * [Terraform](https://teraform.io/)
+
+### Usage
+
+ * Type `terraform` into your prompt and hit `TAB` to see available completion options
diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
new file mode 100644
index 000000000..1252bb961
--- /dev/null
+++ b/plugins/terraform/_terraform
@@ -0,0 +1,161 @@
+#compdef terraform
+
+local -a _terraform_cmds
+_terraform_cmds=(
+    'apply:Builds or changes infrastructure'
+    'destroy:Destroy Terraform-managed infrastructure'
+    'get:Download and install modules for the configuration'
+    'graph:Create a visual graph of Terraform resources'
+    'init:Initializes Terraform configuration from a module'
+    'output:Read an output from a state file'
+    'plan:Generate and show an execution plan'
+    'pull:Refreshes the local state copy from the remote server'
+    'push:Uploads the local state to the remote server'
+    'refresh:Update local state file against real resources'
+    'remote:Configures remote state management'
+    'taint:Manually forcing a destroy and recreate on the next plan/apply'
+    'show:Inspect Terraform state or plan'
+    'version:Prints the Terraform version'
+)
+
+__apply() {
+    _arguments \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-input=[(true) Ask for input for variables if not directly set.]' \
+        '-no-color[If specified, output will not contain any color.]' \
+        '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
+        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+}
+
+__destroy() {
+    _arguments \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-force[Do not ask for input for destroy confirmation.]' \
+        '-no-color[If specified, output will not contain any color.]' \
+        '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
+        '-state=[Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
+        '-state-out=[Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+}
+
+__get() {
+    _arguments \
+        '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]'
+}
+
+__graph() {
+    _arguments \
+        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]'
+}
+
+__init() {
+    _arguments \
+        '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \
+        '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \
+        '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \
+        '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \
+        '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]'
+}
+
+__output() {
+    _arguments \
+        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]'
+}
+
+__plan() {
+    _arguments \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with" .backup" extension. Set to "-" to disable backup.]' \
+        '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
+        '-input=[(true) Ask for input for variables if not directly set.]' \
+        '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is zero. -1 will expand all.]' \
+        '-no-color[If specified, output will not contain any color.]' \
+        '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \
+        '-refresh=[(true) Update state prior to checking for differences.]' \
+        '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
+        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+}
+
+__push() {
+    _arguments \
+        '-force[Forces the upload of the local state, ignoring any conflicts. This should be used carefully, as force pushing can cause remote state information to be lost.]'
+}
+
+__refresh() {
+    _arguments \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-input=[(true)  Ask for input for variables if not directly set.]' \
+        '-no-color[If specified, output will not contain any color.]' \
+        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+}
+
+__taint() {
+    _arguments \
+        '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
+        '-no-color[If specified, output will not contain any color.]' \
+        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
+        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
+}
+
+__remote() {
+    _arguments \
+        '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \
+        '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \
+        '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-disable[Disables remote state management and migrates the state to the -state path.]' \
+        '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \
+        '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]' \
+        '-pull=[(true) Controls if the remote state is pulled before disabling. This defaults to true to ensure the latest state is cached before disabling.]' \
+        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]'
+}
+
+__show() {
+    _arguments \
+        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \
+        '-no-color[If specified, output will not contain any color.]'
+}
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "terraform command" _terraform_cmds
+  return
+fi
+
+local -a _command_args
+case "$words[1]" in
+  apply)
+    __apply ;;
+  destroy)
+    __destroy ;;
+  get)
+    __get ;;
+  graph)
+    __graph ;;
+  init)
+    __init ;;
+  output)
+    __output ;;
+  plan)
+    __plan ;;
+  push)
+    __push ;;
+  refresh)
+    __refresh ;;
+  remote)
+    __remote ;;
+  show)
+    __show ;;
+  taint)
+    __taint ;;
+esac

From cf78586f15fc75fb82566fbc4abcdb405d61588b Mon Sep 17 00:00:00 2001
From: Florin Patan <florinpatan@gmail.com>
Date: Tue, 4 Aug 2015 21:54:01 +0200
Subject: [PATCH 1211/1378] Update to latest Terraform release 0.6.1

---
 plugins/terraform/README.md  |  2 +-
 plugins/terraform/_terraform | 52 +++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 3f357b183..44e38a1c0 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -4,7 +4,7 @@ Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely a
 
 ### Requirements
 
- * [Terraform](https://teraform.io/)
+ * [Terraform](https://terraform.io/)
 
 ### Usage
 
diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
index 1252bb961..11740dc48 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -13,8 +13,8 @@ _terraform_cmds=(
     'push:Uploads the local state to the remote server'
     'refresh:Update local state file against real resources'
     'remote:Configures remote state management'
-    'taint:Manually forcing a destroy and recreate on the next plan/apply'
     'show:Inspect Terraform state or plan'
+    'taint:Manually forcing a destroy and recreate on the next plan/apply'
     'version:Prints the Terraform version'
 )
 
@@ -26,6 +26,7 @@ __apply() {
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
         '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
         '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
         '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
 }
@@ -33,11 +34,13 @@ __apply() {
 __destroy() {
     _arguments \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-force[Do not ask for input for destroy confirmation.]' \
+        '-force[If set, then the destroy confirmation will not be shown.]' \
+        '-input=[(true) Ask for input for variables if not directly set.]' \
         '-no-color[If specified, output will not contain any color.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
-        '-state-out=[Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-target=[(resource) Instead of affecting "dependencies" will instead also destroy any resources that depend on the target(s) specified.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
         '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
 }
@@ -49,7 +52,9 @@ __get() {
 
 __graph() {
     _arguments \
-        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]'
+        '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors.]' \
+        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \
+        '-verbose[Generate a verbose, "worst-case" graph, with all nodes for potential operations in place.]'
 }
 
 __init() {
@@ -63,49 +68,50 @@ __init() {
 
 __output() {
     _arguments \
-        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]'
+        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]' \
+        '-module=[(module_name) The module path which has needed output. By default this is the root path. Other modules can be specified by a period-separated list.]'
 }
 
 __plan() {
     _arguments \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with" .backup" extension. Set to "-" to disable backup.]' \
         '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
+        '-detailed-exitcode[Return a detailed exit code when the command exits. When provided, this argument changes the exit codes and their meanings to provide more granular information about what the resulting plan contains]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
         '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is zero. -1 will expand all.]' \
         '-no-color[If specified, output will not contain any color.]' \
         '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \
         '-refresh=[(true) Update state prior to checking for differences.]' \
         '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
+        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
         '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
 }
 
 __push() {
     _arguments \
-        '-force[Forces the upload of the local state, ignoring any conflicts. This should be used carefully, as force pushing can cause remote state information to be lost.]'
+        '-atlas-address=[(url) An alternate address to an Atlas instance. Defaults to https://atlas.hashicorp.com.]' \
+        '-upload-modules=[(true) If true (default), then the modules being used are all locked at their current checkout and uploaded completely to Atlas. This prevents Atlas from running terraform get for you.]' \
+        '-name=[(name) Name of the infrastructure configuration in Atlas. The format of this is: "username/name" so that you can upload configurations not just to your account but to other accounts and organizations. This setting can also be set in the configuration in the Atlas section.]' \
+        '-no-color[Disables output with coloring]' \
+        '-overwrite=[(foo) Marks a specific variable to be updated on Atlas. Normally, if a variable is already set in Atlas, Terraform will not send the local value (even if it is different). This forces it to send the local value to Atlas. This flag can be repeated multiple times.]' \
+        '-token=[(token) Atlas API token to use to authorize the upload. If blank or unspecified, the ATLAS_TOKEN environmental variable will be used.]' \
+        '-var=[("foo=bar") Set the value of a variable for the Terraform configuration.]' \
+        '-var-file=[(foo) Set the value of variables using a variable file.]' \
+        '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are comitted to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]'
 }
 
 __refresh() {
     _arguments \
         '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-input=[(true)  Ask for input for variables if not directly set.]' \
         '-no-color[If specified, output will not contain any color.]' \
         '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
         '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
+        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \
         '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
         '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
 }
 
-__taint() {
-    _arguments \
-        '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-        '-no-color[If specified, output will not contain any color.]' \
-        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
-        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
-}
-
 __remote() {
     _arguments \
         '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \
@@ -125,6 +131,16 @@ __show() {
         '-no-color[If specified, output will not contain any color.]'
 }
 
+__taint() {
+    _arguments \
+        '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
+        '-no-color[If specified, output will not contain any color.]' \
+        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
+        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
+}
+
 _arguments '*:: :->command'
 
 if (( CURRENT == 1 )); then

From cddfc3b038d821ddb6d0e81410675ffaeb11cac9 Mon Sep 17 00:00:00 2001
From: "xiao.fan" <xiao.fan@workday.com>
Date: Tue, 4 Aug 2015 15:07:47 -0700
Subject: [PATCH 1212/1378] style fixes

---
 plugins/dirhistory/dirhistory.plugin.zsh             | 3 +--
 plugins/dirpersist/dirpersist.plugin.zsh             | 3 +--
 plugins/last-working-dir/last-working-dir.plugin.zsh | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index a2faa9ee4..0209981e3 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -49,8 +49,7 @@ function push_future() {
 }
 
 # Called by zsh when directory changes
-typeset -ga chpwd_functions
-chpwd_functions+='chpwd_dirhistory'
+chpwd_functions+=(chpwd_dirhistory)
 function chpwd_dirhistory() {
   push_past $PWD
   # If DIRHISTORY_CD is not set...
diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
index e4590afc6..616e2c3c6 100644
--- a/plugins/dirpersist/dirpersist.plugin.zsh
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -11,8 +11,7 @@ if [[ -f ${dirstack_file} ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then
   [[ -d $dirstack[1] ]] && cd $dirstack[1] && cd $OLDPWD
 fi
 
-typeset -ga chpwd_functions
-chpwd_functions+='chpwd_dirpersist'
+chpwd_functions+=(chpwd_dirpersist)
 chpwd_dirpersist() {
   if (( $DIRSTACKSIZE <= 0 )) || [[ -z $dirstack_file ]]; then return; fi
   local -ax my_stack
diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index 708ae4f74..c458464ce 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -8,8 +8,7 @@ mkdir -p $ZSH_CACHE_DIR
 cache_file="$ZSH_CACHE_DIR/last-working-dir"
 
 # Updates the last directory once directory is changed.
-typeset -ga chpwd_functions
-chpwd_functions+='chpwd_last_working_dir'
+chpwd_functions+=(chpwd_last_working_dir)
 function chpwd_last_working_dir() {
   # Use >| in case noclobber is set to avoid "file exists" error
 	pwd >| "$cache_file"

From 2d0bfcf81846ea4cb0fe2a42f3dac7f2c60e77b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2015 00:27:51 +0200
Subject: [PATCH 1213/1378] Implement cross-platform open function
 open_command()

For now this supports:
- Mac OS X
- Linux (presumably works on all versions)
- Cygwin (Windows)
---
 lib/functions.zsh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 17f5f9cbf..0d632a268 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -15,6 +15,22 @@ function take() {
   cd $1
 }
 
+function open_command() {
+  local open_cmd
+
+  # define the open command
+  case "$OSTYPE" in
+    darwin*)  open_cmd="open" ;;
+    cygwin*)  open_cmd="cygstart" ;;
+    linux*)   open_cmd="xdg-open" ;;
+    *)        echo "Platform $OSTYPE not supported"
+              return 1
+              ;;
+  esac
+
+  nohup $open_cmd "$@" &>/dev/null
+}
+
 #
 # Get the value of an alias.
 #

From d1d06b5675bebbe54f3d876eb993b6e89d8963c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2015 00:32:57 +0200
Subject: [PATCH 1214/1378] Use standard open command in current plugins

Substitutes the current duplicate logic for the standard
and cross-platform function open_command in plugins:

  frontend-search, jira, node, web-search
---
 .../frontend-search/frontend-search.plugin.zsh    | 10 +---------
 plugins/jira/jira.plugin.zsh                      | 15 ++++-----------
 plugins/node/node.plugin.zsh                      | 10 +---------
 plugins/web-search/web-search.plugin.zsh          | 12 +-----------
 4 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index b9fb8634c..f7485621b 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -2,14 +2,6 @@
 
 function frontend() {
 
-  # get the open command
-  local open_cmd
-  if [[ $(uname -s) == 'Darwin' ]]; then
-    open_cmd='open'
-  else
-    open_cmd='xdg-open'
-  fi
-
   # no keyword provided, simply show how call methods
   if [[ $# -le 1 ]]; then
     echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n"
@@ -113,7 +105,7 @@ function frontend() {
 
   echo "$url"
 
-  $open_cmd "$url"
+  open_command "$url"
 
 }
 
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index ca540c84c..9a8932702 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -11,13 +11,6 @@
 # Usage: jira           # opens a new issue
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {
-  local open_cmd
-  if [[ "$OSTYPE" = darwin* ]]; then
-    open_cmd='open'
-  else
-    open_cmd='xdg-open'
-  fi
-
   if [ -f .jira-url ]; then
     jira_url=$(cat .jira-url)
   elif [ -f ~/.jira-url ]; then
@@ -39,7 +32,7 @@ open_jira_issue () {
 
   if [ -z "$1" ]; then
     echo "Opening new issue"
-    $open_cmd "${jira_url}/secure/CreateIssue!default.jspa"
+    open_command "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
     jira_query $@
   else 
@@ -52,9 +45,9 @@ open_jira_issue () {
     fi
     
     if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then
-      $open_cmd  "$jira_url/issues/$jira_prefix$1$addcomment"
+      open_command  "$jira_url/issues/$jira_prefix$1$addcomment"
     else
-      $open_cmd  "$jira_url/browse/$jira_prefix$1$addcomment"
+      open_command  "$jira_url/browse/$jira_prefix$1$addcomment"
     fi
   fi
 }
@@ -90,7 +83,7 @@ jira_query () {
         return 1
     fi
     echo "Browsing issues ${verb} ${preposition} ${jira_name}"
-    $open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
+    open_command "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
 }
 
 alias jira='open_jira_issue'
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 39d8b10d9..2463815ac 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,13 +1,5 @@
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
 function node-docs {
-  # get the open command
-  local open_cmd
-  if [[ "$OSTYPE" = darwin* ]]; then
-    open_cmd='open'
-  else
-    open_cmd='xdg-open'
-  fi
-
-  $open_cmd "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
+  open_command "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
 }
diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index d407edb96..7c3ad9046 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -14,16 +14,6 @@ function web_search() {
     github      "https://github.com/search?q="
   )
 
-  # define the open command
-  case "$OSTYPE" in
-    darwin*)  open_cmd="open" ;;
-    cygwin*)  open_cmd="cygstart" ;;
-    linux*)   open_cmd="xdg-open" ;;
-    *)        echo "Platform $OSTYPE not supported"
-              return 1
-              ;;
-  esac
-
   # check whether the search engine is supported
   if [[ -z "$urls[$1]" ]]; then
     echo "Search engine $1 not supported."
@@ -41,7 +31,7 @@ function web_search() {
     url="${(j://:)${(s:/:)urls[$1]}[1,2]}"
   fi
 
-  nohup $open_cmd "$url" &>/dev/null
+  open_command "$url"
 }
 
 

From b760a10cb27e5e17ad32e51ffac3374334fa4888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2015 01:02:17 +0200
Subject: [PATCH 1215/1378] Use standard open command in fasd and lighthouse
 plugins

---
 plugins/fasd/fasd.plugin.zsh             | 6 +++---
 plugins/lighthouse/lighthouse.plugin.zsh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index 472ab2b0f..b11f0b511 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -5,7 +5,7 @@ if [ $commands[fasd] ]; then # check if fasd is installed
   fi
   source "$fasd_cache"
   unset fasd_cache
-  alias v='f -e vim'
-  alias o='a -e open'
-fi
 
+  alias v='f -e vim'
+  alias o='a -e open_command'
+fi
diff --git a/plugins/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
index 7661c6add..48cddbccc 100644
--- a/plugins/lighthouse/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
@@ -9,7 +9,7 @@ open_lighthouse_ticket () {
   else
     lighthouse_url=$(cat .lighthouse-url);
     echo "Opening ticket #$1";
-    `open $lighthouse_url/tickets/$1`;
+    open_command "$lighthouse_url/tickets/$1";
   fi
 }
 

From 269ae84c9b2e9b9bff2c8af6973ac03ba38c7e44 Mon Sep 17 00:00:00 2001
From: Ahmed Hisham Ismail <ahm3d.hisham@gmail.com>
Date: Wed, 5 Aug 2015 02:49:20 +0200
Subject: [PATCH 1216/1378] Removes unnecessary single quotes

---
 plugins/npm/npm.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 6d7357622..64ba93a18 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -14,4 +14,4 @@ alias npmS="npm i -S "
 alias npmD="npm i -D "
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
-alias npmE="'PATH=$(npm bin):$PATH'"
+alias npmE="PATH=$(npm bin):$PATH"

From 720fb5b68e186feae24c48283ded7c41b41c73fb Mon Sep 17 00:00:00 2001
From: Manfred Touron <m@42.am>
Date: Tue, 9 Jun 2015 11:07:23 +0200
Subject: [PATCH 1217/1378] Support for 'scw' command (Scaleway CLI)

---
 plugins/scw/README.md |   7 +
 plugins/scw/_scw      | 333 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 340 insertions(+)
 create mode 100644 plugins/scw/README.md
 create mode 100644 plugins/scw/_scw

diff --git a/plugins/scw/README.md b/plugins/scw/README.md
new file mode 100644
index 000000000..d2312c2e5
--- /dev/null
+++ b/plugins/scw/README.md
@@ -0,0 +1,7 @@
+## Scaleway CLI autocomplete plugin
+
+[scw](https://github.com/scaleway/scaleway-cli): Manage Bare Metal servers from Command Line (as easily as with Docker)
+
+- Adds autocomplete options for all `scw` commands.
+
+Maintainer : Manfred Touron ([@moul](https://github.com/moul))
diff --git a/plugins/scw/_scw b/plugins/scw/_scw
new file mode 100644
index 000000000..f9fdf916e
--- /dev/null
+++ b/plugins/scw/_scw
@@ -0,0 +1,333 @@
+#compdef scw
+#
+# zsh completion for scw (http://scaleway.com)
+#
+# Inspired by https://github.com/felixr/docker-zsh-completion
+
+__scw_get_servers() {
+    local expl
+    declare -a servers
+    servers=(${(f)"$(_call_program commands scw _completion servers-names)"})
+    _describe -t servers "servers" servers
+}
+
+__scw_stoppedservers() {
+    __scw_get_servers
+}
+
+__scw_runningservers() {
+    __scw_get_servers
+}
+
+__scw_servers () {
+    __scw_get_servers
+}
+
+__scw_images () {
+    local expl
+    declare -a images
+    images=(${(f)"$(_call_program commands scw _completion images-names)"})
+    _describe -t images "images" images
+}
+
+__scw_images_and_snapshots () {
+    __scw_images
+    __scw_snapshots
+}
+
+__scw_snapshots () {
+    local expl
+    declare -a snapshots
+    snapshots=(${(f)"$(_call_program commands scw _completion --prefix snapshots-names)"})
+    _describe -t snapshots "snapshots" snapshots
+}
+
+__scw_bootscripts () {
+    local expl
+    declare -a bootscripts
+    bootscripts=(${(f)"$(_call_program commands scw _completion bootscripts-names)"})
+    _describe -t bootscripts "bootscripts" bootscripts
+}
+
+__scw_tags() {
+    __scw_images
+}
+
+__scw_repositories_with_tags() {
+    __scw_images
+}
+
+__scw_search() {
+    # declare -a scwsearch
+    local cache_policy
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    if [[ -z "$cache_policy" ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy __scw_caching_policy
+    fi
+
+    local searchterm cachename
+    searchterm="${words[$CURRENT]%/}"
+    cachename=_scw-search-$searchterm
+
+    local expl
+    local -a result
+    if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
+        && ! _retrieve_cache ${cachename#_}; then
+        _message "Searching for ${searchterm}..."
+        result=(${${${(f)"$(_call_program commands scw search ${searchterm})"}%% *}[2,-1]})
+        _store_cache ${cachename#_} result
+    fi
+    _wanted scwsearch expl 'available images' compadd -a result
+}
+
+__scw_caching_policy()
+{
+  oldp=( "$1"(Nmh+1) )     # 1 hour
+  (( $#oldp ))
+}
+
+
+__scw_repositories () {
+    __scw_images
+}
+
+__scw_commands () {
+    # local -a  _scw_subcommands
+    local cache_policy
+
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    if [[ -z "$cache_policy" ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy __scw_caching_policy
+    fi
+
+    if ( [[ ${+_scw_subcommands} -eq 0 ]] || _cache_invalid scw_subcommands) \
+        && ! _retrieve_cache scw_subcommands;
+    then
+        local -a lines
+        lines=(${(f)"$(_call_program commands scw 2>&1)"})
+        _scw_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)    *]}]}## #}/ ##/:})
+        _scw_subcommands=($_scw_subcommands 'help:Show help for a command')
+        _store_cache scw_subcommands _scw_subcommands
+    fi
+    _describe -t scw-commands "scw command" _scw_subcommands
+}
+
+__scw_subcommand () {
+    local -a _command_args
+    case "$words[1]" in
+        (attach)
+            _arguments \
+                '--no-stdin[Do not attach stdin]' \
+                ':servers:__scw_runningservers'
+            ;;
+        (commit)
+            _arguments \
+                {-v,--volume=0}'[Volume slot]:volume: ' \
+                ':server:__scw_servers' \
+                ':repository:__scw_repositories_with_tags'
+            ;;
+        (cp)
+            _arguments \
+                ':server:->server' \
+                ':hostpath:_files'
+            case $state in
+                (server)
+                    if compset -P '*:'; then
+                        _files
+                    else
+                        __scw_servers -qS ":"
+                    fi
+                    ;;
+            esac
+            ;;
+        (exec)
+            local state ret
+            _arguments \
+                {-T,--timeout=0}'[Set timeout values to seconds]' \
+                {-w,--wait}'[Wait for SSH to be ready]' \
+                ':servers:__scw_runningservers' \
+                '*::command:->anycommand' && ret=0
+
+            case $state in
+                (anycommand)
+                    shift 1 words
+                    (( CURRENT-- ))
+                    _normal
+                    ;;
+            esac
+
+            return ret
+            ;;
+        (history)
+            _arguments \
+                '--no-trunc[Do not truncate output]' \
+                {-q,--quiet}'[Only show numeric IDs]' \
+                '*:images:__scw_images'
+            ;;
+        (images)
+            _arguments \
+                {-a,--all}'[Show all images]' \
+                '--no-trunc[Do not truncate output]' \
+                {-q,--quiet}'[Only show numeric IDs]' \
+                ':repository:__scw_repositories'
+            ;;
+        (info)
+            ;;
+        (inspect)
+            _arguments \
+                {-f,--format=-}'[Format the output using the given go template]:template: ' \
+                '*:servers:__scw_servers'
+            ;;
+        (kill)
+            _arguments \
+                '*:servers:__scw_runningservers'
+            ;;
+        (login)
+            _arguments \
+                {-o,--organization=-}'[Organization]:organization: ' \
+                {-t,--token=-}'[Token]:token: ' \
+                ':server: '
+            ;;
+        (logout)
+            _arguments \
+                ':server: '
+            ;;
+        (logs)
+            _arguments \
+                '*:servers:__scw_servers'
+            ;;
+        (port)
+            _arguments \
+                '1:servers:__scw_runningservers' \
+                '2:port:_ports'
+            ;;
+        (start)
+            _arguments \
+                {-T,--timeout=0}'[Set timeout values to seconds]' \
+                {-w,--wait}'[Wait for SSH to be ready]' \
+                '*:servers:__scw_stoppedservers'
+            ;;
+        (rm)
+            _arguments \
+                '*:servers:__scw_stoppedservers'
+            ;;
+        (rmi)
+            _arguments \
+                '*:images:__scw_images'
+            ;;
+        (restart)
+            _arguments \
+                '*:servers:__scw_runningservers'
+            ;;
+        (stop)
+            _arguments \
+                {-t,--terminate}'[Stop and trash a server with its volumes]' \
+                {-w,--wait}'[Synchronous stop. Wait for server to be stopped]' \
+                '*:servers:__scw_runningservers'
+            ;;
+        (top)
+            _arguments \
+                '1:servers:__scw_runningservers' \
+                '(-)*:: :->ps-arguments'
+            case $state in
+                (ps-arguments)
+                    _ps
+                    ;;
+            esac
+            ;;
+        (ps)
+            _arguments \
+                {-a,--all}'[Show all servers. Only running servers are shown by default]' \
+                {-l,--latest}'[Show only the latest created server]' \
+                '-n[Show n last created servers, include non-running one]:n:(1 5 10 25 50)' \
+                '--no-trunc[Do not truncate output]' \
+                {-q,--quiet}'[Only show numeric IDs]'
+            ;;
+        (tag)
+            _arguments \
+                {-f,--force}'[force]'\
+                ':image:__scw_images'\
+                ':repository:__scw_repositories_with_tags'
+            ;;
+        (create|run)
+            _arguments \
+                {-a,--attach}'[Attach to stdin, stdout or stderr]' \
+                '*'{-e,--environment=-}'[Set environment variables]:environment variable: ' \
+                '--name=-[Server name]:name: ' \
+                '--bootscript=-[Assign a bootscript]:bootscript:__scw_bootscripts ' \
+                '*-v[Bind mount a volume]:volume: '\
+                '(-):images:__scw_images_and_snapshots' \
+                '(-):command: _command_names -e' \
+                '*::arguments: _normal'
+
+            case $state in
+                (link)
+                    if compset -P '*:'; then
+                        _wanted alias expl 'Alias' compadd -E ""
+                    else
+                        __scw_runningservers -qS ":"
+                    fi
+                    ;;
+            esac
+            ;;
+        (rename)
+            _arguments \
+                ':old name:__scw_servers' \
+                ':new name: '
+            ;;
+        (search)
+            _arguments \
+                '--no-trunc[Do not truncate output]' \
+                ':term: '
+            ;;
+        (wait)
+            _arguments '*:servers:__scw_runningservers'
+            ;;
+        (help)
+            _arguments ':subcommand:__scw_commands'
+            ;;
+        (*)
+            _message 'Unknown sub command'
+    esac
+
+}
+
+_scw () {
+    # Support for subservices, which allows for `compdef _scw scw-shell=_scw_servers`.
+    # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`.
+    if [[ $service != scw ]]; then
+        _call_function - _$service
+        return
+    fi
+
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+      '-H[tcp://host:port to bind/connect to]:socket: ' \
+         '(-): :->command' \
+         '(-)*:: :->option-or-argument'
+
+    if (( CURRENT == 1 )); then
+
+    fi
+    case $state in
+        (command)
+            __scw_commands
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*:*}:scw-$words[1]:
+            __scw_subcommand
+            ;;
+    esac
+}
+
+_scw "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 4
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# End:
+# vim: ft=zsh sw=4 ts=4 et

From c3fbe4d121d9edb8b34bfbe1aad45a1d81e9899e Mon Sep 17 00:00:00 2001
From: Andrew Robertson <andyrobo60@gmail.com>
Date: Wed, 5 Aug 2015 19:51:05 +0100
Subject: [PATCH 1218/1378] Add support for Docker images from custom
 registries

---
 plugins/docker/_docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 25f55beca..a82a31ad3 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -27,7 +27,7 @@ __docker_all_containers() {
 # output a selectable list of all docker images
 __docker_images() {
     declare -a img_cmd
-    img_cmd=($(docker images | awk 'NR>1{print $1}'))
+    img_cmd=($(docker images | awk 'NR>1{print $1}'| sed 's/:/\\:/g'))
     _describe 'images' img_cmd
 }
 

From ccb0ae57207b1701c3187faf49c417fb0a902f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 7 Aug 2015 22:45:46 +0200
Subject: [PATCH 1219/1378] Add quotes to support folders with whitespace

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index c40ca86ac..6cd30732e 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -38,7 +38,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       local WORKON_CWD=1
       # Check if this is a Git repo
       local GIT_REPO_ROOT=""
-      local GIT_TOPLEVEL=$(git rev-parse --show-toplevel 2> /dev/null)
+      local GIT_TOPLEVEL="$(git rev-parse --show-toplevel 2> /dev/null)"
       if [[ $? == 0 ]]; then
         GIT_REPO_ROOT="$GIT_TOPLEVEL"
       fi
@@ -53,7 +53,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       fi
       # Check for virtualenv name override
       if [[ -f "$PROJECT_ROOT/.venv" ]]; then
-        ENV_NAME=`cat "$PROJECT_ROOT/.venv"`        
+        ENV_NAME="$(cat "$PROJECT_ROOT/.venv")"
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
       elif [[ "$PROJECT_ROOT" != "." ]]; then

From 3fe3ce8bdc702d7e40917bf677b0dc34211e0a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 8 Aug 2015 01:31:02 +0200
Subject: [PATCH 1220/1378] Revert "Move custon *.zsh file sourcing up so that
 they can load plugins and other things that come after."

This reverts commit a28dbc83937cbe624ec726199b4bbe7b65b2b2a0.
---
 oh-my-zsh.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index ec64c240f..4e5f77990 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -29,11 +29,6 @@ for config_file ($ZSH/lib/*.zsh); do
   source $config_file
 done
 
-# Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
-  source $config_file
-done
-unset config_file
 
 is_plugin() {
   local base_dir=$1
@@ -77,6 +72,12 @@ for plugin ($plugins); do
   fi
 done
 
+# Load all of your custom configurations from custom/
+for config_file ($ZSH_CUSTOM/*.zsh(N)); do
+  source $config_file
+done
+unset config_file
+
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]; then
   themes=($ZSH/themes/*zsh-theme)

From 17da983442f8872e147381db215266735751abc8 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 9 Aug 2015 15:15:12 -0400
Subject: [PATCH 1221/1378] termsupport: avoid repeated dir in window title in
 Terminal.app

---
 lib/termsupport.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e1c2e2f93..ecca516f2 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -23,6 +23,10 @@ function title {
 
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
 ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
+# Avoid duplication of directory in terminals with independent dir display
+if [[ $TERM_PROGRAM == Apple_Terminal ]]; then
+  ZSH_THEME_TERM_TITLE_IDLE="%n@%m"
+fi
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {

From be5dcb8a59c795495318522522b92672886d4a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 9 Aug 2015 21:55:10 +0200
Subject: [PATCH 1222/1378] Check if fbterm is installed and use $TTY variable

---
 plugins/fbterm/fbterm.plugin.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/fbterm/fbterm.plugin.zsh b/plugins/fbterm/fbterm.plugin.zsh
index 4f0456016..d60f0e27d 100644
--- a/plugins/fbterm/fbterm.plugin.zsh
+++ b/plugins/fbterm/fbterm.plugin.zsh
@@ -1,6 +1,8 @@
 # start fbterm automatically in /dev/tty*
 
-if [[ $(tty|grep -o '/dev/tty') = /dev/tty ]] ; then
-	fbterm
-	exit
+if (( ${+commands[fbterm]} )); then
+	if [[ "$TTY" = /dev/tty* ]] ; then
+		fbterm
+		exit
+	fi
 fi

From 14b4ba83c35c34f4a1f3a69c9967f502ee2d6528 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 9 Aug 2015 16:28:47 -0400
Subject: [PATCH 1223/1378] Move urlencode/urldecode functions to core lib

---
 lib/functions.zsh   | 134 ++++++++++++++++++++++++++++++++++++++++++++
 lib/termsupport.zsh |  33 +----------
 2 files changed, 135 insertions(+), 32 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 17f5f9cbf..5c1a5a283 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -73,3 +73,137 @@ function env_default() {
     env | grep -q "^$1=" && return 0 
     export "$1=$2"       && return 3
 }
+
+
+# Required for $langinfo
+zmodload zsh/langinfo
+
+# URL-encode a string
+#
+# Encodes a string using RFC 2396 URL-encoding (%-escaped).
+# See: https://www.ietf.org/rfc/rfc2396.txt
+#
+# By default, reserved characters and unreserved "mark" characters are
+# not escaped by this function. This allows the common usage of passing
+# an entire URL in, and encoding just special characters in it, with 
+# the expectation that reserved and mark characters are used appropriately.
+# The -r and -m options turn on escaping of the reserved and mark characters,
+# respectively, which allows arbitrary strings to be fully escaped for
+# embedding inside URLs, where reserved characters might be misinterpreted.
+#
+# Prints the encoded string on stdout.
+# Returns nonzero if encoding failed.
+#
+# Usage:
+#  omz_urlencode [-r] [-m] <string>
+#  
+#    -r causes reserved characters (;/?:@&=+$,) to be escaped
+#
+#    -m causes "mark" characters (_.!~*''()-) to be escaped
+#
+#    -P causes spaces to be encoded as '%20' instead of '+'
+function omz_urlencode() {
+  emulate -L zsh
+  zparseopts -D -E -a opts r m P
+
+  local in_str=$1
+  local url_str=""
+  local spaces_as_plus
+  if [[ -z $opts[(r)-P] ]]; then spaces_as_plus=1; fi
+  local str="$in_str"
+
+  # URLs must use UTF-8 encoding; convert str to UTF-8 if required
+  local encoding=$langinfo[CODESET]
+  local safe_encodings
+  safe_encodings=(UTF-8 utf8 US-ASCII)
+  if [[ -z ${safe_encodings[(r)$encoding]} ]]; then
+    str=$(echo -E "$str" | iconv -f $encoding -t UTF-8)
+    if [[ $? != 0 ]]; then
+      echo "Error converting string from $encoding to UTF-8" >&2
+      return 1
+    fi
+  fi
+
+  # Use LC_CTYPE=C to process text byte-by-byte
+  local i byte ord LC_ALL=C
+  export LC_ALL
+  local reserved=';/?:@&=+$,'
+  local mark='_.!~*''()-'
+  local dont_escape="[A-Za-z0-9"
+  if [[ -z $opts[(r)-r] ]]; then
+    dont_escape+=$reserved
+  fi
+  # $mark must be last because of the "-"
+  if [[ -z $opts[(r)-m] ]]; then
+    dont_escape+=$mark
+  fi
+  dont_escape+="]"
+
+  # Implemented to use a single printf call and avoid subshells in the loop,
+  # for performance (primarily on Windows).
+  local url_str=""
+  for (( i = 1; i <= ${#str}; ++i )); do
+    byte="$str[i]"
+    if [[ "$byte" =~ "$dont_escape" ]]; then
+      url_str+="$byte"
+    else
+      if [[ "$byte" == " " && -n $spaces_as_plus ]]; then
+        url_str+="+"
+      else
+        ord=$(( [##16] #byte ))
+        url_str+="%$ord"
+      fi
+    fi
+  done
+  echo -E "$url_str"
+}
+
+# URL-decode a string
+#
+# Decodes a RFC 2396 URL-encoded (%-escaped) string.
+# This decodes the '+' and '%' escapes in the input string, and leaves 
+# other characters unchanged. Does not enforce that the input is a 
+# valid URL-encoded string. This is a convenience to allow callers to
+# pass in a full URL or similar strings and decode them for human
+# presentation.
+#
+# Outputs the encoded string on stdout.
+# Returns nonzero if encoding failed.
+#
+# Usage:
+#   omz_urldecode <urlstring>  - prints decoded string followed by a newline
+function omz_urldecode {
+  emulate -L zsh
+  local encoded_url=$1
+
+  echo -e input $1
+  # Work bytewise, since URLs escape UTF-8 octets
+  local caller_encoding=$langinfo[CODESET]
+  local LC_ALL=C
+  export LC_ALL
+  
+  # Change + back to ' '
+  local tmp=${encoded_url:gs/+/ /}
+  # Protect other escapes to pass through the printf unchanged
+  tmp=${tmp:gs/\\/\\\\/}
+  # Handle %-escapes by turning them into `\xXX` printf escapes
+  tmp=${tmp:gs/%/\\x/}
+  echo -E "before decode $tmp"
+  local decoded
+  eval "decoded=\$'$tmp'"
+
+  # Now we have a UTF-8 encoded string in the variable. We need to re-encode
+  # it if caller is in a non-UTF-8 locale.
+  local safe_encodings
+  safe_encodings=(UTF-8 utf8 US-ASCII)
+  if [[ -z ${safe_encodings[(r)$caller_encoding]} ]]; then
+    decoded=$(echo -E "$decoded" | iconv -f UTF-8 -t $caller_encoding)
+    if [[ $? != 0 ]]; then
+      echo "Error converting string from UTF-8 to $caller_encoding" >&2
+      return 1
+    fi
+  fi
+
+  echo -E "$decoded"
+}
+
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 52622f5ab..726cdce41 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -59,44 +59,13 @@ preexec_functions+=(omz_termsupport_preexec)
 
 if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
 
-  # URL-encodes a string
-  # Outputs the encoded string on stdout
-  # Returns nonzero if encoding failed
-  function _omz_urlencode() {
-    local str=$1
-    local url_str=""
-
-    # URLs must use UTF-8 encoding; convert if required
-    local encoding=${LC_CTYPE/*./}
-    if [[ -n $encoding && $encoding != UTF-8 && $encoding != utf8 ]]; then
-      str=$(echo $str | iconv -f $encoding -t UTF-8)
-      if [[ $? != 0 ]]; then
-        echo "Error converting string from $encoding to UTF-8" >&2
-        return 1
-      fi
-    fi
-
-    # Use LC_CTYPE=C to process text byte-by-byte
-    local i ch hexch LC_CTYPE=C
-    for ((i = 1; i <= ${#str}; ++i)); do
-      ch="$str[i]"
-      if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
-        url_str+="$ch"
-      else
-        hexch=$(printf "%02X" "'$ch")
-        url_str+="%$hexch"
-      fi
-    done
-    echo $url_str
-  }
-
   # Emits the control sequence to notify Terminal.app of the cwd
   function update_terminalapp_cwd() {
     # Identify the directory using a "file:" scheme URL, including
     # the host name to disambiguate local vs. remote paths.
 
     # Percent-encode the pathname.
-    local URL_PATH=$(_omz_urlencode $PWD)
+    local URL_PATH=$(omz_urlencode -P $PWD)
     [[ $? != 0 ]] && return 1
     local PWD_URL="file://$HOST$URL_PATH"
     # Undocumented Terminal.app-specific control sequence

From be10229659959a4ff455642e44fdaa5666e15ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 9 Aug 2015 21:56:02 +0200
Subject: [PATCH 1224/1378] Exit only if the fbterm session closed correctly

This prevents the previous behavior that exitted the zsh session
even if fbterm didn't start correctly.
---
 plugins/fbterm/fbterm.plugin.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/fbterm/fbterm.plugin.zsh b/plugins/fbterm/fbterm.plugin.zsh
index d60f0e27d..bc2532092 100644
--- a/plugins/fbterm/fbterm.plugin.zsh
+++ b/plugins/fbterm/fbterm.plugin.zsh
@@ -2,7 +2,6 @@
 
 if (( ${+commands[fbterm]} )); then
 	if [[ "$TTY" = /dev/tty* ]] ; then
-		fbterm
-		exit
+		fbterm && exit
 	fi
 fi

From 9caa215a2f319b4af3369fb10a4e7ee16e03281d Mon Sep 17 00:00:00 2001
From: wubaiqing <wubaiqing@vip.qq.com>
Date: Mon, 10 Aug 2015 11:41:48 +0800
Subject: [PATCH 1225/1378] Add Baidu support to web-search plugin

---
 plugins/web-search/web-search.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh
index d407edb96..898eb2c3a 100644
--- a/plugins/web-search/web-search.plugin.zsh
+++ b/plugins/web-search/web-search.plugin.zsh
@@ -12,6 +12,7 @@ function web_search() {
     duckduckgo  "https://www.duckduckgo.com/?q="
     yandex      "https://yandex.ru/yandsearch?text="
     github      "https://github.com/search?q="
+    baidu       "https://www.baidu.com/s?wd="
   )
 
   # define the open command
@@ -51,6 +52,7 @@ alias yahoo='web_search yahoo'
 alias ddg='web_search duckduckgo'
 alias yandex='web_search yandex'
 alias github='web_search github'
+alias baidu='web_search baidu'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'

From dcd95dd2238bc1b3203306a2f66acc09080cfee6 Mon Sep 17 00:00:00 2001
From: Ahmed Hisham Ismail <ahm3d.hisham@gmail.com>
Date: Tue, 11 Aug 2015 02:56:49 +0200
Subject: [PATCH 1226/1378] Changes quotes so that path will be set
 appropriately on multiple runs

---
 plugins/npm/npm.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 64ba93a18..595105d3c 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -14,4 +14,4 @@ alias npmS="npm i -S "
 alias npmD="npm i -D "
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
-alias npmE="PATH=$(npm bin):$PATH"
+alias npmE='PATH="$(npm bin)":"$PATH"'

From 58d2f9335d21a30a85d47c820203e00c1f3d5be7 Mon Sep 17 00:00:00 2001
From: Chang Hyun Park <heartinpiece@gmail.com>
Date: Wed, 12 Aug 2015 16:47:37 +0900
Subject: [PATCH 1227/1378] Check if Zsh is installed prior to installing Oh My
 Zsh

Check if Zsh is installed before installing anything else.
New-commers, or people who don't read the disclaimers(ex. me) will go
straight to stack overflow if chsh -s returns an error.
---
 tools/install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index c83a6f23d..951737754 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,5 +1,12 @@
 set -e
 
+CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
+if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
+  echo "\033[0;33m Zsh is not installed!\033[0m Please install zsh first!"
+  exit
+fi
+unset CHECK_ZSH_INSTALLED
+
 if [ ! -n "$ZSH" ]; then
   ZSH=~/.oh-my-zsh
 fi

From 02383017268004c4873797c16a667389bead1b83 Mon Sep 17 00:00:00 2001
From: LE Manh Cuong <manhcuongle@hotmail.com>
Date: Fri, 14 Aug 2015 09:55:46 +0700
Subject: [PATCH 1228/1378] Emoji plugin - Fix wrong string comparison

---
 plugins/emoji/emoji-char-definitions.zsh | 9 +++++++++
 plugins/emoji/update_emoji.pl            | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh
index 7d110603c..04693da05 100644
--- a/plugins/emoji/emoji-char-definitions.zsh
+++ b/plugins/emoji/emoji-char-definitions.zsh
@@ -7,8 +7,12 @@
 #   $emoji         - which maps character names to Unicode characters
 #   $emoji_flags   - maps country names to Unicode flag characters using region indicators 
 
+# Main emoji
 typeset -gAH emoji
+# National flags
 typeset -gAH emoji_flags
+# Combining modifiers
+typeset -gAH emoji_mod
 
 emoji[copyright_sign]=$'\U00A9'
 emoji[registered_sign]=$'\U00AE'
@@ -448,10 +452,15 @@ emoji[badminton_racquet_and_shuttlecock]=$'\U1F3F8'
 emoji[bow_and_arrow]=$'\U1F3F9'
 emoji[amphora]=$'\U1F3FA'
 emoji[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
+emoji_mod[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
 emoji[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
+emoji_mod[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
 emoji[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
+emoji_mod[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
 emoji[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
+emoji_mod[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
 emoji[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
+emoji_mod[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
 emoji[rat]=$'\U1F400'
 emoji[mouse]=$'\U1F401'
 emoji[ox]=$'\U1F402'
diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl
index d90c6e316..04f3ce8e7 100644
--- a/plugins/emoji/update_emoji.pl
+++ b/plugins/emoji/update_emoji.pl
@@ -88,7 +88,7 @@ typeset -gAH emoji_mod
 			}
 			# Modifiers are included in both the main set and their separate map,
 			# because they have a standalone representation as a color swatch.
-			if ( $modifier_status == "modifier" ) {
+			if ( $modifier_status eq "modifier" ) {
 				$outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n");
 			}
 		} else {

From d20c111d78f52dfe81bc632532774d3715feb4e3 Mon Sep 17 00:00:00 2001
From: Chayoung You <yousbe@gmail.com>
Date: Sat, 15 Aug 2015 15:19:02 +0900
Subject: [PATCH 1229/1378] rvm plugin: Fix `gems` to work with GNU sed

Fix #1579.
---
 plugins/rvm/rvm.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 234ac1642..53e809aaf 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -61,11 +61,11 @@ function gems {
 	local current_ruby=`rvm-prompt i v p`
 	local current_gemset=`rvm-prompt g`
 
-	gem list $@ | sed \
-		-Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
-		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+	gem list $@ | sed -E \
+		-e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+		-e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
+		-e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+		-e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 }
 
 function _rvm_completion {

From daedfcab510b01d566a2dff6bc94a9e91a563a18 Mon Sep 17 00:00:00 2001
From: Gabe Martin-Dempesy <gabe@mudbugmedia.com>
Date: Sat, 15 Aug 2015 12:54:46 -0700
Subject: [PATCH 1230/1378] reduce rbenv plugin load time by 150ms by removing
 additional brew call

---
 plugins/rbenv/rbenv.plugin.zsh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 213e1beb0..ef5106f2d 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -2,14 +2,11 @@ _homebrew-installed() {
   type brew &> /dev/null
 }
 
-_rbenv-from-homebrew-installed() {
-  brew --prefix rbenv &> /dev/null
-}
-
 FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
-if _homebrew-installed && _rbenv-from-homebrew-installed ; then
-    rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
+if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null); then
+    rbenvdirs=($rbenv_homebrew_path "${rbenvdirs[@]}")
+    unset rbenv_homebrew_path
 fi
 
 for rbenvdir in "${rbenvdirs[@]}" ; do

From de47e2df69fd4ac29fd887f5ab593f2f738f982a Mon Sep 17 00:00:00 2001
From: Felix Krause <KrauseFx@users.noreply.github.com>
Date: Sun, 16 Aug 2015 19:29:58 +0200
Subject: [PATCH 1231/1378] Use https instead of http

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 5f0a81f1d..e06e4f331 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -9,7 +9,7 @@ then
   printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
   printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
   printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
-  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest news and updates, follow us on twitter: ' 'http://twitter.com/ohmyzsh'
+  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest news and updates, follow us on twitter: ' 'https://twitter.com/ohmyzsh'
   printf '\033[0;34m%s\033[1m%s\033[0m\n' 'Get your Oh My Zsh swag at: ' 'http://shop.planetargon.com/'
 else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'

From 88243b846adc61c3e34a60f4c0ae53e3eb8b9e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 16 Aug 2015 22:26:33 +0200
Subject: [PATCH 1232/1378] Use right variable name to avoid zero-length array

This fixes the typographic error that always assigned an undefined
array to `$names`, which made `$list_size` = 0 and triggered a
divide by zero error on the next line.
---
 plugins/emoji/emoji.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index a98d0b714..adb11bb53 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -255,7 +255,7 @@ function random_emoji() {
   if [[ -z "$group" || "$group" == "all" ]]; then
   	names=(${(k)emoji})
   else
-  	names=(${=emoji_groups[$group_name]})
+	names=(${=emoji_groups[$group]})
   fi
   local list_size=$#names
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))

From c6a5f6efb434fa64f31b40f366e7fecae80758e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 16 Aug 2015 22:30:56 +0200
Subject: [PATCH 1233/1378] Check that list_size value is not zero before
 division

---
 plugins/emoji/emoji.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index adb11bb53..f2d169bf3 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -257,7 +257,8 @@ function random_emoji() {
   else
 	names=(${=emoji_groups[$group]})
   fi
-  local list_size=$#names
+  local list_size=${#names}
+  [[ $list_size -eq 0 ]] && return 1
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))
   local name=${names[$random_index]}
   echo ${emoji[$name]}

From 6443626a6beedc1135402e0fdd4646ba1e7ae35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 1 Aug 2015 18:06:36 +0200
Subject: [PATCH 1234/1378] Pull in latest version from
 olivierverdier/zsh-git-prompt

---
 plugins/git-prompt/git-prompt.plugin.zsh |  95 +++++++++++++----
 plugins/git-prompt/gitstatus.py          | 125 ++++++++++-------------
 2 files changed, 127 insertions(+), 93 deletions(-)

diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index d868a5fe1..ccba22dc5 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,32 +1,34 @@
 # ZSH Git Prompt Plugin from:
 # http://github.com/olivierverdier/zsh-git-prompt
-#
-export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt
+
+export __GIT_PROMPT_DIR=${0:A:h}
+
+export GIT_PROMPT_EXECUTABLE=${GIT_PROMPT_USE_PYTHON:-"python"}
+
+# Initialize colors.
+autoload -U colors
+colors
 
 # Allow for functions in the prompt.
 setopt PROMPT_SUBST
 
-## Enable auto-execution of functions.
-typeset -ga preexec_functions
-typeset -ga precmd_functions
-typeset -ga chpwd_functions
+autoload -U add-zsh-hook
 
-# Append git functions needed for prompt.
-preexec_functions+='preexec_update_git_vars'
-precmd_functions+='precmd_update_git_vars'
-chpwd_functions+='chpwd_update_git_vars'
+add-zsh-hook chpwd chpwd_update_git_vars
+add-zsh-hook preexec preexec_update_git_vars
+add-zsh-hook precmd precmd_update_git_vars
 
 ## Function definitions
 function preexec_update_git_vars() {
     case "$2" in
-        git*)
+        git*|hub*|gh*|stg*)
         __EXECUTED_GIT_COMMAND=1
         ;;
     esac
 }
 
 function precmd_update_git_vars() {
-    if [ -n "$__EXECUTED_GIT_COMMAND" ]; then
+    if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ ! -n "$ZSH_THEME_GIT_PROMPT_CACHE" ]; then
         update_current_git_vars
         unset __EXECUTED_GIT_COMMAND
     fi
@@ -39,19 +41,68 @@ function chpwd_update_git_vars() {
 function update_current_git_vars() {
     unset __CURRENT_GIT_STATUS
 
-    local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
-    _GIT_STATUS=`python ${gitstatus}`
-    __CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}")
+    if [[ "$GIT_PROMPT_EXECUTABLE" == "python" ]]; then
+        local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
+        _GIT_STATUS=`python ${gitstatus} 2>/dev/null`
+    fi
+    if [[ "$GIT_PROMPT_EXECUTABLE" == "haskell" ]]; then
+        local gitstatus="$__GIT_PROMPT_DIR/dist/build/gitstatus/gitstatus"
+        _GIT_STATUS=`${gitstatus}`
+    fi
+     __CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}")
+	GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
+	GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
+	GIT_BEHIND=$__CURRENT_GIT_STATUS[3]
+	GIT_STAGED=$__CURRENT_GIT_STATUS[4]
+	GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
+	GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
+	GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
 }
 
-function prompt_git_info() {
+
+git_super_status() {
+	precmd_update_git_vars
     if [ -n "$__CURRENT_GIT_STATUS" ]; then
-        echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})"
-    fi
+	  STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
+	  if [ "$GIT_BEHIND" -ne "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
+	  fi
+	  if [ "$GIT_AHEAD" -ne "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}"
+	  fi
+	  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
+	  if [ "$GIT_STAGED" -ne "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
+	  fi
+	  if [ "$GIT_CONFLICTS" -ne "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
+	  fi
+	  if [ "$GIT_CHANGED" -ne "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
+	  fi
+	  if [ "$GIT_UNTRACKED" -ne "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
+	  fi
+	  if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
+		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
+	  fi
+	  STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+	  echo "$STATUS"
+	fi
 }
 
+# Default values for the appearance of the prompt. Configure at will.
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
+ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}"
+ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
+ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
+
 # Set the prompt.
-#PROMPT='%B%m%~%b$(prompt_git_info) %# '
-# for a right prompt:
-#RPROMPT='%b$(prompt_git_info)'
-RPROMPT='$(prompt_git_info)'
+RPROMPT='$(git_super_status)'
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 256841432..d944fd4ed 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,82 +1,65 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
+from __future__ import print_function
+
+# change this symbol to whatever you prefer
+prehash = ':'
+
 from subprocess import Popen, PIPE
-import re
 
-# change those symbols to whatever you prefer
-symbols = {
-    'ahead of': '↑',
-    'behind': '↓',
-    'staged': '♦',
-    'changed': '‣',
-    'untracked': '…',
-    'clean': '⚡',
-    'unmerged': '≠',
-    'sha1': ':'
-}
+import sys
+gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
+branch, error = gitsym.communicate()
 
-output, error = Popen(
-    ['git', 'status'], stdout=PIPE, stderr=PIPE, universal_newlines=True).communicate()
+error_string = error.decode('utf-8')
 
-if error:
-    import sys
-    sys.exit(0)
-lines = output.splitlines()
+if 'fatal: Not a git repository' in error_string:
+	sys.exit(0)
 
-behead_re = re.compile(
-    r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
-diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
+branch = branch.decode("utf-8").strip()[11:]
 
-status = ''
-staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE)
-changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
-untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
-unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
+res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
+err_string = err.decode('utf-8')
+if 'fatal' in err_string:
+	sys.exit(0)
+changed_files = [namestat[0] for namestat in res.decode("utf-8").splitlines()]
+staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
+nb_changed = len(changed_files) - changed_files.count('U')
+nb_U = staged_files.count('U')
+nb_staged = len(staged_files) - nb_U
+staged = str(nb_staged)
+conflicts = str(nb_U)
+changed = str(nb_changed)
+nb_untracked = len([0 for status in Popen(['git','status','--porcelain',],stdout=PIPE).communicate()[0].decode("utf-8").splitlines() if status.startswith('??')])
+untracked = str(nb_untracked)
 
+ahead, behind = 0,0
 
-def execute(*command):
-    out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate()
-    if not err:
-        nb = len(out.splitlines())
-    else:
-        nb = '?'
-    return nb
-
-if staged.search(output):
-    nb = execute(
-        ['git', 'diff', '--staged', '--name-only', '--diff-filter=ACDMRT'])
-    status += '%s%s' % (symbols['staged'], nb)
-if unmerged.search(output):
-    nb = execute(['git', 'diff', '--staged', '--name-only', '--diff-filter=U'])
-    status += '%s%s' % (symbols['unmerged'], nb)
-if changed.search(output):
-    nb = execute(['git', 'diff', '--name-only', '--diff-filter=ACDMRT'])
-    status += '%s%s' % (symbols['changed'], nb)
-if untracked.search(output):
-    status += symbols['untracked']
-if status == '':
-    status = symbols['clean']
-
-remote = ''
-
-bline = lines[0]
-if bline.find('Not currently on any branch') != -1:
-    branch = symbols['sha1'] + Popen([
-        'git',
-        'rev-parse',
-        '--short',
-        'HEAD'], stdout=PIPE).communicate()[0][:-1]
+if not branch: # not on any branch
+	branch = prehash + Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0].decode("utf-8")[:-1]
 else:
-    branch = bline.split(' ')[-1]
-    bstatusline = lines[1]
-    match = behead_re.match(bstatusline)
-    if match:
-        remote = symbols[match.groups()[0]]
-        remote += match.groups()[2]
-    elif lines[2:]:
-        div_match = diverge_re.match(lines[2])
-        if div_match:
-            remote = "{behind}{1}{ahead of}{0}".format(
-                *div_match.groups(), **symbols)
+	remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
+	if remote_name:
+		merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
+		if remote_name == '.': # local
+			remote_ref = merge_name
+		else:
+			remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
+		revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
+		revlist = revgit.communicate()[0]
+		if revgit.poll(): # fallback to local
+			revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
+		behead = revlist.decode("utf-8").splitlines()
+		ahead = len([x for x in behead if x[0]=='>'])
+		behind = len(behead) - ahead
+
+out = ' '.join([
+	branch,
+	str(ahead),
+	str(behind),
+	staged,
+	conflicts,
+	changed,
+	untracked,
+	])
+print(out, end='')
 
-print('\n'.join([branch, remote, status]))

From 5642014ff1b718df04d803b7b0457b9872b2b4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 1 Aug 2015 18:13:46 +0200
Subject: [PATCH 1235/1378] Pull in simplified version from @wkentaro

This version uses `git status --porcelain` instead of making
multiple calls to `git status`.
---
 plugins/git-prompt/gitstatus.py | 80 +++++++++++++++++----------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index d944fd4ed..1065b3cb5 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -4,6 +4,7 @@ from __future__ import print_function
 # change this symbol to whatever you prefer
 prehash = ':'
 
+import subprocess
 from subprocess import Popen, PIPE
 
 import sys
@@ -13,53 +14,56 @@ branch, error = gitsym.communicate()
 error_string = error.decode('utf-8')
 
 if 'fatal: Not a git repository' in error_string:
-	sys.exit(0)
+    sys.exit(0)
 
 branch = branch.decode("utf-8").strip()[11:]
 
-res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
-err_string = err.decode('utf-8')
-if 'fatal' in err_string:
-	sys.exit(0)
-changed_files = [namestat[0] for namestat in res.decode("utf-8").splitlines()]
-staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
-nb_changed = len(changed_files) - changed_files.count('U')
-nb_U = staged_files.count('U')
-nb_staged = len(staged_files) - nb_U
-staged = str(nb_staged)
-conflicts = str(nb_U)
-changed = str(nb_changed)
-nb_untracked = len([0 for status in Popen(['git','status','--porcelain',],stdout=PIPE).communicate()[0].decode("utf-8").splitlines() if status.startswith('??')])
-untracked = str(nb_untracked)
+# Get git status (staged, change, conflicts and untracked)
+try:
+    res = subprocess.check_output(['git', 'status', '--porcelain'])
+except subprocess.CalledProcessError:
+    sys.exit(0)
+status = [(st[0], st[1], st[2:]) for st in res.splitlines()]
+untracked, staged, changed, conflicts = [], [], [], []
+for st in status:
+    if st[0] == '?' and st[1] == '?':
+        untracked.append(st)
+    else:
+        if st[1] == 'M':
+            changed.append(st)
+        if st[0] == 'U':
+            conflicts.append(st)
+        elif st[0] != ' ':
+            staged.append(st)
 
 ahead, behind = 0,0
 
 if not branch: # not on any branch
-	branch = prehash + Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0].decode("utf-8")[:-1]
+    branch = prehash + Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0].decode("utf-8")[:-1]
 else:
-	remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
-	if remote_name:
-		merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
-		if remote_name == '.': # local
-			remote_ref = merge_name
-		else:
-			remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
-		revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
-		revlist = revgit.communicate()[0]
-		if revgit.poll(): # fallback to local
-			revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
-		behead = revlist.decode("utf-8").splitlines()
-		ahead = len([x for x in behead if x[0]=='>'])
-		behind = len(behead) - ahead
+    remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
+    if remote_name:
+        merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
+        if remote_name == '.': # local
+            remote_ref = merge_name
+        else:
+            remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
+        revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
+        revlist = revgit.communicate()[0]
+        if revgit.poll(): # fallback to local
+            revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
+        behead = revlist.decode("utf-8").splitlines()
+        ahead = len([x for x in behead if x[0]=='>'])
+        behind = len(behead) - ahead
 
 out = ' '.join([
-	branch,
-	str(ahead),
-	str(behind),
-	staged,
-	conflicts,
-	changed,
-	untracked,
-	])
+    branch,
+    str(ahead),
+    str(behind),
+    str(len(staged)),
+    str(len(conflicts)),
+    str(len(changed)),
+    str(len(untracked)),
+])
 print(out, end='')
 

From 1d133ff11fe187ee7255637d51165013b4e6a738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 1 Aug 2015 18:26:18 +0200
Subject: [PATCH 1236/1378] Cleanup the rest of gitstatus.py

---
 plugins/git-prompt/gitstatus.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 1065b3cb5..903ad474d 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -4,16 +4,13 @@ from __future__ import print_function
 # change this symbol to whatever you prefer
 prehash = ':'
 
+import sys
 import subprocess
 from subprocess import Popen, PIPE
 
-import sys
-gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
-branch, error = gitsym.communicate()
+branch, error = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE).communicate()
 
-error_string = error.decode('utf-8')
-
-if 'fatal: Not a git repository' in error_string:
+if 'fatal: Not a git repository' in error.decode('utf-8'):
     sys.exit(0)
 
 branch = branch.decode("utf-8").strip()[11:]

From 6ff53d173b374e5ebbdff141059c71e4e14aa62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 1 Aug 2015 18:09:20 +0200
Subject: [PATCH 1237/1378] Cleanup of git-prompt plugin file

---
 plugins/git-prompt/git-prompt.plugin.zsh | 110 ++++++++++-------------
 1 file changed, 47 insertions(+), 63 deletions(-)

diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index ccba22dc5..5175bf70f 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,24 +1,13 @@
 # ZSH Git Prompt Plugin from:
 # http://github.com/olivierverdier/zsh-git-prompt
 
-export __GIT_PROMPT_DIR=${0:A:h}
+__GIT_PROMPT_DIR="${0:A:h}"
 
-export GIT_PROMPT_EXECUTABLE=${GIT_PROMPT_USE_PYTHON:-"python"}
+## Hook function definitions
+function chpwd_update_git_vars() {
+    update_current_git_vars
+}
 
-# Initialize colors.
-autoload -U colors
-colors
-
-# Allow for functions in the prompt.
-setopt PROMPT_SUBST
-
-autoload -U add-zsh-hook
-
-add-zsh-hook chpwd chpwd_update_git_vars
-add-zsh-hook preexec preexec_update_git_vars
-add-zsh-hook precmd precmd_update_git_vars
-
-## Function definitions
 function preexec_update_git_vars() {
     case "$2" in
         git*|hub*|gh*|stg*)
@@ -34,64 +23,59 @@ function precmd_update_git_vars() {
     fi
 }
 
-function chpwd_update_git_vars() {
-    update_current_git_vars
-}
+chpwd_functions+=(chpwd_update_git_vars)
+precmd_functions+=(precmd_update_git_vars)
+preexec_functions+=(preexec_update_git_vars)
 
+
+## Function definitions
 function update_current_git_vars() {
     unset __CURRENT_GIT_STATUS
 
-    if [[ "$GIT_PROMPT_EXECUTABLE" == "python" ]]; then
-        local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
-        _GIT_STATUS=`python ${gitstatus} 2>/dev/null`
-    fi
-    if [[ "$GIT_PROMPT_EXECUTABLE" == "haskell" ]]; then
-        local gitstatus="$__GIT_PROMPT_DIR/dist/build/gitstatus/gitstatus"
-        _GIT_STATUS=`${gitstatus}`
-    fi
+    local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
+    _GIT_STATUS=$(python ${gitstatus} 2>/dev/null)
      __CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}")
-	GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
-	GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
-	GIT_BEHIND=$__CURRENT_GIT_STATUS[3]
-	GIT_STAGED=$__CURRENT_GIT_STATUS[4]
-	GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
-	GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
-	GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
+    GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
+    GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
+    GIT_BEHIND=$__CURRENT_GIT_STATUS[3]
+    GIT_STAGED=$__CURRENT_GIT_STATUS[4]
+    GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
+    GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
+    GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
 }
 
-
 git_super_status() {
-	precmd_update_git_vars
+    precmd_update_git_vars
     if [ -n "$__CURRENT_GIT_STATUS" ]; then
-	  STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
-	  if [ "$GIT_BEHIND" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_AHEAD" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}"
-	  fi
-	  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
-	  if [ "$GIT_STAGED" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_CONFLICTS" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_CHANGED" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_UNTRACKED" -ne "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
-	  fi
-	  if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
-		  STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
-	  fi
-	  STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
-	  echo "$STATUS"
-	fi
+      STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
+      if [ "$GIT_BEHIND" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
+      fi
+      if [ "$GIT_AHEAD" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}"
+      fi
+      STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
+      if [ "$GIT_STAGED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
+      fi
+      if [ "$GIT_CONFLICTS" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
+      fi
+      if [ "$GIT_CHANGED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
+      fi
+      if [ "$GIT_UNTRACKED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
+      fi
+      if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
+      fi
+      STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+      echo "$STATUS"
+    fi
 }
 
-# Default values for the appearance of the prompt. Configure at will.
+# Default values for the appearance of the prompt.
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
 ZSH_THEME_GIT_PROMPT_SEPARATOR="|"

From 94007f7db2d47f3e13e4aac878f0e780a479f628 Mon Sep 17 00:00:00 2001
From: Kentaro Wada <www.kentaro.wada@gmail.com>
Date: Sun, 2 Aug 2015 08:50:56 +0900
Subject: [PATCH 1238/1378] git-prompt: collect all git status information by
 one cmd

This commit uses the `git status --porcelain -b` format to gather the
number of ahead and behind commits related to the remote branch.
---
 plugins/git-prompt/gitstatus.py | 61 +++++++++++++++------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 903ad474d..2f02e5fcc 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -5,25 +5,40 @@ from __future__ import print_function
 prehash = ':'
 
 import sys
-import subprocess
 from subprocess import Popen, PIPE
 
-branch, error = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE).communicate()
 
-if 'fatal: Not a git repository' in error.decode('utf-8'):
-    sys.exit(0)
+# `git status --porcelain -b` can collect all information
+# branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
+po = Popen(['git', 'status', '--porcelain', '-b'], stdout=PIPE, stderr=PIPE)
+stdout, sterr = po.communicate()
+if po.returncode != 0:
+    sys.exit(0)  # Not a git repository
 
-branch = branch.decode("utf-8").strip()[11:]
-
-# Get git status (staged, change, conflicts and untracked)
-try:
-    res = subprocess.check_output(['git', 'status', '--porcelain'])
-except subprocess.CalledProcessError:
-    sys.exit(0)
-status = [(st[0], st[1], st[2:]) for st in res.splitlines()]
+# collect git status information
 untracked, staged, changed, conflicts = [], [], [], []
+ahead, behind = 0, 0
+status = [(line[0], line[1], line[2:]) for line in stdout.splitlines()]
 for st in status:
-    if st[0] == '?' and st[1] == '?':
+    if st[0] == '#' and st[1] == '#':
+        if len(st[2].strip().split('...')) == 1:
+            branch = st[2].strip()
+        else:
+            # current and remote branch info
+            branch, rest = st[2].strip().split('...')
+            if len(rest.split(' ')) == 1:
+                # remote_branch = rest.split(' ')[0]
+                pass
+            else:
+                # ahead or behind
+                divergence = ' '.join(rest.split(' ')[1:])
+                divergence = divergence.lstrip('[').rstrip(']')
+                for div in divergence.split(', '):
+                    if 'ahead' in div:
+                        ahead = int(div[len('ahead '):].strip())
+                    elif 'behind' in div:
+                        behind = int(div[len('behind '):].strip())
+    elif st[0] == '?' and st[1] == '?':
         untracked.append(st)
     else:
         if st[1] == 'M':
@@ -33,26 +48,6 @@ for st in status:
         elif st[0] != ' ':
             staged.append(st)
 
-ahead, behind = 0,0
-
-if not branch: # not on any branch
-    branch = prehash + Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0].decode("utf-8")[:-1]
-else:
-    remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
-    if remote_name:
-        merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
-        if remote_name == '.': # local
-            remote_ref = merge_name
-        else:
-            remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
-        revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
-        revlist = revgit.communicate()[0]
-        if revgit.poll(): # fallback to local
-            revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
-        behead = revlist.decode("utf-8").splitlines()
-        ahead = len([x for x in behead if x[0]=='>'])
-        behind = len(behead) - ahead
-
 out = ' '.join([
     branch,
     str(ahead),

From 30bed07e9c9480d1e563d29da5747ce427f58d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 4 Aug 2015 16:34:03 +0200
Subject: [PATCH 1239/1378] Parse UTF-8 output from git status

---
 plugins/git-prompt/gitstatus.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 2f02e5fcc..8790f3a3c 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -18,7 +18,7 @@ if po.returncode != 0:
 # collect git status information
 untracked, staged, changed, conflicts = [], [], [], []
 ahead, behind = 0, 0
-status = [(line[0], line[1], line[2:]) for line in stdout.splitlines()]
+status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
     if st[0] == '#' and st[1] == '#':
         if len(st[2].strip().split('...')) == 1:
@@ -58,4 +58,3 @@ out = ' '.join([
     str(len(untracked)),
 ])
 print(out, end='')
-

From 45473c3a81410735dac7fe0a1df33ad95fd3f2e5 Mon Sep 17 00:00:00 2001
From: Kentaro Wada <www.kentaro.wada@gmail.com>
Date: Tue, 11 Aug 2015 12:04:51 +0900
Subject: [PATCH 1240/1378] Fix for initial or detached status branch info

---
 plugins/git-prompt/gitstatus.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 8790f3a3c..59feadc39 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -5,6 +5,8 @@ from __future__ import print_function
 prehash = ':'
 
 import sys
+import re
+import subprocess
 from subprocess import Popen, PIPE
 
 
@@ -21,8 +23,13 @@ ahead, behind = 0, 0
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
     if st[0] == '#' and st[1] == '#':
-        if len(st[2].strip().split('...')) == 1:
+        if re.search('Initial commit on', st[2]):
+            branch = st[2].split(' ')[-1]
+        elif len(st[2].strip().split('...')) == 1:
             branch = st[2].strip()
+            if branch == 'HEAD (no branch)':
+                cmd = ['git', 'log', '-1', '--format="%h"']
+                branch = subprocess.check_output(cmd).strip().strip('"')
         else:
             # current and remote branch info
             branch, rest = st[2].strip().split('...')

From 3c698743fa4265ab2b70b880e12f957792669438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 11 Aug 2015 11:29:05 +0200
Subject: [PATCH 1241/1378] Clean up gitstatus.py

---
 plugins/git-prompt/gitstatus.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 59feadc39..1beae541a 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -1,18 +1,14 @@
 #!/usr/bin/env python
 from __future__ import print_function
 
-# change this symbol to whatever you prefer
-prehash = ':'
-
 import sys
 import re
-import subprocess
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, check_output
 
 
-# `git status --porcelain -b` can collect all information
+# `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '-b'], stdout=PIPE, stderr=PIPE)
+po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE)
 stdout, sterr = po.communicate()
 if po.returncode != 0:
     sys.exit(0)  # Not a git repository
@@ -25,11 +21,10 @@ for st in status:
     if st[0] == '#' and st[1] == '#':
         if re.search('Initial commit on', st[2]):
             branch = st[2].split(' ')[-1]
+        elif re.search('no branch', st[2]):
+            branch = check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('utf-8').strip()
         elif len(st[2].strip().split('...')) == 1:
             branch = st[2].strip()
-            if branch == 'HEAD (no branch)':
-                cmd = ['git', 'log', '-1', '--format="%h"']
-                branch = subprocess.check_output(cmd).strip().strip('"')
         else:
             # current and remote branch info
             branch, rest = st[2].strip().split('...')

From be667a24b0dc6a42a3e5368727366449b09633d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 17 Aug 2015 01:05:37 +0200
Subject: [PATCH 1242/1378] Remove obsolete comment

---
 plugins/emoji/emoji.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index f2d169bf3..7876f1c89 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -76,8 +76,6 @@ emoji_skintone[6]=$'\U1F3FF'
 # These are stored in a single associative array, $emoji_groups, to avoid cluttering up the global
 # namespace, and to allow adding additional group definitions at run time.
 # The keys are the group names, and the values are whitespace-separated lists of emoji character names.
-#
-# These extra local arrays are used to allow more convenient formatting of the source code.
 
 emoji_groups[fruits]="
   tomato

From 3f83331c71b9dd8b1065c4e7a58223cd7d5be421 Mon Sep 17 00:00:00 2001
From: Mohnish Jadwani <mail4mohnish@gmail.com>
Date: Mon, 17 Aug 2015 06:23:58 +0530
Subject: [PATCH 1243/1378] removes a trailing white space

---
 plugins/rails/rails.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 097578e23..c4ad595e7 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -58,7 +58,7 @@ alias rdmtc='rake db:migrate db:test:clone'
 alias rlc='rake log:clear'
 alias rn='rake notes'
 alias rr='rake routes'
-alias rrg='rake routes | grep '
+alias rrg='rake routes | grep'
 
 # legacy stuff
 alias sstat='thin --stats "/thin/stats" start'

From c66c3aef8126bf943b2746afb6a9c2a536990db5 Mon Sep 17 00:00:00 2001
From: Fice-T <Fice-T@users.noreply.github.com>
Date: Sun, 16 Aug 2015 22:36:32 -0600
Subject: [PATCH 1244/1378] Fix graphical bug in cypher theme when return
 status is non-zero

- When the previous command's return status is non-zero and the prompt
  is redrawn, graphical errors sometimes arise due to the fg{red} not
  being escaped.
---
 themes/cypher.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/cypher.zsh-theme b/themes/cypher.zsh-theme
index 45df53d22..6e6b78ee6 100644
--- a/themes/cypher.zsh-theme
+++ b/themes/cypher.zsh-theme
@@ -1,4 +1,4 @@
 # Based on evan's prompt
 # Shows the exit status of the last command if non-zero
 # Uses "#" instead of "»" when running with elevated privileges
-PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . ${fg[red]}%? )%{${fg[blue]}%}»%{${reset_color}%} "
+PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . %{${fg[red]}%}%? )%{${fg[blue]}%}»%{${reset_color}%} "

From c4ba3065a1e9beb76f2f0ac64f3436b5448576b2 Mon Sep 17 00:00:00 2001
From: Kentaro Wada <www.kentaro.wada@gmail.com>
Date: Mon, 17 Aug 2015 18:22:27 +0900
Subject: [PATCH 1245/1378] Show tag name when detached status if possible

---
 plugins/git-prompt/gitstatus.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 1beae541a..a8eb8284b 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -3,9 +3,31 @@ from __future__ import print_function
 
 import sys
 import re
+import shlex
 from subprocess import Popen, PIPE, check_output
 
 
+def get_tagname_or_hash():
+    """return tagname if exists else hash"""
+    cmd = 'git log -1 --format="%h%d"'
+    output = check_output(shlex.split(cmd)).decode('utf-8').strip()
+    hash_, tagname = None, None
+    # get hash
+    m = re.search('\(.*\)$', output)
+    if m:
+        hash_ = output[:m.start()-1]
+    # get tagname
+    m = re.search('tag: .*[,\)]', output)
+    if m:
+        tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]
+
+    if tagname:
+        return tagname
+    elif hash_:
+        return hash_
+    return None
+
+
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
 po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE)
@@ -21,8 +43,8 @@ for st in status:
     if st[0] == '#' and st[1] == '#':
         if re.search('Initial commit on', st[2]):
             branch = st[2].split(' ')[-1]
-        elif re.search('no branch', st[2]):
-            branch = check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('utf-8').strip()
+        elif re.search('no branch', st[2]):  # detached status
+            branch = get_tagname_or_hash()
         elif len(st[2].strip().split('...')) == 1:
             branch = st[2].strip()
         else:

From 96c34cebae5da3a52e7da0d61188c1f9822a9c2e Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 9 Aug 2015 16:37:12 -0400
Subject: [PATCH 1246/1378] Add a deprecation comment.

---
 lib/functions.zsh                          | 2 --
 plugins/terminalapp/terminalapp.plugin.zsh | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 plugins/terminalapp/terminalapp.plugin.zsh

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 5c1a5a283..2a962669c 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -176,7 +176,6 @@ function omz_urldecode {
   emulate -L zsh
   local encoded_url=$1
 
-  echo -e input $1
   # Work bytewise, since URLs escape UTF-8 octets
   local caller_encoding=$langinfo[CODESET]
   local LC_ALL=C
@@ -188,7 +187,6 @@ function omz_urldecode {
   tmp=${tmp:gs/\\/\\\\/}
   # Handle %-escapes by turning them into `\xXX` printf escapes
   tmp=${tmp:gs/%/\\x/}
-  echo -E "before decode $tmp"
   local decoded
   eval "decoded=\$'$tmp'"
 
diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
new file mode 100644
index 000000000..7c0c278b9
--- /dev/null
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
@@ -0,0 +1,6 @@
+# This file is intentionally empty.
+#
+# The terminalapp plugin is deprecated and may be removed in a future release.
+# Its functionality has been folded in to the core lib/termsupport.zsh, which
+# is loaded for all users. You can remove terminalapp from your $plugins list
+# once all your systems are updated to the current version of Oh My Zsh.

From 47d19cc56425aa7c550d845726111ee8bd9520d1 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 17 Aug 2015 20:55:41 -0400
Subject: [PATCH 1247/1378] Add defensive `emulate -L zsh` to termsupport
 functions

---
 lib/termsupport.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 726cdce41..ff61d5329 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -7,6 +7,7 @@
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
+  emulate -L zsh
   [[ "$EMACS" == *term* ]] && return
 
   # if $2 is unset use $1 as default
@@ -26,6 +27,7 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
+  emulate -L zsh
   if [[ $DISABLE_AUTO_TITLE == true ]]; then
     return
   fi
@@ -35,11 +37,11 @@ function omz_termsupport_precmd {
 
 # Runs before executing the command
 function omz_termsupport_preexec {
+  emulate -L zsh
   if [[ $DISABLE_AUTO_TITLE == true ]]; then
     return
   fi
 
-  emulate -L zsh
   setopt extended_glob
 
   # cmd name only, or if this is sudo or ssh, the next cmd
@@ -61,6 +63,7 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
 
   # Emits the control sequence to notify Terminal.app of the cwd
   function update_terminalapp_cwd() {
+    emulate -L zsh
     # Identify the directory using a "file:" scheme URL, including
     # the host name to disambiguate local vs. remote paths.
 

From 5c8b0cc0c1782b34790548498018fb9e0300992b Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 17 Aug 2015 22:53:45 -0400
Subject: [PATCH 1248/1378] Add clipcopy() and clippaste() generic
 cross-platform CLI clipboard functions. Change copydir, copyfile, and coffee
 plugins to use them, instead of the Mac-only `pbcopy` command.

---
 lib/clipboard.zsh                    | 67 ++++++++++++++++++++++++++++
 plugins/coffee/coffee.plugin.zsh     | 10 ++---
 plugins/copydir/copydir.plugin.zsh   |  4 +-
 plugins/copyfile/copyfile.plugin.zsh |  8 ++--
 4 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 lib/clipboard.zsh

diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
new file mode 100644
index 000000000..24b7380f7
--- /dev/null
+++ b/lib/clipboard.zsh
@@ -0,0 +1,67 @@
+# System clipboard integration
+#
+# This file has support for doing system clipboard copy and paste operations
+# from the command line in a generic cross-platform fashion.
+#
+# On OS X and Windows, the main system clipboard or "pasteboard" is used. On other
+# Unix-like OSes, this considers the X Windows CLIPBOARD selection to be the
+# "system clipboard", and the X Windows `xclip` command must be installed.
+
+# clipcopy - Copy data to clipboard
+#
+# Usage:
+#
+#  <command> | clipcopy    - copies stdin to clipboard
+#
+#  clipcopy <file>         - copies a file's contents to clipboard
+#
+function clipcopy() {
+  emulate -L zsh
+  local file=$1
+  if [[ $OSTYPE == darwin* ]]; then
+    if [[ -z $file ]]; then
+      pbcopy
+    else
+      cat $file | pbcopy
+    fi
+  elif [[ $OSTYPE == cygwin* ]]; then
+    if [[ -z $file ]]; then
+      cat > /dev/clipboard
+    else
+      cat $file > /dev/clipboard
+    fi
+  else
+    which xclip &>/dev/null
+    if [[ $? != 0 ]]; then
+      print "clipcopy: Platform $OSTYPE not supported or xclip not installed" >&2
+      return 1
+    fi
+    if [[ -z $file ]]; then
+      xclip -in -selection clipboard
+    else
+      xclip -in -selection clipboard $file
+    fi
+  fi
+}
+
+# clippaste - "Paste" data from clipboard to stdout
+#
+# Usage:
+#
+#   clippaste   - writes clipboard's contents to stdout
+#
+function clippaste() {
+  emulate -L zsh
+  if [[ $OSTYPE == darwin* ]]; then
+    pbpaste
+  elif [[ $OSTYPE == cygwin* ]]; then
+    cat /dev/clipboard
+  else
+    which xclip &>/dev/null 
+    if [[ $? != 0 ]]; then
+      print "clipcopy: Platform $OSTYPE not supported or xclip not installed" >&2
+      return 1
+    fi
+    xclip -out -selection clipboard
+  fi
+}
\ No newline at end of file
diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh
index 1a7bedd87..c7b486a6b 100644
--- a/plugins/coffee/coffee.plugin.zsh
+++ b/plugins/coffee/coffee.plugin.zsh
@@ -6,11 +6,11 @@ cf () {
 }
 # compile & copy to clipboard
 cfc () {
-  cf $1 | pbcopy
+  cf $1 | clipcopy
 }
 
-# compile from pasteboard & print
-alias cfp='coffeeMe "$(pbpaste)"'
+# compile from clipboard & print
+alias cfp='coffeeMe "$(clippaste)"'
 
-# compile from pasteboard and copy to clipboard
-alias cfpc='cfp | pbcopy'
+# compile from clipboard and copy to clipboard
+alias cfpc='cfp | clipcopy'
diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
index 37bb5e086..4b918e815 100644
--- a/plugins/copydir/copydir.plugin.zsh
+++ b/plugins/copydir/copydir.plugin.zsh
@@ -1,3 +1,5 @@
+# Copies the pathname of the current directory to the system or X Windows clipboard
 function copydir {
-  pwd | tr -d "\r\n" | pbcopy
+  emulate -L zsh
+  print -n $PWD | clipcopy
 }
\ No newline at end of file
diff --git a/plugins/copyfile/copyfile.plugin.zsh b/plugins/copyfile/copyfile.plugin.zsh
index 944a903c6..f4eca5acf 100644
--- a/plugins/copyfile/copyfile.plugin.zsh
+++ b/plugins/copyfile/copyfile.plugin.zsh
@@ -1,5 +1,7 @@
+# Copies the contents of a given file to the system or X Windows clipboard
+#
+# copyfile <file>
 function copyfile {
-  [[ "$#" != 1 ]] && return 1
-  local file_to_copy=$1
-  cat $file_to_copy | pbcopy
+  emulate -L zsh
+  clipcopy $1
 }

From 7cf892ecaa86f064aa3f78b9d5bee3b7db208ca4 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Tue, 18 Aug 2015 04:46:52 -0400
Subject: [PATCH 1249/1378] Add dashboard support and default-action
 configuration. Some refactoring.

---
 plugins/jira/jira.plugin.zsh | 118 ++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 52 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 842dff5c7..a10feec3e 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -1,61 +1,88 @@
-# To use: add a .jira-url file in the base of your project
-#         You can also set JIRA_URL in your .zshrc or put .jira-url in your home directory
-#         .jira-url in the current directory takes precedence. The same goes with .jira-prefix
-#         and JIRA_PREFIX.
+# CLI support for JIRA interaction
 #
-# If you use Rapid Board, set:
-#JIRA_RAPID_BOARD="true"
-# in you .zshrc
+# Setup: 
+#   Add a .jira-url file in the base of your project
+#   You can also set $JIRA_URL in your .zshrc or put .jira-url in your home directory
+#   A .jira-url in the current directory takes precedence. 
+#   The same goes with .jira-prefix and $JIRA_PREFIX.
 #
-# Setup: cd to/my/project
-#        echo "https://name.jira.com" >> .jira-url
-# Usage: jira           # opens a new issue
-#        jira ABC-123   # Opens an existing issue
-open_jira_issue () {
-  if [ -f .jira-url ]; then
+#   For example:
+#     cd to/my/project
+#     echo "https://name.jira.com" >> .jira-url
+#
+# Variables:
+#  $JIRA_RAPID_BOARD     - set to "true" if you use Rapid Board
+#  $JIRA_DEFAULT_ACTION  - action to do when `jira` is called witn no args
+#                          defaults to "new"
+#  $JIRA_NAME            - Your JIRA username. Used as default for assigned/reported
+#  $JIRA_PREFIX          - Prefix added to issue ID arguments
+#
+#
+# Usage: 
+#   jira            # Performs the default action
+#   jira new        # opens a new issue
+#   jira reported [username]
+#   jira assigned [username]
+#   jira dashboard
+#   jira ABC-123    # Opens an existing issue
+#   jira ABC-123 m  # Opens an existing issue for adding a comment
+
+: ${JIRA_DEFAULT_ACTION:=new}
+
+function jira() {
+  local action=${1:=$JIRA_DEFAULT_ACTION}
+
+  local jira_url jira_prefix
+  if [[ -f .jira-url ]]; then
     jira_url=$(cat .jira-url)
-  elif [ -f ~/.jira-url ]; then
+  elif [[ -f ~/.jira-url ]]; then
     jira_url=$(cat ~/.jira-url)
-  elif [[ "${JIRA_URL}" != "" ]]; then
+  elif [[ -n "${JIRA_URL}" ]]; then
     jira_url=${JIRA_URL}
   else
     jira_url_help
     return 1
   fi
 
-  local jira_prefix
-  if [ -f .jira-prefix ]; then
+  if [[ -f .jira-prefix ]]; then
     jira_prefix=$(cat .jira-prefix)
-  elif [ -f ~/.jira-prefix ]; then
+  elif [[ -f ~/.jira-prefix ]]; then
     jira_prefix=$(cat ~/.jira-prefix)
-  elif [[ "${JIRA_PREFIX}" != "" ]]; then
+  elif [[ -n "${JIRA_PREFIX}" ]]; then
     jira_prefix=${JIRA_PREFIX}
   else
     jira_prefix=""
   fi
 
-  if [ -z "$1" ]; then
+
+  if [[ $action == "new" ]]; then
     echo "Opening new issue"
     open_command "${jira_url}/secure/CreateIssue!default.jspa"
-  elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then
+  elif [[ "$action" == "assigned" || "$action" == "reported" ]]; then
     jira_query $@
+  elif [[ "$action" == "dashboard" ]]; then
+    echo "Opening dashboard"
+    open_command "${jira_url}/secure/Dashboard.jspa"
   else
-    local addcomment=''
+    # Anything that doesn't match a special action is considered an issue name
+    local issue_arg=$action
+    local issue="${jira_prefix}${issue_arg}"
+    local url_fragment=''
     if [[ "$2" == "m" ]]; then
-      addcomment="#add-comment"
-      echo "Add comment to issue #$1"
+      url_fragment="#add-comment"
+      echo "Add comment to issue #$issue"
     else
-      echo "Opening issue #$1"
+      echo "Opening issue #$issue"
     fi
     if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-      open_command "${jira_url}/issues/${jira_prefix}${1}${addcomment}"
+      open_command "${jira_url}/issues/${issue}${url_fragment}"
     else
-      open_command "${jira_url}/browse/${jira_prefix}${1}${addcomment}"
+      open_command "${jira_url}/browse/${issue}${url_fragment}"
     fi
   fi
 }
 
-jira_url_help() {
+function jira_url_help() {
   cat << EOF
 JIRA url is not specified anywhere.
 Valid options, in order of precedence:
@@ -65,40 +92,27 @@ Valid options, in order of precedence:
 EOF
 }
 
-jira_name () {
-  if [[ -z "$1" ]]; then
-    if [[ "${JIRA_NAME}" != "" ]]; then
-      jira_name=${JIRA_NAME}
-    else
-      echo "JIRA_NAME not specified"
-      return 1
-    fi
-  else
-    jira_name=$@
-  fi
-}
-
-jira_query () {
+function jira_query() {
   local verb="$1"
-  local jira_name lookup preposition
-  if [[ "${verb}" = "reported" ]]; then
+  local jira_name lookup preposition query
+  if [[ "${verb}" == "reported" ]]; then
     lookup=reporter
     preposition=by
-  elif [[ "${verb}" = "assigned" ]]; then
+  elif [[ "${verb}" == "assigned" ]]; then
     lookup=assignee
     preposition=to
   else
-    echo "not a valid lookup $verb"
+    echo "not a valid lookup: $verb" >&2
     return 1
   fi
-  shift 1
-  jira_name $@
-  if [[ $? = 1 ]]; then
+  jira_name=${2:=$JIRA_NAME}
+  if [[ -z $jira_name ]]; then
+    echo "JIRA_NAME not specified" >&2
     return 1
   fi
+
   echo "Browsing issues ${verb} ${preposition} ${jira_name}"
-  open_command "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
+  query="${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC"
+  open_command "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${query}"
 }
 
-alias jira='open_jira_issue'
-

From dc42e8d488d7b7b5285e71947940c7d6fb19355b Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Tue, 18 Aug 2015 05:05:54 -0400
Subject: [PATCH 1250/1378] jira: add completion

---
 plugins/jira/_jira           | 21 +++++++++++++++++++++
 plugins/jira/jira.plugin.zsh |  8 ++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 plugins/jira/_jira

diff --git a/plugins/jira/_jira b/plugins/jira/_jira
new file mode 100644
index 000000000..b0ea658e2
--- /dev/null
+++ b/plugins/jira/_jira
@@ -0,0 +1,21 @@
+#compdef jira
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+  'new:create a new issue'
+  'dashboard:open the dashboard'
+  'reported:search for issues reported by a user'
+  'assigned:search for issues assigned to a user'
+)
+
+_arguments -C \
+  ':command:->command' \
+  '*::options:->options'
+
+case $state in
+  (command)
+    _describe -t commands "jira subcommand" _1st_arguments
+    return
+   ;;
+esac
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index a10feec3e..89559767f 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -40,7 +40,7 @@ function jira() {
   elif [[ -n "${JIRA_URL}" ]]; then
     jira_url=${JIRA_URL}
   else
-    jira_url_help
+    _jira_url_help
     return 1
   fi
 
@@ -59,7 +59,7 @@ function jira() {
     echo "Opening new issue"
     open_command "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$action" == "assigned" || "$action" == "reported" ]]; then
-    jira_query $@
+    _jira_query $@
   elif [[ "$action" == "dashboard" ]]; then
     echo "Opening dashboard"
     open_command "${jira_url}/secure/Dashboard.jspa"
@@ -82,7 +82,7 @@ function jira() {
   fi
 }
 
-function jira_url_help() {
+function _jira_url_help() {
   cat << EOF
 JIRA url is not specified anywhere.
 Valid options, in order of precedence:
@@ -92,7 +92,7 @@ Valid options, in order of precedence:
 EOF
 }
 
-function jira_query() {
+function _jira_query() {
   local verb="$1"
   local jira_name lookup preposition query
   if [[ "${verb}" == "reported" ]]; then

From a9daea17d89ae2b7d30dc6e184566ca8104e63d2 Mon Sep 17 00:00:00 2001
From: fgibaux <florent+gh@gibaux.fr>
Date: Tue, 18 Aug 2015 14:19:40 +0200
Subject: [PATCH 1251/1378] plugin symfony2 sf2.7 compatibility fix

with symfony 2.7 command group titles are listed as commands. this commit prevents it.
---
 plugins/symfony2/symfony2.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index e94280ed0..98a2321db 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -5,7 +5,7 @@ _symfony_console () {
 }
 
 _symfony2_get_command_list () {
-   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  ?[a-z]+/ { print $1 }'
+   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  ?[^ ]+ / { print $1 }'
 }
 
 _symfony2 () {

From 7c31c7a96391e80bdd6ebdb6579751f4d44d6ac4 Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Wed, 19 Aug 2015 22:33:41 -0700
Subject: [PATCH 1252/1378] Bring bgnotify plugin up to date with
 t413/zsh-background-notify

Changes include:
- time format now shows h/m/s (only when needed!)
- adds hooks only for interactive connections
- adds specific kde support (via kdialog)
- adds click-action for OS X terminals
---
 plugins/bgnotify/bgnotify.plugin.zsh | 36 ++++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index b70b42f98..f6dd3886c 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -11,31 +11,38 @@ autoload -Uz add-zsh-hook || { print "can't add zsh hook!"; return }
 
 ## definitions ##
 
-if ! (type bgnotify_formatted | grep -q 'function'); then
-  function bgnotify_formatted {
-    ## exit_status, command, elapsed_time
-    [ $1 -eq 0 ] && title="#win (took $3 s)" || title="#fail (took $3 s)"
-    bgnotify "$title" "$2"
+if ! (type bgnotify_formatted | grep -q 'function'); then ## allow custom function override
+  function bgnotify_formatted { ## args: (exit_status, command, elapsed_seconds)
+    elapsed="$(( $3 % 60 ))s"
+    (( $3 >= 60 )) && elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
+    (( $3 >= 3600 )) && elapsed="$(( $3 / 3600 ))h $elapsed"
+    [ $1 -eq 0 ] && bgnotify "#win (took $elapsed)" "$2" || bgnotify "#fail (took $elapsed)" "$2"
   }
 fi
 
 currentWindowId () {
   if hash osascript 2>/dev/null; then #osx
     osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
-  elif hash notify-send 2>/dev/null; then #ubuntu!
-    xprop -root | awk '/NET_ACTIVE_WINDOW/ { print $5; exit }'
+  elif (hash notify-send 2>/dev/null || hash kdialog 2>/dev/null); then #ubuntu!
+    xprop -root 2> /dev/null | awk '/NET_ACTIVE_WINDOW/{print $5;exit} END{exit !$5}' || echo "0"
   else
     echo $EPOCHSECONDS #fallback for windows
   fi
 }
 
-bgnotify () {
+bgnotify () { ## args: (title, subtitle)
   if hash terminal-notifier 2>/dev/null; then #osx
-    terminal-notifier -message "$2" -title "$1"
+    [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2' ||
+    [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] && term_id='com.apple.terminal';
+    ## now call terminal-notifier, (hopefully with $term_id!)
+    [ -z "$term_id" ] && terminal-notifier -message "$2" -title "$1" >/dev/null ||
+    terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m "$1" "$2"
-  elif hash notify-send 2>/dev/null; then #ubuntu!
+  elif hash notify-send 2>/dev/null; then #ubuntu gnome!
     notify-send "$1" "$2"
+  elif hash kdialog 2>/dev/null; then #ubuntu kde!
+    kdialog  -title "$1" --passivepopup  "$2" 5
   elif hash notifu 2>/dev/null; then #cygwyn support!
     notifu /m "$2" /p "$1"
   fi
@@ -46,7 +53,7 @@ bgnotify () {
 
 bgnotify_begin() {
   bgnotify_timestamp=$EPOCHSECONDS
-  bgnotify_lastcmd=$1
+  bgnotify_lastcmd="$1"
   bgnotify_windowid=$(currentWindowId)
 }
 
@@ -63,5 +70,8 @@ bgnotify_end() {
   bgnotify_timestamp=0 #reset it to 0!
 }
 
-add-zsh-hook preexec bgnotify_begin
-add-zsh-hook precmd bgnotify_end
+## only enable if a local (non-ssh) connection
+if [ -z "$SSH_CLIENT" ] && [ -z "$SSH_TTY" ]; then
+  add-zsh-hook preexec bgnotify_begin
+  add-zsh-hook precmd bgnotify_end
+fi

From 1aeebf60a0dd09ba13a08ae0b81d1d44cad7d15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=A0=E6=AD=A3=E4=B8=AD?= <z.ach@outlook.com>
Date: Fri, 21 Aug 2015 14:28:03 +0800
Subject: [PATCH 1253/1378] Update link

---
 plugins/vundle/vundle.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index fa1911477..0f071597a 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -1,13 +1,13 @@
 function vundle-init () {
-  if [ ! -d ~/.vim/bundle/vundle/ ]
+  if [ ! -d ~/.vim/bundle/Vundle.vim/ ]
   then
-    mkdir -p ~/.vim/bundle/vundle/
+    mkdir -p ~/.vim/bundle/Vundle.vim/
   fi
 
-  if [ ! -d ~/.vim/bundle/vundle/.git ] && [ ! -f ~/.vim/bundle/vundle/.git ]
+  if [ ! -d ~/.vim/bundle/Vundle.vim/.git ] && [ ! -f ~/.vim/bundle/Vundle.vim/.git ]
   then
-    git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
-    echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n"
+    git clone git://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+    echo "\n\tRead about vim configuration for vundle at https://github.com/VundleVim/Vundle.vim\n"
   fi
 }
 

From aaf5c8f43f6eee141b9ea4b85b4e1097db4a1770 Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <loctauxphilippe@users.noreply.github.com>
Date: Fri, 21 Aug 2015 16:05:54 +0200
Subject: [PATCH 1254/1378] added apt-get autoremove in ubuntu plugin

I use that command a lot of times, and there's no shortcut for that.
Now it does :)
---
 plugins/ubuntu/ubuntu.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 0211d3374..a1a5016c7 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -3,6 +3,7 @@
 # https://github.com/dbb
 # https://github.com/Mappleconfusers
 # Nicolas Jonas nextgenthemes.com
+# https://github.com/loctauxphilippe
 #
 # Debian, Ubuntu and friends related zsh aliases and functions for zsh
 
@@ -38,6 +39,7 @@ alias agu='sudo apt-get update'   # ad
 alias agud='sudo apt-get update && sudo apt-get dist-upgrade' #adu
 alias agug='sudo apt-get upgrade' # ag
 alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
+alias agar='sudo apt-get autoremove'
 
 compdef _ag ag='sudo apt-get'
 compdef _aga aga='sudo apt-get autoclean'
@@ -51,6 +53,7 @@ compdef _agu agu='sudo apt-get update'
 compdef _agud agud='sudo apt-get update && sudo apt-get dist-upgrade'
 compdef _agug agug='sudo apt-get upgrade'
 compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade'
+compdef _agar agar='sudo apt-get autoremove'
 
 # Remove ALL kernel images and headers EXCEPT the one in use
 alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \

From 76f4871d4e65a8d114055c765ed026ebadd5079d Mon Sep 17 00:00:00 2001
From: Dawid Ferenczy <dawid@ferenczy.cz>
Date: Tue, 25 Aug 2015 18:07:47 +0200
Subject: [PATCH 1255/1378] Added missing commands to Vagrant plugin, updated
 commands description

---
 plugins/vagrant/_vagrant | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 76f80b0d7..764f89545 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -1,4 +1,4 @@
-#compdef vagrant 
+#compdef vagrant
 #autoload
 
 # vagrant zsh completion
@@ -6,37 +6,45 @@
 local -a _1st_arguments
 _1st_arguments=(
     'box:Box commands'
-    'connect:Connects to a shared, remote Vagrant environment'
+    'connect:Connects to a remotely shared Vagrant environment'
     'destroy:Destroys the vagrant environment'
-    'docker-logs:Shows Docker logs'
-    'docker-run:Run one-off commands against a Docker container'
+    'docker-logs:Outputs the logs from the Docker container'
+    'docker-run:Run a one-off command in the context of a container'
     'global-status:Reports the status of all active Vagrant environments on the system'
     'halt:Halts the currently running vagrant environment'
+    'help:Shows the help for a subcommand'
     'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
+    'list-commands:Outputs all available Vagrant subcommands, even non-primary ones'
     'login:Authenticates against a Vagrant Cloud server to access protected boxes'
     'package:Packages a vagrant environment for distribution'
     'plugin:Plugin commands'
     'provision:Run the provisioner'
+    'push:Deploys code in this environment to a configured destination'
+    'rdp:Connects to machine via RDP'
     'reload:Reload the vagrant environment'
     'resume:Resumes a suspend vagrant environment'
-    'share:Shares the Vagrant environment and allows remote access'
+    'rsync:Syncs rsync synced folders to remote machine'
+    'rsync-auto:Syncs rsync synced folders automatically when files change'
+    'share:Shares your Vagrant environment with anyone in the world'
     'ssh:SSH into the currently running environment'
-    'ssh-config:outputs .ssh/config valid syntax for connecting to this environment via ssh'
+    'ssh-config:Outputs .ssh/config valid syntax for connecting to this environment via ssh'
     'status:Shows the status of the current Vagrant environment'
     'suspend:Suspends the currently running vagrant environment'
     'up:Creates the vagrant environment'
-    'version:Prints the currently installed Vagrant version and checks for new updates'
+    'version:Prints current and latest Vagrant version'
     '--help:[TASK] Describe available tasks or one specific task'
     '--version:Prints the Vagrant version information'
 )
 
 local -a _box_arguments
 _box_arguments=(
-    'add:NAME URI Add a box to the system'
-    'help:COMMAND Describe subcommands or one specific subcommand'
+    'add:ADDRESS Adds a box to the system'
+    'help:COMMAND List subcommands'
     'list:Lists all installed boxes'
-    'remove:NAME Remove a box from the system'
-    'repackage:NAME Repackage an installed box into a `.box` file.'
+    'outdated:Checks if a box has newer version'
+    'remove:NAME Removes a box from the system'
+    'repackage:NAME PROVIDER VERSION Repackages an installed box into a `.box` file'
+    'update:Updates box to a newer version, if available'
 )
 
 __task_list ()
@@ -78,7 +86,7 @@ __vagrant-box ()
        (options)
            case $line[1] in
                (repackage|remove)
-                   _arguments ':feature:__box_list' 
+                   _arguments ':feature:__box_list'
                ;;
            esac
        ;;
@@ -107,14 +115,14 @@ case $state in
   (options)
     case $line[1] in
       (help)
-         _arguments ':feature:__task_list' 
+         _arguments ':feature:__task_list'
       ;;
 
       (box)
           __vagrant-box
       ;;
       (up|provision|package|destroy|reload|ssh|ssh-config|halt|resume|status)
-	_arguments ':feature:__vm_list'
+      _arguments ':feature:__vm_list'
     esac
   ;;
 esac

From 1bf5c587a5183f111538bf0879fbc75892988b8e Mon Sep 17 00:00:00 2001
From: Hans Chen <contact@hanschen.org>
Date: Tue, 25 Aug 2015 17:05:28 -0400
Subject: [PATCH 1256/1378] Update autojump plugin for latest brew installation

---
 plugins/autojump/autojump.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 4cf036401..c05c699e1 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -15,7 +15,7 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /usr/local/share/autojump/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
-  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew
-    . `brew --prefix`/etc/autojump.zsh
+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
+    . `brew --prefix`/etc/autojump.sh
   fi
 fi

From 8ab1b6d0fd94d150735d170bb246bccd563937ad Mon Sep 17 00:00:00 2001
From: "G. Kay Lee" <balancetraveller+github@gmail.com>
Date: Wed, 26 Aug 2015 12:04:28 +0800
Subject: [PATCH 1257/1378] Update README.markdown

Fix typo
---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index d4d3fdbaf..183e67742 100644
--- a/README.markdown
+++ b/README.markdown
@@ -65,7 +65,7 @@ Once you find a theme that you want to use, you will need to edit the `~/.zshrc`
 ZSH_THEME="robbyrussell"
 ```
 
-To use a different theme, simple change the value to match the name of your desired theme. For example:
+To use a different theme, simply change the value to match the name of your desired theme. For example:
 
 ```shell
 ZSH_THEME="agnoster" # (this is one of the fancy ones)

From a127c4f88e9807c9d5ac58f5424dfc479370c227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Maggioni?= <nicco.maggioni@gmail.com>
Date: Wed, 26 Aug 2015 10:48:01 +0200
Subject: [PATCH 1258/1378] 'ip' command compatibility and much quicker
 external IP detection

---
 plugins/systemadmin/systemadmin.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 4ae70dfa7..f6641b273 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -140,12 +140,16 @@ d0() {
 
 # gather external ip address
 geteip() {
-    curl http://ifconfig.me
+    echo "$(curl -s -S http://ipecho.net/plain)"
 }
 
 # determine local IP address
 getip() {
-    ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
+    if [ "$(which ip)" != "" ]; then
+        ip addr | grep "inet " | grep -v '127.0.0.1' | awk '{print $2}'
+    else
+        ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'
+    fi
 }
 
 # Clear zombie processes

From 058bbe4f02be67102871d82de6aa194e6b865cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Maggioni?= <nicco.maggioni@gmail.com>
Date: Wed, 26 Aug 2015 10:54:08 +0200
Subject: [PATCH 1259/1378] General compatibility

---
 plugins/systemadmin/systemadmin.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index f6641b273..5618ba8f1 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -145,7 +145,7 @@ geteip() {
 
 # determine local IP address
 getip() {
-    if [ "$(which ip)" != "" ]; then
+    if [ $(hash | grep '^ip=') ]; then
         ip addr | grep "inet " | grep -v '127.0.0.1' | awk '{print $2}'
     else
         ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'

From 241be2d28b41293f163c4be75bb122975c2eacd9 Mon Sep 17 00:00:00 2001
From: Robin Daugherty <robin@robindaugherty.net>
Date: Wed, 26 Aug 2015 13:24:59 -0400
Subject: [PATCH 1260/1378] Fix rand-quote failure when site is unreachable

This plugin was designed so that if there is any failure, it will simply call itself recursively. Which means that if you were working offline, if `quote` was called in your `.zshrc`, you would be unable to open a new terminal session.

I fixed this by allowing the plugin to output nothing if a quote could not be fetched.
---
 plugins/rand-quote/rand-quote.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index c3bf6234e..3c9722a73 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -18,8 +18,8 @@ if [[ -x `which curl` ]]; then
         W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
         if [ "$W" -a "$TXT" ]; then
           echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}"
-        else
-          quote
+        # else
+        #   quote
         fi
     }
     #quote

From 96aefd2b98e5a646573a0ad6394f6ca0276facf1 Mon Sep 17 00:00:00 2001
From: Robin Daugherty <robin@robindaugherty.net>
Date: Wed, 26 Aug 2015 14:12:38 -0400
Subject: [PATCH 1261/1378] Remove code, not comment it out

Gaaah.
---
 plugins/rand-quote/rand-quote.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index 3c9722a73..8f345d9aa 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -18,8 +18,6 @@ if [[ -x `which curl` ]]; then
         W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
         if [ "$W" -a "$TXT" ]; then
           echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}"
-        # else
-        #   quote
         fi
     }
     #quote

From d923cebdb34c373597d6f11a0e57e4b73f9f53f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niccol=C3=B2=20Maggioni?= <nicco.maggioni@gmail.com>
Date: Thu, 27 Aug 2015 11:34:53 +0200
Subject: [PATCH 1262/1378] Updated with @mcornella suggestions

---
 plugins/systemadmin/systemadmin.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 5618ba8f1..8c2633355 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -140,12 +140,12 @@ d0() {
 
 # gather external ip address
 geteip() {
-    echo "$(curl -s -S http://ipecho.net/plain)"
+    curl -s -S https://icanhazip.com
 }
 
 # determine local IP address
 getip() {
-    if [ $(hash | grep '^ip=') ]; then
+    if (( ${+commands[ip]} )); then
         ip addr | grep "inet " | grep -v '127.0.0.1' | awk '{print $2}'
     else
         ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'

From fe92ea98e0633784508e85d6b756b1c3f667b2a4 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Tue, 18 Aug 2015 03:01:21 -0400
Subject: [PATCH 1263/1378] installer: switch twitter link to https

---
 tools/install.sh | 4 ++--
 tools/upgrade.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 8ff1219b0..beec750c3 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -4,7 +4,7 @@ set -e
 # supports them.
 ncolors=$(tput colors)
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-  RED=="$(tput setaf 1)"
+  RED="$(tput setaf 1)"
   GREEN="$(tput setaf 2)"
   YELLOW="$(tput setaf 3)"
   BLUE="$(tput setaf 4)"
@@ -70,7 +70,7 @@ echo ''
 echo ''
 echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
 echo ''
-echo 'p.s. Follow us at http://twitter.com/ohmyzsh.'
+echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
 echo ''
 echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
 echo ''
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 4929054c9..59b380116 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -30,7 +30,7 @@ then
   printf '%s\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
   printf '%s\n' '                        /____/                       '
   printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
-  printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: http://twitter.com/ohmyzsh"
+  printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
   printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at:  http://shop.planetargon.com/"
 else
   printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'

From 0a2c31fb60ab9870f3a2090eba10d0bdbcc9a3b9 Mon Sep 17 00:00:00 2001
From: MoonFruit <dkmoonfruit@gmail.com>
Date: Fri, 28 Aug 2015 10:46:45 +0800
Subject: [PATCH 1264/1378] Remove redundant semicolon

Remove redundant semicolon to make tab() works better in ITerm 2.
---
 plugins/osx/osx.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index a6e3a83e6..390960fdc 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -6,7 +6,7 @@
 # ------------------------------------------------------------------------------
 
 function tab() {
-  local command="cd \\\"$PWD\\\"; clear; "
+  local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
   the_app=$(

From acf6039ff391cd868814d5df714fb26339f1009b Mon Sep 17 00:00:00 2001
From: cxbig <i@cxbig.info>
Date: Sat, 29 Aug 2015 01:35:41 +0200
Subject: [PATCH 1265/1378] improved alias conflict between git flow & git
 fetch

---
 plugins/git-flow/git-flow.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 4357c0895..444440bcb 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -21,7 +21,7 @@
 #
 
 #Alias
-alias gf='git flow'
+alias gfl='git flow'
 alias gcd='git checkout develop'
 alias gch='git checkout hotfix'
 alias gcr='git checkout release'

From 0a80889848ccb3ada94dd2fdb793a01a268f7a16 Mon Sep 17 00:00:00 2001
From: Will Mendes <willmendesneto@gmail.com>
Date: Sat, 29 Aug 2015 11:48:28 -0300
Subject: [PATCH 1266/1378] Frontend-search: add search in npm website

---
 plugins/frontend-search/README.md                  | 2 ++
 plugins/frontend-search/_frontend-search.sh        | 4 ++++
 plugins/frontend-search/frontend-search.plugin.zsh | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index 801d450f3..b8e96ea4a 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -43,6 +43,7 @@ The search content are
 * `reactjs <google.com/search?as_q=<search-term>&as_sitesearch=facebook.github.io/react>`
 * `emberjs <emberjs.com>`
 * `stackoverflow <stackoverflow.com>`
+* `npmjs <npmjs.com>`
 
 
 ## Aliases ##
@@ -69,6 +70,7 @@ There are a few aliases presented as well:
 * `reactjs` A shorthand for `frontend reactjs`
 * `emberjs` A shorthand for `frontend emberjs`
 * `stackoverflow` A shorthand for `frontend stackoverflow`
+* `npmjs` A shorthand for `frontend npmjs`
 
 
 ## Author
diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend-search.sh
index 252f21570..b12f829a1 100644
--- a/plugins/frontend-search/_frontend-search.sh
+++ b/plugins/frontend-search/_frontend-search.sh
@@ -37,6 +37,7 @@ function _frontend() {
     'reactjs: Search in React website'
     'emberjs: Search in Ember website'
     'stackoverflow: Search in StackOverflow website'
+    'npmjs: Search in NPMJS website'
   )
 
   _arguments -C \
@@ -110,6 +111,9 @@ function _frontend() {
         stackoverflow)
           _describe -t points "Warp points" frontend_points && ret=0
           ;;
+        npmjs)
+          _describe -t points "Warp points" frontend_points && ret=0
+          ;;
       esac
       ;;
   esac
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index f7485621b..e47735a60 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -9,7 +9,7 @@ function frontend() {
   fi
 
   # check whether the search engine is supported
-  if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs|stackoverflow)' ]];
+  if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs|stackoverflow|npmjs)' ]];
   then
     echo "Search valid search content $1 not supported."
     echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')"
@@ -33,6 +33,7 @@ function frontend() {
     echo "* reactjs"
     echo "* emberjs"
     echo "* stackoverflow"
+    echo "* npmjs"
     echo ""
 
     return 1
@@ -99,6 +100,9 @@ function frontend() {
     "stackoverflow")
       url="${url}stackoverflow.com"
       url="${url}/search?q=$2" ;;
+    "npmjs")
+      url="${url}www.npmjs.com"
+      url="${url}/search?q=$2" ;;
     *) echo "INVALID PARAM!"
        return ;;
   esac
@@ -148,3 +152,4 @@ alias emberjs='frontend emberjs'
 
 # search websites
 alias stackoverflow='frontend stackoverflow'
+alias npmjs='frontend npmjs'

From 69f098a63cf32fa13556de328971254addaae309 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 30 Aug 2015 21:58:52 -0700
Subject: [PATCH 1267/1378] Mentioning that you can set the theme to 'random'
 and it'll possibly bake you a pie.

---
 README.markdown | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.markdown b/README.markdown
index 183e67742..a29df81ab 100644
--- a/README.markdown
+++ b/README.markdown
@@ -77,6 +77,14 @@ Open up a new terminal window and your prompt should look something like...
 
 In case you did not find a suitable theme for your needs, please have a look at the wiki for [more of them](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes).
 
+If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
+
+
+```shell
+ZSH_THEME="random" # (...please let it be pie... please be some pie..)
+```
+
+
 ## Advanced Topics
 
 If you're the type that likes to get their hands dirty, these sections might resonate.

From 022a060ec754f3ed54cb62acc3370310bfe71a50 Mon Sep 17 00:00:00 2001
From: kyleheyne <kyleheyne@gmail.com>
Date: Mon, 31 Aug 2015 17:36:41 -0400
Subject: [PATCH 1268/1378] thefuck-alias -> thefuck --alias

Per warning message.
---
 plugins/thefuck/thefuck.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index 8b1746e85..765e2b9a5 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -4,7 +4,7 @@ if [[ -z $commands[thefuck] ]]; then
 fi
 
 # Register alias
-eval "$(thefuck-alias)"
+eval "$(thefuck --alias)"
 
 fuck-command-line() {
     local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"

From 7f64092361472e12de85f945884445e0e2274846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 1 Sep 2015 19:07:49 +0200
Subject: [PATCH 1269/1378] [vim-interaction plugin] Escaping special chars in
 file names and simplifying code.

---
 .../vim-interaction.plugin.zsh                | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index b0b9414cd..b774be342 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -4,17 +4,6 @@
 # Derek Wyatt (derek@{myfirstnamemylastname}.org
 # 
 
-function resolveFile
-{
-  if [ -f "$1" ]; then
-    echo $(readlink -f "$1")
-  elif [[ "${1#/}" == "$1" ]]; then
-    echo "$PWD/$1"
-  else
-    echo $1
-  fi
-}
-
 function callvim
 {
   if [[ $# == 0 ]]; then
@@ -48,13 +37,10 @@ EOH
   if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
     before="$before<cr>"
   fi
-  local files=""
-  for f in $@
-  do
-    files="$files $(resolveFile $f)"
-  done
-  if [[ -n $files ]]; then
-    files=':args! '"$files<cr>"
+  local files
+  if [[ $# -gt 0 ]]; then
+    # absolute path of files resolving symlinks (:A) and quoting special chars (:q)
+    files=':args! '"${@:A:q}<cr>"
   fi
   cmd="$before$files$after"
   gvim --remote-send "$cmd"

From f1472f1f6462d391a14ec80157365500f7a11b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 30 Aug 2015 00:09:15 +0200
Subject: [PATCH 1270/1378] Simplify frontend-search function with assoc array

Also adds the lodash URL (which was missing) and uses https on those websites
that support it.
---
 .../frontend-search.plugin.zsh                | 100 ++++++------------
 1 file changed, 32 insertions(+), 68 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index e47735a60..3afc3336d 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -1,6 +1,33 @@
 # frontend from terminal
 
 function frontend() {
+  emulate -L zsh
+
+  # define search content URLS
+  typeset -A urls
+  urls=(
+    angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
+    aurajs         'http://aurajs.com/api/#stq='
+    bem            'https://google.com/search?as_sitesearch=bem.info&as_q='
+    bootsnipp      'http://bootsnipp.com/search?q='
+    caniuse        'http://caniuse.com/#search='
+    codepen        'http://codepen.io/search?q='
+    compass        'http://compass-style.org/search?q='
+    cssflow        'http://www.cssflow.com/search?q='
+    dartlang       'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:'
+    emberjs        'http://emberjs.com/api/#stp=1&stq='
+    fontello       'http://fontello.com/#search='
+    html5please    'http://html5please.com/#'
+    jquery         'https://api.jquery.com/?s='
+    lodash         'https://devdocs.io/lodash/index#'
+    mdn            'https://developer.mozilla.org/search?q='
+    npmjs          'https://www.npmjs.com/search?q='
+    qunit          'https://api.qunitjs.com/?s='
+    reactjs        'https://google.com/search?as_sitesearch=facebook.github.io/react&as_q='
+    smacss         'https://google.com/search?as_sitesearch=smacss.com&as_q='
+    stackoverflow  'http://stackoverflow.com/search?q='
+    unheap         'http://www.unheap.com/?s='
+  )
 
   # no keyword provided, simply show how call methods
   if [[ $# -le 1 ]]; then
@@ -9,7 +36,7 @@ function frontend() {
   fi
 
   # check whether the search engine is supported
-  if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs|stackoverflow|npmjs)' ]];
+  if [[ -z "$urls[$1]" ]]; then
   then
     echo "Search valid search content $1 not supported."
     echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')"
@@ -39,73 +66,10 @@ function frontend() {
     return 1
   fi
 
-  local url="http://"
-  local query=""
-
-  case "$1" in
-    "jquery")
-      url="${url}api.jquery.com"
-      url="${url}/?s=$2" ;;
-    "mdn")
-      url="${url}developer.mozilla.org"
-      url="${url}/search?q=$2" ;;
-    "compass")
-      url="${url}compass-style.org"
-      url="${url}/search?q=$2" ;;
-    "html5please")
-      url="${url}html5please.com"
-      url="${url}/#$2" ;;
-    "caniuse")
-      url="${url}caniuse.com"
-      url="${url}/#search=$2" ;;
-    "aurajs")
-      url="${url}aurajs.com"
-      url="${url}/api/#stq=$2" ;;
-    "dartlang")
-      url="${url}api.dartlang.org/apidocs/channels/stable/dartdoc-viewer"
-      url="${url}/dart-$2" ;;
-    "qunit")
-      url="${url}api.qunitjs.com"
-      url="${url}/?s=$2" ;;
-    "fontello")
-      url="${url}fontello.com"
-      url="${url}/#search=$2" ;;
-    "bootsnipp")
-      url="${url}bootsnipp.com"
-      url="${url}/search?q=$2" ;;
-    "cssflow")
-      url="${url}cssflow.com"
-      url="${url}/search?q=$2" ;;
-    "codepen")
-      url="${url}codepen.io"
-      url="${url}/search?q=$2" ;;
-    "unheap")
-      url="${url}www.unheap.com"
-      url="${url}/?s=$2" ;;
-    "bem")
-      url="${url}google.com"
-      url="${url}/search?as_q=$2&as_sitesearch=bem.info" ;;
-    "smacss")
-      url="${url}google.com"
-      url="${url}/search?as_q=$2&as_sitesearch=smacss.com" ;;
-    "angularjs")
-      url="${url}google.com"
-      url="${url}/search?as_q=$2&as_sitesearch=angularjs.org" ;;
-    "reactjs")
-      url="${url}google.com"
-      url="${url}/search?as_q=$2&as_sitesearch=facebook.github.io/react" ;;
-    "emberjs")
-      url="${url}emberjs.com"
-      url="${url}/api/#stq=$2&stp=1" ;;
-    "stackoverflow")
-      url="${url}stackoverflow.com"
-      url="${url}/search?q=$2" ;;
-    "npmjs")
-      url="${url}www.npmjs.com"
-      url="${url}/search?q=$2" ;;
-    *) echo "INVALID PARAM!"
-       return ;;
-  esac
+  # build search url:
+  # join arguments passed with '+', then append to search engine URL
+  # TODO substitute for proper urlencode method
+  url="${urls[$1]}${(j:+:)@[2,-1]}"
 
   echo "$url"
 

From ff706f3ef8fd632d93e2c347d32c62f15b17c25c Mon Sep 17 00:00:00 2001
From: willmendesneto <willmendesneto@gmail.com>
Date: Thu, 3 Jul 2014 22:53:00 -0300
Subject: [PATCH 1271/1378] Add "help" method in "frontend-search" plugin

---
 plugins/frontend-search/README.md             |  9 ++++++-
 .../frontend-search.plugin.zsh                | 26 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index b8e96ea4a..bf8a4bc08 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -17,9 +17,16 @@ plugins=( <your-plugins-list>... frontend-search)
 
 ## Commands ##
 
-All command searches are accept only in format
+All command searches are accept only in formats
 
 * `frontend <search-content> <search-term>`
+* `<search-content> <search-term>`
+
+For more informations, please run help command (are similars)
+
+* `frontend -h`
+* `frontend --help`
+* `frontend help`
 
 The search content are
 
diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 3afc3336d..08930ddcd 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -29,14 +29,36 @@ function frontend() {
     unheap         'http://www.unheap.com/?s='
   )
 
+  # show help for commands list
+  if [[ $1 =~ '(help|--help|-h)' ]]
+  then
+      echo "Usage:"
+      echo "\n\tfrontend <search-content>\n\t<search-content>\n\tfrontend <search-content> <search-term>"
+      echo ""
+      echo "Where <search-content> is one of:"
+      echo "jquery, mdn, compass, html5please, caniuse, aurajs, dartlang, qunit, fontello,"
+      echo "bootsnipp, cssflow, codepen, unheap, bem, smacss, angularjs, reactjs, emberjs"
+      echo "help"
+      echo ""
+      echo "Where <search-term> is a term to search in allowed repositories"
+      echo ""
+      echo "frontend --help       show plugin help"
+      echo "frontend -h           show plugin help"
+      echo ""
+      echo "It is allowed to directly access all search contents."
+      echo ""
+      return 1
+  fi
+
   # no keyword provided, simply show how call methods
-  if [[ $# -le 1 ]]; then
+  if [[ $# -le 1 ]]
+  then
     echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n"
     return 1
   fi
 
   # check whether the search engine is supported
-  if [[ -z "$urls[$1]" ]]; then
+  if [[ -z "$urls[$1]" ]]
   then
     echo "Search valid search content $1 not supported."
     echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')"

From 663ac56d54d252b9de7c76346bd64a14340a51f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 31 Aug 2015 18:49:05 +0200
Subject: [PATCH 1272/1378] Prettify frontend help output and clean up logic

---
 .../frontend-search.plugin.zsh                | 79 ++++++-------------
 1 file changed, 24 insertions(+), 55 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 08930ddcd..6eb1fed2b 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -1,9 +1,7 @@
-# frontend from terminal
-
 function frontend() {
   emulate -L zsh
 
-  # define search content URLS
+  # define search context URLS
   typeset -A urls
   urls=(
     angularjs      'https://google.com/search?as_sitesearch=angularjs.org&as_q='
@@ -29,74 +27,45 @@ function frontend() {
     unheap         'http://www.unheap.com/?s='
   )
 
-  # show help for commands list
-  if [[ $1 =~ '(help|--help|-h)' ]]
+  # show help for command list
+  if [[ $# -lt 2 ]]
   then
-      echo "Usage:"
-      echo "\n\tfrontend <search-content>\n\t<search-content>\n\tfrontend <search-content> <search-term>"
-      echo ""
-      echo "Where <search-content> is one of:"
-      echo "jquery, mdn, compass, html5please, caniuse, aurajs, dartlang, qunit, fontello,"
-      echo "bootsnipp, cssflow, codepen, unheap, bem, smacss, angularjs, reactjs, emberjs"
-      echo "help"
-      echo ""
-      echo "Where <search-term> is a term to search in allowed repositories"
-      echo ""
-      echo "frontend --help       show plugin help"
-      echo "frontend -h           show plugin help"
-      echo ""
-      echo "It is allowed to directly access all search contents."
-      echo ""
+      print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
+      print -P ""
+      print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
+      print -P "and %Ucontext%u is one of the following:"
+      print -P ""
+      print -P "  angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compass, cssflow,"
+      print -P "  dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs,"
+      print -P "  qunit, reactjs, smacss, stackoverflow, unheap"
+      print -P ""
+      print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
+      print -P ""
       return 1
   fi
 
-  # no keyword provided, simply show how call methods
-  if [[ $# -le 1 ]]
-  then
-    echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n"
-    return 1
-  fi
-
-  # check whether the search engine is supported
+  # check whether the search context is supported
   if [[ -z "$urls[$1]" ]]
   then
-    echo "Search valid search content $1 not supported."
-    echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')"
-    echo "* jquery"
-    echo "* mdn"
-    echo "* compass"
-    echo "* html5please"
-    echo "* caniuse"
-    echo "* aurajs"
-    echo "* dartlang"
-    echo "* lodash"
-    echo "* qunit"
-    echo "* fontello"
-    echo "* bootsnipp"
-    echo "* cssflow"
-    echo "* codepen"
-    echo "* unheap"
-    echo "* bem"
-    echo "* smacss"
-    echo "* angularjs"
-    echo "* reactjs"
-    echo "* emberjs"
-    echo "* stackoverflow"
-    echo "* npmjs"
+    echo "Search context \"$1\" currently not supported."
+    echo ""
+    echo "Valid contexts are:"
+    echo ""
+    echo "  angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compass, cssflow, "
+    echo "  dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs,  "
+    echo "  qunit, reactjs, smacss, stackoverflow, unheap"
     echo ""
-
     return 1
   fi
 
   # build search url:
-  # join arguments passed with '+', then append to search engine URL
+  # join arguments passed with '+', then append to search context URL
   # TODO substitute for proper urlencode method
   url="${urls[$1]}${(j:+:)@[2,-1]}"
 
-  echo "$url"
+  echo "Opening $url ..."
 
   open_command "$url"
-
 }
 
 # javascript

From d982e1200f1f14fa4487a45c8af4e18834092ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 31 Aug 2015 19:12:05 +0200
Subject: [PATCH 1273/1378] Reorder alias definitions

---
 .../frontend-search.plugin.zsh                | 63 +++++++------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 6eb1fed2b..2fd5416b3 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -1,3 +1,25 @@
+alias angularjs='frontend angularjs'
+alias aurajs='frontend aurajs'
+alias bem='frontend bem'
+alias bootsnipp='frontend bootsnipp'
+alias caniuse='frontend caniuse'
+alias codepen='frontend codepen'
+alias compass='frontend compass'
+alias cssflow='frontend cssflow'
+alias dartlang='frontend dartlang'
+alias emberjs='frontend emberjs'
+alias fontello='frontend fontello'
+alias html5please='frontend html5please'
+alias jquery='frontend jquery'
+alias lodash='frontend lodash'
+alias mdn='frontend mdn'
+alias npmjs='frontend npmjs'
+alias qunit='frontend qunit'
+alias reactjs='frontend reactjs'
+alias smacss='frontend smacss'
+alias stackoverflow='frontend stackoverflow'
+alias unheap='frontend unheap'
+
 function frontend() {
   emulate -L zsh
 
@@ -67,44 +89,3 @@ function frontend() {
 
   open_command "$url"
 }
-
-# javascript
-alias jquery='frontend jquery'
-alias mdn='frontend mdn'
-
-# pre processors frameworks
-alias compassdoc='frontend compass'
-
-# important links
-alias html5please='frontend html5please'
-alias caniuse='frontend caniuse'
-
-# components and libraries
-alias aurajs='frontend aurajs'
-alias dartlang='frontend dartlang'
-alias lodash='frontend lodash'
-
-#tests
-alias qunit='frontend qunit'
-
-#fonts
-alias fontello='frontend fontello'
-
-# snippets
-alias bootsnipp='frontend bootsnipp'
-alias cssflow='frontend cssflow'
-alias codepen='frontend codepen'
-alias unheap='frontend unheap'
-
-# css architecture
-alias bem='frontend bem'
-alias smacss='frontend smacss'
-
-# frameworks
-alias angularjs='frontend angularjs'
-alias reactjs='frontend reactjs'
-alias emberjs='frontend emberjs'
-
-# search websites
-alias stackoverflow='frontend stackoverflow'
-alias npmjs='frontend npmjs'

From c481c62bc996cfe22417621dfd96c4267eb1e740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 31 Aug 2015 19:17:16 +0200
Subject: [PATCH 1274/1378] Refactor and clear up README file

---
 plugins/frontend-search/README.md | 107 ++++++++++++------------------
 1 file changed, 41 insertions(+), 66 deletions(-)

diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md
index bf8a4bc08..d0bc5589f 100644
--- a/plugins/frontend-search/README.md
+++ b/plugins/frontend-search/README.md
@@ -1,83 +1,60 @@
-## Rationale ##
+## Introduction ##
 
-> Searches for your Frontend contents more easier
+> Searches for your frontend web development made easier
 
 
-## Instalation ##
+## Installation ##
 
+Open your `~/.zshrc` file and enable the `frontend-search` plugin:
 
-Open your `.zshrc` file and load `frontend-search` plugin
+```zsh
+
+plugins=( ... frontend-search)
 
-```bash
-...
-plugins=( <your-plugins-list>... frontend-search)
-...
 ```
 
 
-## Commands ##
+## Usage ##
 
-All command searches are accept only in formats
+You can use the frontend-search plugin in these two forms:
 
-* `frontend <search-content> <search-term>`
-* `<search-content> <search-term>`
+* `frontend <context> <term> [more terms if you want]`
+* `<context> <term> [more terms if you want]`
 
-For more informations, please run help command (are similars)
+For example, these two are equivalent:
 
-* `frontend -h`
-* `frontend --help`
-* `frontend help`
+```zsh
+$ frontend angularjs dependency injection
+$ angularjs dependency injection
+```
 
-The search content are
+Available search contexts are:
 
-* `jquery <api.jquery.com>`
-* `mdn <developer.mozilla.org>`
-* `compass <compass-style.org>`
-* `html5please <html5please.com>`
-* `caniuse <caniuse.com>`
-* `aurajs <aurajs.com>`
-* `dartlang <api.dartlang.org/apidocs/channels/stable/dartdoc-viewer>`
-* `lodash <search>`
-* `qunit <api.qunitjs.com>`
-* `fontello <fontello.com>`
-* `bootsnipp <bootsnipp.com>`
-* `cssflow <cssflow.com>`
-* `codepen <codepen.io>`
-* `unheap <www.unheap.com>`
-* `bem <google.com/search?as_q=<search-term>&as_sitesearch=bem.info>`
-* `smacss <google.com/search?as_q=<search-term>&as_sitesearch=smacss.com>`
-* `angularjs <google.com/search?as_q=<search-term>&as_sitesearch=angularjs.org>`
-* `reactjs <google.com/search?as_q=<search-term>&as_sitesearch=facebook.github.io/react>`
-* `emberjs <emberjs.com>`
-* `stackoverflow <stackoverflow.com>`
-* `npmjs <npmjs.com>`
+| context       | URL                                                                      |
+|---------------|--------------------------------------------------------------------------|
+| angularjs     | `https://google.com/search?as_sitesearch=angularjs.org&as_q=`            |
+| aurajs        | `http://aurajs.com/api/#stq=`                                            |
+| bem           | `https://google.com/search?as_sitesearch=bem.info&as_q=`                 |
+| bootsnipp     | `http://bootsnipp.com/search?q=`                                         |
+| caniuse       | `http://caniuse.com/#search=`                                            |
+| codepen       | `http://codepen.io/search?q=`                                            |
+| compass       | `http://compass-style.org/search?q=`                                     |
+| cssflow       | `http://www.cssflow.com/search?q=`                                       |
+| dartlang      | `https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:`  |
+| emberjs       | `http://emberjs.com/api/#stp=1&stq=`                                     |
+| fontello      | `http://fontello.com/#search=`                                           |
+| html5please   | `http://html5please.com/#`                                               |
+| jquery        | `https://api.jquery.com/?s=`                                             |
+| lodash        | `https://devdocs.io/lodash/index#`                                       |
+| mdn           | `https://developer.mozilla.org/search?q=`                                |
+| npmjs         | `https://www.npmjs.com/search?q=`                                        |
+| qunit         | `https://api.qunitjs.com/?s=`                                            |
+| reactjs       | `https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=` |
+| smacss        | `https://google.com/search?as_sitesearch=smacss.com&as_q=`               |
+| stackoverflow | `http://stackoverflow.com/search?q=`                                     |
+| unheap        | `http://www.unheap.com/?s=`                                              |
 
-
-## Aliases ##
-
-There are a few aliases presented as well:
-
-* `jquery` A shorthand for `frontend jquery`
-* `mdn` A shorthand for `frontend mdn`
-* `compass` A shorthand for `frontend compass`
-* `html5please` A shorthand for `frontend html5please`
-* `caniuse` A shorthand for `frontend caniuse`
-* `aurajs` A shorthand for `frontend aurajs`
-* `dartlang` A shorthand for `frontend dartlang`
-* `lodash` A shorthand for `frontend lodash`
-* `qunit` A shorthand for `frontend qunit`
-* `fontello` A shorthand for `frontend fontello`
-* `bootsnipp` A shorthand for `frontend bootsnipp`
-* `cssflow` A shorthand for `frontend cssflow`
-* `codepen` A shorthand for `frontend codepen`
-* `unheap` A shorthand for `frontend unheap`
-* `bem` A shorthand for `frontend bem`
-* `smacss` A shorthand for `frontend smacss`
-* `angularjs` A shorthand for `frontend angularjs`
-* `reactjs` A shorthand for `frontend reactjs`
-* `emberjs` A shorthand for `frontend emberjs`
-* `stackoverflow` A shorthand for `frontend stackoverflow`
-* `npmjs` A shorthand for `frontend npmjs`
+If you want to have another context, open an Issue and tell us!
 
 
 ## Author
@@ -86,5 +63,3 @@ There are a few aliases presented as well:
 + <https://plus.google.com/+WilsonMendes>
 + <https://twitter.com/willmendesneto>
 + <http://github.com/willmendesneto>
-
-New features comming soon.

From b08431ff7431528f0e9dc49ceb199be2226266dc Mon Sep 17 00:00:00 2001
From: Andy Blyler <andy@blyler.cc>
Date: Tue, 1 Sep 2015 23:08:41 -0400
Subject: [PATCH 1275/1378] Add codeclimate autocomplete plugin

---
 plugins/codeclimate/_codeclimate | 82 ++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 plugins/codeclimate/_codeclimate

diff --git a/plugins/codeclimate/_codeclimate b/plugins/codeclimate/_codeclimate
new file mode 100644
index 000000000..fd2536a34
--- /dev/null
+++ b/plugins/codeclimate/_codeclimate
@@ -0,0 +1,82 @@
+#compdef codeclimate
+
+_codeclimate_all_engines() {
+  engines_all=(`codeclimate engines:list | tail -n +2 | gawk '{ print $2 }' | gawk -F: '{ print $1 }'`)
+}
+
+_codeclimate_installed_engines() {
+  _codeclimate_all_engines
+
+  engines_installed=()
+
+  if [ -e .codeclimate.yml ]
+  then
+    for engine in $engines_all
+    do
+      if grep -q $engine ".codeclimate.yml"
+      then
+        engines_installed+=$engine
+      fi
+    done
+  fi
+}
+
+_codeclimate_not_installed_engines() {
+  _codeclimate_all_engines
+
+  engines_not_installed=()
+
+  if [ -e .codeclimate.yml ]
+  then
+    for engine in $engines_all
+    do
+      if ! grep -q $engine ".codeclimate.yml"
+      then
+        engines_not_installed+=$engine
+      fi
+    done
+  fi
+}
+
+local curcontext="$curcontext" state line ret=1
+local expl
+local -a engines_all engines_installed engines_not_installed
+
+_arguments \
+  '1: :->cmds' \
+  '*:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "bundle command" \
+      "analyze[Analyze all relevant files in the current working directory]" \
+      "console[Start an interactive session providing access to the classes within the CLI]" \
+      "engines\:disable[Prevents the engine from being used in this project]" \
+      "engines\:enable[This engine will be run the next time your project is analyzed]" \
+      "engines\:install[Compares the list of engines in your .codeclimate.yml file to those that are currently installed, then installs any missing engines]" \
+      "engines\:list[Lists all available engines in the Code Climate Docker Hub]" \
+      "engines\:remove[Removes an engine from your .codeclimate.yml file]" \
+      "help[Displays a list of commands that can be passed to the Code Climate CLI]" \
+      "init[Generates a new .codeclimate.yml file in the current working directory]" \
+      "validate-config[Validates the .codeclimate.yml file in the current working directory]" \
+      "version[Displays the current version of the Code Climate CLI]"
+    ret=0
+    ;;
+  args)
+    case $line[1] in
+      engines:enable)
+        _codeclimate_not_installed_engines
+        _wanted engines_not_installed expl 'not installed engines' compadd -a engines_not_installed ;;
+      engines:disable|engines:remove)
+        _codeclimate_installed_engines
+        _wanted engines_installed expl 'installed engines' compadd -a engines_installed ;;
+      analyze)
+        _arguments \
+          '-f:Output Format:(text json)'
+        ret=0
+        ;;
+    esac
+    ;;
+esac
+
+return ret

From ef4a31563075aa0c0453219fcb66eb3941f2d515 Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Tue, 3 Mar 2015 18:28:32 +0100
Subject: [PATCH 1276/1378] Fix invocation of gradlew

---
 plugins/gradle/gradle.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 6f634d1ba..97941756d 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -82,7 +82,7 @@ _gradlew_tasks () {
   if [ in_gradle ]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-     gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+     ./gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
     fi
     compadd -X "==== Gradlew Tasks ====" `cat .gradletasknamecache`
   fi

From 6d7c39a2aef023ac887f0cadbe0035706838c859 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Wed, 2 Sep 2015 20:57:04 +0200
Subject: [PATCH 1277/1378] Added fancy-ctrl-z plugin

Use Ctrl-Z to switch back to Vim
I frequently need to execute random command in my shell. To achieve it I pause
Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.

The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
to Vim.
I could not find a solution, so I developed one on my own that works wonderfully
with ZSH.

Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
---
 plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh

diff --git a/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
new file mode 100644
index 000000000..d4e41b71f
--- /dev/null
+++ b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
@@ -0,0 +1,21 @@
+# Use Ctrl-Z to switch back to Vim
+# I frequently need to execute random command in my shell. To achieve it I pause 
+# Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
+# The fg part really hurt sme. I just wanted to hit Ctrl-z once again to get back 
+# to Vim. I could not find a solution, so I developed one on my own that 
+# works wonderfully with ZSH
+#
+# Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
+
+fancy-ctrl-z () {
+  if [[ $#BUFFER -eq 0 ]]; then
+    BUFFER="fg"
+    zle accept-line
+  else
+    zle push-input
+    zle clear-screen
+  fi
+}
+zle -N fancy-ctrl-z
+bindkey '^Z' fancy-ctrl-z
+

From bec496f0534560dd32d9986b1cb99d25a1fbd819 Mon Sep 17 00:00:00 2001
From: bronzdoc <lsagastume1990@gmail.com>
Date: Wed, 2 Sep 2015 16:57:13 -0600
Subject: [PATCH 1278/1378] Display rvm-prompt output.

---
 themes/amuse.zsh-theme | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
index 548f6d39d..60761b5c0 100644
--- a/themes/amuse.zsh-theme
+++ b/themes/amuse.zsh-theme
@@ -18,4 +18,11 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
+  RPROMPT='%{$fg_bold[red]%}‹$(~/.rvm/bin/rvm-prompt i v)›%{$reset_color%}'
+else
+  if which rbenv &> /dev/null; then
+    RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'
+  fi
+fi
+

From 9a7b2d7ffb6def1b1009b3c4a21d33af22a74234 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Thu, 3 Sep 2015 08:55:03 +0200
Subject: [PATCH 1279/1378] Moved comments and credits from source to README

---
 plugins/fancy-ctrl-z/README.md               | 14 ++++++++++++++
 plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh |  9 ---------
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 plugins/fancy-ctrl-z/README.md

diff --git a/plugins/fancy-ctrl-z/README.md b/plugins/fancy-ctrl-z/README.md
new file mode 100644
index 000000000..a7670fa2c
--- /dev/null
+++ b/plugins/fancy-ctrl-z/README.md
@@ -0,0 +1,14 @@
+# Use Ctrl-Z to switch back to Vim
+
+I frequently need to execute random command in my shell. To achieve it I pause 
+Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
+The fg part really hurt sme. I just wanted to hit Ctrl-z once again to get back 
+to Vim. I could not find a solution, so I developed one on my own that 
+works wonderfully with ZSH
+
+Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
+
+Credits: 
+- original idea by @sheerun
+- added to OMZ by @mbologna
+
diff --git a/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
index d4e41b71f..8ab297913 100644
--- a/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
+++ b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
@@ -1,12 +1,3 @@
-# Use Ctrl-Z to switch back to Vim
-# I frequently need to execute random command in my shell. To achieve it I pause 
-# Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
-# The fg part really hurt sme. I just wanted to hit Ctrl-z once again to get back 
-# to Vim. I could not find a solution, so I developed one on my own that 
-# works wonderfully with ZSH
-#
-# Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
-
 fancy-ctrl-z () {
   if [[ $#BUFFER -eq 0 ]]; then
     BUFFER="fg"

From c7d782f1ab2488ff0e44c2d72d9b81ea24b3195c Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Thu, 3 Sep 2015 13:39:41 -0300
Subject: [PATCH 1280/1378] Add the update from @mtwentyman
 https://github.com/phstc/dotfiles/pull/1 to make it work for older versions
 of capistrano

---
 plugins/capistrano/_capistrano | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index c181b55ca..e6e71ffcc 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -14,7 +14,7 @@ _arguments -C \
 _cap_tasks() {
   if [[ -f config/deploy.rb || -f Capfile ]]; then
     if [[ ! -f .cap_tasks~ ]]; then
-      shipit -v --tasks | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
+      shipit -v --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
     fi
 
     OLD_IFS=$IFS

From 502f08b5e19716d43a7ec8b006178a7b017f68cd Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Fri, 27 Feb 2015 23:11:00 -0500
Subject: [PATCH 1281/1378] Add Cygwin support to installer. * Balk at
 incompatible Windows/MSYS git * Test for chsh presence before trying to use
 it * Replace non-portable `[[ ... ]]` and `[ x = *pattern* ]` constructs

---
 tools/install.sh   | 23 ++++++++++++++++++++---
 tools/uninstall.sh | 12 ++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index c83a6f23d..1da261cf9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -10,9 +10,21 @@ if [ -d "$ZSH" ]; then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
-  echo "git not installed"
-  exit
+hash git >/dev/null 2>&1 || {
+  echo "Error: git is not installed"
+  exit 1
+}
+# The Windows (MSYS) Git is not compatible with normal use on cygwin
+if [ "$OSTYPE" = cygwin ]; then
+  if git --version | grep msysgit > /dev/null; then
+    echo "Error: Windows/MSYS Git is not supported on Cygwin"
+    echo "Error: Make sure the Cygwin git package is installed and is first on the path"
+    exit 1
+  fi
+fi
+env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
+  echo "Error: git clone of oh-my-zsh repo failed"
+  exit 1
 }
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
@@ -34,8 +46,13 @@ export PATH=\"$PATH\"
 
 TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
 if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
+  if hash chsh >/dev/null 2>&1; then
     echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
     chsh -s $(grep /zsh$ /etc/shells | tail -1)
+  else
+    echo "I can't change your shell automatically because this system does not have chsh."
+    echo "Please edit /etc/passwd to set your default shell to zsh."
+  fi
 fi
 unset TEST_CURRENT_SHELL
 
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 41d601576..23bfac0eb 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,5 +1,5 @@
 echo "Removing ~/.oh-my-zsh"
-if [[ -d ~/.oh-my-zsh ]]
+if [ -d ~/.oh-my-zsh ]
 then
   rm -rf ~/.oh-my-zsh
 fi
@@ -20,9 +20,13 @@ then
 
   source ~/.zshrc;
 else
-  echo "Switching back to bash"
-  chsh -s /bin/bash
-  source /etc/profile
+  if hash chsh >/dev/null 2>&1
+  then
+    echo "Switching back to bash"
+    chsh -s /bin/bash
+  else
+    echo "You can edit /etc/passwd to switch your default shell back to bash"
+  fi
 fi
 
 echo "Thanks for trying out Oh My Zsh. It's been uninstalled."

From d009f24ac395b815287ad10db1b78b1cd9e1cf54 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Wed, 1 Jul 2015 10:33:08 -0400
Subject: [PATCH 1282/1378] gnzh theme: fix "eval" and related problems. Switch
 to normal zsh %F/%f prompt escapes to avoid "eval" and extra variables. Wrap
 whole thing in anonymous function so the existing `local` statements actually
 work. Then switch '...' to eager "..." so stuff actually works with local
 variables. And local-ize the remaining variables that are used only in prompt
 construction.

---
 themes/gnzh.zsh-theme | 57 ++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index ab154c1e5..04b0450a8 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -1,53 +1,50 @@
 # ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
 # Based on bira theme
 
-# load some modules
-autoload -U zsh/terminfo # Used in the colour alias below
 setopt prompt_subst
 
-# make some aliases for the colours: (could use normal escape sequences too)
-for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-  eval PR_$color='%{$fg[${(L)color}]%}'
-done
-eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
-eval PR_BOLD="%{$terminfo[bold]%}"
+() {
+
+local PR_USER PR_USER_OP PR_PROMPT PR_HOST
 
 # Check the UID
 if [[ $UID -ne 0 ]]; then # normal user
-  eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}'
-  eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
-  local PR_PROMPT='$PR_NO_COLOR➤ $PR_NO_COLOR'
+  PR_USER='%F{green}%n%f'
+  PR_USER_OP='%F{green}%#%f'
+  PR_PROMPT='%f➤ %f'
 else # root
-  eval PR_USER='${PR_RED}%n${PR_NO_COLOR}'
-  eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
-  local PR_PROMPT='$PR_RED➤ $PR_NO_COLOR'
+  PR_USER='%F{red}%n%f'
+  PR_USER_OP='%F{red}%#%f'
+  PR_PROMPT='%F{red}➤ %f'
 fi
 
 # Check if we are on SSH or not
 if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
-  eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
+  PR_HOST='%F{red}%M%f' # SSH
 else
-  eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
+  PR_HOST='%F{green}%M%f' # no SSH
 fi
 
-local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 
-local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
-local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
+local return_code="%(?..%F{red}%? ↵%f)"
+
+local user_host="${PR_USER}%F{cyan}@${PR_HOST}"
+local current_dir="%B%F{blue}%~%f%b"
 local rvm_ruby=''
-if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
-  rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation
-  rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-elif which rbenv &> /dev/null; then # detect Simple Ruby Version management
-  rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
+if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect user-local rvm installation
+  rvm_ruby='%F{red}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%f'
+elif which rvm-prompt &> /dev/null; then # detect system-wide rvm installation
+  rvm_ruby='%F{red}‹$(rvm-prompt i v g s)›%f'
+elif which rbenv &> /dev/null; then # detect Simple Ruby Version Management
+  rvm_ruby='%F{red}‹$(rbenv version | sed -e "s/ (set.*$//")›%f'
 fi
-local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
+local git_branch='$(git_prompt_info)'
 
-#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
 ╰─$PR_PROMPT "
-RPS1="${return_code}"
+RPROMPT="${return_code}"
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$PR_NO_COLOR%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %f"
+
+}

From 46ddd88fe056ee84064536ce9b34f86bba6b53ca Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 4 Sep 2015 14:13:00 -0400
Subject: [PATCH 1283/1378] diagnostics: switch to shasum, filter sysinfo using
 lines

shasum seems more widely available than md5/md5sum, and we don't have to worry about dealing with the different signatures and output formats of md5 and md5sum then.

sysinfo outputs localized message labels, so we can't just grep for "OS Type". But OS is the first thing it outputs, so we can probably just grab those lines by line number. Switched to doing that.
---
 lib/diagnostics.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index f38239110..afc33829b 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -117,13 +117,16 @@ function _omz_diag_dump_one_big_text() {
 
   # Installed programs
   programs=(sh zsh ksh bash sed cat grep ls find git posh)
+  local progfile="" extra_str="" sha_str=""
   for program in $programs; do
-    local md5_str="" md5="" link_str="" extra_str=""
+    extra_str="" sha_str=""
     progfile=$(builtin which $program)
     if [[ $? == 0 ]]; then
       if [[ -e $progfile ]]; then
-        if builtin whence md5 &>/dev/null; then
-          extra_str+=" $(md5 -q $progfile)"
+        if builtin whence shasum &>/dev/null; then
+          sha_str=($(command shasum $progfile))
+          sha_str=$sha_str[1]
+          extra_str+=" SHA $sha_str"
         fi
         if [[ -h "$progfile" ]]; then
           extra_str+=" ( -> ${progfile:A} )"
@@ -314,7 +317,7 @@ function _omz_diag_dump_os_specific_version() {
       builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
       ;;
     cygwin)
-      command systeminfo | command grep "^OS Name\|^OS Version"
+      command systeminfo | command head -4 | command tail -2
       ;;
   esac
 

From 7a63ccabf662138777a43d014a1a0ab5d8f86ab0 Mon Sep 17 00:00:00 2001
From: Alexey V Zapparov <ixti@member.fsf.org>
Date: Fri, 4 Sep 2015 21:18:32 +0200
Subject: [PATCH 1284/1378] Fix aws plugin RPROMPT pollution

---
 plugins/aws/aws.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 7246db9f0..d31052f83 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -11,11 +11,16 @@ export AWS_HOME=~/.aws
 function agp {
   echo $AWS_DEFAULT_PROFILE
 }
+
 function asp {
+  local rprompt=${RPROMPT/<aws:$(agp)>/}
+
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
-  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>$RPROMPT"
+
+  export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>$rprompt"
 }
+
 function aws_profiles {
   reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/'))
 }

From 3976e040350bd9ac9423252b97dee28d3762adc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 19 Aug 2015 09:03:43 +0200
Subject: [PATCH 1285/1378] Use proper if comparison

---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 452c0dfe7..e848ea2dd 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -58,7 +58,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then
+if [[ $COMPLETION_WAITING_DOTS = true ]]; then
   expand-or-complete-with-dots() {
     echo -n "\e[31m......\e[0m"
     zle expand-or-complete

From 6a8d406eaa715814dc5a6df08960d1fe62e5c066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 16 Aug 2015 22:19:59 +0200
Subject: [PATCH 1286/1378] Use prompt expansion sequence to color red the
 output

This makes it clearer and possibly more portable for different
platforms.
---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e848ea2dd..81250d9e1 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,7 +60,7 @@ zstyle '*' single-ignored show
 
 if [[ $COMPLETION_WAITING_DOTS = true ]]; then
   expand-or-complete-with-dots() {
-    echo -n "\e[31m......\e[0m"
+    print -Pn "%{%F{red}......%f%}"
     zle expand-or-complete
     zle redisplay
   }

From b42efeb87ebdcb89510b8ffbcf210494f194109e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 22 Aug 2015 21:21:41 +0200
Subject: [PATCH 1287/1378] Switch off line wrapping in case dots occupy extra
 line

This commit uses the (hopefully) standard rmam and smam escape sequences
which toggle off and on line wrapping respectively.

This is so that extra dots that don't fit the current line won't be
displayed in the next line, which would in turn make the shell
display a new prompt on the next line after the dots are hidden.

I've added a check for $terminfo rmam and smam values to be sure we have
them before printing them out.

If this commit breaks something post an issue with your terminal
emulator and $TERM value and we'll figure out what went wrong.
---
 lib/completion.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 81250d9e1..f5b292471 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,7 +60,11 @@ zstyle '*' single-ignored show
 
 if [[ $COMPLETION_WAITING_DOTS = true ]]; then
   expand-or-complete-with-dots() {
+    # toggle line-wrapping off and back on again
+    [[ -n "$terminfo[rmam]" && -n "$terminfo[smam]" ]] && echoti rmam
     print -Pn "%{%F{red}......%f%}"
+    [[ -n "$terminfo[rmam]" && -n "$terminfo[smam]" ]] && echoti smam
+
     zle expand-or-complete
     zle redisplay
   }

From 75844fe1a1c9bfc84270b593cc0357fd1c356d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 10 Aug 2015 01:45:11 +0200
Subject: [PATCH 1288/1378] Put relevant documentation into README file

---
 plugins/taskwarrior/README.md              | 13 +++++++++++++
 plugins/taskwarrior/taskwarrior.plugin.zsh | 14 --------------
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 plugins/taskwarrior/README.md

diff --git a/plugins/taskwarrior/README.md b/plugins/taskwarrior/README.md
new file mode 100644
index 000000000..053151e78
--- /dev/null
+++ b/plugins/taskwarrior/README.md
@@ -0,0 +1,13 @@
+# taskwarrior
+
+This plugin adds smart tab completion for [TaskWarrior](http://taskwarrior.org/).
+It uses the zsh tab completion script (`_task`) shipped with TaskWarrior for the
+completion definitions.
+
+The latest version pulled in from the official project is of January 1st, 2015.
+
+
+## Examples
+
+Typing `task [TAB]` will give you a list of commands, `task 66[TAB]` shows a
+list of available modifications for that task, etcetera.
diff --git a/plugins/taskwarrior/taskwarrior.plugin.zsh b/plugins/taskwarrior/taskwarrior.plugin.zsh
index 5d1e6ffea..ab885943f 100644
--- a/plugins/taskwarrior/taskwarrior.plugin.zsh
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
@@ -1,17 +1,3 @@
-################################################################################
-# Author: Pete Clark
-# Email: pete[dot]clark[at]gmail[dot]com
-# Version: 0.1 (05/24/2011)
-# License: WTFPL<http://sam.zoy.org/wtfpl/>
-#
-# This oh-my-zsh plugin adds smart tab completion for
-# TaskWarrior<http://taskwarrior.org/>. It uses the zsh tab completion
-# script (_task) distributed with TaskWarrior for the completion definitions.
-#
-# Typing task [tabtab] will give you a list of current tasks, task 66[tabtab]
-# gives a list of available modifications for that task, etc.
-################################################################################
-
 zstyle ':completion:*:*:task:*' verbose yes
 zstyle ':completion:*:*:task:*:descriptions' format '%U%B%d%b%u'
 

From 38d25a335999753093011f93699725c865f73360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 14 Aug 2015 20:43:11 +0200
Subject: [PATCH 1289/1378] Update taskwarrior completion to latest version
 (Jul 26 2015)

See relevant commit at:
https://git.tasktools.org/projects/TM/repos/task/commits/3158883dc4d251
---
 plugins/taskwarrior/_task | 306 +++++++++++++++++++++-----------------
 1 file changed, 170 insertions(+), 136 deletions(-)

diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
index 5cc253152..afa30d45a 100644
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
@@ -1,9 +1,6 @@
 #compdef task
-# zsh completion for taskwarrior
 #
-# taskwarrior - a command line task list manager.
-#
-# Copyright 2010 - 2011 Johannes Schlatow
+# Copyright 2010 - 2015 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -30,31 +27,40 @@ typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
 _task_tags=($(task _tags))
 _task_ids=($(task _ids))
+_task_zshids=( ${(f)"$(task _zshids)"} )
 _task_config=($(task _config))
 _task_columns=($(task _columns))
 _task_modifiers=(
-	'before' \
-	'after' \
-	'none' \
-	'any' \
-	'is' \
-	'isnt' \
-	'has' \
-	'hasnt' \
-	'startswith' \
-	'endswith' \
-	'word' \
-	'noword'
+  'before' \
+  'after' \
+  'none' \
+  'any' \
+  'is' \
+  'isnt' \
+  'has' \
+  'hasnt' \
+  'startswith' \
+  'endswith' \
+  'word' \
+  'noword'
 )
 _task_conjunctions=(
-   'and' \
-   'or' \
-	'xor' \
-	'\)'
-	'\('
+  'and' \
+  'or' \
+  'xor' \
+  '\)' \
+  '\(' \
+  '<' \
+  '<=' \
+  '=' \
+  '!=' \
+  '>=' \
+  '>'
 )
-_task_cmds=($(task _commands))
-_task_zshcmds=( ${(f)"$(task _zshcommands)"} )
+_task_cmds=($(task _commands; task _aliases))
+_task_zshcmds=( ${(f)"$(task _zshcommands)"} sentinel:sentinel:sentinel )
+
+_task_aliases=($(task _aliases))
 
 _task() {
     _arguments -s -S \
@@ -68,110 +74,130 @@ word=$'[^\0]#\0'
 # priorities
 local -a task_priorities
 _regex_words values 'task priorities' \
-	'H:High' \
-	'M:Middle' \
-	'L:Low'
+  'H:High' \
+  'M:Middle' \
+  'L:Low'
 task_priorities=("$reply[@]")
 
 # projects
 local -a task_projects
 task_projects=(
-	/"$word"/
-	":values:task projects:compadd -a _task_projects"
+  /"$word"/
+  ":values:task projects:compadd -a _task_projects"
 )
 
 local -a _task_dates
 _regex_words values 'task dates' \
-	'tod*ay:Today' \
-	'yes*terday:Yesterday' \
-	'tom*orrow:Tomorrow' \
-	'sow:Start of week' \
-	'soww:Start of work week' \
-	'socw:Start of calendar week' \
-	'som:Start of month' \
-	'soy:Start of year' \
-	'eow:End of week' \
-	'eoww:End of work week' \
-	'eocw:End of calendar week' \
-	'eom:End of month' \
-	'eoy:End of year' \
-	'mon:Monday' \
-	'tue:Tuesday'\
-	'wed:Wednesday' \
-	'thu:Thursday' \
-	'fri:Friday' \
-	'sat:Saturday' \
-	'sun:Sunday'
+  'tod*ay:Today' \
+  'yes*terday:Yesterday' \
+  'tom*orrow:Tomorrow' \
+  'sow:Start of week' \
+  'soww:Start of work week' \
+  'socw:Start of calendar week' \
+  'som:Start of month' \
+  'soq:Start of quarter' \
+  'soy:Start of year' \
+  'eow:End of week' \
+  'eoww:End of work week' \
+  'eocw:End of calendar week' \
+  'eom:End of month' \
+  'eoq:End of quarter' \
+  'eoy:End of year' \
+  'mon:Monday' \
+  'tue:Tuesday'\
+  'wed:Wednesday' \
+  'thu:Thursday' \
+  'fri:Friday' \
+  'sat:Saturday' \
+  'sun:Sunday' \
+  'good*friday:Good Friday' \
+  'easter:Easter' \
+  'eastermonday:Easter Monday' \
+  'ascension:Ascension' \
+  'pentecost:Pentecost' \
+  'midsommar:Midsommar' \
+  'midsommarafton:Midsommarafton' \
+  'later:Later' \
+  'someday:Some Day'
 _task_dates=("$reply[@]")
 
 local -a _task_reldates
 _regex_words values 'task reldates' \
-	'hrs:n hours' \
-	'day:n days' \
-	'1st:first' \
-	'2nd:second' \
-	'3rd:third' \
-	'th:4th, 5th, etc.' \
-	'wks:weeks'
+  'hrs:n hours' \
+  'day:n days' \
+  '1st:first' \
+  '2nd:second' \
+  '3rd:third' \
+  'th:4th, 5th, etc.' \
+  'wks:weeks'
 _task_reldates=("$reply[@]")
 
 task_dates=(
-	\( "$_task_dates[@]" \|
+  \( "$_task_dates[@]" \|
     \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
-	\)
+  \)
 )
 
+local -a task_zshids
+_regex_words values 'task IDs' $_task_zshids
+task_zshids=("$reply[@]")
+
 _regex_words values 'task frequencies' \
-	'daily:Every day' \
-	'day:Every day' \
-	'weekdays:Every day skipping weekend days' \
-	'weekly:Every week' \
-	'biweekly:Every two weeks' \
-	'fortnight:Every two weeks' \
-+ 'monthly:Every month' \
-	'quarterly:Every three months' \
-	'semiannual:Every six months' \
-	'annual:Every year' \
-	'yearly:Every year' \
-	'biannual:Every two years' \
-	'biyearly:Every two years'
+  'daily:Every day' \
+  'day:Every day' \
+  'weekdays:Every day skipping weekend days' \
+  'weekly:Every week' \
+  'biweekly:Every two weeks' \
+  'fortnight:Every two weeks' \
+  'monthly:Every month' \
+  'quarterly:Every three months' \
+  'semiannual:Every six months' \
+  'annual:Every year' \
+  'yearly:Every year' \
+  'biannual:Every two years' \
+  'biyearly:Every two years'
 _task_freqs=("$reply[@]")
 
 local -a _task_frequencies
 _regex_words values 'task frequencies' \
-	'd:days' \
-	'w:weeks' \
-	'q:quarters' \
-	'y:years'
+  'd:days' \
+  'w:weeks' \
+  'q:quarters' \
+  'y:years'
 _task_frequencies=("$reply[@]")
 
 task_freqs=(
-	\( "$_task_freqs[@]" \|
+  \( "$_task_freqs[@]" \|
      \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
-	\)
+  \)
 )
 
 # attributes
 local -a task_attributes
 _regex_words -t ':' default 'task attributes' \
-	'pro*ject:Project name:$task_projects' \
-	'du*e:Due date:$task_dates' \
-	'wa*it:Date until task becomes pending:$task_dates' \
-	're*cur:Recurrence frequency:$task_freqs' \
-	'pri*ority:priority:$task_priorities' \
-	'un*til:Recurrence end date:$task_dates' \
-	'fg:Foreground color' \
-	'bg:Background color' \
-	'li*mit:Desired number of rows in report'
+  'des*cription:Task description text' \
+  'status:Status of task - pending, completed, deleted, waiting' \
+  'pro*ject:Project name:$task_projects' \
+  'pri*ority:priority:$task_priorities' \
+  'du*e:Due date:$task_dates' \
+  're*cur:Recurrence frequency:$task_freqs' \
+  'un*til:Expiration date:$task_dates' \
+  'li*mit:Desired number of rows in report' \
+  'wa*it:Date until task becomes pending:$task_dates' \
+  'ent*ry:Date task was created:$task_dates' \
+  'end:Date task was completed/deleted:$task_dates' \
+  'st*art:Date task was started:$task_dates' \
+  'sc*heduled:Date task is scheduled to start:$task_dates' \
+  'dep*ends:Other tasks that this task depends upon:$task_zshids'
 task_attributes=("$reply[@]")
 
 args=(
-	\( "$task_attributes[@]" \|
-	\( /'(project|due|wait|recur|priority|until|fg|bg|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \|
-	\( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \|
-	\( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \|
-	\( /"$word"/ \)
-	\) \#
+  \( "$task_attributes[@]" \|
+  \( /'(project|description|status|entry|end|start|scheduled|depends|due|wait|recur|priority|until|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \|
+  \( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \|
+  \( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \|
+  \( /"$word"/ \)
+  \) \#
 )
 _regex_arguments _task_attributes "${args[@]}"
 
@@ -180,43 +206,50 @@ _regex_arguments _task_attributes "${args[@]}"
 # filter completion
 (( $+functions[_task_filter] )) ||
 _task_filter() {
-	_task_attributes "$@"
+  _task_attributes "$@"
 
-	# TODO complete conjunctions only if the previous word is a filter expression, i.e. attribute, ID, any non-command
-	_describe -t default 'task conjunctions' _task_conjunctions
-}
-
-# merge completion
-(( $+functions[_task_merge] )) ||
-_task_merge() {
-	# TODO match URIs in .taskrc
-	_files
-}
-
-# push completion
-(( $+functions[_task_push] )) ||
-_task_push() {
-	# TODO match URIs in .taskrc
-	_files
-}
-
-# pull completion
-(( $+functions[_task_pull] )) ||
-_task_pull() {
-	# TODO match URIs in .taskrc
-	_files
+  # TODO complete conjunctions only if the previous word is a filter expression, i.e. attribute, ID, any non-command
+  _describe -t default 'task conjunctions' _task_conjunctions
 }
 
 # execute completion
 (( $+functions[_task_execute] )) ||
 _task_execute() {
-	_files
+  _files
 }
 
 # id-only completion
 (( $+functions[_task_id] )) ||
 _task_id() {
-	_describe -t values 'task IDs' _task_zshids
+  _describe -t values 'task IDs' _task_zshids
+}
+
+# subcommand-only function
+(( $+functions[_task_subcommands] )) ||
+_task_subcommands() {
+  local -a subcommands
+  local _zshcmd
+  local cmd category desc
+  local lastcategory=''
+  # The list is sorted by category, in the right order.
+  for _zshcmd in "$_task_zshcmds[@]"; do
+    # Parse out the three fields
+    cmd=${_zshcmd%%:*}
+    category=${${_zshcmd#*:}%%:*}
+    desc=${_zshcmd#*:*:}
+
+    # Present each category as soon as the first entry in the *next* category
+    # is seen.
+    if [[ $category != $lastcategory && -n $lastcategory ]]; then
+      _describe -t ${lastcategory}-commands "task ${lastcategory} command" subcommands
+      subcommands=()
+    fi
+
+    # Log the subcommand; we will process it in some future iteration.
+    subcommands+=( "$cmd:$desc" )
+
+    lastcategory=$category
+  done
 }
 
 ## first level completion => task sub-command completion
@@ -224,27 +257,28 @@ _task_id() {
 _task_default() {
     local cmd ret=1
 
-	integer i=1
-	while (( i < $#words ))
-	do
-		cmd="${_task_cmds[(r)$words[$i]]}"
-		if (( $#cmd )); then
-			_call_function ret _task_${cmd} ||
-				_call_function ret _task_filter ||
-					_message "No command remaining."
-			return ret
-		fi
-		(( i++ ))
-	done
+  integer i=1
+  while (( i < $#words ))
+  do
+    cmd="${_task_cmds[(r)$words[$i]]}"
+    if (( $#cmd )); then
+      _call_function ret _task_${cmd} ||
+        _call_function ret _task_filter ||
+          _message "No command remaining."
+      return ret
+    fi
+    (( i++ ))
+  done
 
-	# update IDs
-	_task_zshids=( ${(f)"$(task _zshids)"} )
+  # update IDs
+  _task_zshids=( ${(f)"$(task _zshids)"} )
 
-	_describe -t commands 'task command' _task_zshcmds
-	_describe -t values 'task IDs' _task_zshids
-	_call_function ret _task_filter
+  _task_subcommands
+  _describe -t tasks 'task IDs' _task_zshids
+  _describe -t aliases 'task aliases' _task_aliases
+  _call_function ret _task_filter
 
-	return ret
+  return ret
 }
 
-_task
+_task "$@"

From cbdad588e65f4205fcdc4e34e97b04fa7fdb5457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 7 Aug 2015 18:56:57 +0200
Subject: [PATCH 1290/1378] Use zsh globbing instead of ls + grep in xc
 function

Uses zsh arrays and globbing to find .xcworkspace and .xcodeproj files.
---
 plugins/xcode/xcode.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 1d1205b80..4aa6bfc9b 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -1,12 +1,12 @@
 #xc function courtesy of http://gist.github.com/subdigital/5420709
 function xc {
-  xcode_proj=`ls | grep "\.xc" | sort -r | head -1`
-  if [[ `echo -n $xcode_proj | wc -m` == 0 ]]
-  then
+  local xcode_proj
+  xcode_proj=(*.{xcworkspace,xcodeproj}(N))
+  if [[ ${#xcode_proj} -eq 0 ]]; then
     echo "No xcworkspace/xcodeproj file found in the current directory."
   else
-    echo "Found $xcode_proj" 
-    open "$xcode_proj" 
+    echo "Found ${xcode_proj[1]}"
+    open "${xcode_proj[1]}"
   fi
 }
 

From 6a830f39b68300cf86504f1c60d9ab77c09b7971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Sep 2015 01:43:48 +0200
Subject: [PATCH 1291/1378] Return error if no xcode files where found

---
 plugins/xcode/xcode.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 4aa6bfc9b..274bd92e4 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -2,8 +2,10 @@
 function xc {
   local xcode_proj
   xcode_proj=(*.{xcworkspace,xcodeproj}(N))
+
   if [[ ${#xcode_proj} -eq 0 ]]; then
     echo "No xcworkspace/xcodeproj file found in the current directory."
+    return 1
   else
     echo "Found ${xcode_proj[1]}"
     open "${xcode_proj[1]}"

From 24bdd8e29a344f0282b842f89a4a10f145344939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 7 Aug 2015 19:04:26 +0200
Subject: [PATCH 1292/1378] Replace xcsel function with just an alias

---
 plugins/xcode/xcode.plugin.zsh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 274bd92e4..059c78fd5 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -12,10 +12,7 @@ function xc {
   fi
 }
 
-function xcsel {
-  sudo xcode-select --switch "$*"
-}
-
+alias xcsel='sudo xcode-select --switch'
 alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
 alias xcdd='rm -rf ~/Library/Developer/Xcode/DerivedData/*'

From ec3694c788d2b32eb1735687cf89b057d4ca4d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Sep 2015 22:08:57 +0200
Subject: [PATCH 1293/1378] Make simulator dependant of currently active dev
 directory

This also gets rid of `xcode-select` command-not-found errors.
---
 plugins/xcode/xcode.plugin.zsh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 059c78fd5..f80de36d5 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -17,8 +17,15 @@ alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
 alias xcdd='rm -rf ~/Library/Developer/Xcode/DerivedData/*'
 
-if [[ -d $(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app ]]; then
-  alias simulator='open $(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\ Simulator.app'
-else
-  alias simulator='open $(xcode-select -p)/Applications/iOS\ Simulator.app'
-fi
+function simulator {
+  local devfolder
+  devfolder="$(xcode-select -p)"
+
+  # Xcode ≤ 5.x
+  if [[ -d "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app" ]]; then
+    open "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app"
+  # Xcode ≥ 6.x
+  else
+    open "${devfolder}/Applications/iOS Simulator.app"
+  fi
+}

From d95589d4e43d3a6288b8a66492c17d12c4e4eca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 5 Sep 2015 23:17:38 +0200
Subject: [PATCH 1294/1378] Add README for the xcode plugin

---
 plugins/xcode/README.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 plugins/xcode/README.md

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
new file mode 100644
index 000000000..b8efef38c
--- /dev/null
+++ b/plugins/xcode/README.md
@@ -0,0 +1,31 @@
+# Xcode
+
+## Description
+
+This plugin provides a few utilities that can help you on your daily use of Xcode and iOS development.
+
+To start using it, add the `xcode` plugin to your `plugins` array:
+
+```zsh
+plugins=(... xcode)
+```
+
+
+## Aliases
+
+| Alias | Description                           | Command                                        |
+|-------|---------------------------------------|------------------------------------------------|
+| xcsel | Change active developer directory     | sudo xcode-select --switch                     |
+| xcp   | Show currently active dev. directory  | xcode-select --print-path                      |
+| xcb   | Build Xcode projects and workspaces   | xcodebuild                                     |
+| xcdd  | Purge all temporary build information | rm -rf ~/Library/Developer/Xcode/DerivedData/* |
+
+
+## Functions
+
+- **`xc`**:
+  Open one of the `.xcworkspace` and `.xcodeproj` files that it can find in the current working directory.
+  Returns 1 if it didn't find any relevant files.
+
+- **`simulator`**:
+  Open the iOS Simulator from your command line, dependant on whichever is the active developer directory for Xcode.

From 86d881c47de3d0ed791e1e7d8c2ed480e6c781ee Mon Sep 17 00:00:00 2001
From: Juraj Fiala <doctorjellyface@riseup.net>
Date: Sun, 6 Sep 2015 13:01:09 +0200
Subject: [PATCH 1295/1378] Added aliases for --now commands

Also removed the old sc-launch alias because this is just better.
---
 plugins/systemd/systemd.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index 503f7c138..f9b522e40 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -9,4 +9,7 @@ sudo_commands=(
 
 for c in $user_commands; do; alias sc-$c="systemctl $c"; done
 for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done
-alias sc-launch="sudo systemctl start $c && sudo systemctl enable $c"
+
+alias sc-enable-now="sc-enable --now"
+alias sc-disable-now="sc-disable --now"
+alias sc-mask-now="sc-mask --now"

From 5584aa05c7c94949665f024ad0d88b8162654cb9 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 4 Sep 2015 17:17:16 -0400
Subject: [PATCH 1296/1378] xcode: add version-based xcselv()

---
 plugins/xcode/xcode.plugin.zsh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index f80de36d5..b3058ceff 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -17,6 +17,35 @@ alias xcb='xcodebuild'
 alias xcp='xcode-select --print-path'
 alias xcdd='rm -rf ~/Library/Developer/Xcode/DerivedData/*'
 
+
+# "XCode-SELect by Version" - select Xcode by just version number
+# Uses naming convention:
+#  - different versions of Xcode are named Xcode-<version>.app or stored
+#     in a folder named Xcode-<version>
+#  - the special version name "-" refers to the "default" Xcode.app with no suffix
+function xcselv {
+  emulate -L zsh
+  local version=$1
+  local apps_dirs apps_dir apps app
+  apps_dirs=( $HOME/Applications /Applications )
+  for apps_dir ($apps_dirs); do
+    if [[ $version == "-" ]]; then
+      apps=( $apps_dir/Xcode.app $apps_dir/Xcode/Xcode.app )
+    else
+      apps=( $apps_dir/Xcode-$version.app $apps_dir/Xcode-$version/Xcode.app )
+    fi
+    for app ($apps); do
+      if [[ -e "$app" ]]; then
+        echo "selecting Xcode $version: $app"
+        xcsel "$app"
+        return
+      fi
+    done
+  done
+  echo "xcselv: Xcode version $version not found"
+  return 1
+}
+
 function simulator {
   local devfolder
   devfolder="$(xcode-select -p)"

From 213f46a296bd76031eb6a2fa66c72efeb912481d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 7 Sep 2015 12:08:50 +0200
Subject: [PATCH 1297/1378] Add xcselv documentation in the README

---
 plugins/xcode/README.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index b8efef38c..362940b93 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -13,12 +13,13 @@ plugins=(... xcode)
 
 ## Aliases
 
-| Alias | Description                           | Command                                        |
-|-------|---------------------------------------|------------------------------------------------|
-| xcsel | Change active developer directory     | sudo xcode-select --switch                     |
-| xcp   | Show currently active dev. directory  | xcode-select --print-path                      |
-| xcb   | Build Xcode projects and workspaces   | xcodebuild                                     |
-| xcdd  | Purge all temporary build information | rm -rf ~/Library/Developer/Xcode/DerivedData/* |
+| Alias | Description                              | Command                                        |
+|-------|------------------------------------------|------------------------------------------------|
+| xcb   | Build Xcode projects and workspaces      | xcodebuild                                     |
+| xcdd  | Purge all temporary build information    | rm -rf ~/Library/Developer/Xcode/DerivedData/* |
+| xcp   | Show currently selected Xcode directory  | xcode-select --print-path                      |
+| xcsel | Select different Xcode directory by path | sudo xcode-select --switch                     |
+
 
 
 ## Functions
@@ -29,3 +30,6 @@ plugins=(... xcode)
 
 - **`simulator`**:
   Open the iOS Simulator from your command line, dependant on whichever is the active developer directory for Xcode.
+
+- **`xcselv`**:
+  Select different Xcode by version. Example: `xcselv 6.2`

From 82ae41ca4cf4fac253294f17b33b0c718755ffc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 7 Sep 2015 12:09:08 +0200
Subject: [PATCH 1298/1378] Reorder xcode plugin file

---
 plugins/xcode/xcode.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index b3058ceff..1f547470d 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -1,4 +1,10 @@
-#xc function courtesy of http://gist.github.com/subdigital/5420709
+alias xcb='xcodebuild'
+alias xcdd='rm -rf ~/Library/Developer/Xcode/DerivedData/*'
+alias xcp='xcode-select --print-path'
+alias xcsel='sudo xcode-select --switch'
+
+# original author: @subdigital
+# source: http://gist.github.com/subdigital/5420709
 function xc {
   local xcode_proj
   xcode_proj=(*.{xcworkspace,xcodeproj}(N))
@@ -12,12 +18,6 @@ function xc {
   fi
 }
 
-alias xcsel='sudo xcode-select --switch'
-alias xcb='xcodebuild'
-alias xcp='xcode-select --print-path'
-alias xcdd='rm -rf ~/Library/Developer/Xcode/DerivedData/*'
-
-
 # "XCode-SELect by Version" - select Xcode by just version number
 # Uses naming convention:
 #  - different versions of Xcode are named Xcode-<version>.app or stored

From 6170fa41d975d40f462a14ca69612270ae9ddb9b Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Wed, 9 Sep 2015 11:42:56 +0200
Subject: [PATCH 1299/1378] Added fedora plugin, based on dnf/yum plugin

---
 plugins/fedora/README.md         |  3 +++
 plugins/fedora/fedora.plugin.zsh | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 plugins/fedora/README.md
 create mode 100644 plugins/fedora/fedora.plugin.zsh

diff --git a/plugins/fedora/README.md b/plugins/fedora/README.md
new file mode 100644
index 000000000..f384b0ffd
--- /dev/null
+++ b/plugins/fedora/README.md
@@ -0,0 +1,3 @@
+This is a plugin based on yum plugin, but using dnf as main frontend
+(from Fedora 22 onwards, yum is deprecated in favor of dnf).
+ 
diff --git a/plugins/fedora/fedora.plugin.zsh b/plugins/fedora/fedora.plugin.zsh
new file mode 100644
index 000000000..eddc3627b
--- /dev/null
+++ b/plugins/fedora/fedora.plugin.zsh
@@ -0,0 +1,16 @@
+## Aliases
+
+alias dnfs="dnf search"                       # search package
+alias dnfp="dnf info"                         # show package info
+alias dnfl="dnf list"                         # list packages
+alias dnfgl="dnf grouplist"                   # list package groups
+alias dnfli="dnf list installed"              # print all installed packages
+alias dnfmc="dnf makecache"                   # rebuilds the dnf package list
+
+alias dnfu="sudo dnf upgrade"                 # upgrade packages
+alias dnfi="sudo dnf install"                 # install package
+alias dnfgi="sudo dnf groupinstall"           # install package group
+alias dnfr="sudo dnf remove"                  # remove package
+alias dnfgr="sudo dnf groupremove"            # remove pagage group
+alias dnfrl="sudo dnf remove --remove-leaves" # remove package and leaves
+alias dnfc="sudo dnf clean all"               # clean cache

From 9e9b790fe1e3150b36bb1e01b432f5b38e52b512 Mon Sep 17 00:00:00 2001
From: Ilia Choly <icholy@accipiterradar.com>
Date: Tue, 8 Sep 2015 17:34:39 -0400
Subject: [PATCH 1300/1378] golang: improve go doc completion

---
 plugins/golang/golang.plugin.zsh     | 36 +++++++++++++++++++---------
 plugins/golang/templates/package.txt | 29 ++++++++++++++++++++++
 plugins/golang/templates/search.txt  |  0
 3 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 plugins/golang/templates/package.txt
 create mode 100644 plugins/golang/templates/search.txt

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 900fc630d..4e6ca0a99 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -54,23 +54,37 @@ __go_tool_complete() {
     '-installsuffix[suffix to add to package directory]:suffix'
     '-tags[list of build tags to consider satisfied]:tags'
   )
-  __go_list() {
-      local expl importpaths
-      declare -a importpaths
-      importpaths=($(go list ${words[$CURRENT]}... 2>/dev/null))
-      _wanted importpaths expl 'import paths' compadd "$@" - "${importpaths[@]}"
+  __go_packages() {
+      _path_files -W "$(go env GOROOT)/src" -/
+      _path_files -W "$(go env GOPATH)/src" -/
+  }
+  __go_identifiers() {
+      compadd $(godoc -templates $ZSH/plugins/golang/templates ${words[-2]} 2> /dev/null)
   }
   case ${words[2]} in
-  clean|doc)
-      _arguments -s -w : '*:importpaths:__go_list'
+  doc)
+    _arguments -s -w \
+      "-c[symbol matching honors case (paths not affected)]" \
+      "-cmd[show symbols with package docs even if package is a command]" \
+      "-u[show unexported symbols as well as exported]" \
+      "2:importpaths:__go_packages" \
+      ":next identifiers:__go_identifiers"
+      ;;
+  clean)
+    _arguments -s -w \
+      "-i[remove the corresponding installed archive or binary (what 'go install' would create)]" \
+      "-n[print the remove commands it would execute, but not run them]" \
+      "-r[apply recursively to all the dependencies of the packages named by the import paths]" \
+      "-x[print remove commands as it executes them]" \
+      "*:importpaths:__go_packages"
       ;;
   fix|fmt|list|vet)
-      _alternative ':importpaths:__go_list' ':files:_path_files -g "*.go"'
+      _alternative ':importpaths:__go_packages' ':files:_path_files -g "*.go"'
       ;;
   install)
       _arguments -s -w : ${build_flags[@]} \
         "-v[show package names]" \
-        '*:importpaths:__go_list'
+        '*:importpaths:__go_packages'
       ;;
   get)
       _arguments -s -w : \
@@ -81,7 +95,7 @@ __go_tool_complete() {
         ${build_flags[@]} \
         "-v[show package names]" \
         "-o[output file]:file:_files" \
-        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
+        "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
       ;;
   test)
       _arguments -s -w : \
@@ -103,7 +117,7 @@ __go_tool_complete() {
         "-cpuprofile[write CPU profile to file]:file:_files" \
         "-memprofile[write heap profile to file]:file:_files" \
         "-memprofilerate[set heap profiling rate]:number" \
-        "*:args:{ _alternative ':importpaths:__go_list' ':files:_path_files -g \"*.go\"' }"
+        "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
       ;;
   help)
       _values "${commands[@]}" \
diff --git a/plugins/golang/templates/package.txt b/plugins/golang/templates/package.txt
new file mode 100644
index 000000000..2b75cce35
--- /dev/null
+++ b/plugins/golang/templates/package.txt
@@ -0,0 +1,29 @@
+{{with .PDoc}}{{/*
+
+Constants 
+---------------------------------------
+
+*/}}{{with .Consts}}{{range .}}{{range .Names}}{{.}} {{end}}{{end}}{{end}}{{/*
+
+Variables
+---------------------------------------
+
+*/}}{{with .Vars}}{{range .}}{{range .Names}}{{.}} {{end}}{{end}}{{end}}{{/*
+
+Functions
+---------------------------------------
+
+*/}}{{with .Funcs}}{{range .}}{{ .Name }} {{end}}{{end}}{{/*
+
+Types
+---------------------------------------
+
+*/}}{{with .Types}}{{range .}}{{ $TypeName := .Name }}{{ $TypeName }} {{/*
+
+*/}}{{range .Methods}}{{ $TypeName }}.{{.Name}} {{end}}{{/*
+
+*/}}{{range .Funcs}}{{.Name}} {{end}}{{/*
+
+*/}}{{range .Consts}}{{range .Names}}{{.}} {{end}}{{end}}{{/*
+
+*/}}{{range .Vars}}{{range .Names}}{{.}} {{end}}{{end}}{{end}}{{end}}{{end}}
diff --git a/plugins/golang/templates/search.txt b/plugins/golang/templates/search.txt
new file mode 100644
index 000000000..e69de29bb

From 19c0b185ad9b37b448a979fb6cc995cc648e76a4 Mon Sep 17 00:00:00 2001
From: iCross <rja@icross.cc>
Date: Thu, 10 Sep 2015 14:08:02 +0800
Subject: [PATCH 1301/1378] fix url-quote-magic not working issue

Incompatibilites between 5.0.8 and 5.1:
bracketed-paste-magic may also be necessary in order to apply url-quote-magic.

Reference:
https://github.com/zsh-users/zsh/blob/a9df6aaa702abf761b155cd842a7f6917be44139/Functions/Zle/url-quote-magic#L11
---
 lib/misc.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 6d1a64e8d..bdb884046 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,6 +1,10 @@
 ## Load smart urls if available
 for d in $fpath; do
 	if [[ -e "$d/url-quote-magic" ]]; then
+		if [[ -e "$d/bracketed-paste-magic" ]]; then
+			autoload -Uz bracketed-paste-magic
+			zle -N bracketed-paste bracketed-paste-magic
+		fi
 		autoload -U url-quote-magic
 		zle -N self-insert url-quote-magic
 	fi

From 953e4d892631f93e31cfdfb72199fb8f413c6b49 Mon Sep 17 00:00:00 2001
From: Ben Klein <robobenklein@gmail.com>
Date: Thu, 10 Sep 2015 22:19:53 -0400
Subject: [PATCH 1302/1378] Make Linux compatible

Just an if/else to determine if we're OSX or Linux and alias `at` appropriately.
---
 plugins/atom/atom.plugin.zsh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
index 9adb9031a..ec1a114ed 100644
--- a/plugins/atom/atom.plugin.zsh
+++ b/plugins/atom/atom.plugin.zsh
@@ -1,14 +1,22 @@
-local _atom_paths > /dev/null 2>&1
-_atom_paths=(
-    "$HOME/Applications/Atom.app"
-    "/Applications/Atom.app"
-)
+# Gets OS Type
+unamestr=$(uname -s)
 
-for _atom_path in $_atom_paths; do
-    if [[ -a $_atom_path ]]; then
-        alias at="open -a '$_atom_path'"
-        break
-    fi
-done
+# If OSX
+if [[ "$unamestr" == 'Darwin' ]]; then
+    local _atom_paths > /dev/null 2>&1
+    _atom_paths=(
+        "$HOME/Applications/Atom.app"
+        "/Applications/Atom.app"
+    )
 
-alias att='at .'
+    for _atom_path in $_atom_paths; do
+        if [[ -a $_atom_path ]]; then
+            alias at="open -a '$_atom_path'"
+            break
+        fi
+    done
+# If Linux
+elif [[ "$unamestr" == 'Linux' ]]; then
+    # Alerts the user if 'atom' is not a found command.
+    type atom >/dev/null 2>&1 && alias at="atom" || { echo >&2 "You have enabled the atom oh-my-zsh plugin on Linux, but atom is not a recognized command. Please make sure you have it installed before using this plugin."; }
+fi

From dca429557aef7b700ae2f1088115a707af78a31b Mon Sep 17 00:00:00 2001
From: Ben Klein <robobenklein@gmail.com>
Date: Thu, 10 Sep 2015 22:22:00 -0400
Subject: [PATCH 1303/1378] Make Readme much clearer and explain edits.

Also added some examples, but those should be mostly self-explanatory.
---
 plugins/atom/README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/atom/README.md b/plugins/atom/README.md
index 75d77a0ac..6350c647b 100644
--- a/plugins/atom/README.md
+++ b/plugins/atom/README.md
@@ -1,6 +1,8 @@
 ## atom
 
-Plugin for Atom, a cross platform text and code editor, available for Linux, Mac OS X, and Windows.
+This plugin makes "at" a useful function for invoking the Atom Editor.
+
+Originally by Github user [aforty](https://github.com/aforty) for OSX, modified to alias 'at' to 'atom' for Linux, since atom already works on the terminal for Linux, and calling 'at' in a non-OSX environment should still work.
 
 ### Requirements
 
@@ -10,8 +12,12 @@ Plugin for Atom, a cross platform text and code editor, available for Linux, Mac
 
  * If `at` command is called without an argument, launch Atom
 
- * If `at` is passed a directory, `cd` to it and open it in Atom
+ * If `at` is passed a directory, open it in Atom
 
  * If `at` is passed a file, open it in Atom
 
- * if `att` command is called, it is equivalent to `at .`, opening the current folder in Atom
+### Examples
+
+ * Open the current dir in atom: `at .`
+ * Open another dir in atom: `at path/to/folder`
+ * Open a file: `at filename.extension`

From 023397983bb0d983216c580d884936a660b265f8 Mon Sep 17 00:00:00 2001
From: Kirill Pahnev <kirill.pahnev@gmail.com>
Date: Thu, 10 Sep 2015 22:52:01 +0300
Subject: [PATCH 1304/1378] Fixed broken git branch icon

---
 themes/amuse.zsh-theme | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
index 548f6d39d..395b34380 100644
--- a/themes/amuse.zsh-theme
+++ b/themes/amuse.zsh-theme
@@ -12,7 +12,8 @@ PROMPT='
 %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
 $ '
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}⭠ "
+# Must use Powerline font, for \uE0A0 to render.
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}\uE0A0 "
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"

From 36fea45bfc564c667007421a643df38c02235c8b Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 11 Sep 2015 03:11:01 -0400
Subject: [PATCH 1305/1378] svn plugin: urldecode repo info

The repo location reported by `svn` is a URL. If you don't decode it before using it a prompt, the `%` sequences will be misinterpreted by prompt expansion and give screwy results.
Fixes #2233
---
 plugins/svn/svn.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 9f7a4c6eb..816055afe 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,16 +1,17 @@
 # vim:ft=zsh ts=2 sw=2 sts=2
 #
 function svn_prompt_info() {
+  local _DISPLAY
   if in_svn; then
     if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
       unset SVN_SHOW_BRANCH
       _DISPLAY=$(svn_get_branch_name)
     else
       _DISPLAY=$(svn_get_repo_name)
+      _DISPLAY=$(omz_urldecode "${_DISPLAY}")
     fi
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR"
-    unset _DISPLAY
   fi
 }
 
@@ -30,7 +31,7 @@ function svn_get_repo_name() {
 }
 
 function svn_get_branch_name() {
-  _DISPLAY=$(
+  local _DISPLAY=$(
     svn info 2> /dev/null | \
       awk -F/ \
       '/^URL:/ { \
@@ -49,7 +50,6 @@ function svn_get_branch_name() {
   else
     echo $_DISPLAY
   fi
-  unset _DISPLAY
 }
 
 function svn_get_rev_nr() {
@@ -60,7 +60,7 @@ function svn_get_rev_nr() {
 
 function svn_dirty_choose() {
   if in_svn; then
-    root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
+    local root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
     if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
@@ -77,7 +77,7 @@ function svn_dirty() {
 
 function svn_dirty_choose_pwd () {
   if in_svn; then
-    root=$PWD
+    local root=$PWD
     if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1

From 22287d0153047cf5d5872d294202d9ce35e8eac8 Mon Sep 17 00:00:00 2001
From: Ilia Choly <icholy@accipiterradar.com>
Date: Fri, 11 Sep 2015 12:20:26 -0400
Subject: [PATCH 1306/1378] handle multiple paths in GOPATH

---
 plugins/golang/golang.plugin.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 4e6ca0a99..1ce3cea58 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -55,8 +55,13 @@ __go_tool_complete() {
     '-tags[list of build tags to consider satisfied]:tags'
   )
   __go_packages() {
-      _path_files -W "$(go env GOROOT)/src" -/
-      _path_files -W "$(go env GOPATH)/src" -/
+      local gopaths
+      declare -a gopaths
+      gopaths=("${(s/:/)$(go env GOPATH)}")
+      gopaths+=("$(go env GOROOT)")
+      for p in $gopaths; do
+        _path_files -W "$p/src" -/
+      done
   }
   __go_identifiers() {
       compadd $(godoc -templates $ZSH/plugins/golang/templates ${words[-2]} 2> /dev/null)

From 6642a99fac11dd4e10869566f1d38761f1e8746c Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 10 Sep 2015 01:48:24 -0400
Subject: [PATCH 1307/1378] xcode: extend xcselv to list versions and do
 completion

---
 plugins/xcode/README.md        |  65 ++++++++++++--
 plugins/xcode/_xcselv          |  19 +++++
 plugins/xcode/xcode.plugin.zsh | 151 ++++++++++++++++++++++++++++++---
 3 files changed, 214 insertions(+), 21 deletions(-)
 create mode 100644 plugins/xcode/_xcselv

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index 362940b93..15e657859 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -4,7 +4,7 @@
 
 This plugin provides a few utilities that can help you on your daily use of Xcode and iOS development.
 
-To start using it, add the `xcode` plugin to your `plugins` array:
+To start using it, add the `xcode` plugin to your `plugins` array in `~/.zshrc`:
 
 ```zsh
 plugins=(... xcode)
@@ -24,12 +24,61 @@ plugins=(... xcode)
 
 ## Functions
 
-- **`xc`**:
-  Open one of the `.xcworkspace` and `.xcodeproj` files that it can find in the current working directory.
-  Returns 1 if it didn't find any relevant files.
+###  `xc`
 
-- **`simulator`**:
-  Open the iOS Simulator from your command line, dependant on whichever is the active developer directory for Xcode.
+Opens the current directory in Xcode as an Xcode project. This will open one of the `.xcworkspace` and `.xcodeproj` files that it can find in the current working directory.
+Returns 1 if it didn't find any relevant files.
 
-- **`xcselv`**:
-  Select different Xcode by version. Example: `xcselv 6.2`
+###  `simulator`
+
+Opens the iOS Simulator from your command line, dependent on whichever is the active developer directory for Xcode. (That is, it respects the `xcsel` setting.)
+
+### `xcselv`
+
+Selects different Xcode installations by version name. This is like `xcsel`, except it takes just a version name as an argument instead of the full path to the Xcode installation. Uses the naming conventions described below.
+
+* `xcselv <version>` selects a version
+ * Example: `xcselv 6.2`
+* `xcselv default` selects the default unversioned `Applications/Xcode.app`
+* `xcselv` with no argument lists the available Xcode versions in a human-readable format
+* `xcselv -l` lists the installed Xcode versions
+* `xcselv -L` lists the installed Xcode versions in a short version-name-only format
+* `xcselv -p` prints info about the active Xcode version
+* `xcselv -h` prints a help message
+
+The option parsing for `xcselv` is naive. Options may not be combined, and only the first option is recognized.
+
+## Multiple Xcode Versions
+
+The `xcselv` command provides support for switching between different Xcode installations using just a version number. Different Xcode versions are identified by file naming conventions.
+
+### Versioned Xcode Naming Conventions
+
+Apple does not seem to explicitly define or provide tooling support for a naming convention or other organizational mechanism for managing versioned Xcode installations. Apple seems to have released beta versions with both `Xcode<version>.app` and `Xcode-<version>.app` style names in the past, and both styles show up in forum and blog discussions.
+
+We've adopted the following naming convention:
+
+* Versioned Xcode installations are identified by the name `Xcode-<version>` or `Xcode<version>`.
+* The `-` separating `"Xcode"` and the version name is optional, and may be replaced by a space.
+* The versioned name may be applied to the `Xcode.app` itself, or a subdirectory underneath `Applications/` containing it.
+* You cannot version both the `Xcode.app` filename itself and the containing subfolder.
+* Thus, all of the following are equivalent.
+ * `Applications/Xcode-<version>.app`
+ * `Applications/Xcode-<version>/Xcode.app`
+ * `Applications/Xcode<version>.app`
+ * `Applications/Xcode <version>.app`
+ * `Applications/Xcode <version>/Xcode.app`
+* Both the system `/Applications/` and user `$HOME/Applications/` directories are searched.
+ * The user's `$HOME/Applications/` takes precedence over `/Applications` for a given version.
+ * If multiple naming variants within the same `Applications/` folder indicate the same version (for example, `Xcode-3.2.1.app`, `Xcode3.2.1.app`, and `Xcode-3.2.1/Xcode.app`), the precedence order is unspecified and implementation-dependent.
+* The `<version>` may be any string that is valid in a filename.
+* The special version name `"default"` refers to the "default" unversioned Xcode at `Applications/Xcode.app` (in either `/Applications/` or `$HOME/Applications/`).
+* Version names may not start with ``"-"`` or whitespace.
+
+The restrictions on the naming convention may need to be tightened in the future. In particular, if there are other well-known applications whose names begin with the string `"Xcode"`, the strings allowed for `<version>` may need to be restricted to avoid colliding with other applications. If there's evidence that one of these naming techniques is strongly favored either in practice or by Apple, we may tighten the naming convention to favor it.
+
+## Caveats
+
+Using `xcsel` or `xcselv` to select an Xcode that is installed under your `$HOME` may break things for other users, depending on your system setup. We let you do this anyway because some people run OS X as effectively single-user, or have open permissions so this will work. You could also use `$DEVELOPER_DIR` as an alternative to `xcsel` that is scoped to the current user or session, instead of a global setting.
+
+This does not verify that the version name in the Xcode filename matches the actual version of that binary. It is the user's responsibility to get the names right.
diff --git a/plugins/xcode/_xcselv b/plugins/xcode/_xcselv
new file mode 100644
index 000000000..f9861d54b
--- /dev/null
+++ b/plugins/xcode/_xcselv
@@ -0,0 +1,19 @@
+#compdef xcselv
+#autoload
+
+function _xcselv_compl_list_versions() {
+  _omz_xcode_list_versions short
+}
+
+_arguments \
+  '(-l -L -p)-h[prints a help message]' \
+  '(-L -p -h)-l[lists installed Xcode versions]' \
+  '(-l -p -h)-L[lists installed Xcode versions (long form)]' \
+  '(-h -l -L)-p[prints active Xcode version]' \
+  && ret=0
+
+local _xcode_versions
+_xcode_versions=($(_xcselv_compl_list_versions))
+_describe -t _xcode_versions 'version' _xcode_versions
+
+return 1
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 1f547470d..b63a857a7 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -22,28 +22,153 @@ function xc {
 # Uses naming convention:
 #  - different versions of Xcode are named Xcode-<version>.app or stored
 #     in a folder named Xcode-<version>
-#  - the special version name "-" refers to the "default" Xcode.app with no suffix
+#  - the special version name "default" refers to the "default" Xcode.app with no suffix
 function xcselv {
   emulate -L zsh
+  if [[ $# == 0 ]]; then
+    echo "xcselv: error: no option or argument given" >&2
+    echo "xcselv: see 'xcselv -h' for help" >&2
+    return 1
+  elif [[ $1 == "-p" ]]; then
+    _omz_xcode_print_active_version
+    return
+  elif [[ $1 == "-l" ]]; then
+    _omz_xcode_list_versions
+    return
+  elif [[ $1 == "-L" ]]; then
+    _omz_xcode_list_versions short
+    return
+  elif [[ $1 == "-h" ]]; then
+    _omz_xcode_print_xcselv_usage
+    return 0
+  elif [[ $1 == -* && $1 != "-" ]]; then
+    echo "xcselv: error: unrecognized option: $1" >&2
+    echo "xcselv: see 'xcselv -h' for help" >&2
+    return 1
+  fi
+  # Main case: "xcselv <version>" to select a version
   local version=$1
-  local apps_dirs apps_dir apps app
-  apps_dirs=( $HOME/Applications /Applications )
-  for apps_dir ($apps_dirs); do
-    if [[ $version == "-" ]]; then
-      apps=( $apps_dir/Xcode.app $apps_dir/Xcode/Xcode.app )
+  local -A xcode_versions
+  _omz_xcode_locate_versions
+  if [[ -z ${xcode_versions[$version]} ]]; then
+    echo "xcselv: error: Xcode version '$version' not found" >&2
+    return 1
+  fi
+  app="${xcode_versions[$version]}"
+  echo "selecting Xcode $version: $app"
+  xcsel "$app"
+}
+
+function _omz_xcode_print_xcselv_usage {
+  cat << EOF >&2
+Usage: 
+  xcselv <version>
+  xcselv [options]
+
+Options:
+  <version> set the active Xcode version
+  -h        print this help message and exit
+  -p        print the active Xcode version
+  -l        list installed Xcode versions (long human-readable form)
+  -L        list installed Xcode versions (short form, version names only)
+EOF
+}
+
+# Parses the Xcode version from a filename based on our conventions
+# Only meaningful when called from other _omz_xcode functions
+function _omz_xcode_parse_versioned_file {
+  local file=$1
+  local basename=${app:t}
+  local dir=${app:h}
+  local parent=${dir:t}
+  #echo "parent=$parent basename=$basename verstr=$verstr ver=$ver" >&2
+  local verstr
+  if [[ $parent == Xcode* ]]; then
+    if [[ $basename == "Xcode.app" ]]; then
+      # "Xcode-<version>/Xcode.app" format
+      verstr=$parent
     else
-      apps=( $apps_dir/Xcode-$version.app $apps_dir/Xcode-$version/Xcode.app )
+      # Both file and parent dir are versioned. Reject.
+      return 1;
     fi
+  elif [[ $basename == Xcode*.app ]]; then
+    # "Xcode-<version>.app" format
+    verstr=${basename:r}
+  else
+    # Invalid naming pattern
+    return 1;
+  fi
+
+  local ver=${verstr#Xcode}
+  ver=${ver#[- ]}
+  if [[ -z $ver ]]; then
+    # Unversioned "default" installation location
+    ver="default"
+  fi
+  print -- "$ver"
+}
+
+# Print the active version, using xcselv's notion of versions
+function _omz_xcode_print_active_version {
+  emulate -L zsh
+  local -A xcode_versions
+  local versions version active_path
+  _omz_xcode_locate_versions
+  active_path=$(xcode-select -p)
+  active_path=${active_path%%/Contents/Developer*}
+  versions=(${(kni)xcode_versions})
+  for version ($versions); do
+    if [[ "${xcode_versions[$version]}" == $active_path ]]; then
+      printf "%s (%s)\n" $version $active_path
+      return
+    fi
+  done
+  printf "%s (%s)\n" "<unknown>" $active_path
+}
+
+# Locates all the installed versions of Xcode on this system, for this
+# plugin's internal use.
+# Populates the $xcode_versions associative array variable
+# Caller should local-ize $xcode_versions with `local -A xcode_versions`
+function _omz_xcode_locate_versions {
+  emulate -L zsh
+  local -a app_dirs
+  local app_dir apps app xcode_ver
+  # In increasing precedence order:
+  app_dirs=(/Applications $HOME/Applications)
+  for app_dir ($app_dirs); do
+    apps=( $app_dir/Xcode*.app(N) $app_dir/Xcode*/Xcode.app(N) )
     for app ($apps); do
-      if [[ -e "$app" ]]; then
-        echo "selecting Xcode $version: $app"
-        xcsel "$app"
-        return
+      xcode_ver=$(_omz_xcode_parse_versioned_file $app)
+      if [[ $? != 0 ]]; then
+        continue
       fi
+      xcode_versions[$xcode_ver]=$app
     done
   done
-  echo "xcselv: Xcode version $version not found"
-  return 1
+}
+
+function _omz_xcode_list_versions {
+  emulate -L zsh
+  local -A xcode_versions
+  _omz_xcode_locate_versions
+  local width=1 width_i versions do_short=0
+  if [[ $1 == "short" ]]; then
+    do_short=1
+  fi
+  versions=(${(kni)xcode_versions})
+  for version ($versions); do
+    if [[ $#version > $width ]]; then
+      width=$#version;
+    fi
+  done
+  for version ($versions); do
+    if [[ $do_short == 1 ]]; then
+      printf "%s\n" $version
+    else
+      printf "%-${width}s -> %s\n" "$version" "${xcode_versions[$version]}"
+    fi
+  done
 }
 
 function simulator {

From c9af79fcad9af8e4f2fd102336e7b0ffc1df0336 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 11 Sep 2015 18:37:39 -0400
Subject: [PATCH 1308/1378] jira: add README, "emulate -L zsh", add
 "dumpconfig" action

(The "dumpconfig" action is for verifying the configuration behavior against what's documented in the README now.)
add "error" to some of the error messages
---
 plugins/jira/README.md       | 64 ++++++++++++++++++++++++++++++++++++
 plugins/jira/_jira           |  1 +
 plugins/jira/jira.plugin.zsh | 44 ++++++++-----------------
 3 files changed, 79 insertions(+), 30 deletions(-)
 create mode 100644 plugins/jira/README.md

diff --git a/plugins/jira/README.md b/plugins/jira/README.md
new file mode 100644
index 000000000..efb8a743a
--- /dev/null
+++ b/plugins/jira/README.md
@@ -0,0 +1,64 @@
+#  Jira plugin  #
+
+CLI support for JIRA interaction
+
+##  Description  ##
+
+This plugin provides command line tools for interacting with Atlassian's [JIRA](https://www.atlassian.com/software/jira) bug tracking software.
+
+The interaction is all done through the web. No local installation of JIRA is necessary.
+
+In this document, "JIRA" refers to the JIRA issue tracking server, and `jira` refers to the command this plugin supplies.
+
+##  Usage  ##
+
+This plugin supplies one command, `jira`, through which all its features are exposed. Most forms of this command open a JIRA page in your web browser.
+
+```
+jira            # performs the default action
+
+jira new        # opens a new issue
+jira dashboard  # opens your JIRA dashboard
+jira reported [username]  # queries for issues reported by a user
+jira assigned [username]  # queries for issues assigned to a user
+jira ABC-123    # opens an existing issue
+jira ABC-123 m  # opens an existing issue for adding a comment
+```
+
+#### Debugging usage  ####
+
+These calling forms are for developers' use, and may change at any time.
+
+```
+jira dumpconfig   # displays the effective configuration
+```
+
+##  Setup  ##
+
+The URL for your JIRA instance is set by `$JIRA_URL` or a `.jira_url` file.
+
+Add a `.jira-url` file in the base of your project. You can also set `$JIRA_URL` in your `~/.zshrc` or put a `.jira-url` in your home directory. A `.jira-url` in the current directory takes precedence, so you can make per-project customizations.
+
+The same goes with `.jira-prefix` and `$JIRA_PREFIX`. These control the prefix added to all issue IDs, which differentiates projects within a JIRA instance.
+
+For example:
+
+```
+cd to/my/project
+echo "https://jira.atlassian.com" >> .jira-url
+```
+
+(Note: The current implementation only looks in the current directory for `.jira-url` and `.jira-prefix`, not up the path, so if you are in a subdirectory of your project, it will fall back to your default JIRA URL. This will probably change in the future though.)
+
+###  Variables  ###
+
+* `$JIRA_URL` - Your JIRA instance's URL
+* `$JIRA_NAME` - Your JIRA username; used as the default user for `assigned`/`reported` searches
+* `$JIRA_PREFIX` - Prefix added to issue ID arguments
+* `$JIRA_RAPID_BOARD` - Set to `true` if you use Rapid Board
+* `$JIRA_DEFAULT_ACTION` - Action to do when `jira` is called with no arguments; defaults to "new"
+
+
+### Browser ###
+
+Your default web browser, as determined by how `open_command` handles `http://` URLs, is used for interacting with the JIRA instance. If you change your system's URL handler associations, it will change the browser that `jira` uses.
diff --git a/plugins/jira/_jira b/plugins/jira/_jira
index b0ea658e2..03fe6a499 100644
--- a/plugins/jira/_jira
+++ b/plugins/jira/_jira
@@ -7,6 +7,7 @@ _1st_arguments=(
   'dashboard:open the dashboard'
   'reported:search for issues reported by a user'
   'assigned:search for issues assigned to a user'
+  'dumpconfig:display effective jira configuration'
 )
 
 _arguments -C \
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 89559767f..341e23ec0 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -1,35 +1,11 @@
 # CLI support for JIRA interaction
 #
-# Setup: 
-#   Add a .jira-url file in the base of your project
-#   You can also set $JIRA_URL in your .zshrc or put .jira-url in your home directory
-#   A .jira-url in the current directory takes precedence. 
-#   The same goes with .jira-prefix and $JIRA_PREFIX.
-#
-#   For example:
-#     cd to/my/project
-#     echo "https://name.jira.com" >> .jira-url
-#
-# Variables:
-#  $JIRA_RAPID_BOARD     - set to "true" if you use Rapid Board
-#  $JIRA_DEFAULT_ACTION  - action to do when `jira` is called witn no args
-#                          defaults to "new"
-#  $JIRA_NAME            - Your JIRA username. Used as default for assigned/reported
-#  $JIRA_PREFIX          - Prefix added to issue ID arguments
-#
-#
-# Usage: 
-#   jira            # Performs the default action
-#   jira new        # opens a new issue
-#   jira reported [username]
-#   jira assigned [username]
-#   jira dashboard
-#   jira ABC-123    # Opens an existing issue
-#   jira ABC-123 m  # Opens an existing issue for adding a comment
+# See README.md for details
 
 : ${JIRA_DEFAULT_ACTION:=new}
 
 function jira() {
+  emulate -L zsh
   local action=${1:=$JIRA_DEFAULT_ACTION}
 
   local jira_url jira_prefix
@@ -63,6 +39,12 @@ function jira() {
   elif [[ "$action" == "dashboard" ]]; then
     echo "Opening dashboard"
     open_command "${jira_url}/secure/Dashboard.jspa"
+  elif [[ "$action" == "dumpconfig" ]]; then
+    echo "JIRA_URL=$jira_url"
+    echo "JIRA_PREFIX=$jira_prefix"
+    echo "JIRA_NAME=$JIRA_NAME"
+    echo "JIRA_RAPID_BOARD=$JIRA_RAPID_BOARD"
+    echo "JIRA_DEFAULT_ACTION=$JIRA_DEFAULT_ACTION"
   else
     # Anything that doesn't match a special action is considered an issue name
     local issue_arg=$action
@@ -84,15 +66,17 @@ function jira() {
 
 function _jira_url_help() {
   cat << EOF
-JIRA url is not specified anywhere.
+error: JIRA URL is not specified anywhere.
+
 Valid options, in order of precedence:
   .jira-url file
   \$HOME/.jira-url file
-  JIRA_URL environment variable
+  \$JIRA_URL environment variable
 EOF
 }
 
 function _jira_query() {
+  emulate -L zsh
   local verb="$1"
   local jira_name lookup preposition query
   if [[ "${verb}" == "reported" ]]; then
@@ -102,12 +86,12 @@ function _jira_query() {
     lookup=assignee
     preposition=to
   else
-    echo "not a valid lookup: $verb" >&2
+    echo "error: not a valid lookup: $verb" >&2
     return 1
   fi
   jira_name=${2:=$JIRA_NAME}
   if [[ -z $jira_name ]]; then
-    echo "JIRA_NAME not specified" >&2
+    echo "error: JIRA_NAME not specified" >&2
     return 1
   fi
 

From 6e0fcf803fe00445c97861360d1b0806d8cc56b8 Mon Sep 17 00:00:00 2001
From: Ramses Ladlani <ramses.ladlani@fishingcactus.com>
Date: Mon, 14 Sep 2015 11:02:00 +0200
Subject: [PATCH 1309/1378] Fixed atom plugin for cygwin users

---
 plugins/atom/atom.plugin.zsh | 38 +++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
index 9adb9031a..290c75330 100644
--- a/plugins/atom/atom.plugin.zsh
+++ b/plugins/atom/atom.plugin.zsh
@@ -1,14 +1,34 @@
-local _atom_paths > /dev/null 2>&1
-_atom_paths=(
-    "$HOME/Applications/Atom.app"
-    "/Applications/Atom.app"
-)
+if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
+    local _atom_path > /dev/null 2>&1
+
+    _atom_path=${LOCALAPPDATA}/atom/bin/atom
 
-for _atom_path in $_atom_paths; do
     if [[ -a $_atom_path ]]; then
-        alias at="open -a '$_atom_path'"
-        break
+        cyg_open_atom()
+        {
+            if [[ -n $1 ]]; then
+                ${_atom_path} `cygpath -w $1`
+            else
+                ${_atom_path}
+            fi
+        }
+
+        alias at=cyg_open_atom
     fi
-done
+else
+    local _atom_paths > /dev/null 2>&1
+
+    _atom_paths=(
+        "$HOME/Applications/Atom.app"
+        "/Applications/Atom.app"
+    )
+
+    for _atom_path in $_atom_paths; do
+        if [[ -a $_atom_path ]]; then
+            alias at="open -a '$_atom_path'"
+            break
+        fi
+    done
+fi
 
 alias att='at .'

From 797e1f9a64c0d2775723bb28c76745b327f86d56 Mon Sep 17 00:00:00 2001
From: Tim O'Brien <timo@t413.com>
Date: Mon, 14 Sep 2015 15:32:50 -0700
Subject: [PATCH 1310/1378] [plugins/bgnotify] fix for iTerm2 notification
 clicks

---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index f6dd3886c..459f5214e 100755
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -32,7 +32,7 @@ currentWindowId () {
 
 bgnotify () { ## args: (title, subtitle)
   if hash terminal-notifier 2>/dev/null; then #osx
-    [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2' ||
+    [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2';
     [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] && term_id='com.apple.terminal';
     ## now call terminal-notifier, (hopefully with $term_id!)
     [ -z "$term_id" ] && terminal-notifier -message "$2" -title "$1" >/dev/null ||

From a8a8bc3967fc7b6906bd03c8f893a206ebc055f5 Mon Sep 17 00:00:00 2001
From: Daniel Stankevich <daniel.stankevich@rea-group.com>
Date: Wed, 16 Sep 2015 17:18:27 +1000
Subject: [PATCH 1311/1378] Add simple Stack commands list

---
 plugins/stack/stack.plugin.zsh | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 plugins/stack/stack.plugin.zsh

diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
new file mode 100644
index 000000000..7cc256394
--- /dev/null
+++ b/plugins/stack/stack.plugin.zsh
@@ -0,0 +1,49 @@
+function stack_sandbox_info() {
+    stack_files=(*.stack(N))
+    if [ $#stack_files -gt 0 ]; then
+        if [ -f stack.sandbox.config ]; then
+            echo "%{$fg[green]%}sandboxed%{$reset_color%}"
+        else
+            echo "%{$fg[red]%}not sandboxed%{$reset_color%}"
+        fi
+    fi
+}
+
+function _stack_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "build:Build the project(s) in this directory/configuration"
+          "install:Build executables and install to a user path"
+          "test:Build and test the project(s) in this directory/configuration"
+          "bench:Build and benchmark the project(s) in this directory/configuration"
+          "haddock:Generate haddocks for the project(s) in this directory/configuration"
+          "new:Create a brand new project"
+          "init:Initialize a stack project based on one or more stack packages"
+          "solver:Use a dependency solver to try and determine missing extra-deps"
+          "setup:Get the appropriate ghc for your project"
+          "path:Print out handy path information"
+          "unpack:Unpack one or more packages locally"
+          "update:Update the package index"
+          "upgrade:Upgrade to the latest stack (experimental)"
+          "upload:Upload a package to Hackage"
+          "dot:Visualize your project's dependency graph using Graphviz dot"
+          "exec:Execute a command"
+          "ghc:Run ghc"
+          "ghci:Run ghci in the context of project(s)"
+          "ide:Run ide-backend-client with the correct arguments"
+          "runghc:Run runghc"
+          "clean:Clean the local packages"
+          "docker:Subcommands specific to Docker use"
+        )
+        _describe -t subcommands 'stack subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+compdef _stack_commands stack
+

From bb10ad0a13f0dfc1d716ea023d4fc806a4e167d0 Mon Sep 17 00:00:00 2001
From: Daniel Stankevich <daniel.stankevich@rea-group.com>
Date: Wed, 16 Sep 2015 17:25:39 +1000
Subject: [PATCH 1312/1378] Remove unnecessary sandbox fn

---
 plugins/stack/stack.plugin.zsh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
index 7cc256394..a149208d0 100644
--- a/plugins/stack/stack.plugin.zsh
+++ b/plugins/stack/stack.plugin.zsh
@@ -1,14 +1,3 @@
-function stack_sandbox_info() {
-    stack_files=(*.stack(N))
-    if [ $#stack_files -gt 0 ]; then
-        if [ -f stack.sandbox.config ]; then
-            echo "%{$fg[green]%}sandboxed%{$reset_color%}"
-        else
-            echo "%{$fg[red]%}not sandboxed%{$reset_color%}"
-        fi
-    fi
-}
-
 function _stack_commands() {
     local ret=1 state
     _arguments ':subcommand:->subcommand' && ret=0
@@ -46,4 +35,3 @@ function _stack_commands() {
 }
 
 compdef _stack_commands stack
-

From 8c5b9481622759d2081e0b28faef64a39200f122 Mon Sep 17 00:00:00 2001
From: Henrik Hodne <henrik@hodne.io>
Date: Wed, 16 Sep 2015 15:28:08 +0200
Subject: [PATCH 1313/1378] =?UTF-8?q?chruby:=20don=CA=BCt=20try=20to=20exe?=
 =?UTF-8?q?cute=20.sh=20files=20before=20loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/chruby/chruby.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index b461b0c9b..5be6528b0 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -45,11 +45,11 @@ _source_from_omz_settings() {
     zstyle -s :omz:plugins:chruby path _chruby_path
     zstyle -s :omz:plugins:chruby auto _chruby_auto
 
-    if ${_chruby_path} && [[ -r ${_chruby_path} ]]; then
+    if [[ -r ${_chruby_path} ]]; then
         source ${_chruby_path}
     fi
 
-    if ${_chruby_auto} && [[ -r ${_chruby_auto} ]]; then
+    if [[ -r ${_chruby_auto} ]]; then
         source ${_chruby_auto}
     fi
 }

From 5cf0a0128b2dbee9aecbd6124dff72d2568001ac Mon Sep 17 00:00:00 2001
From: Alexander Olsson <noseglid@gmail.com>
Date: Thu, 17 Sep 2015 10:10:23 +0200
Subject: [PATCH 1314/1378] Use local gradlew

Instead of requiring to add `cwd` to path, just use `gradlew` from the local folder. This is how most gradle wrapper projects are laid out
---
 plugins/gradle/gradle.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 6f634d1ba..97941756d 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -82,7 +82,7 @@ _gradlew_tasks () {
   if [ in_gradle ]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-     gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+     ./gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
     fi
     compadd -X "==== Gradlew Tasks ====" `cat .gradletasknamecache`
   fi

From dce052dac00f83dae364358cdc6c24ed3486e9ea Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Fri, 18 Sep 2015 14:24:46 +0200
Subject: [PATCH 1315/1378] Add emotty plugin

which displays an emoji for the current $TTY.
---
 plugins/emotty/emotty.plugin.zsh      | 43 ++++++++++++++++++++
 plugins/emotty/emotty_emoji_set.zsh   | 24 +++++++++++
 plugins/emotty/emotty_floral_set.zsh  | 18 +++++++++
 plugins/emotty/emotty_love_set.zsh    | 34 ++++++++++++++++
 plugins/emotty/emotty_nature_set.zsh  | 58 +++++++++++++++++++++++++++
 plugins/emotty/emotty_stellar_set.zsh | 25 ++++++++++++
 plugins/emotty/emotty_zodiac_set.zsh  | 29 ++++++++++++++
 7 files changed, 231 insertions(+)
 create mode 100644 plugins/emotty/emotty.plugin.zsh
 create mode 100644 plugins/emotty/emotty_emoji_set.zsh
 create mode 100644 plugins/emotty/emotty_floral_set.zsh
 create mode 100644 plugins/emotty/emotty_love_set.zsh
 create mode 100644 plugins/emotty/emotty_nature_set.zsh
 create mode 100644 plugins/emotty/emotty_stellar_set.zsh
 create mode 100644 plugins/emotty/emotty_zodiac_set.zsh

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
new file mode 100644
index 000000000..b32dd1a4c
--- /dev/null
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -0,0 +1,43 @@
+# ------------------------------------------------------------------------------
+#          FILE: emotty.plugin.zsh
+#   DESCRIPTION: Return an emoji for the current $TTY number.
+#        AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
+#       VERSION: 1.0.0
+#       DEPENDS: emoji plugin
+#       
+# There are different sets of emoji characters available, to choose a different
+# set export emotty_set to the name of the set you would like to use, e.g.:
+# % export emotty_set=nature
+# ------------------------------------------------------------------------------
+
+typeset -gAH _emotty_sets
+local _emotty_plugin_dir="${0:h}"
+source "$_emotty_plugin_dir/emotty_stellar_set.zsh"
+source "$_emotty_plugin_dir/emotty_floral_set.zsh"
+source "$_emotty_plugin_dir/emotty_zodiac_set.zsh"
+source "$_emotty_plugin_dir/emotty_nature_set.zsh"
+source "$_emotty_plugin_dir/emotty_emoji_set.zsh"
+source "$_emotty_plugin_dir/emotty_love_set.zsh"
+unset _emotty_plugin_dir
+
+emotty_default_set=emoji
+
+function emotty() {
+  # Use emotty set defined by user, fallback to default
+  local emotty=${_emotty_sets[${emotty_set:-$emotty_default_set}]}
+  # Parse $TTY number, normalizing it to an emotty set index
+  (( tty = (${TTY##/dev/ttys} % ${#${=emotty}}) + 1 ))
+  local character_name=${${=emotty}[tty]}
+  echo "${emoji[${character_name}]}${emoji2[emoji_style]}"
+}
+
+function display_emotty() {
+  local name=$1
+  for i in ${=_emotty_sets[$name]}; do
+    printf "${emoji[$i]}${emoji2[emoji_style]}  "
+  done
+  print
+  for i in ${=_emotty_sets[$name]}; do
+    print "${emoji[$i]}${emoji2[emoji_style]}  = $i"
+  done
+}
diff --git a/plugins/emotty/emotty_emoji_set.zsh b/plugins/emotty/emotty_emoji_set.zsh
new file mode 100644
index 000000000..00e317131
--- /dev/null
+++ b/plugins/emotty/emotty_emoji_set.zsh
@@ -0,0 +1,24 @@
+#!/usr/bin/env zsh
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+_emotty_sets[emoji]="
+  crystal_ball
+  ghost
+  jack_o_lantern
+  see_no_evil_monkey
+  hear_no_evil_monkey
+  speak_no_evil_monkey
+  smiling_cat_face_with_open_mouth
+  extraterrestrial_alien
+  rocket
+  billiards
+  bomb
+  pill
+  japanese_symbol_for_beginner
+  direct_hit
+  cyclone
+  diamond_shape_with_a_dot_inside
+  sparkle
+  eight_spoked_asterisk
+  eight_pointed_black_star
+  "
diff --git a/plugins/emotty/emotty_floral_set.zsh b/plugins/emotty/emotty_floral_set.zsh
new file mode 100644
index 000000000..f761feae6
--- /dev/null
+++ b/plugins/emotty/emotty_floral_set.zsh
@@ -0,0 +1,18 @@
+#!/usr/bin/env zsh
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+_emotty_sets[floral]="
+  hibiscus
+  cherry_blossom
+  blossom
+  sunflower
+  bouquet
+  tulip
+  rose
+  four_leaf_clover
+  seedling
+  herb
+  palm_tree
+  evergreen_tree
+  deciduous_tree
+  "
diff --git a/plugins/emotty/emotty_love_set.zsh b/plugins/emotty/emotty_love_set.zsh
new file mode 100644
index 000000000..8f19e6902
--- /dev/null
+++ b/plugins/emotty/emotty_love_set.zsh
@@ -0,0 +1,34 @@
+#!/usr/bin/env zsh
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+# Note: The heavy_black_heart emoji requires $emoji2[emoji_style]
+# to be rendered as the emoji red heart.
+_emotty_sets[love]="
+  green_heart
+  blue_heart
+  purple_heart
+  yellow_heart
+  heavy_black_heart
+  broken_heart
+  heart_with_arrow
+  heart_with_ribbon
+  sparkling_heart
+  two_hearts
+  revolving_hearts
+  growing_heart
+  beating_heart
+  heart_decoration
+  couple_with_heart
+  kiss
+  man_and_woman_holding_hands
+  two_women_holding_hands
+  two_men_holding_hands
+  kiss_mark
+  smiling_face_with_heart_shaped_eyes
+  kissing_face
+  face_throwing_a_kiss
+  kissing_face_with_smiling_eyes
+  kissing_face_with_closed_eyes
+  smiling_cat_face_with_heart_shaped_eyes
+  kissing_cat_face_with_closed_eyes
+  "
diff --git a/plugins/emotty/emotty_nature_set.zsh b/plugins/emotty/emotty_nature_set.zsh
new file mode 100644
index 000000000..8dab4c1ba
--- /dev/null
+++ b/plugins/emotty/emotty_nature_set.zsh
@@ -0,0 +1,58 @@
+#!/usr/bin/env zsh
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+_emotty_sets[nature]="
+  mouse_face
+  hamster_face
+  rabbit_face
+  dog_face
+  cat_face
+  tiger_face
+  bear_face
+  monkey_face
+  koala
+  panda_face
+  chicken
+  baby_chick
+  bird
+  penguin
+  cow_face
+  pig_face
+  frog_face
+  boar
+  wolf_face
+  horse_face
+  snail
+  bug
+  ant
+  honeybee
+  lady_beetle
+  spouting_whale
+  dolphin
+  octopus
+  fish
+  tropical_fish
+  snake
+  turtle
+  lemon
+  tangerine
+  peach
+  mushroom
+  tomato
+  strawberry
+  red_apple
+  cherries
+  grapes
+  aubergine
+  watermelon
+  banana
+  pineapple
+  melon
+  pear
+  green_apple
+  ear_of_maize
+  sunflower
+  seedling
+  herb
+  four_leaf_clover
+  "
diff --git a/plugins/emotty/emotty_stellar_set.zsh b/plugins/emotty/emotty_stellar_set.zsh
new file mode 100644
index 000000000..8e7e61068
--- /dev/null
+++ b/plugins/emotty/emotty_stellar_set.zsh
@@ -0,0 +1,25 @@
+#!/usr/bin/env zsh
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+# NOTE: The following emoji show as $'character' in the title
+#  white_medium_star
+#  sparkles
+#  dizzy_symbol
+
+_emotty_sets[stellar]="
+  full_moon_symbol
+  waning_gibbous_moon_symbol
+  waning_crescent_moon_symbol
+  last_quarter_moon_symbol
+  new_moon_symbol
+  new_moon_with_face
+  waxing_crescent_moon_symbol
+  first_quarter_moon_symbol
+  waxing_gibbous_moon_symbol
+  full_moon_with_face
+  sun_with_face
+  glowing_star
+  crescent_moon
+  first_quarter_moon_with_face
+  last_quarter_moon_with_face
+  "
diff --git a/plugins/emotty/emotty_zodiac_set.zsh b/plugins/emotty/emotty_zodiac_set.zsh
new file mode 100644
index 000000000..bde6e3d2e
--- /dev/null
+++ b/plugins/emotty/emotty_zodiac_set.zsh
@@ -0,0 +1,29 @@
+#!/usr/bin/env zsh
+# vim:ft=zsh ts=2 sw=2 sts=2
+
+_emotty_sets[zodiac]="
+  aries
+  taurus
+  gemini
+  cancer
+  leo
+  virgo
+  libra
+  scorpius
+  sagittarius
+  capricorn
+  aquarius
+  pisces
+  rat
+  ox
+  tiger
+  rabbit
+  dragon
+  snake
+  horse
+  goat
+  monkey
+  rooster
+  dog
+  pig
+  "

From 550573bfb8a9369f279a46c70a0278a03d866dd3 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Fri, 18 Sep 2015 14:25:47 +0200
Subject: [PATCH 1316/1378] Add emotty theme

---
 themes/emotty.zsh-theme | 99 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 themes/emotty.zsh-theme

diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
new file mode 100644
index 000000000..f646b2fa8
--- /dev/null
+++ b/themes/emotty.zsh-theme
@@ -0,0 +1,99 @@
+#!/usr/bin/env zsh
+# ------------------------------------------------------------------------------
+#          FILE: emotty.zsh-theme
+#   DESCRIPTION: A varying emoji based theme
+#        AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
+#       VERSION: 1.0.0
+#       DEPENDS: emotty plugin
+#    RECOMMENDS: Hasklig font
+#
+# This theme shows a different emoji for each tty at the main prompt.
+#
+# There are pre-defined different emoji sets to choose from, e.g.:
+# emoji, stellar, floral, zodiac, love (see emotty plugin).
+# 
+# To choose a different emotty set than the default (emoji)
+# % export emotty_set=nature
+#
+# For the superuser (root) this theme shows a designated indicator
+# and switches the foreground color to red
+# (see root_prompt variable, default: skull).
+# But you are using sudo (8) instead of designated a root shell, right‽
+#
+# When logged in via SSH the main prompt also shows the user- and hostname.
+#
+# The exit status of the last failed command is displayed in the window title
+# along with an indicator (see warn_glyph variable, default: collision symbol).
+# To clear it just run: $NULL, true or :
+#
+# The right prompt shows the current working directory (3 levels up) in cyan.
+#
+# When in a git repository the main prompt shows the current branch name
+# with a branch indicator in yellow
+# (see vcs_branch_glyph variable, default: Hasklig branch glyph).
+#
+# If there are modified files the prompt switches to red and shows an unstaged
+# indicator (see vcs_unstaged_glyph variable, default: circled letter M).
+#
+# If there are staged files the prompt switches to green and shows an staged
+# indicator (see vcs_staged_glyph variable, default: high voltage sign).
+#
+# In a git repository the right prompt shows the repository name in bold and
+# prepends the current working directory subpath within the repository.
+#
+# When git currently performs an action such as merge or rebase, the action is
+# displayed in red instead of the branch name and a special action indicator
+# is shown (see vcs_action_glyph variable, default: chevron).
+# ------------------------------------------------------------------------------
+
+user_prompt="$(emotty)"
+root_prompt="$emoji[skull]"
+warn_prompt="$emoji[collision_symbol]"
+
+vcs_unstaged_glyph="%{$emoji[circled_latin_capital_letter_m]$emoji2[emoji_style] %2G%}"
+vcs_staged_glyph="%{$emoji[high_voltage_sign] %1G%}"
+vcs_branch_glyph=$(print -P $'\Ue0a0') #  
+vcs_action_glyph=$(print -P $'\U276f') # ❯
+
+red="$FG[001]"
+yellow="$FG[003]"
+green="$FG[002]"
+cyan="$FG[014]"
+
+prompt_glyph="%{%(#.${root_prompt}.${user_prompt})%1G%}"
+
+# Uncomment the next line if you also like to see the warn_prompt in the prompt on the right.
+#last_command_failed="%(?.. %F{red}%1{${warn_prompt} %1G%}%?%f)"
+
+
+setopt promptsubst
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+zstyle ':vcs_info:*' enable git #hg svn cvs
+zstyle ':vcs_info:*' get-revision false
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:git:*' unstagedstr "${red}${vcs_unstaged_glyph}"
+zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}"
+
+# %(K|F){color} set (back|fore)ground color
+# %(k|f) reset (back|fore)ground color
+zstyle ':vcs_info:*' max-exports 3
+zstyle ':vcs_info:*' nvcsformats "${prompt_glyph} " '%3~' ''
+zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" 
+zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]"
+
+red_if_root="%(!.%F{red}.)"
+sshuser_on_host="${SSH_TTY:+%(!.$red.$yellow)%n@%m$reset_color}"
+
+PROMPT='${sshuser_on_host}${vcs_info_msg_0_}${red_if_root} '
+RPROMPT='${cyan}${vcs_info_msg_1_##.|}${vcs_info_msg_2_}%f${last_command_failed}'
+
+emotty_title() {
+  title "${${?/[^0]*/$warn_prompt $?}/0/${prompt_glyph}}"
+}
+add-zsh-hook precmd emotty_title
+add-zsh-hook precmd vcs_info
+
+# vim:ft=zsh ts=2 sw=2 sts=2

From 1a51100d09883961ef023c63006dc576abcb1ae4 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 20 Sep 2015 11:44:58 +0200
Subject: [PATCH 1317/1378] Fix issues with character widths in emotty theme

---
 themes/emotty.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
index f646b2fa8..34d491ff0 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -51,7 +51,7 @@ root_prompt="$emoji[skull]"
 warn_prompt="$emoji[collision_symbol]"
 
 vcs_unstaged_glyph="%{$emoji[circled_latin_capital_letter_m]$emoji2[emoji_style] %2G%}"
-vcs_staged_glyph="%{$emoji[high_voltage_sign] %1G%}"
+vcs_staged_glyph="%{$emoji[high_voltage_sign] %2G%}"
 vcs_branch_glyph=$(print -P $'\Ue0a0') #  
 vcs_action_glyph=$(print -P $'\U276f') # ❯
 
@@ -60,7 +60,7 @@ yellow="$FG[003]"
 green="$FG[002]"
 cyan="$FG[014]"
 
-prompt_glyph="%{%(#.${root_prompt}.${user_prompt})%1G%}"
+prompt_glyph="%{%(#.${root_prompt}.${user_prompt}) %2G%}"
 
 # Uncomment the next line if you also like to see the warn_prompt in the prompt on the right.
 #last_command_failed="%(?.. %F{red}%1{${warn_prompt} %1G%}%?%f)"
@@ -80,7 +80,7 @@ zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}"
 # %(K|F){color} set (back|fore)ground color
 # %(k|f) reset (back|fore)ground color
 zstyle ':vcs_info:*' max-exports 3
-zstyle ':vcs_info:*' nvcsformats "${prompt_glyph} " '%3~' ''
+zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' ''
 zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" 
 zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]"
 

From f8502965e491d341829e565e221d7848588d6798 Mon Sep 17 00:00:00 2001
From: Ramses Ladlani <ramses.ladlani@fishingcactus.com>
Date: Mon, 21 Sep 2015 09:18:43 +0200
Subject: [PATCH 1318/1378] Added cygwin support to atom plugin

---
 plugins/atom/atom.plugin.zsh | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
index ec1a114ed..2711cf0e8 100644
--- a/plugins/atom/atom.plugin.zsh
+++ b/plugins/atom/atom.plugin.zsh
@@ -1,8 +1,5 @@
-# Gets OS Type
-unamestr=$(uname -s)
-
-# If OSX
-if [[ "$unamestr" == 'Darwin' ]]; then
+case $OSTYPE in
+darwin*)
     local _atom_paths > /dev/null 2>&1
     _atom_paths=(
         "$HOME/Applications/Atom.app"
@@ -15,8 +12,26 @@ if [[ "$unamestr" == 'Darwin' ]]; then
             break
         fi
     done
-# If Linux
-elif [[ "$unamestr" == 'Linux' ]]; then
+    ;;
+cygwin)
+    local _atom_path > /dev/null 2>&1
+
+    _atom_path=${LOCALAPPDATA}/atom/bin/atom
+
+    if [[ -a $_atom_path ]]; then
+        cyg_open_atom()
+        {
+            if [[ -n $1 ]]; then
+                ${_atom_path} `cygpath -w -a $1`
+            else
+                ${_atom_path}
+            fi
+        }
+
+        alias at=cyg_open_atom
+    fi
+    ;;
+linux*)
     # Alerts the user if 'atom' is not a found command.
     type atom >/dev/null 2>&1 && alias at="atom" || { echo >&2 "You have enabled the atom oh-my-zsh plugin on Linux, but atom is not a recognized command. Please make sure you have it installed before using this plugin."; }
-fi
+esac

From 1bb2715b22a08d3ae24d99550acd531c872a26cd Mon Sep 17 00:00:00 2001
From: Michael SALIHI <admin@prestance-informatique.fr>
Date: Mon, 21 Sep 2015 13:17:45 +0200
Subject: [PATCH 1319/1378] Fix capistrano problem when generating
 autocompletion

---
 plugins/capistrano/_capistrano | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index e6e71ffcc..c19c20b7a 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -14,7 +14,7 @@ _arguments -C \
 _cap_tasks() {
   if [[ -f config/deploy.rb || -f Capfile ]]; then
     if [[ ! -f .cap_tasks~ ]]; then
-      shipit -v --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
+      shipit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
     fi
 
     OLD_IFS=$IFS

From 884a8795623087d4812511de21dfb9329fa29e56 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fred@crozat.net>
Date: Mon, 21 Sep 2015 19:55:28 +0200
Subject: [PATCH 1320/1378] Do not fail if tput is not available

Fixes issue #4376
---
 tools/install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 4b1a6ba7e..30d66d4b5 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -2,7 +2,10 @@ set -e
 
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-ncolors=$(tput colors)
+tput=$(which tput)
+if [ -n "$tput" ]; then
+    ncolors=$($tput colors)
+fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
   RED="$(tput setaf 1)"
   GREEN="$(tput setaf 2)"

From a746e6010ae2b260213f081789eaff01865f5664 Mon Sep 17 00:00:00 2001
From: Andy Bateman <andy@kitjunkie.org>
Date: Mon, 14 Sep 2015 19:27:41 +1200
Subject: [PATCH 1321/1378] Update osx.plugin.zsh

Added function to display the song you're currently listening to in iTunes

Fixed indent

Indentation on line 169 was squiffy

Fixed spelling

Removed unnecessary wording to make function more succinct.

Highlighting of Artist and Track

Changed the highlighting of the Track and Artist in yellow to make use of Prompt Expansion Colors
---
 plugins/osx/osx.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 390960fdc..044276c1c 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -161,6 +161,15 @@ function itunes() {
 		vol)
 			opt="set sound volume to $1" #$1 Due to the shift
 			;;
+		playing)
+			local state=`osascript -e 'tell application "iTunes" to player state as string'`
+			if [ "$state" = "playing" ]; then
+				currenttrack=`osascript -e 'tell application "iTunes" to name of current track as string'`
+				currentartist=`osascript -e 'tell application "iTunes" to artist of current track as string'`
+				echo "Listening to %F{yellow}$currenttrack%f by %F{yellow}$currentartist%f";
+			fi
+			return 0
+			;;
 		shuf|shuff|shuffle)
 			# The shuffle property of current playlist can't be changed in iTunes 12,
 			# so this workaround uses AppleScript to simulate user input instead.
@@ -199,6 +208,7 @@ EOF
 			echo "\tnext|previous\tplay next or previous track"
 			echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
 			echo "\tvol\tSet the volume, takes an argument from 0 to 100"
+			echo "\tplaying\tShow what song is currently playing in iTunes."
 			echo "\thelp\tshow this message and exit"
 			return 0
 			;;

From 29db0e0119aba4f317ac320ed5089b82142bcb10 Mon Sep 17 00:00:00 2001
From: Andy Bateman <andy@andybateman.com>
Date: Thu, 17 Sep 2015 13:48:30 +1200
Subject: [PATCH 1322/1378] Fixed colourisation of Now Playing function

---
 plugins/osx/osx.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 044276c1c..f1b437189 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -166,7 +166,7 @@ function itunes() {
 			if [ "$state" = "playing" ]; then
 				currenttrack=`osascript -e 'tell application "iTunes" to name of current track as string'`
 				currentartist=`osascript -e 'tell application "iTunes" to artist of current track as string'`
-				echo "Listening to %F{yellow}$currenttrack%f by %F{yellow}$currentartist%f";
+				print -P "Listening to %F{yellow}$currenttrack%f by %F{yellow}$currentartist%f";
 			fi
 			return 0
 			;;

From 9f2acdc445f05e6556cf6180a1edd52b6939bbcc Mon Sep 17 00:00:00 2001
From: Andy Bateman <andy@andybateman.com>
Date: Thu, 17 Sep 2015 18:28:48 +1200
Subject: [PATCH 1323/1378] You can now use 'itunes status' as well as 'itunes
 playing' to show current track

---
 plugins/osx/osx.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index f1b437189..859e08da5 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -161,9 +161,9 @@ function itunes() {
 		vol)
 			opt="set sound volume to $1" #$1 Due to the shift
 			;;
-		playing)
+		playing|status)
 			local state=`osascript -e 'tell application "iTunes" to player state as string'`
-			if [ "$state" = "playing" ]; then
+			if [[ "$state" = "playing" ]]; then
 				currenttrack=`osascript -e 'tell application "iTunes" to name of current track as string'`
 				currentartist=`osascript -e 'tell application "iTunes" to artist of current track as string'`
 				print -P "Listening to %F{yellow}$currenttrack%f by %F{yellow}$currentartist%f";

From 993e09cc6b6127be92afe072f5957e4e9e72367f Mon Sep 17 00:00:00 2001
From: Andy Bateman <andy@andybateman.com>
Date: Thu, 17 Sep 2015 19:12:35 +1200
Subject: [PATCH 1324/1378] Added function for 'itunes playing' to display
 state when not playing

---
 plugins/osx/osx.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 859e08da5..9413f5056 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -167,6 +167,8 @@ function itunes() {
 				currenttrack=`osascript -e 'tell application "iTunes" to name of current track as string'`
 				currentartist=`osascript -e 'tell application "iTunes" to artist of current track as string'`
 				print -P "Listening to %F{yellow}$currenttrack%f by %F{yellow}$currentartist%f";
+			else
+				print "iTunes is" $state;
 			fi
 			return 0
 			;;
@@ -208,7 +210,7 @@ EOF
 			echo "\tnext|previous\tplay next or previous track"
 			echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
 			echo "\tvol\tSet the volume, takes an argument from 0 to 100"
-			echo "\tplaying\tShow what song is currently playing in iTunes."
+			echo "\tplaying|status\tShow what song is currently playing in iTunes."
 			echo "\thelp\tshow this message and exit"
 			return 0
 			;;

From 326c2b08593e9b02da149dcc0d3c5cf99b21d3a2 Mon Sep 17 00:00:00 2001
From: Andy Bateman <andy@andybateman.com>
Date: Sun, 20 Sep 2015 08:46:45 +1200
Subject: [PATCH 1325/1378] Replaced the use of 'print' with 'echo' in order to
 sanitise track and artist names

Fixed indentation

Fixed indentation
---
 plugins/osx/osx.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 9413f5056..86778363b 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -166,9 +166,9 @@ function itunes() {
 			if [[ "$state" = "playing" ]]; then
 				currenttrack=`osascript -e 'tell application "iTunes" to name of current track as string'`
 				currentartist=`osascript -e 'tell application "iTunes" to artist of current track as string'`
-				print -P "Listening to %F{yellow}$currenttrack%f by %F{yellow}$currentartist%f";
+				echo -E "Listening to $fg[yellow]$currenttrack$reset_color by $fg[yellow]$currentartist$reset_color";
 			else
-				print "iTunes is" $state;
+				echo "iTunes is" $state;
 			fi
 			return 0
 			;;

From 95296bb0c5fade33c6cda7ccc7139a35c2641b3a Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fred@crozat.net>
Date: Tue, 22 Sep 2015 16:46:22 +0200
Subject: [PATCH 1326/1378] also handle missing tput in upgrade script.

---
 tools/upgrade.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 65af6e368..6e9696202 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,7 +1,10 @@
 
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-ncolors=$(tput colors)
+tput=$(which tput)
+if [ -n "$tput" ]; then
+    ncolors=$(tput colors)
+fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
   RED="$(tput setaf 1)"
   GREEN="$(tput setaf 2)"

From e957ae41354d6892170e327df3be8a5913f41e78 Mon Sep 17 00:00:00 2001
From: Alexander Frolov <thephilosoft@gmail.com>
Date: Wed, 23 Sep 2015 09:54:22 +0300
Subject: [PATCH 1327/1378] Update README.md

---
 plugins/vi-mode/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index 03e67cca2..8519a5592 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -61,8 +61,8 @@ Insertion
 Delete and Insert
 -----------------
 
-- `ctrl-h`      : While in *Insert mode*: delete character after the cursor
-- `ctrl-w`      : While in *Insert mode*: delete word after the cursor
+- `ctrl-h`      : While in *Insert mode*: delete character before the cursor
+- `ctrl-w`      : While in *Insert mode*: delete word before the cursor
 - `d{motion}`   : Delete text that {motion} moves over
 - `dd`          : Delete line
 - `D`           : Delete characters under the cursor until the end of the line

From 5323954c98ca41b47f0d9d40797932d4a6cd980f Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Wed, 23 Sep 2015 10:52:24 +0200
Subject: [PATCH 1328/1378] Uniform git prompt equal remote

Uniform git prompt equal remote to all others prompts, setting the correct symbol
(if applicable) to $git_remote_status, instead of echoing it.

It also solves the problem pointed out in #3911
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index baf863717..15cd364a0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -38,7 +38,7 @@ git_remote_status() {
 
         if [ $ahead -eq 0 ] && [ $behind -eq 0 ]
         then
-          echo "$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
+          git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
         elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
         then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"

From 12e99b5334c547c8e8fc1bdcacc88347386eb743 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Wed, 23 Sep 2015 11:14:14 +0200
Subject: [PATCH 1329/1378] fix indentation

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 15cd364a0..1e203c7c6 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -38,7 +38,7 @@ git_remote_status() {
 
         if [ $ahead -eq 0 ] && [ $behind -eq 0 ]
         then
-          git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
+          	git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
         elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
         then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"

From 7a636097f8cdc5cacfe9c2e794d885fa3ecfc5dc Mon Sep 17 00:00:00 2001
From: shawn <ag4ve.us@gmail.com>
Date: Wed, 23 Sep 2015 18:47:09 -0400
Subject: [PATCH 1330/1378] Correct repo dir

cvs's metadata is under CVS and not .cvs
---
 lib/grep.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/grep.zsh b/lib/grep.zsh
index 3fa103d19..abc1650a1 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -11,7 +11,7 @@ if grep-flag-available --color=auto; then
 fi
 
 # ignore VCS folders (if the necessary grep flags are available)
-VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
+VCS_FOLDERS="{.bzr,CVS,.git,.hg,.svn}"
 
 if grep-flag-available --exclude-dir=.cvs; then
     GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"

From 8e74f7c1aa44b5f74cf4ede49562f0586a562347 Mon Sep 17 00:00:00 2001
From: Michael SALIHI <admin@prestance-informatique.fr>
Date: Thu, 24 Sep 2015 02:22:50 +0200
Subject: [PATCH 1331/1378] Add alias for print latest tag name

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bbee13ab8..4f2745038 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -84,6 +84,7 @@ alias gcs='git commit -S'
 
 alias gd='git diff'
 alias gdca='git diff --cached'
+alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff

From 07f08aa731e73bfa27a4e89b96ce991af5175848 Mon Sep 17 00:00:00 2001
From: Tyler Charlesworth <tysiva@gmail.com>
Date: Thu, 24 Sep 2015 01:25:22 -0700
Subject: [PATCH 1332/1378] Adds Cygwin support

---
 plugins/sublime/sublime.plugin.zsh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 4b93c1580..62c6df8f8 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,5 +1,3 @@
-# Sublime Text 2 Aliases
-
 if [[ $('uname') == 'Linux' ]]; then
     local _sublime_linux_paths > /dev/null 2>&1
     _sublime_linux_paths=(
@@ -33,7 +31,6 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
         "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
         "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
     )
-
     for _sublime_path in $_sublime_darwin_paths; do
         if [[ -a $_sublime_path ]]; then
             subl () { "$_sublime_path" $* }
@@ -43,4 +40,18 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
     done
 fi
 
+elif [[ "$OSTYPE" = 'cygwin' ]]; then
+    local _sublime_cygwin_paths > /dev/null 2>&1
+    _sublime_cygwin_paths=(
+        "$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
+        "$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
+    )
+    for _sublime_path in $_sublime_cygwin_paths; do
+        if [[ -a $_sublime_path ]]; then
+            subl () { "$_sublime_path" $* }
+            alias st=subl
+            break
+        fi
+    done
+
 alias stt='st .'

From 0c0450b3035cd4e9fd3f2c07469b933a4d1aa78f Mon Sep 17 00:00:00 2001
From: Aleksandar Vidakovic <cheetah@monkeysintown.com>
Date: Thu, 24 Sep 2015 11:51:15 +0100
Subject: [PATCH 1333/1378] Accept single and double quotes in Gulp plugin

---
 plugins/gulp/gulp.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh
index 6017c7b60..8e11a444f 100644
--- a/plugins/gulp/gulp.plugin.zsh
+++ b/plugins/gulp/gulp.plugin.zsh
@@ -20,10 +20,10 @@
 # in the current directory.
 #
 function $$gulp_completion() {
-    compls=$(grep -Eo "gulp.task\(('(([a-zA-Z0-9]|-)*)',)" gulpfile.js 2>/dev/null | grep -Eo "'(([a-zA-Z0-9]|-)*)'" | sed s/"'"//g | sort)
+    compls=$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
 
     completions=(${=compls})
     compadd -- $completions
 }
 
-compdef $$gulp_completion gulp
\ No newline at end of file
+compdef $$gulp_completion gulp

From 17088c6431271fe9fd9fa5cdfd56ff2addab5fd5 Mon Sep 17 00:00:00 2001
From: Piotr Gaczkowski <DoomHammerNG@gmail.com>
Date: Fri, 25 Sep 2015 22:45:45 +0200
Subject: [PATCH 1334/1378] Fix invalid test expression.

---
 plugins/chruby/chruby.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 5be6528b0..164b4319f 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -24,7 +24,7 @@ _homebrew-installed() {
 }
 
 _chruby-from-homebrew-installed() {
-  [ -r $(brew --prefix chruby)] &> /dev/null
+  [ -r $(brew --prefix chruby) ] &> /dev/null
 }
 
 _ruby-build_installed() {

From dc3413b91cb5ab2d78b74ab58dbdeabd6728b8ca Mon Sep 17 00:00:00 2001
From: justvitalius <justvitalius@gmail.com>
Date: Sun, 27 Sep 2015 19:01:12 +0300
Subject: [PATCH 1335/1378] Fix print rvm version in amuse theme

---
 themes/amuse.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
index c1314e8b1..4e7361ced 100644
--- a/themes/amuse.zsh-theme
+++ b/themes/amuse.zsh-theme
@@ -20,7 +20,7 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 if [ -e ~/.rvm/bin/rvm-prompt ]; then
-  RPROMPT='%{$fg_bold[red]%}‹$(~/.rvm/bin/rvm-prompt i v)›%{$reset_color%}'
+  RPROMPT='%{$fg_bold[red]%}‹$(rvm_current)›%{$reset_color%}'
 else
   if which rbenv &> /dev/null; then
     RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'

From 2266368b77805574a1db4a839a029f02947d5e62 Mon Sep 17 00:00:00 2001
From: Tyler Charlesworth <tysiva@gmail.com>
Date: Sun, 27 Sep 2015 16:51:38 -0700
Subject: [PATCH 1336/1378] Update sublime.plugin.zsh

---
 plugins/sublime/sublime.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 62c6df8f8..a5d63cde6 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -38,7 +38,6 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
             break
         fi
     done
-fi
 
 elif [[ "$OSTYPE" = 'cygwin' ]]; then
     local _sublime_cygwin_paths > /dev/null 2>&1
@@ -54,4 +53,6 @@ elif [[ "$OSTYPE" = 'cygwin' ]]; then
         fi
     done
 
+fi
+
 alias stt='st .'

From 758195cb791556c3f5268e7e075f3ab55bcd5e90 Mon Sep 17 00:00:00 2001
From: LE Manh Cuong <manhcuongle@hotmail.com>
Date: Mon, 28 Sep 2015 16:05:22 +0700
Subject: [PATCH 1337/1378] Encode64 Plugin - Fix wrong `echo` usage

Currently, encode64 plugin using `echo -n` to print the content
of $1 variable. This approach will not work with arbitrary data,
which contains sequence of escaped characters, since when many
`echo` implementation will expand them.

This commit chage the usage to `printf`, which is builtin in all
POSIX shells and can print arbitrary data reliability.
---
 plugins/encode64/encode64.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/encode64/encode64.plugin.zsh b/plugins/encode64/encode64.plugin.zsh
index 4dbd1b453..53de6478a 100644
--- a/plugins/encode64/encode64.plugin.zsh
+++ b/plugins/encode64/encode64.plugin.zsh
@@ -1,4 +1,4 @@
-encode64(){ echo -n $1 | base64 }
-decode64(){ echo -n $1 | base64 --decode }
+encode64(){ printf '%s' $1 | base64 }
+decode64(){ printf '%s' $1 | base64 --decode }
 alias e64=encode64
 alias d64=decode64

From f94fee5a7fd1a4704d65d52a2f1c522a3831ca1a Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 28 Sep 2015 08:35:25 -0400
Subject: [PATCH 1338/1378] installer: don't bail on errors in color setup

This is a hack to keep the installer working on systems without tput/terminfo.
---
 tools/install.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 5633320a8..67d341c7c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,5 +1,3 @@
-set -e
-
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
 tput=$(which tput)
@@ -21,6 +19,11 @@ else
   BOLD=""
   NORMAL=""
 fi
+
+# Only enable exit-on-error after the non-critical colorization stuff,
+# which may fail on systems lacking tput or terminfo
+set -e
+
 CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
 if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
   printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"

From 5af52fbc75a07f03f2f796846184e0c2d6ca87b2 Mon Sep 17 00:00:00 2001
From: Joseph Post <jp@jsphpst.com>
Date: Mon, 28 Sep 2015 10:50:35 -0500
Subject: [PATCH 1339/1378] gulp plugin: missing opening double quote & had
 unneeded parens on function

---
 plugins/gulp/gulp.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh
index 8e11a444f..f7eaefa85 100644
--- a/plugins/gulp/gulp.plugin.zsh
+++ b/plugins/gulp/gulp.plugin.zsh
@@ -19,8 +19,8 @@
 # Grabs all available tasks from the `gulpfile.js`
 # in the current directory.
 #
-function $$gulp_completion() {
-    compls=$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
+function $$gulp_completion {
+    compls="$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
 
     completions=(${=compls})
     compadd -- $completions

From 3e04cd62d3f569da7a92380083f4e0806f2fa14e Mon Sep 17 00:00:00 2001
From: Gustavo Villa <gfvcastro@gmail.com>
Date: Mon, 28 Sep 2015 14:59:06 -0300
Subject: [PATCH 1340/1378] Add 'rake middleware' alias.

---
 plugins/rails/rails.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 39e388494..1bbd1fb4b 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -59,7 +59,7 @@ alias rn='rake notes'
 alias rr='rake routes'
 alias rrg='rake routes | grep'
 alias rt='rake test'
-
+alias rmd='rake middleware'
 
 # legacy stuff
 alias sstat='thin --stats "/thin/stats" start'

From 1e305e01868a3524b7ce7ec1fdaba7e752f3ce8c Mon Sep 17 00:00:00 2001
From: Gutem <gutemhc@gmail.com>
Date: Mon, 28 Sep 2015 16:04:25 -0300
Subject: [PATCH 1341/1378] Update Simulator's Path to XCode 7.x

---
 plugins/xcode/xcode.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index b63a857a7..0a2fa0839 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -179,7 +179,10 @@ function simulator {
   if [[ -d "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app" ]]; then
     open "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app"
   # Xcode ≥ 6.x
-  else
+  elif [[ -d "${devfolder}/Applications/iOS Simulator.app" ]]; then
     open "${devfolder}/Applications/iOS Simulator.app"
+  # Xcode ≥ 7.x
+  else
+    open "${devfolder}/Applications/Simulator.app"
   fi
 }

From 4589bc6c654650d52a47b5cb86c588f4ab2aca46 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 28 Sep 2015 18:09:29 -0400
Subject: [PATCH 1342/1378] completion: turn off the #3889 compfix check by
 default

---
 oh-my-zsh.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 8e31ddd0f..6cc5ac630 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -11,6 +11,8 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit
 
+: ${ZSH_DISABLE_COMPFIX:=true}
+
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
 if [[ -z "$ZSH_CUSTOM" ]]; then
@@ -62,13 +64,17 @@ if [ -z "$ZSH_COMPDUMP" ]; then
   ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
-# If completion insecurities exist, warn the user without enabling completions.
-if ! compaudit &>/dev/null; then
-  # This function resides in the "lib/compfix.zsh" script sourced above.
-  handle_completion_insecurities
-# Else, enable and cache completions to the desired file.
+if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
+  # If completion insecurities exist, warn the user without enabling completions.
+  if ! compaudit &>/dev/null; then
+    # This function resides in the "lib/compfix.zsh" script sourced above.
+    handle_completion_insecurities
+  # Else, enable and cache completions to the desired file.
+  else
+    compinit -d "${ZSH_COMPDUMP}"
+  fi
 else
-  compinit -d "${ZSH_COMPDUMP}"
+  compinit -i -d "${ZSH_COMPDUMP}"
 fi
 
 # Load all of the plugins that were defined in ~/.zshrc

From df80081e9b8d652177a18542080b169268dc4d58 Mon Sep 17 00:00:00 2001
From: Xavier Haniquaut <xavhan@hotmail.com>
Date: Tue, 29 Sep 2015 10:20:55 +0200
Subject: [PATCH 1343/1378] Add alias for npm global install

---
 plugins/npm/npm.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 595105d3c..3a1a8ba3a 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -5,6 +5,9 @@ eval "$(npm completion 2>/dev/null)"
 # - https://twitter.com/substack/status/23122603153150361
 # Thus, we've used camelCase for the following aliases:
 
+# Install dependencies globally
+alias npmg="npm i -g "
+
 # Install and save to dependencies in your package.json
 # npms is used by https://www.npmjs.com/package/npms
 alias npmS="npm i -S "
@@ -12,6 +15,7 @@ alias npmS="npm i -S "
 # Install and save to dev-dependencies in your package.json
 # npmd is used by https://github.com/dominictarr/npmd
 alias npmD="npm i -D "
+
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
 alias npmE='PATH="$(npm bin)":"$PATH"'

From 0516a39dec64568f6db194d143a0ae2969c3cf9b Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Tue, 29 Sep 2015 12:16:18 -0400
Subject: [PATCH 1344/1378] Remove Atom plugin

The Atom plugin is obsolete.

See #3193
---
 plugins/atom/README.md       | 23 ----------------------
 plugins/atom/atom.plugin.zsh | 37 ------------------------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 plugins/atom/README.md
 delete mode 100644 plugins/atom/atom.plugin.zsh

diff --git a/plugins/atom/README.md b/plugins/atom/README.md
deleted file mode 100644
index 6350c647b..000000000
--- a/plugins/atom/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## atom
-
-This plugin makes "at" a useful function for invoking the Atom Editor.
-
-Originally by Github user [aforty](https://github.com/aforty) for OSX, modified to alias 'at' to 'atom' for Linux, since atom already works on the terminal for Linux, and calling 'at' in a non-OSX environment should still work.
-
-### Requirements
-
- * [Atom](https://atom.io/)
-
-### Usage
-
- * If `at` command is called without an argument, launch Atom
-
- * If `at` is passed a directory, open it in Atom
-
- * If `at` is passed a file, open it in Atom
-
-### Examples
-
- * Open the current dir in atom: `at .`
- * Open another dir in atom: `at path/to/folder`
- * Open a file: `at filename.extension`
diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
deleted file mode 100644
index 2711cf0e8..000000000
--- a/plugins/atom/atom.plugin.zsh
+++ /dev/null
@@ -1,37 +0,0 @@
-case $OSTYPE in
-darwin*)
-    local _atom_paths > /dev/null 2>&1
-    _atom_paths=(
-        "$HOME/Applications/Atom.app"
-        "/Applications/Atom.app"
-    )
-
-    for _atom_path in $_atom_paths; do
-        if [[ -a $_atom_path ]]; then
-            alias at="open -a '$_atom_path'"
-            break
-        fi
-    done
-    ;;
-cygwin)
-    local _atom_path > /dev/null 2>&1
-
-    _atom_path=${LOCALAPPDATA}/atom/bin/atom
-
-    if [[ -a $_atom_path ]]; then
-        cyg_open_atom()
-        {
-            if [[ -n $1 ]]; then
-                ${_atom_path} `cygpath -w -a $1`
-            else
-                ${_atom_path}
-            fi
-        }
-
-        alias at=cyg_open_atom
-    fi
-    ;;
-linux*)
-    # Alerts the user if 'atom' is not a found command.
-    type atom >/dev/null 2>&1 && alias at="atom" || { echo >&2 "You have enabled the atom oh-my-zsh plugin on Linux, but atom is not a recognized command. Please make sure you have it installed before using this plugin."; }
-esac

From f9c16f940e1b952dab2811e0c988bfc25f7dc93c Mon Sep 17 00:00:00 2001
From: Xavier Haniquaut <xavhan@hotmail.com>
Date: Wed, 30 Sep 2015 16:42:34 +0200
Subject: [PATCH 1345/1378] Remove broken link and move npmg alias position

---
 plugins/npm/npm.plugin.zsh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 3a1a8ba3a..3f6fe0fb3 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -1,13 +1,11 @@
 eval "$(npm completion 2>/dev/null)"
 
-
-# npm package names are lowercase
-# - https://twitter.com/substack/status/23122603153150361
-# Thus, we've used camelCase for the following aliases:
-
 # Install dependencies globally
 alias npmg="npm i -g "
 
+# npm package names are lowercase
+# Thus, we've used camelCase for the following aliases:
+
 # Install and save to dependencies in your package.json
 # npms is used by https://www.npmjs.com/package/npms
 alias npmS="npm i -S "

From c146853a5e529a522ca4cd6015cd55b796788806 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 1 Oct 2015 19:29:59 -0400
Subject: [PATCH 1346/1378] autoenv: also look in the Homebrew installation
 location for it

---
 plugins/autoenv/autoenv.plugin.zsh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index edc16a4ca..c9f968118 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -1,12 +1,25 @@
 # Activates autoenv or reports its failure
-if ! type autoenv_init &>/dev/null && ! source $HOME/.autoenv/activate.sh 2>/dev/null; then
-  echo '-------- AUTOENV ---------'
-  echo 'Could not find autoenv_init function or ~/.autoenv/activate.sh.'
-  echo 'Please check if autoenv is correctly installed.'
-  echo 'In the meantime the autoenv plugin is DISABLED.'
-  echo '--------------------------'
-  return 1
+() {
+if ! type autoenv_init >/dev/null; then
+  for d (~/.autoenv /usr/local/opt/autoenv); do
+    if [[ -e $d/activate.sh ]]; then
+      autoenv_dir=$d
+      break
+    fi
+  done
+  if [[ -z $autoenv_dir ]]; then 
+    cat <<END >&2
+-------- AUTOENV ---------
+Could not locate autoenv installation.
+Please check if autoenv is correctly installed.
+In the meantime the autoenv plugin is DISABLED.
+--------------------------
+END
+    return 1
+  fi
 fi
+}
+[[ $? != 0 ]] && return $?
 
 # The use_env call below is a reusable command to activate/create a new Python
 # virtualenv, requiring only a single declarative line of code in your .env files.

From 7f2656c1263488c1a54af65397ad1d0c450c8e7d Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 2 Oct 2015 03:07:01 -0400
Subject: [PATCH 1347/1378] git-extras: fix for compatibility with zsh _git

This changes all the __git_* functions it was defining to __gitex_* to avoid collisions with the internal functions used inside _git from zsh.
---
 plugins/git-extras/README.md             | 11 ++++
 plugins/git-extras/git-extras.plugin.zsh | 82 +++++++++++++-----------
 2 files changed, 54 insertions(+), 39 deletions(-)
 create mode 100644 plugins/git-extras/README.md

diff --git a/plugins/git-extras/README.md b/plugins/git-extras/README.md
new file mode 100644
index 000000000..8f12e297e
--- /dev/null
+++ b/plugins/git-extras/README.md
@@ -0,0 +1,11 @@
+# git-extras
+
+This plugin provides completion definitions for some of the commands defined by [git-extras](http://github.com/tj/git-extras).
+
+##  Setup notes
+
+The completions work by augmenting the `_git` completion provided by `zsh`. This only works with the `zsh`-provided `_git`, not the `_git` provided by `git` itself. If you have both `zsh` and `git` installed, you need to make sure that the `zsh`-provided `_git` takes precedence.
+
+### OS X Homebrew Setup
+
+On OS X with Homebrew, you need to install `git` with `brew install git --without-completions`. Otherwise, `git`'s `_git` will take precedence, and you won't see the completions for `git-extras` commands.
diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index d91c1af81..681fbb466 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -1,10 +1,13 @@
-#compdef git
 # ------------------------------------------------------------------------------
 # Description
 # -----------
 #
 #  Completion script for git-extras (http://github.com/tj/git-extras).
 #
+#  This depends on and reueses some of the internals of the _git completion
+#  function that ships with zsh itself. It will not work with the _git that ships
+#  with git.
+#
 # ------------------------------------------------------------------------------
 # Authors
 # -------
@@ -22,16 +25,18 @@
 # ------------------------------------------------------------------------------
 
 
-__git_command_successful () {
-    if (( ${#pipestatus:#0} > 0 )); then
-        _message 'not a git repository'
-        return 1
-    fi
-    return 0
+# Internal functions
+# These are a lot like their __git_* equivalents inside _git
+
+__gitex_command_successful () {
+  if (( ${#*:#0} > 0 )); then
+    _message 'not a git repository'
+    return 1
+  fi
+  return 0
 }
 
-
-__git_commits() {
+__gitex_commits() {
     declare -A commits
     git log --oneline -15 | sed 's/\([[:alnum:]]\{7\}\) /\1:/' | while read commit
     do
@@ -42,7 +47,7 @@ __git_commits() {
     _describe -t commits commit commits && ret=0
 }
 
-__git_tag_names() {
+__gitex_tag_names() {
     local expl
     declare -a tag_names
     tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
@@ -51,7 +56,7 @@ __git_tag_names() {
 }
 
 
-__git_branch_names() {
+__gitex_branch_names() {
     local expl
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
@@ -59,7 +64,7 @@ __git_branch_names() {
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-__git_specific_branch_names() {
+__gitex_specific_branch_names() {
     local expl
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})
@@ -67,32 +72,28 @@ __git_specific_branch_names() {
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-
-__git_feature_branch_names() {
-    __git_specific_branch_names 'feature'
+__gitex_feature_branch_names() {
+    __gitex_specific_branch_names 'feature'
 }
 
-
-__git_refactor_branch_names() {
-    __git_specific_branch_names 'refactor'
+__gitex_refactor_branch_names() {
+    __gitex_specific_branch_names 'refactor'
 }
 
-
-__git_bug_branch_names() {
-    __git_specific_branch_names 'bug'
+__gitex_bug_branch_names() {
+    __gitex_specific_branch_names 'bug'
 }
 
-
-__git_submodule_names() {
+__gitex_submodule_names() {
     local expl
     declare -a submodule_names
-    submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})
+    submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})  # '
     __git_command_successful || return
     _wanted submodule-names expl submodule-name compadd $* - $submodule_names
 }
 
 
-__git_author_names() {
+__gitex_author_names() {
     local expl
     declare -a author_names
     author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' | sort -u)"})
@@ -123,7 +124,7 @@ _git-bug() {
             case $line[1] in
                 (finish)
                     _arguments -C \
-                        ':branch-name:__git_bug_branch_names'
+                        ':branch-name:__gitex_bug_branch_names'
                     ;;
             esac
     esac
@@ -139,7 +140,7 @@ _git-changelog() {
 
 _git-contrib() {
     _arguments \
-        ':author:__git_author_names'
+        ':author:__gitex_author_names'
 }
 
 
@@ -151,19 +152,19 @@ _git-count() {
 
 _git-delete-branch() {
     _arguments \
-        ':branch-name:__git_branch_names'
+        ':branch-name:__gitex_branch_names'
 }
 
 
 _git-delete-submodule() {
     _arguments \
-        ':submodule-name:__git_submodule_names'
+        ':submodule-name:__gitex_submodule_names'
 }
 
 
 _git-delete-tag() {
     _arguments \
-        ':tag-name:__git_tag_names'
+        ':tag-name:__gitex_tag_names'
 }
 
 
@@ -172,6 +173,7 @@ _git-effort() {
         '--above[ignore file with less than x commits]'
 }
 
+
 _git-extras() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -216,7 +218,7 @@ _git-feature() {
             case $line[1] in
                 (finish)
                     _arguments -C \
-                        ':branch-name:__git_feature_branch_names'
+                        ':branch-name:__gitex_feature_branch_names'
                     ;;
             esac
     esac
@@ -225,8 +227,8 @@ _git-feature() {
 
 _git-graft() {
     _arguments \
-        ':src-branch-name:__git_branch_names' \
-        ':dest-branch-name:__git_branch_names'
+        ':src-branch-name:__gitex_branch_names' \
+        ':dest-branch-name:__gitex_branch_names'
 }
 
 
@@ -236,12 +238,14 @@ _git-ignore() {
         '(--global -g)'{--global,-g}'[show global gitignore]'
 }
 
+
 _git-missing() {
     _arguments \
-        ':first-branch-name:__git_branch_names' \
-        ':second-branch-name:__git_branch_names'
+        ':first-branch-name:__gitex_branch_names' \
+        ':second-branch-name:__gitex_branch_names'
 }
 
+
 _git-refactor() {
     local curcontext=$curcontext state line ret=1
     declare -A opt_args
@@ -263,7 +267,7 @@ _git-refactor() {
             case $line[1] in
                 (finish)
                     _arguments -C \
-                        ':branch-name:__git_refactor_branch_names'
+                        ':branch-name:__gitex_refactor_branch_names'
                     ;;
             esac
     esac
@@ -272,12 +276,12 @@ _git-refactor() {
 
 _git-squash() {
     _arguments \
-        ':branch-name:__git_branch_names'
+        ':branch-name:__gitex_branch_names'
 }
 
 _git-summary() {
-    _arguments '--line[summarize with lines other than commits]'
-    __git_commits
+    _arguments '--line[summarize with lines rather than commits]'
+    __gitex_commits
 }
 
 

From b35d78f2f8535dbbcba2254ad91041312814ebc1 Mon Sep 17 00:00:00 2001
From: Will Weaver <will.weaver@gmail.com>
Date: Fri, 2 Oct 2015 08:14:06 -0400
Subject: [PATCH 1348/1378] Add Git Hubflow aliases

---
 plugins/git-hubflow/git-hubflow.plugin.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
index 4cf5b9177..b0157c7a1 100644
--- a/plugins/git-hubflow/git-hubflow.plugin.zsh
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -20,6 +20,13 @@
 #     c. Or, use this file as an oh-my-zsh plugin.
 #
 
+alias ghf='git hf'
+alias ghff='git hf feature'
+alias ghfr='git hf release'
+alias ghfh='git hf hotfix'
+alias ghfs='git hf support'
+alias ghfu='git hf update'
+
 _git-hf ()
 {
     local curcontext="$curcontext" state line

From df5e1f9c2cca5722e09bef3787571d7d948fe467 Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Sat, 3 Oct 2015 19:37:12 +0200
Subject: [PATCH 1349/1378] Add 3 more nmap aliases to nmap plugin

---
 plugins/nmap/README.md       | 19 ++++++++++++-------
 plugins/nmap/nmap.plugin.zsh |  6 +++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugins/nmap/README.md b/plugins/nmap/README.md
index 8bb8e0648..5cd646277 100644
--- a/plugins/nmap/README.md
+++ b/plugins/nmap/README.md
@@ -19,14 +19,19 @@ Nmap options are:
 
 ## Aliases explained
 
- * nmap_open_ports - scan for open ports on target
- * nmap_list_interfaces - list all network interfaces on host where the command runs
- * nmap_slow - slow scan that avoids to spam the targets logs
- * nmap_fin - scan to see if hosts are up with TCP FIN scan
- * nmap_full - aggressive full scan that scans all ports, tries to determine OS and service versions
+ * nmap_open_ports - Scan for open ports on target
+ * nmap_list_interfaces - List all network interfaces on host where the command runs
+ * nmap_slow - Slow scan that avoids to spam the targets logs
+ * nmap_fin - Scan to see if hosts are up with TCP FIN scan
+ * nmap_full - Aggressive full scan that scans all ports, tries to determine OS and service versions
  * nmap_check_for_firewall - TCP ACK scan to check for firewall existence
  * nmap_ping_through_firewall - Host discovery with SYN and ACK probes instead of just pings to avoid firewall
    restrictions
  * nmap_fast - Fast scan of the top 300 popular ports
- * nmap_detect_versions - detects versions of services and OS, runs on all ports
- * nmap_check_for_vulns - uses vulscan script to check target services for vulnerabilities
+ * nmap_detect_versions - Detects versions of services and OS, runs on all ports
+ * nmap_check_for_vulns - Uses vulscan script to check target services for vulnerabilities
+ * nmap_full_udp - Same as full but via UDP
+ * nmap_traceroute - Try to traceroute using the most common ports
+ * nmap_full_with_scripts - Same as nmap_full but also runs all the scripts
+ * nmap_web_safe_osscan - Little "safer" scan for OS version  as connecting to only HTTP and HTTPS ports doesn't look so attacking.
+
diff --git a/plugins/nmap/nmap.plugin.zsh b/plugins/nmap/nmap.plugin.zsh
index f3603f622..d09f2c615 100644
--- a/plugins/nmap/nmap.plugin.zsh
+++ b/plugins/nmap/nmap.plugin.zsh
@@ -22,7 +22,11 @@ alias nmap_fin="nmap -sF -v"
 alias nmap_full="nmap -sS -T4 -PE -PP -PS80,443 -PY -g 53 -A -p1-65535 -v"
 alias nmap_check_for_firewall="nmap -sA -p1-65535 -v -T4"
 alias nmap_ping_through_firewall="nmap -PS -PA"
-alias nmap_fast="nmap -F -T5 --top-ports 300"
+alias nmap_fast="nmap -F -T5 --version-light --top-ports 300"
 alias nmap_detect_versions="nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
 alias nmap_check_for_vulns="nmap --script=vulscan"
+alias nmap_full_udp="nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
+alias nmap_traceroute="nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
+alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
+alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
 

From 2d9df4468f5650d0d16cc789c96d828fb0dff4aa Mon Sep 17 00:00:00 2001
From: Jeff Smith <jeff@selectwv.com>
Date: Sat, 3 Oct 2015 18:39:41 -0700
Subject: [PATCH 1350/1378] Fix 'ack-grep' bug for non-ubuntu users

Redirect STDERR along with STDOUT when looking for ack-grep
---
 lib/misc.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 223d61509..8ff076e77 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -22,7 +22,7 @@ alias _='sudo'
 alias please='sudo'
 
 ## more intelligent acking for ubuntu users
-if which ack-grep > /dev/null;
+if which ack-grep &> /dev/null;
 then
   alias afind='ack-grep -il'
 else

From a95473919ab300e4b1a6179e8dca7356a256615d Mon Sep 17 00:00:00 2001
From: Kevin O'Neal <oneal.kevin@gmail.com>
Date: Sun, 4 Oct 2015 17:05:28 -0500
Subject: [PATCH 1351/1378] Update Gradle Commands

---
 plugins/gradle/gradle.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 97941756d..661c29d5b 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -1,6 +1,6 @@
 #!zsh
 ##############################################################################
-# A descriptive listing of core Gradle commands 
+# A descriptive listing of core Gradle commands
 ############################################################################
 function _gradle_core_commands() {
     local ret=1 state
@@ -32,14 +32,22 @@ function _gradle_arguments() {
     '--stop[Stop the Gradle daemon]' \
     '--daemon[Use the Gradle daemon]' \
     '--no-daemon[Do not use the Gradle daemon]' \
-    '--no-opt[Do not perform any task optimization]' \
+    '--rerun-task [Specifies that any task optimization is ignored.]' \
     '-i[Log at the info level]' \
     '-m[Dry run]' \
     '-P[Set a project property]' \
+    '-p[Specifies the start directory]' \
     '--profile[Profile the build time]' \
     '-q[Log at the quiet level (only show errors)]' \
     '-v[Print the Gradle version info]' \
     '-x[Specify a task to be excluded]' \
+    '-b[Specifies the build file.]' \
+    '-c[Specifies the settings file.]' \
+    '--continue[Continues task execution after a task failure.]' \
+    '-g[Specifies the Gradle user home directory.]' \
+    '-I[Specifies an initialization script.]' \
+    '--refresh-dependencies[Refresh the state of dependencies.]' \
+    '-u[Don''t search in parent directories for a settings.gradle file.]' \
     '*::command:->command' \
     && return 0
 }

From b6d78df62c540245f67ffc900d0b1a17a6dfb77e Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 4 Oct 2015 03:42:24 -0400
Subject: [PATCH 1352/1378] clip*: add xsel support

---
 lib/clipboard.zsh                  | 45 +++++++++++++++++++++---------
 plugins/copydir/copydir.plugin.zsh |  2 +-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
index 24b7380f7..b663800a4 100644
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -31,15 +31,21 @@ function clipcopy() {
       cat $file > /dev/clipboard
     fi
   else
-    which xclip &>/dev/null
-    if [[ $? != 0 ]]; then
-      print "clipcopy: Platform $OSTYPE not supported or xclip not installed" >&2
-      return 1
-    fi
-    if [[ -z $file ]]; then
-      xclip -in -selection clipboard
+    if which xclip &>/dev/null; then
+      if [[ -z $file ]]; then
+        xclip -in -selection clipboard
+      else
+        xclip -in -selection clipboard $file
+      fi
+    elif which xsel &>/dev/null; then
+      if [[ -z $file ]]; then
+        xsel --clipboard --input 
+      else
+        cat "$file" | xsel --clipboard --input
+      fi
     else
-      xclip -in -selection clipboard $file
+      print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
+      return 1
     fi
   fi
 }
@@ -50,6 +56,17 @@ function clipcopy() {
 #
 #   clippaste   - writes clipboard's contents to stdout
 #
+#   clippaste | <command>    - pastes contents and pipes it to another process
+#
+#   clippaste > <file>      - paste contents to a file
+#
+# Examples:
+#
+#   # Pipe to another process
+#   clippaste | grep foo
+#
+#   # Paste to a file
+#   clippaste > file.txt
 function clippaste() {
   emulate -L zsh
   if [[ $OSTYPE == darwin* ]]; then
@@ -57,11 +74,13 @@ function clippaste() {
   elif [[ $OSTYPE == cygwin* ]]; then
     cat /dev/clipboard
   else
-    which xclip &>/dev/null 
-    if [[ $? != 0 ]]; then
-      print "clipcopy: Platform $OSTYPE not supported or xclip not installed" >&2
+    if which xclip &>/dev/null; then
+      xclip -out -selection clipboard
+    elif which xsel &>/dev/null; then
+      xsel --clipboard --output
+    else
+      print "clipcopy: Platform $OSTYPE not supported or xclip/xsel not installed" >&2
       return 1
     fi
-    xclip -out -selection clipboard
   fi
-}
\ No newline at end of file
+}
diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
index 4b918e815..c45106240 100644
--- a/plugins/copydir/copydir.plugin.zsh
+++ b/plugins/copydir/copydir.plugin.zsh
@@ -2,4 +2,4 @@
 function copydir {
   emulate -L zsh
   print -n $PWD | clipcopy
-}
\ No newline at end of file
+}

From d26549b7ecb93665148e37b18741ace6d0b8141a Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 5 Oct 2015 13:46:20 -0700
Subject: [PATCH 1353/1378] Removing legacy rails-specific aliases from the
 Textmate plugin. This is probably best handled as a custom plugin.

---
 plugins/textmate/textmate.plugin.zsh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index 773c4f8d2..02813de9e 100644
--- a/plugins/textmate/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
@@ -1,11 +1,3 @@
-alias et='mate .'
-alias ett='mate Gemfile app config features lib db public spec test Rakefile Capfile Todo'
-alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
-alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
-
-# Edit Ruby app in TextMate
-alias mr='mate CHANGELOG app config db lib public script spec test'
-
 # If the tm command is called without an argument, open TextMate in the current directory
 # If tm is passed a directory, cd to it and open it in TextMate
 # If tm is passed a file, open it in TextMate

From 6b73f5ec7504ebc118d4bb6fdfaf841333f9c7a4 Mon Sep 17 00:00:00 2001
From: Rodrigo Chiossi <rodrigo.chiossi@intel.com>
Date: Mon, 5 Oct 2015 18:32:42 -0300
Subject: [PATCH 1354/1378] Ask for confirmation before uninstall

Prompt the user before removing oh-my-zsh from the system
---
 tools/uninstall.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 23bfac0eb..f9da00c9b 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,3 +1,10 @@
+read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
+if ! [[ $confirmation =~ ^[yY]$ ]]
+then
+    echo "Uninstall cancelled"
+    exit
+fi
+
 echo "Removing ~/.oh-my-zsh"
 if [ -d ~/.oh-my-zsh ]
 then

From a7f0c71c703de2603bcf05170e797068145728c0 Mon Sep 17 00:00:00 2001
From: Avi Samloff <avi.samloff@gmail.com>
Date: Thu, 8 Oct 2015 15:07:24 -0700
Subject: [PATCH 1355/1378] Fix ohmyz.sh link

Change http://ohmyz.sh link to use proper markdown syntax
---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index a29df81ab..779ce77c3 100644
--- a/README.markdown
+++ b/README.markdown
@@ -5,7 +5,7 @@ Oh My Zsh is an open source, community-driven framework for managing your [zsh](
 
 __Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
 
-To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
+To learn more, visit [ohmyz.sh](http://ohmyz.sh) and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
 
 ## Getting Started
 

From 35517457921c095be1aa6ed948debfbe183b89ac Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Tue, 6 Oct 2015 21:03:47 -0400
Subject: [PATCH 1356/1378] Disable bracketed-paste-magic in zsh 5.1.1, where
 it is buggy

A bracketed-paste-magic bug breaks pasting of CJK and some other characters in zsh 5.1.1.
http://www.zsh.org/mla/workers/2015/msg02680.html
See #4434
---
 lib/misc.zsh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 8ff076e77..c81dab413 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,14 +1,19 @@
 ## Load smart urls if available
-for d in $fpath; do
-	if [[ -e "$d/url-quote-magic" ]]; then
-		if [[ -e "$d/bracketed-paste-magic" ]]; then
-			autoload -Uz bracketed-paste-magic
-			zle -N bracketed-paste bracketed-paste-magic
-		fi
-		autoload -U url-quote-magic
-		zle -N self-insert url-quote-magic
-	fi
-done
+# bracketed-paste-magic is known buggy in zsh 5.1.1 (only), so skip it there; see #4434
+autoload -Uz is-at-least
+if [[ $ZSH_VERSION != 5.1.1 ]]; then
+  for d in $fpath; do
+  	if [[ -e "$d/url-quote-magic" ]]; then
+  		if is-at-least 5.1; then
+  			autoload -Uz bracketed-paste-magic
+  			zle -N bracketed-paste bracketed-paste-magic
+  		fi
+  		autoload -Uz url-quote-magic
+  		zle -N self-insert url-quote-magic
+      break
+  	fi
+  done
+fi
 
 ## jobs
 setopt long_list_jobs
@@ -22,8 +27,7 @@ alias _='sudo'
 alias please='sudo'
 
 ## more intelligent acking for ubuntu users
-if which ack-grep &> /dev/null;
-then
+if which ack-grep &> /dev/null; then
   alias afind='ack-grep -il'
 else
   alias afind='ack -il'

From d15521d09dfa59da664aca6ddd40928d1031c5ad Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 8 Oct 2015 22:31:39 -0400
Subject: [PATCH 1357/1378] diagnostics: fix for reserved-word changes in zsh
 5.1

Reference:
https://github.com/zsh-users/zsh/blob/zsh-5.1.1/NEWS#L20-L32
---
 lib/diagnostics.zsh | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index afc33829b..9c9905e4d 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -52,6 +52,9 @@
 # * Consider whether to move default output file location to TMPDIR. More robust
 #     but less user friendly.
 #
+
+autoload -Uz is-at-least
+
 function omz_diagnostic_dump() {
   emulate -L zsh
 
@@ -247,7 +250,7 @@ function _omz_diag_dump_one_big_text() {
 
 function _omz_diag_dump_check_core_commands() {
   builtin echo "Core command check:"
-  local redefined name builtins externals
+  local redefined name builtins externals reserved_words
   redefined=()
   # All the zsh non-module builtin commands
   # These are taken from the zsh reference manual for 5.0.2
@@ -255,17 +258,32 @@ function _omz_diag_dump_check_core_commands() {
   # (For back-compatibility, if any of these are newish, they should be removed,
   # or at least made conditional on the version of the current running zsh.)
   # "history" is also excluded because OMZ is known to redefine that
+  reserved_words=( do done esac then elif else fi for case if while function 
+    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}' 
+    )
   builtins=( alias autoload bg bindkey break builtin bye cd chdir command
     comparguments compcall compctl compdescribe compfiles compgroups compquote comptags
-    comptry compvalues continue declare dirs disable disown echo echotc echoti emulate
-    enable eval exec exit export false fc fg float functions getln getopts hash
-    integer jobs kill let limit local log logout noglob popd print printf
-    pushd pushln pwd r read readonly rehash return sched set setopt shift
-    source suspend test times trap true ttyctl type typeset ulimit umask unalias
+    comptry compvalues continue dirs disable disown echo echotc echoti emulate
+    enable eval exec exit false fc fg functions getln getopts hash
+    jobs kill let limit log logout noglob popd print printf
+    pushd pushln pwd r read rehash return sched set setopt shift
+    source suspend test times trap true ttyctl type ulimit umask unalias
     unfunction unhash unlimit unset unsetopt vared wait whence where which zcompile
     zle zmodload zparseopts zregexparse zstyle )
+  if is-at-least 5.1; then
+    reserved_word+=( declare export integer float local readonly typeset )
+  else
+    builtins+=( declare export integer float local readonly typeset )
+  fi
   builtins_fatal=( builtin command local )
   externals=( zsh )
+  for name in $reserved_words; do
+    if [[ $(builtin whence -w $name) != "$name: reserved" ]]; then
+      builtin echo "reserved word '$name' has been redefined"
+      builtin which $name
+      redefined+=$name
+    fi
+  done
   for name in $builtins; do
     if [[ $(builtin whence -w $name) != "$name: builtin" ]]; then
       builtin echo "builtin '$name' has been redefined"

From bb509dda236f8ed04b90806bc66f4ad1a41f57bc Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 9 Oct 2015 07:07:57 -0700
Subject: [PATCH 1358/1378] Renaming colored-man to colored-man-pages because
 it needs to be.

---
 .../colored-man-pages.plugin.zsh}                                 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{colored-man/colored-man.plugin.zsh => colored-man-pages/colored-man-pages.plugin.zsh} (100%)

diff --git a/plugins/colored-man/colored-man.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
similarity index 100%
rename from plugins/colored-man/colored-man.plugin.zsh
rename to plugins/colored-man-pages/colored-man-pages.plugin.zsh

From 252078dd6c8adc78c6c9d3564dd16fca5aa146a1 Mon Sep 17 00:00:00 2001
From: Bruno Volcov <volcov.bruno@gmail.com>
Date: Fri, 9 Oct 2015 18:47:48 -0300
Subject: [PATCH 1359/1378] add alias to sort by version

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 4f2745038..15caab28f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -212,6 +212,7 @@ alias gsts='git stash show --text'
 alias gsu='git submodule update'
 
 alias gts='git tag -s'
+alias gtv='git tag | sort -V'
 
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'

From 2d0e7fbdadce6a3d052ea0f33ccf9114a4b23c0a Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 9 Oct 2015 20:35:19 -0400
Subject: [PATCH 1360/1378] autoenv: actually source autoenv once located

Fixes bug introduced in #4440
---
 plugins/autoenv/autoenv.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index c9f968118..ea2e56dd6 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -17,6 +17,7 @@ In the meantime the autoenv plugin is DISABLED.
 END
     return 1
   fi
+  source $autoenv_dir/activate.sh
 fi
 }
 [[ $? != 0 ]] && return $?

From 7597bf805e6c9bfd0cbe216251d6dd639ecffcea Mon Sep 17 00:00:00 2001
From: Satoshi Ohmori <sachin21dev@gmail.com>
Date: Sat, 10 Oct 2015 11:49:56 +0900
Subject: [PATCH 1361/1378] Add an alias for upstream

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 4f2745038..600f756e1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -217,6 +217,7 @@ alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
+alias glum='git pull upstream master'
 
 alias gvt='git verify-tag'
 

From b18d386d7fe6c6569a9a05a306b50c6dada9c474 Mon Sep 17 00:00:00 2001
From: Gustavo Villa <gfvcastro@gmail.com>
Date: Mon, 12 Oct 2015 04:32:22 -0300
Subject: [PATCH 1362/1378] Add option '--port' to 'rails server' alias.

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 1bbd1fb4b..a390c919c 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -42,6 +42,7 @@ alias rp='rails plugin'
 alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
+alias rsp='rails server --port'
 
 # Rake aliases
 alias rdm='rake db:migrate'

From 8a95cedc3b200762f44d1c4e9475240f0d61c8a1 Mon Sep 17 00:00:00 2001
From: Arvind Chembarpu <achembarpu@gmail.com>
Date: Thu, 15 Oct 2015 08:43:40 +0530
Subject: [PATCH 1363/1378] Init pyenv virtualenvs too

---
 plugins/pyenv/pyenv.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index b3dc7aa17..706aad3cf 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -18,6 +18,7 @@ for pyenvdir in "${pyenvdirs[@]}" ; do
         export PYENV_ROOT=$pyenvdir
         export PATH=${pyenvdir}/bin:$PATH
         eval "$(pyenv init --no-rehash - zsh)"
+        eval "$(pyenv virtualenv-init - zsh)"
 
         function pyenv_prompt_info() {
             echo "$(pyenv version-name)"

From 8a362b2b1f00448af6dd2ef1a6b0d5ea2d9b025e Mon Sep 17 00:00:00 2001
From: Arvind Chembarpu <achembarpu@gmail.com>
Date: Thu, 15 Oct 2015 08:44:15 +0530
Subject: [PATCH 1364/1378] Enable pyenv rehash

---
 plugins/pyenv/pyenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 706aad3cf..b06507b62 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -17,7 +17,7 @@ for pyenvdir in "${pyenvdirs[@]}" ; do
         FOUND_PYENV=1
         export PYENV_ROOT=$pyenvdir
         export PATH=${pyenvdir}/bin:$PATH
-        eval "$(pyenv init --no-rehash - zsh)"
+        eval "$(pyenv init - zsh)"
         eval "$(pyenv virtualenv-init - zsh)"
 
         function pyenv_prompt_info() {

From e59e1c8417513a246509f7738ae05b4f2c9a8a8e Mon Sep 17 00:00:00 2001
From: Arvind Chembarpu <achembarpu@gmail.com>
Date: Fri, 16 Oct 2015 23:19:55 +0530
Subject: [PATCH 1365/1378] Check for git before trying to upgrade, as per
 #4504

---
 tools/check_for_upgrade.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 5afd83c1e..1c897cb36 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -26,6 +26,9 @@ fi
 # oh-my-zsh directory.
 [[ -w "$ZSH" ]] || return 0
 
+# Cancel upgrade if git is unavailable on the system
+whence git >/dev/null || return 0
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
@@ -54,4 +57,3 @@ else
   # create the zsh file
   _update_zsh_update
 fi
-

From 75e619b72421e7330011c8bda5f99af5231a8b7d Mon Sep 17 00:00:00 2001
From: Yannick Eckey <yannick.eckey@googlemail.com>
Date: Thu, 15 Oct 2015 15:37:30 +0200
Subject: [PATCH 1366/1378] Fix install.sh/upgrade.sh for tput-less systems

@fcrozat's original fix assumes `which` not to output anything to STDOUT
in case the command is not found. That is not necessarily true on all
systems. A better solution is to check the return value instead.

Fixes #4376
---
 tools/install.sh | 5 ++---
 tools/upgrade.sh | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 5633320a8..542bf97c2 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -2,9 +2,8 @@ set -e
 
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
-    ncolors=$($tput colors)
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
 fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
   RED="$(tput setaf 1)"
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6e9696202..fe8fbadca 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,8 +1,7 @@
 
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
+if which tput >/dev/null 2>&1; then
     ncolors=$(tput colors)
 fi
 if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then

From 2c54428d6e3c683e5b01b30d8405232f98668691 Mon Sep 17 00:00:00 2001
From: Superbil <superbil@gmail.com>
Date: Sat, 17 Oct 2015 05:55:29 +0800
Subject: [PATCH 1367/1378] Fixd bug for pyenv plugin

Check pyenv-virtualenv can eval before use it.

Signed-off-by: Superbil <superbil@gmail.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index b06507b62..aa1f9488a 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -18,7 +18,10 @@ for pyenvdir in "${pyenvdirs[@]}" ; do
         export PYENV_ROOT=$pyenvdir
         export PATH=${pyenvdir}/bin:$PATH
         eval "$(pyenv init - zsh)"
-        eval "$(pyenv virtualenv-init - zsh)"
+
+        if pyenv commands | command grep -q virtualenv-init; then
+            eval "$(pyenv virtualenv-init - zsh)"
+        fi
 
         function pyenv_prompt_info() {
             echo "$(pyenv version-name)"

From 2c8697b934847a84d68f2e00ba1d0cabeed19412 Mon Sep 17 00:00:00 2001
From: Satoshi Ohmori <sachin21dev@gmail.com>
Date: Tue, 20 Oct 2015 18:45:12 +0900
Subject: [PATCH 1368/1378] [FIX #4525]: Fix typo

---
 plugins/git-extras/git-extras.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index 681fbb466..507bf1b25 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -302,7 +302,7 @@ zstyle ':completion:*:*:git:*' user-commands \
     count:'count commits' \
     create-branch:'create local and remote branch' \
     delete-branch:'delete local and remote branch' \
-    delete-merged-brancees:'delete merged branches'\
+    delete-merged-branches:'delete merged branches'\
     delete-submodule:'delete submodule' \
     delete-tag:'delete local and remote tag' \
     effort:'display effort statistics' \

From c9d93757e82785a0fd1e0d1222f5d61e01849703 Mon Sep 17 00:00:00 2001
From: Brian J Brennan <brianloveswords@gmail.com>
Date: Sun, 18 Oct 2015 13:20:49 -0400
Subject: [PATCH 1369/1378] Make install script safer

This changeset wraps all of the commands in tools/install.sh in a
function and then calls that function as the last line of the
script.

The current install instructions ask the user to download the install
script using `curl` and pass the result to `sh`. This is totally
fine (as long as both the instructions and the script itself are served
using HTTPS), but the script should be written in a way such that it
doesn't start trying to actually *do* anything until the very last line.

The reason is due to the way `curl` work: if the socket drops before the
request is complete (server abruptly hangs up, client's internet flakes
out, etc.), `curl` will return the partial data that it received. Here
is an example of that:

![partial file execution](https://cldup.com/qU_Mnh2GmT.png)

A way this might cause issues for tools/install.sh is if the connection drops
after cloning but before the repository (L53-56). The .zshrc
configuration will not be copied and the shell will not be changed, but
if the user tries to run the install script again it will claim
oh-my-zsh is already installed (L31-39).

While this is not a particularly dangerous error condition (the user can
just delete .oh-my-zsh and re-run), it can certainly be confusing for
new users. This also helps future-proof the script for a time when it
might need to use a "dangerous" command, e.g. `rm`, and we want to make
sure it happens in the most transactional way possible.
---
 tools/install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index 67d341c7c..dd9c4f842 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,3 +1,4 @@
+function main() {
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
 tput=$(which tput)
@@ -117,3 +118,6 @@ echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
 echo ''
 printf "${NORMAL}"
 env zsh
+}
+
+main

From fe02e027fe2d549d6027d51b95a8a724e40958df Mon Sep 17 00:00:00 2001
From: evanandrewrose <evanandrewrose@gmail.com>
Date: Mon, 19 Oct 2015 08:21:41 -0400
Subject: [PATCH 1370/1378] Fix "be" -> "b" typo in coffee plugin README.md.

---
 plugins/coffee/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/coffee/README.md b/plugins/coffee/README.md
index d0e7bbe74..432ce3414 100644
--- a/plugins/coffee/README.md
+++ b/plugins/coffee/README.md
@@ -11,7 +11,7 @@ Preview the compiled result of your coffeescript with `cf "code"` as per the
 following:
 
 ```zsh
-$ cf 'if a then be else c'
+$ cf 'if a then b else c'
 if (a) {
   b;
 } else {

From 78dc8583969a046b51ef4f099b1d182f73dcaa12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2015 10:36:40 +0200
Subject: [PATCH 1371/1378] Revert "Make install script safer"

This reverts commit c9d93757e82785a0fd1e0d1222f5d61e01849703, which
makes it fail with a syntax error:

  sh: 1: Syntax error: "(" unexpected
---
 tools/install.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index e65905025..be43968bc 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,4 +1,3 @@
-function main() {
 # Use colors, but only if connected to a terminal, and that terminal
 # supports them.
 if which tput >/dev/null 2>&1; then
@@ -117,6 +116,3 @@ echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
 echo ''
 printf "${NORMAL}"
 env zsh
-}
-
-main

From ca5632bce10e1f5b0fe2a59151ae0fd776619d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2015 10:44:56 +0200
Subject: [PATCH 1372/1378] Fix syntax error in #4515 on certain shells

Drops the `function` keyword and uses only `func(){}` syntax as per the
POSIX specification:

http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_09_05

Related: #4531
---
 tools/install.sh | 232 ++++++++++++++++++++++++-----------------------
 1 file changed, 118 insertions(+), 114 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index be43968bc..8cba52085 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,118 +1,122 @@
-# Use colors, but only if connected to a terminal, and that terminal
-# supports them.
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-  RED="$(tput setaf 1)"
-  GREEN="$(tput setaf 2)"
-  YELLOW="$(tput setaf 3)"
-  BLUE="$(tput setaf 4)"
-  BOLD="$(tput bold)"
-  NORMAL="$(tput sgr0)"
-else
-  RED=""
-  GREEN=""
-  YELLOW=""
-  BLUE=""
-  BOLD=""
-  NORMAL=""
-fi
-
-# Only enable exit-on-error after the non-critical colorization stuff,
-# which may fail on systems lacking tput or terminfo
-set -e
-
-CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
-if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
-  printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"
-  exit
-fi
-unset CHECK_ZSH_INSTALLED
-
-if [ ! -n "$ZSH" ]; then
-  ZSH=~/.oh-my-zsh
-fi
-
-if [ -d "$ZSH" ]; then
-  printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n"
-  printf "You'll need to remove $ZSH if you want to re-install.\n"
-  exit
-fi
-
-# Prevent the cloned repository from having insecure permissions. Failing to do
-# so causes compinit() calls to fail with "command not found: compdef" errors
-# for users with insecure umasks (e.g., "002", allowing group writability). Note
-# that this will be ignored under Cygwin by default, as Windows ACLs take
-# precedence over umasks except for filesystems mounted with option "noacl".
-umask g-w,o-w
-
-printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
-hash git >/dev/null 2>&1 || {
-  echo "Error: git is not installed"
-  exit 1
-}
-env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
-  printf "Error: git clone of oh-my-zsh repo failed\n"
-  exit 1
-}
-
-# The Windows (MSYS) Git is not compatible with normal use on cygwin
-if [ "$OSTYPE" = cygwin ]; then
-  if git --version | grep msysgit > /dev/null; then
-    echo "Error: Windows/MSYS Git is not supported on Cygwin"
-    echo "Error: Make sure the Cygwin git package is installed and is first on the path"
-    exit 1
+main() {
+  # Use colors, but only if connected to a terminal, and that terminal
+  # supports them.
+  if which tput >/dev/null 2>&1; then
+      ncolors=$(tput colors)
   fi
-fi
-
-printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
-if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
-  printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
-  mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
-fi
-
-printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
-cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
-sed "/^export ZSH=/ c\\
-export ZSH=$ZSH
-" ~/.zshrc > ~/.zshrc-omztemp
-mv -f ~/.zshrc-omztemp ~/.zshrc
-
-printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
-sed "/export PATH=/ c\\
-export PATH=\"$PATH\"
-" ~/.zshrc > ~/.zshrc-omztemp
-mv -f ~/.zshrc-omztemp ~/.zshrc
-
-# If this user's login shell is not already "zsh", attempt to switch.
-TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
-if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
-  # If this platform provides a "chsh" command (not Cygwin), do it, man!
-  if hash chsh >/dev/null 2>&1; then
-    printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n"
-    chsh -s $(grep /zsh$ /etc/shells | tail -1)
-  # Else, suggest the user do so manually.
+  if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
   else
-    printf "I can't change your shell automatically because this system does not have chsh.\n"
-    printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n"
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    BOLD=""
+    NORMAL=""
   fi
-fi
 
-printf "${GREEN}"
-echo '         __                                     __   '
-echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
-echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
-echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
-echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
-echo '                        /____/                       ....is now installed!'
-echo ''
-echo ''
-echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
-echo ''
-echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
-echo ''
-echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
-echo ''
-printf "${NORMAL}"
-env zsh
+  # Only enable exit-on-error after the non-critical colorization stuff,
+  # which may fail on systems lacking tput or terminfo
+  set -e
+
+  CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
+  if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
+    printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"
+    exit
+  fi
+  unset CHECK_ZSH_INSTALLED
+
+  if [ ! -n "$ZSH" ]; then
+    ZSH=~/.oh-my-zsh
+  fi
+
+  if [ -d "$ZSH" ]; then
+    printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n"
+    printf "You'll need to remove $ZSH if you want to re-install.\n"
+    exit
+  fi
+
+  # Prevent the cloned repository from having insecure permissions. Failing to do
+  # so causes compinit() calls to fail with "command not found: compdef" errors
+  # for users with insecure umasks (e.g., "002", allowing group writability). Note
+  # that this will be ignored under Cygwin by default, as Windows ACLs take
+  # precedence over umasks except for filesystems mounted with option "noacl".
+  umask g-w,o-w
+
+  printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
+  hash git >/dev/null 2>&1 || {
+    echo "Error: git is not installed"
+    exit 1
+  }
+  env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
+    printf "Error: git clone of oh-my-zsh repo failed\n"
+    exit 1
+  }
+
+  # The Windows (MSYS) Git is not compatible with normal use on cygwin
+  if [ "$OSTYPE" = cygwin ]; then
+    if git --version | grep msysgit > /dev/null; then
+      echo "Error: Windows/MSYS Git is not supported on Cygwin"
+      echo "Error: Make sure the Cygwin git package is installed and is first on the path"
+      exit 1
+    fi
+  fi
+
+  printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
+  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
+    printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
+    mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
+  fi
+
+  printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
+  cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
+  sed "/^export ZSH=/ c\\
+  export ZSH=$ZSH
+  " ~/.zshrc > ~/.zshrc-omztemp
+  mv -f ~/.zshrc-omztemp ~/.zshrc
+
+  printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
+  sed "/export PATH=/ c\\
+  export PATH=\"$PATH\"
+  " ~/.zshrc > ~/.zshrc-omztemp
+  mv -f ~/.zshrc-omztemp ~/.zshrc
+
+  # If this user's login shell is not already "zsh", attempt to switch.
+  TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
+  if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
+    # If this platform provides a "chsh" command (not Cygwin), do it, man!
+    if hash chsh >/dev/null 2>&1; then
+      printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n"
+      chsh -s $(grep /zsh$ /etc/shells | tail -1)
+    # Else, suggest the user do so manually.
+    else
+      printf "I can't change your shell automatically because this system does not have chsh.\n"
+      printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n"
+    fi
+  fi
+
+  printf "${GREEN}"
+  echo '         __                                     __   '
+  echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
+  echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+  echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+  echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+  echo '                        /____/                       ....is now installed!'
+  echo ''
+  echo ''
+  echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
+  echo ''
+  echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
+  echo ''
+  echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
+  echo ''
+  printf "${NORMAL}"
+  env zsh
+}
+
+main

From b2010a0ae63ba09632a3b427edc81888eadec4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2015 11:17:37 +0200
Subject: [PATCH 1373/1378] Fix syntax error in confirmation prompt of
 uninstall.sh

We need to use POSIX syntax. This file is no longer executed with zsh.

Fixes #4483.
---
 tools/uninstall.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index f9da00c9b..488b002e7 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,8 +1,8 @@
 read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
-if ! [[ $confirmation =~ ^[yY]$ ]]
+if [ $confirmation = y ] && [ $confirmation = Y ]
 then
-    echo "Uninstall cancelled"
-    exit
+  echo "Uninstall cancelled"
+  exit
 fi
 
 echo "Removing ~/.oh-my-zsh"

From 4e42e1f7e149f85ba52b654dbea9766080a9a480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2015 11:28:12 +0200
Subject: [PATCH 1374/1378] Fix conditional in uninstall prompt

---
 tools/uninstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 488b002e7..80b11a10a 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,5 +1,5 @@
 read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
-if [ $confirmation = y ] && [ $confirmation = Y ]
+if [ $confirmation = y ] || [ $confirmation = Y ]
 then
   echo "Uninstall cancelled"
   exit

From a1755e652cd96efb22b4956e8ef9759d7d170f5d Mon Sep 17 00:00:00 2001
From: Satoshi Ohmori <sachin21dev@gmail.com>
Date: Fri, 16 Oct 2015 04:49:53 +0900
Subject: [PATCH 1375/1378] Refactor for method in
 plugins/rake-fast/rake-fast.plugin.zsh

---
 plugins/rake-fast/rake-fast.plugin.zsh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh
index cfc9a079f..d305eb1f0 100644
--- a/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/plugins/rake-fast/rake-fast.plugin.zsh
@@ -8,17 +8,7 @@ _rake_refresh () {
 }
 
 _rake_does_task_list_need_generating () {
-  if [ ! -f .rake_tasks ]; then return 0;
-  else
-    if [[ "$OSTYPE" = darwin* ]]; then
-      accurate=$(stat -f%m .rake_tasks)
-      changed=$(stat -f%m Rakefile)
-    else
-      accurate=$(stat -c%Y .rake_tasks)
-      changed=$(stat -c%Y Rakefile)
-    fi
-    return $(expr $accurate '>=' $changed)
-  fi
+  [[ ! -f .rake_tasks ]] || [[ Rakefile -nt .rake_tasks ]]
 }
 
 _rake_generate () {

From d06f4d089302ecd448eaa557baf6ed4fca34428b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2015 16:44:26 +0200
Subject: [PATCH 1376/1378] Fix backwards logic in uninstaller once and for all

Really this time :P

Fixes #4533
---
 tools/uninstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 80b11a10a..9ad1b64a6 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,5 +1,5 @@
 read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
-if [ $confirmation = y ] || [ $confirmation = Y ]
+if [ "$confirmation" != y ] && [ "$confirmation" != Y ]
 then
   echo "Uninstall cancelled"
   exit

From 9264d75d5d1c10de370b0c32606b70768541eaaa Mon Sep 17 00:00:00 2001
From: Cooper Maruyama <cooperm@susteen.com>
Date: Mon, 15 Jun 2015 01:22:40 -0700
Subject: [PATCH 1377/1378] Fix typo.

* `cfp` alias was referencing an old version of the `cf` command which
no longer exists. This has been updated to reference a valid command.
---
 plugins/coffee/coffee.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh
index 77cb663f7..6d1ce5ce4 100644
--- a/plugins/coffee/coffee.plugin.zsh
+++ b/plugins/coffee/coffee.plugin.zsh
@@ -10,7 +10,7 @@ cfc () {
 }
 
 # compile from clipboard & print
-alias cfp='coffeeMe "$(clippaste)"'
+alias cfp='cf "$(clippaste)"'
 
 # compile from clipboard and copy to clipboard
 alias cfpc='cfp | clipcopy'

From e9de366ea7f20962f1847828b3ca185bab69a118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2015 17:39:13 +0200
Subject: [PATCH 1378/1378] Update custom location command and fix code format

---
 README.markdown | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.markdown b/README.markdown
index 779ce77c3..cee314de2 100644
--- a/README.markdown
+++ b/README.markdown
@@ -25,11 +25,15 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 
 #### via curl
 
-`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"`
+```shell
+sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+```
 
 #### via wget
 
-`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"`
+```shell
+sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
+```
 
 ## Using Oh My Zsh
 
@@ -100,7 +104,7 @@ The default location is `~/.oh-my-zsh` (hidden in your home directory)
 If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
 
 ```shell
-curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh
+export ZSH="~/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 ```
 
 #### Manual Installation