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 001/294] 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 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 002/294] [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 003/294] [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 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 004/294] 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 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 005/294] 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 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 006/294] 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 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 007/294] 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 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 008/294] 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 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 009/294] 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 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 010/294] 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 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 011/294] 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 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 012/294] 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 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 013/294] 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 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 014/294] 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 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 015/294] 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 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 016/294] 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 017/294] 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 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 018/294] 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 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 019/294] 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 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 020/294] =?UTF-8?q?drop=20the=20foreach,=20make=20it=20eve?=
 =?UTF-8?q?n=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 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 021/294] 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 022/294] 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 023/294] 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 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 024/294] 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 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 025/294] 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 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 026/294] 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 027/294] #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 028/294] 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 029/294] 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 030/294] 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 031/294] 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 032/294] 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 033/294] 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 034/294] 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 035/294] 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 036/294] 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 037/294] 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 038/294] 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 039/294] 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 040/294] 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 041/294] 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 042/294] 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 043/294] 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 044/294] 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 045/294] 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 046/294] 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 047/294] 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 048/294] 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 049/294] [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 050/294] 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 051/294] [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 052/294] 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 053/294] 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 054/294] 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 055/294] #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 056/294] 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 057/294] 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 058/294] 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 059/294] 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 060/294] 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 061/294] 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 062/294] 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 063/294] 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 064/294] 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 065/294] 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 066/294] 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 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 067/294] 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 068/294] 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 069/294] 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 070/294] 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 071/294] 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 072/294] 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 073/294] 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 074/294] 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 075/294] 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 076/294] 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 077/294] 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 078/294] 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 079/294] 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 080/294] 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 081/294] 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 082/294] #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 083/294] 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 084/294] 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 085/294] 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 086/294] 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 087/294] 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 088/294] 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 089/294] 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 090/294] 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 091/294] 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 092/294] 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 093/294] 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 094/294] 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 095/294] 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 096/294] 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 097/294] 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 098/294] 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 099/294] 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 100/294] 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 101/294] 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 102/294] 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 103/294] 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 104/294] 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 105/294] 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 106/294] 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 107/294] 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 108/294] 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 109/294] 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 110/294] 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 111/294] 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 112/294] 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 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 113/294] 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 114/294] 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 115/294] 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 116/294] 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 117/294] 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 118/294] 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 119/294] [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 120/294] [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 121/294] 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 122/294] 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 123/294] 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 124/294] 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 125/294] 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 126/294] 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 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 127/294] 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 128/294] 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 129/294] 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 130/294] 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 131/294] [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 132/294] 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 133/294] 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 134/294] 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 135/294] 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 136/294] 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 137/294] 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 138/294] 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 139/294] 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 140/294] 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 141/294] 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 142/294] 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 143/294] 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 144/294] 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 145/294] 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 146/294] 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 147/294] 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 148/294] 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 149/294] 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 150/294] 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 151/294] 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 152/294] 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 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 153/294] 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 154/294] 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 155/294] [~] 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 156/294] 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 157/294] 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 158/294] 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 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 159/294] 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 160/294] 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 161/294] 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 162/294] 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 163/294] 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 164/294] 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 165/294] 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 166/294] 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 167/294] 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 168/294] 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 169/294] 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 170/294] 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 171/294] 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 172/294] 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 173/294] 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 174/294] 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 175/294] 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 176/294] 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 177/294] 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 178/294] 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 179/294] 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 180/294] 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 181/294] 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 00ff1bbd1c666be789f94c30cfdd837d16d190d8 Mon Sep 17 00:00:00 2001
From: ekaragodin <ekaragodin@gmail.com>
Date: Mon, 15 Dec 2014 21:37:38 +0600
Subject: [PATCH 182/294] 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 183/294] 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 184/294] 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 185/294] 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 186/294] 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 187/294] 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 188/294] 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 189/294] 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 190/294] 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 191/294] 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 192/294] 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 193/294] 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 194/294] 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 195/294] 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 196/294] 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 197/294] 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 198/294] 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 199/294] 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 200/294] 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 201/294] 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 202/294] 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 203/294] 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 204/294] [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 205/294] 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 206/294] 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 207/294] 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 208/294] 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 209/294] 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 210/294] 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 211/294] 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 212/294] 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 213/294] 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 214/294] 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 215/294] 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 216/294] 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 217/294] 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 218/294] 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 219/294] 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 220/294] 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 221/294] 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 222/294] 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 223/294] 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 224/294] 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 225/294] 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 226/294] 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 227/294] 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 228/294] 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 229/294] 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 230/294] 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 231/294] 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 232/294] 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 233/294] 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 234/294] 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 235/294] 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 236/294] 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 237/294] 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 238/294] 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 239/294] 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 240/294] 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 241/294] 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 242/294] 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 243/294] 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 244/294] 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 245/294] 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 246/294] 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 247/294] 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 248/294] 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 249/294] 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 250/294] 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 251/294] 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 252/294] 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 253/294] 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 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 254/294] 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 255/294] 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 256/294] 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 257/294] 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 258/294] 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 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 259/294] 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 260/294] 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 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 261/294] 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 262/294] 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 263/294] 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 264/294] 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 265/294] 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 266/294] 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 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 267/294] 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 268/294] 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 269/294] 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 270/294] 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 271/294] 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 272/294] 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 273/294] 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 274/294] 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 275/294] 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 276/294] 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 277/294] 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 278/294] 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 279/294] 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 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 280/294] 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 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 281/294] 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 282/294] 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 283/294] 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 284/294] 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 285/294] 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 286/294] 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 287/294] 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 288/294] 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 289/294] 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 290/294] 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 291/294] 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 292/294] 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 293/294] 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 294/294] 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