From 3e1d5fa3164db236653756bde816c94af7d23b01 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Mon, 22 Mar 2010 21:44:15 +0100
Subject: [PATCH 001/907] Make Shift+Tab move backwards in the menu

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

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 87e47bab6..8d22eb2b3 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -20,6 +20,7 @@ bindkey "^[[F"  end-of-line
 bindkey "^[[4~" end-of-line
 bindkey ' ' magic-space    # also do history expansion on space
 
+bindkey '^[[Z' reverse-menu-complete
 
 # consider emacs keybindings:
 
@@ -38,4 +39,4 @@ bindkey ' ' magic-space    # also do history expansion on space
 #bindkey '^I' complete-word
 ## Fix weird sequence that rxvt produces
 #bindkey -s '^[[Z' '\t'
-#
\ No newline at end of file
+#

From 81aa74b73cc221b5050e28ccf35d29317812edf9 Mon Sep 17 00:00:00 2001
From: MasterLambaster <MasterLambaster@gmail.com>
Date: Mon, 31 May 2010 17:09:45 +0800
Subject: [PATCH 002/907] Eastwood theme with optional RVM support

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

diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
new file mode 100644
index 000000000..83664515a
--- /dev/null
+++ b/themes/eastwood.zsh-theme
@@ -0,0 +1,19 @@
+#RVM settings
+if [[ -s ~/.rvm/scripts/rvm ]] ; then 
+  RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
+fi
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+}
+
+PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b '

From 6774490a467016db70e9ec1ddd1bab6fe37a722a Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 9 May 2010 21:17:20 +0800
Subject: [PATCH 003/907] Don't auto-correct ebuild commands.

It breaks "ebuild <foo> manifest", as there are Manifest files in the directory.
---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index a96f7ffd8..043320a6d 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -6,3 +6,4 @@ alias mysql='nocorrect mysql'
 alias mkdir='nocorrect mkdir'
 alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
+alias ebuild='nocorrect ebuild'

From edc8e3d092bc758fa9dd4f3472d2c6ec9d03b737 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 9 May 2010 21:16:33 +0800
Subject: [PATCH 004/907] Ignore commands that start with a space.

This is useful when you want to use a dangerous command, as it won't be
available with history searching.
---
 lib/history.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/history.zsh b/lib/history.zsh
index 509be8f09..ca6f57079 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -10,6 +10,7 @@ setopt hist_verify
 setopt inc_append_history
 setopt extended_history
 setopt hist_expire_dups_first
+setopt hist_ignore_space
 
 setopt SHARE_HISTORY
 setopt APPEND_HISTORY

From f9fbd079832637c192e35fe65532495a37a3e3d3 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 9 May 2010 22:23:11 +0800
Subject: [PATCH 005/907] Don't display dotfiles or reverse sort with ll alias.

The ll alias is a very common default for bash in Linux distributions, so use
that definition.
---
 lib/aliases.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 89c904a7e..80760a1f5 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -18,7 +18,7 @@ alias history='fc -l 1'
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
-alias ll='ls -alr'
+alias ll='ls -l'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'

From 3bc73012041c8762fa0276c6e02ac46fb3698a32 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Thu, 12 Nov 2009 14:52:53 +0800
Subject: [PATCH 006/907] Added a minimum zsh version note.

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

diff --git a/README.textile b/README.textile
index 950f8861b..23d8b5390 100644
--- a/README.textile
+++ b/README.textile
@@ -4,6 +4,8 @@ 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.
+
 h3. The automatic installer... (do you trust me?)
 
 @wget http://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@

From 6efc79c74edbc8cfbb5cdc438332eeae9b950508 Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
Date: Sun, 22 Nov 2009 01:38:55 +0800
Subject: [PATCH 007/907] Don't correct hpodder commands.

---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 043320a6d..fc60dcdbd 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -7,3 +7,4 @@ alias mkdir='nocorrect mkdir'
 alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
 alias ebuild='nocorrect ebuild'
+alias hpodder='nocorrect hpodder'

From 47e9914529e0807681c3c6dd2c11187ee67f0326 Mon Sep 17 00:00:00 2001
From: Takashi Yoshida <takashi@takashiyoshida.org>
Date: Mon, 31 May 2010 00:56:26 +0800
Subject: [PATCH 008/907] Added my own theme.

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

diff --git a/themes/takashiyoshida.zsh-theme b/themes/takashiyoshida.zsh-theme
new file mode 100644
index 000000000..419a8cf3f
--- /dev/null
+++ b/themes/takashiyoshida.zsh-theme
@@ -0,0 +1,27 @@
+#
+# PROMPT
+#
+PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}['
+PROMPT_HOST='%{$fg_bold[cyan]%}%m'
+PROMPT_SEPARATOR='%{$reset_color%}:'
+PROMPT_DIR='%{$fg_bold[yellow]%}%c'
+PROMPT_BRACKET_END='%{$fg_bold[white]%}]'
+
+PROMPT_USER='%{$fg_bold[white]%}%n'
+PROMPT_SIGN='%{$reset_color%}%#'
+
+GIT_PROMPT_INFO='$(git_prompt_info)'
+
+# My current prompt looks like:
+# [host:current_dir] (git_prompt_info)
+# [username]%
+PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO}
+${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} "
+
+#
+# Git repository
+#
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
+ZSH_THEME_GIT_PROMPT_CLEAN=''

From 6bb13632f538db339520ab2b46794006a405430f Mon Sep 17 00:00:00 2001
From: Tobias Birmili <birmilts@studi.informatik.uni-stuttgart.de>
Date: Sun, 6 Jun 2010 18:42:25 +0800
Subject: [PATCH 009/907] added plugin to control macports mysql-server
 installation

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

diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql-macports.plugin.zsh
new file mode 100644
index 000000000..63b881c9f
--- /dev/null
+++ b/plugins/mysql-macports.plugin.zsh
@@ -0,0 +1,6 @@
+# commands to control local mysql-server installation
+# paths are for osx installtion via macports
+
+alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
+alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
+alias mysqlstatus='mysqladmin5 -u root -p ping'
\ No newline at end of file

From b26ff059653716fd38d1813b797572bbec718c16 Mon Sep 17 00:00:00 2001
From: toabi <tobias@codingcorsairs.com>
Date: Sun, 6 Jun 2010 22:14:13 +0800
Subject: [PATCH 010/907] updated the readme

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

diff --git a/README.textile b/README.textile
index 23d8b5390..8b1b6875a 100644
--- a/README.textile
+++ b/README.textile
@@ -27,22 +27,19 @@ h3. The manual way
 
   @chsh -s /bin/zsh@
 
-4. Start / restart zsh (open a new terminal is easy enough..)
+4. Start / restart zsh (open a new terminal is easy enough...)
 
 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_.
 
 h2. Usage
 
-TODO: Update this..
-
-* Rake autocomplete: @rake (tab)@. Will generate a cache of all your rake tasks and then let you auto-complete and/or select the task to run.
-* ssh autocomplete: @ssh (tab)@ or @scp (tab)@
-* Git branch, it'll tell you which branch you're in when you're in a git repository directory.
+* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
+** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with Oh My Zsh.
-* much much more..
+** Take a look at the "current themes":http://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...
 
 h2. Useful
 
@@ -51,6 +48,7 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
 h3. Customization
 
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
+If you have many functions which go good together you can put them as a *.plugin.zsh file in the @plugin/@ directory and then enable this plugin.
 
 h3. Uninstalling
 
@@ -68,8 +66,4 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
 
 h3. Send us your theme!
 
-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
-
-h3. Todo from imajes:
-
-* need to make the title bar support git folder
\ No newline at end of file
+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
\ No newline at end of file

From 7f350da5b74c65ed99766c8ebd5137aee9479225 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 10 Jun 2010 07:50:13 -0700
Subject: [PATCH 011/907] Adding a ggpnp which does a git pull followed by a
 git push.

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

diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh
index e0d967056..655eaf728 100644
--- a/plugins/git.plugin.zsh
+++ b/plugins/git.plugin.zsh
@@ -29,3 +29,4 @@ function current_branch() {
 # these aliases take advangate of the previous function
 alias ggpull='git pull origin $(current_branch)'
 alias ggpush='git push origin $(current_branch)'
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file

From 8c419ae3b5b77a24485c6a68e6af1a0384db67a8 Mon Sep 17 00:00:00 2001
From: NanoTech <nanotech008@gmail.com>
Date: Sat, 12 Jun 2010 16:31:02 -0600
Subject: [PATCH 012/907] Added my theme (nanotech).

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

diff --git a/themes/nanotech.zsh-theme b/themes/nanotech.zsh-theme
new file mode 100644
index 000000000..eddb23c94
--- /dev/null
+++ b/themes/nanotech.zsh-theme
@@ -0,0 +1,7 @@
+PROMPT=' %{$fg_bold[green]%}%2c %{$fg_bold[blue]%}%{[%}%{$reset_color%} '
+RPROMPT='$(git_prompt_info) %{$fg[blue]%}] %{$fg[green]%}%D{%L:%M} %{$fg[yellow]%}%D{%p}%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 5b8bc7aeebdf5f28da811a29bdcdf41e0f08c218 Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Mon, 16 Aug 2010 21:47:21 +0200
Subject: [PATCH 013/907] add candy theme

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

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

From eb14ee1c630a4ae02234e78eabf3e8416dc9d977 Mon Sep 17 00:00:00 2001
From: Josh Price <joshcp@gmail.com>
Date: Tue, 17 Aug 2010 22:45:10 +1000
Subject: [PATCH 014/907] Added my own theme based on pat's

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

diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
new file mode 100644
index 000000000..9d59bd91e
--- /dev/null
+++ b/themes/josh.zsh-theme
@@ -0,0 +1,43 @@
+grey='\e[0;90m'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"
+
+function pat_prompt {
+  (( spare_width = ${COLUMNS} ))
+  prompt=" "
+
+  branch=$(current_branch)
+  ruby_version=$(rvm_prompt_info)
+  path_size=${#PWD}
+  branch_size=${#branch}
+  ruby_size=${#ruby_version}
+  machine_size=11
+  
+  if [[ ${#branch} -eq 0 ]]
+    then (( ruby_size = ruby_size + 1 ))
+  else
+    (( branch_size = branch_size + 4 ))
+    if [[ -n $(git status -s 2> /dev/null) ]]; then
+      (( branch_size = branch_size + 2 ))
+    fi
+  fi
+  
+  (( spare_width = ${spare_width} - (${machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
+
+  while [ ${#prompt} -lt $spare_width ]; do
+    prompt=" $prompt"
+  done
+  
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
+  
+  echo $prompt
+}
+
+setopt prompt_subst
+
+PROMPT='
+%n@%m $(pat_prompt)
+%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '

From 1582570919b5bed145d38d1d60ae8572f4552f25 Mon Sep 17 00:00:00 2001
From: Josh Price <joshcp@gmail.com>
Date: Tue, 17 Aug 2010 23:22:26 +1000
Subject: [PATCH 015/907] Made the user_machine_size calculation generic. Pwned
 the function name.

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

diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index 9d59bd91e..6bed1a70e 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"
 
-function pat_prompt {
+function josh_prompt {
   (( spare_width = ${COLUMNS} ))
   prompt=" "
 
@@ -14,7 +14,7 @@ function pat_prompt {
   path_size=${#PWD}
   branch_size=${#branch}
   ruby_size=${#ruby_version}
-  machine_size=11
+  user_machine_size=${#${(%):-%n@%m-}}
   
   if [[ ${#branch} -eq 0 ]]
     then (( ruby_size = ruby_size + 1 ))
@@ -25,7 +25,7 @@ function pat_prompt {
     fi
   fi
   
-  (( spare_width = ${spare_width} - (${machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
+  (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
 
   while [ ${#prompt} -lt $spare_width ]; do
     prompt=" $prompt"
@@ -39,5 +39,5 @@ function pat_prompt {
 setopt prompt_subst
 
 PROMPT='
-%n@%m $(pat_prompt)
+%n@%m $(josh_prompt)
 %(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '

From 95ccb4db1a33c3cdcf7afd134567b8930fe8b6f5 Mon Sep 17 00:00:00 2001
From: Daniel Schauenberg <d@unwiredcouch.com>
Date: Mon, 9 Aug 2010 15:45:40 +0200
Subject: [PATCH 016/907] update brew plugin from homebrew contributions

---
 plugins/brew.plugin.zsh | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/plugins/brew.plugin.zsh b/plugins/brew.plugin.zsh
index 91397bf3a..162eb6442 100644
--- a/plugins/brew.plugin.zsh
+++ b/plugins/brew.plugin.zsh
@@ -1,6 +1,6 @@
 #compdef brew
 
-# copied from _fink
+# imported from the latest homebrew contributions
 
 _brew_all_formulae() {
   formulae=(`brew search`)
@@ -12,19 +12,25 @@ _brew_installed_formulae() {
 
 local -a _1st_arguments
 _1st_arguments=(
-  'install:install a formula'
-  'remove:remove a formula'
-  'search:search for a formula (/regex/ or string)'
-  'list:list files in a formula or not-installed formulae'
-  'link:link a formula'
-  'unlink:unlink a formula'
+  'cat:display formula file for a formula'
+  'cleanup:uninstall unused and old versions of packages'
+  'create:create a new formula'
+  'deps:list dependencies and dependants of a formula'
+  'doctor:audits your installation for common issues'
+  'edit:edit a formula'
   'home:visit the homepage of a formula or the brew project'
   'info:information about a formula'
-  'prune:remove dead links'
-  'update:freshen up links'
+  'install:install a formula'
+  'link:link a formula'
+  'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
-  'create:create a new formula'
-  'edit:edit a formula'
+  'outdated:list formulas for which a newer version is available'
+  'prune:remove dead links'
+  'remove:remove a formula'
+  'search:search for a formula (/regex/ or string)'
+  'unlink:unlink a formula'
+  'update:freshen up links'
+  'uses:show formulas which depend on a formula'
 )
 
 local expl
@@ -47,12 +53,12 @@ case "$words[1]" in
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
       '1: :->forms' &&  return 0
-      
+
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
         _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|log|info)
+  install|home|log|info|uses|cat|deps)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
   remove|edit|xo)

From 75de90dc9eedc62edfbd34785f191c56fee802b0 Mon Sep 17 00:00:00 2001
From: Daniel Schauenberg <d@unwiredcouch.com>
Date: Sun, 8 Aug 2010 19:45:49 +0200
Subject: [PATCH 017/907] add simple mrtazz theme based on robbyrussell

- simple theme
- hostname and current folder on left prompt
- git branch and working tree status on the right
---
 themes/mrtazz.zsh-theme | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 themes/mrtazz.zsh-theme

diff --git a/themes/mrtazz.zsh-theme b/themes/mrtazz.zsh-theme
new file mode 100644
index 000000000..214ba5a47
--- /dev/null
+++ b/themes/mrtazz.zsh-theme
@@ -0,0 +1,7 @@
+PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# '
+RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>"

From 306cea0945166bd0b32290c0813bf90c7dee6369 Mon Sep 17 00:00:00 2001
From: Matt Fletcher <fletcher@atomicobject.com>
Date: Thu, 14 Jan 2010 03:45:10 +0800
Subject: [PATCH 018/907] add fletcherm theme; a slightly modified copy of an
 old tonotdo theme

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

diff --git a/themes/fletcherm.zsh-theme b/themes/fletcherm.zsh-theme
new file mode 100644
index 000000000..e96188544
--- /dev/null
+++ b/themes/fletcherm.zsh-theme
@@ -0,0 +1,12 @@
+# Copied from old version of tonotdo's theme. LSCOLORS modified.
+PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}•%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» '
+RPROMPT='[%*]'
+
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}⚡%{$fg_bold[blue]%})"
+
+export LSCOLORS="exfxcxdxbxegedabagacad"
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'

From aeabc3f616ccd407f68a621ecd676834e276c531 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 19 Aug 2010 08:04:18 -0700
Subject: [PATCH 019/907] Switching to /usr/bin/env zsh instead of /bin/zsh in
 the installer

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

diff --git a/tools/install.sh b/tools/install.sh
index 004b252f4..6e3872bb9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -22,7 +22,7 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."
 echo "export PATH=$PATH" >> ~/.zshrc
 
 echo "Time to change your default shell to zsh!"
-chsh -s /bin/zsh
+chsh -s "/usr/bin/env zsh"
 
 echo '         __                                     __  '
 echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
@@ -32,5 +32,5 @@ echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
 echo '                        /____/'
 
 echo "\n\n ....is now installed."
-/bin/zsh
+/usr/bin/env zsh
 source ~/.zshrc

From 7b6be5611763f25eca043f9ed0d46066a3454205 Mon Sep 17 00:00:00 2001
From: Daniel Schauenberg <d@unwiredcouch.com>
Date: Fri, 20 Aug 2010 18:55:30 +0200
Subject: [PATCH 020/907] fix problems with brew completion

- update plugin architecture
- completion function in $ZSH/functions/brew
- plugins/brew.plugin.zsh only activates
---
 functions/brew/_brew    | 69 +++++++++++++++++++++++++++++++++++++++
 plugins/brew.plugin.zsh | 71 +++--------------------------------------
 2 files changed, 73 insertions(+), 67 deletions(-)
 create mode 100644 functions/brew/_brew

diff --git a/functions/brew/_brew b/functions/brew/_brew
new file mode 100644
index 000000000..4e590ac63
--- /dev/null
+++ b/functions/brew/_brew
@@ -0,0 +1,69 @@
+#compdef brew
+#autoload
+
+# imported from the latest homebrew contributions
+
+_brew_all_formulae() {
+  formulae=(`brew search`)
+}
+
+_brew_installed_formulae() {
+  installed_formulae=(`brew list`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'cat:display formula file for a formula'
+  'cleanup:uninstall unused and old versions of packages'
+  'create:create a new formula'
+  'deps:list dependencies and dependants of a formula'
+  'doctor:audits your installation for common issues'
+  'edit:edit a formula'
+  'home:visit the homepage of a formula or the brew project'
+  'info:information about a formula'
+  'install:install a formula'
+  'link:link a formula'
+  'list:list files in a formula or not-installed formulae'
+  'log:git commit log for a formula'
+  'outdated:list formulas for which a newer version is available'
+  'prune:remove dead links'
+  'remove:remove a formula'
+  'search:search for a formula (/regex/ or string)'
+  'unlink:unlink a formula'
+  'update:freshen up links'
+  'uses:show formulas which depend on a formula'
+)
+
+local expl
+local -a formula installed_formulae
+
+_arguments \
+  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '(--version)--version[version information]' \
+  '(--prefix)--prefix[where brew lives on this system]' \
+  '(--cache)--cache[brew cache]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "brew subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  list)
+    _arguments \
+      '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '1: :->forms' &&  return 0
+
+      if [[ "$state" == forms ]]; then
+        _brew_installed_formulae
+        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
+      fi ;;
+  install|home|log|info|uses|cat|deps)
+    _brew_all_formulae
+    _wanted formulae expl 'all formulae' compadd -a formulae ;;
+  remove|edit|xo)
+    _brew_installed_formulae
+    _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
+esac
+
diff --git a/plugins/brew.plugin.zsh b/plugins/brew.plugin.zsh
index 162eb6442..a30540966 100644
--- a/plugins/brew.plugin.zsh
+++ b/plugins/brew.plugin.zsh
@@ -1,67 +1,4 @@
-#compdef brew
-
-# imported from the latest homebrew contributions
-
-_brew_all_formulae() {
-  formulae=(`brew search`)
-}
-
-_brew_installed_formulae() {
-  installed_formulae=(`brew list`)
-}
-
-local -a _1st_arguments
-_1st_arguments=(
-  'cat:display formula file for a formula'
-  'cleanup:uninstall unused and old versions of packages'
-  'create:create a new formula'
-  'deps:list dependencies and dependants of a formula'
-  'doctor:audits your installation for common issues'
-  'edit:edit a formula'
-  'home:visit the homepage of a formula or the brew project'
-  'info:information about a formula'
-  'install:install a formula'
-  'link:link a formula'
-  'list:list files in a formula or not-installed formulae'
-  'log:git commit log for a formula'
-  'outdated:list formulas for which a newer version is available'
-  'prune:remove dead links'
-  'remove:remove a formula'
-  'search:search for a formula (/regex/ or string)'
-  'unlink:unlink a formula'
-  'update:freshen up links'
-  'uses:show formulas which depend on a formula'
-)
-
-local expl
-local -a formula installed_formulae
-
-_arguments \
-  '(-v --verbose)'{-v,--verbose}'[verbose]' \
-  '(--version)--version[version information]' \
-  '(--prefix)--prefix[where brew lives on this system]' \
-  '(--cache)--cache[brew cache]' \
-  '*:: :->subcmds' && return 0
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "brew subcommand" _1st_arguments
-  return
-fi
-
-case "$words[1]" in
-  list)
-    _arguments \
-      '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
-      '1: :->forms' &&  return 0
-
-      if [[ "$state" == forms ]]; then
-        _brew_installed_formulae
-        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
-      fi ;;
-  install|home|log|info|uses|cat|deps)
-    _brew_all_formulae
-    _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  remove|edit|xo)
-    _brew_installed_formulae
-    _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
-esac
+# add brew completion function to path
+fpath=($ZSH/functions/brew $fpath)
+autoload -U compinit
+compinit -i

From 99f159e0a7c63e6756f8e6e40691914da8f7a96c Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 24 Aug 2010 11:08:20 -0700
Subject: [PATCH 021/907] Removing '.' alias as it is overwriting a bash/zsh
 feature. Closes #63

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

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 80760a1f5..d2d3aed81 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -3,7 +3,6 @@ alias pu='pushd'
 alias po='popd'
 
 # Basic directory operations
-alias .='pwd'
 alias ...='cd ../..'
 alias -- -='cd -'
 

From fbc22d80fe098f9ee5ca935766bc3d411c53ed92 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 30 Aug 2010 14:59:23 -0400
Subject: [PATCH 022/907] Added the truly epic kennethreitz theme.

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

diff --git a/themes/kennethreitz.zsh-theme b/themes/kennethreitz.zsh-theme
new file mode 100644
index 000000000..109be0c22
--- /dev/null
+++ b/themes/kennethreitz.zsh-theme
@@ -0,0 +1,13 @@
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%{$fg[green]%}%c \
+$(git_prompt_info)\
+%{$fg[red]%}%(!.#.»)%{$reset_color%} '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='%{$fg[blue]%}%~%{$reset_color%} ${return_code} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}:: %{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$fg[yellow]%}"
+

From c96f5f78cbb95d29c712af173c5b9c630efcf710 Mon Sep 17 00:00:00 2001
From: Daniel Schauenberg <d@unwiredcouch.com>
Date: Wed, 1 Sep 2010 13:07:11 +0200
Subject: [PATCH 023/907] add gem completion function and plugin

---
 functions/gem/_gem     | 64 ++++++++++++++++++++++++++++++++++++++++++
 plugins/gem.plugin.zsh |  4 +++
 2 files changed, 68 insertions(+)
 create mode 100644 functions/gem/_gem
 create mode 100644 plugins/gem.plugin.zsh

diff --git a/functions/gem/_gem b/functions/gem/_gem
new file mode 100644
index 000000000..83cba40d1
--- /dev/null
+++ b/functions/gem/_gem
@@ -0,0 +1,64 @@
+#compdef gem
+#autoload
+
+# gem zsh completion, based on homebrew completion
+
+_gem_installed() {
+  installed_gems=(`gem list --local --no-versions`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'cert:Manage RubyGems certificates and signing settings'
+  'check:Check installed gems'
+  'cleanup:Clean up old versions of installed gems in the local repository'
+  'contents:Display the contents of the installed gems'
+  'dependency:Show the dependencies of an installed gem'
+  'environment:Display information about the RubyGems environment'
+  'fetch:Download a gem and place it in the current directory'
+  'generate_index:Generates the index files for a gem server directory'
+  'help:Provide help on the `gem` command'
+  'install:Install a gem into the local repository'
+  'list:Display gems whose name starts with STRING'
+  'lock:Generate a lockdown list of gems'
+  'mirror:Mirror a gem repository'
+  'outdated:Display all gems that need updates'
+  'owner:Manage gem owners on RubyGems.org.'
+  'pristine:Restores installed gems to pristine condition from files located in the gem cache'
+  'push:Push a gem up to RubyGems.org'
+  'query:Query gem information in local or remote repositories'
+  'rdoc:Generates RDoc for pre-installed gems'
+  'search:Display all gems whose name contains STRING'
+  'server:Documentation and gem repository HTTP server'
+  'sources:Manage the sources and cache file RubyGems uses to search for gems'
+  'specification:Display gem specification (in yaml)'
+  'stale:List gems along with access times'
+  'uninstall:Uninstall gems from the local repository'
+  'unpack:Unpack an installed gem to the current directory'
+  'update:Update the named gems (or all installed gems) in the local repository'
+  'which:Find the location of a library file you can require'
+)
+
+local expl
+local -a gems installed_gems
+
+_arguments \
+  '(-v --version)'{-v,--version}'[show version]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "gem subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  list)
+      if [[ "$state" == forms ]]; then
+        _gem_installed
+        _requested installed_gems expl 'installed gems' compadd -a installed_gems
+      fi ;;
+  uninstall|update)
+    _gem_installed
+    _wanted installed_gems expl 'installed gems' compadd -a installed_gems ;;
+esac
diff --git a/plugins/gem.plugin.zsh b/plugins/gem.plugin.zsh
new file mode 100644
index 000000000..0b6ef3c86
--- /dev/null
+++ b/plugins/gem.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/functions/gem $fpath)
+autoload -U compinit
+compinit -i

From fe09064fcf4859b0e417c8040094f622f971012a Mon Sep 17 00:00:00 2001
From: Daniel Schauenberg <d@unwiredcouch.com>
Date: Wed, 1 Sep 2010 13:21:11 +0200
Subject: [PATCH 024/907] add pip completion and plugin

---
 functions/pip/_pip     | 46 ++++++++++++++++++++++++++++++++++++++++++
 plugins/pip.plugin.zsh |  4 ++++
 2 files changed, 50 insertions(+)
 create mode 100644 functions/pip/_pip
 create mode 100644 plugins/pip.plugin.zsh

diff --git a/functions/pip/_pip b/functions/pip/_pip
new file mode 100644
index 000000000..b58010173
--- /dev/null
+++ b/functions/pip/_pip
@@ -0,0 +1,46 @@
+#compdef pip
+#autoload
+
+# pip zsh completion, based on homebrew completion
+
+_pip_installed() {
+  installed_pkgs=(`pip freeze`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'bundle:Create pybundles (archives containing multiple packages)'
+  'freeze:Output all currently installed packages (exact versions) to stdout'
+  'help:Show available commands'
+  'install:Install packages'
+  'search:Search PyPI'
+  'uninstall:Uninstall packages'
+  'unzip:Unzip individual packages'
+  'zip:Zip individual packages'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+  '(--version)--version[Show version number of program and exit]' \
+  '(-v --verbose)'{-v,--verbose}'[Give more output]' \
+  '(-q --quiet)'{-q,--quiet}'[Give less output]' \
+  '(-h --help)'{-h,--help}'[Show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "pip subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  list)
+      if [[ "$state" == forms ]]; then
+        _pip_installed
+        _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs
+      fi ;;
+  uninstall)
+    _pip_installed
+    _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
+esac
diff --git a/plugins/pip.plugin.zsh b/plugins/pip.plugin.zsh
new file mode 100644
index 000000000..69e21f8d7
--- /dev/null
+++ b/plugins/pip.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/functions/pip $fpath)
+autoload -U compinit
+compinit -i

From 5215e74bf470b4baba571e879cbd1bfddc28daf3 Mon Sep 17 00:00:00 2001
From: Vivek Prahlad <vivek.prahlad@gmail.com>
Date: Fri, 10 Sep 2010 10:50:42 +0530
Subject: [PATCH 025/907] Adding a plugin with aliases for macports

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

diff --git a/plugins/macports.plugin.zsh b/plugins/macports.plugin.zsh
new file mode 100644
index 000000000..94a5f5ef2
--- /dev/null
+++ b/plugins/macports.plugin.zsh
@@ -0,0 +1,6 @@
+alias pc="sudo port clean --all installed"
+alias pi="sudo port install $1"
+alias psu="sudo port selfupdate"
+alias puni="sudo port uninstall inactive"
+alias puo="sudo port upgrade outdated"
+alias pup="psu && puo"

From f9fce9bb8d293286d7d0fb7ecde170bd0c7f37fc Mon Sep 17 00:00:00 2001
From: Vivek Prahlad <vivek.prahlad@gmail.com>
Date: Fri, 10 Sep 2010 10:55:17 +0530
Subject: [PATCH 026/907] Adding comments

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

diff --git a/plugins/macports.plugin.zsh b/plugins/macports.plugin.zsh
index 94a5f5ef2..9564829b0 100644
--- a/plugins/macports.plugin.zsh
+++ b/plugins/macports.plugin.zsh
@@ -1,3 +1,4 @@
+#Aliases
 alias pc="sudo port clean --all installed"
 alias pi="sudo port install $1"
 alias psu="sudo port selfupdate"

From a0a8ba666b29cbcdbba05726e4e2d46eca708ca1 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sat, 27 Feb 2010 16:15:47 -0700
Subject: [PATCH 027/907] Initial pass at pesistant directory stack

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

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
new file mode 100644
index 000000000..a7c077ae0
--- /dev/null
+++ b/lib/dirspersist.zsh
@@ -0,0 +1,19 @@
+#!/bin/zsh
+# 
+# Make the dirstack more persistant
+# 
+# Run dirpersiststore in ~/.zlogout
+
+dirpersiststore () {
+    dirs -p | sed 's/ /\\ /g;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
+}
+
+dirpersistrestore () {
+    if [ -f ~/.zdirstore ]; then
+        source ~/.zdirstore
+    fi
+}
+
+DIRSTACKSIZE=10
+setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+dirpersistrestore
\ No newline at end of file

From 870551e960c6cb506fd7cc232a069432dfc72f2c Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Mon, 15 Mar 2010 20:34:26 -0600
Subject: [PATCH 028/907] Alias popd to remove deleted dirs from persistance

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

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
index a7c077ae0..8364a879c 100644
--- a/lib/dirspersist.zsh
+++ b/lib/dirspersist.zsh
@@ -16,4 +16,7 @@ dirpersistrestore () {
 
 DIRSTACKSIZE=10
 setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
-dirpersistrestore
\ No newline at end of file
+dirpersistrestore
+
+# Make popd changes permanent without having to wait for logout
+alias popd="popd;dirpersiststore"
\ No newline at end of file

From 21e2a913bff765b8dc23f12309059f7446e0ff99 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Fri, 2 Apr 2010 15:24:41 -0600
Subject: [PATCH 029/907] Escape &'s in path name.  Need to find general
 function for escaping all shell metacharacters.

---
 lib/dirspersist.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
index 8364a879c..973107c52 100644
--- a/lib/dirspersist.zsh
+++ b/lib/dirspersist.zsh
@@ -5,7 +5,8 @@
 # Run dirpersiststore in ~/.zlogout
 
 dirpersiststore () {
-    dirs -p | sed 's/ /\\ /g;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
+# FIXME: need to escape all shell metacharacters, not just spaces!
+    dirs -p | sed 's/ /\\ /g;s/&/\\&/;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
 }
 
 dirpersistrestore () {
@@ -19,4 +20,4 @@ setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
 dirpersistrestore
 
 # Make popd changes permanent without having to wait for logout
-alias popd="popd;dirpersiststore"
\ No newline at end of file
+alias popd="popd;dirpersiststore"

From 181a2ed5379f5bf9d0420c0caaea56034eb22732 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Thu, 22 Apr 2010 11:26:08 -0600
Subject: [PATCH 030/907] Escape some metachars that trip up .zdirstore script

---
 lib/dirspersist.zsh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/dirspersist.zsh b/lib/dirspersist.zsh
index 973107c52..d694c55e2 100644
--- a/lib/dirspersist.zsh
+++ b/lib/dirspersist.zsh
@@ -5,8 +5,7 @@
 # Run dirpersiststore in ~/.zlogout
 
 dirpersiststore () {
-# FIXME: need to escape all shell metacharacters, not just spaces!
-    dirs -p | sed 's/ /\\ /g;s/&/\\&/;s/^/pushd -q /;1!G;h;$!d;' > ~/.zdirstore
+    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
 }
 
 dirpersistrestore () {

From 50fb2d037ee75ac6e558923c7a92c818a96d43c8 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 19:39:51 -0600
Subject: [PATCH 031/907] Move dirpersist to plugin

---
 lib/dirspersist.zsh => plugins/dirpersist.plugin.zsh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/dirspersist.zsh => plugins/dirpersist.plugin.zsh (100%)

diff --git a/lib/dirspersist.zsh b/plugins/dirpersist.plugin.zsh
similarity index 100%
rename from lib/dirspersist.zsh
rename to plugins/dirpersist.plugin.zsh

From 1862b1c0755770cffcbcb936bdecc3bfb050931d Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 19:43:49 -0600
Subject: [PATCH 032/907] Added installation function

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

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index d694c55e2..48ca94d7c 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -4,6 +4,17 @@
 # 
 # Run dirpersiststore in ~/.zlogout
 
+dirpersistinstall () {
+    if grep -qL 'dirpersiststore' ~/.zlogout; then
+    else
+        if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
+            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
+        else
+            echo "If you don't want this message to appear, remove dirspersist from \$plugins"
+        fi
+    fi
+}
+
 dirpersiststore () {
     dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
 }
@@ -16,6 +27,8 @@ dirpersistrestore () {
 
 DIRSTACKSIZE=10
 setopt autopushd pushdminus pushdsilent pushdtohome pushdignoredups
+
+dirpersistinstall
 dirpersistrestore
 
 # Make popd changes permanent without having to wait for logout

From 610f68c8e0401048f87d1f2bd48086b8c0cd0dbe Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 22:39:11 -0600
Subject: [PATCH 033/907] Added install instructions

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

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index 48ca94d7c..4decd8b30 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -2,7 +2,8 @@
 # 
 # Make the dirstack more persistant
 # 
-# Run dirpersiststore in ~/.zlogout
+# Add dirpersist to $plugins in ~/.zshrc to load
+# 
 
 dirpersistinstall () {
     if grep -qL 'dirpersiststore' ~/.zlogout; then

From 8f7609b4fabd3d02e3991221cbe35bea692c22e3 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 19 Sep 2010 22:40:47 -0600
Subject: [PATCH 034/907] Change zdirstore to variable

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

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index 4decd8b30..5b3fdfb3d 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -5,6 +5,9 @@
 # Add dirpersist to $plugins in ~/.zshrc to load
 # 
 
+# $zdirstore is the file used to persist the stack
+zdirstore=~/.zdirstore
+
 dirpersistinstall () {
     if grep -qL 'dirpersiststore' ~/.zlogout; then
     else
@@ -17,12 +20,12 @@ dirpersistinstall () {
 }
 
 dirpersiststore () {
-    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > ~/.zdirstore
+    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > $zdirstore
 }
 
 dirpersistrestore () {
-    if [ -f ~/.zdirstore ]; then
-        source ~/.zdirstore
+    if [ -f $zdirstore ]; then
+        source $zdirstore
     fi
 }
 

From 2ff567e16267274041f542b5bce18876b8815fca Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Tue, 21 Sep 2010 12:07:02 -0600
Subject: [PATCH 035/907] Removed unportable (and unnecessary) grep flags

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

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index 5b3fdfb3d..b5e825bff 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -9,7 +9,7 @@
 zdirstore=~/.zdirstore
 
 dirpersistinstall () {
-    if grep -qL 'dirpersiststore' ~/.zlogout; then
+    if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
     else
         if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
             echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
@@ -19,6 +19,7 @@ dirpersistinstall () {
     fi
 }
 
+# FIXME solaris doesn't support tail -r
 dirpersiststore () {
     dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > $zdirstore
 }

From 62cea310fb97a98f6360397dfeef3a01507153fd Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Fri, 24 Sep 2010 20:46:52 -0400
Subject: [PATCH 036/907] ssh-agent module

Implement a simple module that automatically launches the ssh-agent when you login and
adds your default key.

Useful for anyone that does remote work and thus doesn't have access to a keychain tool.
---
 plugins/ssh-agent.plugin.zsh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 plugins/ssh-agent.plugin.zsh

diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
new file mode 100644
index 000000000..fa8c45ea2
--- /dev/null
+++ b/plugins/ssh-agent.plugin.zsh
@@ -0,0 +1,24 @@
+# Based on code from Joseph M. Reagle
+# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+
+local SSH_ENV=$HOME/.ssh/environment
+
+function start_agent {
+     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+     chmod 600 ${SSH_ENV}
+     . ${SSH_ENV} > /dev/null
+     /usr/bin/ssh-add;
+}
+
+# Source SSH settings, if applicable
+
+if [ -f "${SSH_ENV}" ]; then
+     . ${SSH_ENV} > /dev/null
+     #ps ${SSH_AGENT_PID} doesn't work under cywgin
+     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+         start_agent;
+     }
+else
+     start_agent;
+fi
+

From 6764e50397f35eba635e57a231ff06f1685efc5f Mon Sep 17 00:00:00 2001
From: Jake Bell <jake.b.bell@gmail.com>
Date: Sat, 25 Sep 2010 00:48:19 -0500
Subject: [PATCH 037/907] Added theunraveler theme.

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

diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler.zsh-theme
new file mode 100644
index 000000000..4eec8e827
--- /dev/null
+++ b/themes/theunraveler.zsh-theme
@@ -0,0 +1,6 @@
+# Comment 
+
+ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
+ZSH_THEME_GIT_PROMPT_SUFFIX=')'
+
+PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
\ No newline at end of file

From e37d62a282dc74b7cd265643dcb01f80e25b3e34 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Sun, 26 Sep 2010 16:05:53 +0200
Subject: [PATCH 038/907] unset config_file is useless

---
 oh-my-zsh.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bb45c71eb..c46aea7ac 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -21,5 +21,3 @@ then
 else
   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
-
-unset config_file
\ No newline at end of file

From 74b2c5d75ab6477ea3f72eeadb6fd81b42c1abd4 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Sun, 26 Sep 2010 16:03:44 +0200
Subject: [PATCH 039/907] Do not complete named-directories

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

diff --git a/lib/completion.zsh b/lib/completion.zsh
index cba90179f..52cc5b53c 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -1,4 +1,4 @@
-## fixme - the load process here seems a bit bizarre
+# fixme - the load process here seems a bit bizarre
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
@@ -30,6 +30,11 @@ 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"
 
+# disable named-directories autocompletion
+zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
+cdpath=(.)
+
+
 # Load known hosts file for auto-completion with ssh and scp commands
 if [ -f ~/.ssh/known_hosts ]; then
   zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )

From 6c3b9daaf7cd1bf387d46e865f316c6815dc14d2 Mon Sep 17 00:00:00 2001
From: Tomas Kramar <kramar.tomas@gmail.com>
Date: Sun, 26 Sep 2010 22:25:31 +0200
Subject: [PATCH 040/907] Add vi-mode plugin for vi-like editing

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

diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode.plugin.zsh
new file mode 100644
index 000000000..c47ab7211
--- /dev/null
+++ b/plugins/vi-mode.plugin.zsh
@@ -0,0 +1,22 @@
+function zle-line-init zle-keymap-select {
+  zle reset-prompt
+}
+
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+bindkey -v
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$MODE_INDICATOR" == "" ]]; then
+  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+fi
+
+function vi_mode_prompt_info() {
+  echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+}
+
+# define right prompt, if it wasn't defined by a theme
+if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
+  RPS1='$(vi_mode_prompt_info)'
+fi

From 3add6a2ac47186240a2d02a986ae22b6519d965f Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 26 Sep 2010 21:30:57 -0600
Subject: [PATCH 041/907] Portable perl dirpersiststore because 'tail -r'
 doesn't work everywhere.

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

diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist.plugin.zsh
index b5e825bff..6a2b289a2 100644
--- a/plugins/dirpersist.plugin.zsh
+++ b/plugins/dirpersist.plugin.zsh
@@ -19,9 +19,8 @@ dirpersistinstall () {
     fi
 }
 
-# FIXME solaris doesn't support tail -r
 dirpersiststore () {
-    dirs -p | tail -r | perl -ne 'chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"' > $zdirstore
+    dirs -p | perl -e 'foreach (reverse <STDIN>) {chomp;s/([& ])/\\$1/g ;print "if [ -d $_ ]; then pushd -q $_; fi\n"}' > $zdirstore
 }
 
 dirpersistrestore () {

From c24936ece51940536f3e62fc9e458b74c2affe68 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Thu, 30 Sep 2010 19:56:56 -0700
Subject: [PATCH 042/907] added steeef theme

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
new file mode 100644
index 000000000..a54cdce14
--- /dev/null
+++ b/themes/steeef.zsh-theme
@@ -0,0 +1,68 @@
+# prompt style and colors based on Steve Losh's Prose theme:
+# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
+#
+# vcs_info modifications from Bart Trojanowski's zsh prompt:
+# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+PR_GIT_UPDATE=1
+
+setopt prompt_subst
+autoload colors
+colors
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+
+# check-for-changes can be really slow.
+# you should disable it, if you work with large repositories
+zstyle ':vcs_info:*:prompt:*' check-for-changes true
+
+# set formats
+# %b - branchname
+# %u - unstagedstr (see below)
+# %c - stagedstr (see below)
+# %a - action (e.g. rebase-i)
+# %R - repository path
+# %S - path in the repository
+PR_RST="%{${reset_color}%}"
+FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
+FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
+FMT_UNSTAGED="%{$fg[yellow]%}!"
+FMT_STAGED="%{$fg[yellow]%}?"
+
+zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
+zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
+zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
+zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
+
+
+function steeef_preexec {
+    case "$(history $HISTCMD)" in
+        *git*)
+            PR_GIT_UPDATE=1
+            ;;
+    esac
+}
+add-zsh-hook preexec steeef_preexec
+
+function steeef_chpwd {
+    PR_GIT_UPDATE=1
+}
+add-zsh-hook chpwd steeef_chpwd
+
+function steeef_precmd {
+    if [[ -n "$PR_GIT_UPDATE" ]] ; then
+        vcs_info 'prompt'
+        PR_GIT_UPDATE=
+    fi
+}
+add-zsh-hook precmd steeef_precmd
+
+PROMPT=$'
+%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}%~%{$reset_color%} $vcs_info_msg_0_
+$(virtualenv_info)$ '

From d647a9b25c43b75eea6fee29f27affe5edc4b72e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 30 Sep 2010 20:54:45 -0700
Subject: [PATCH 043/907] Tidying up the spacing to bring in line with coding
 standards

---
 plugins/ssh-agent.plugin.zsh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent.plugin.zsh
index fa8c45ea2..ce0d645c1 100644
--- a/plugins/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent.plugin.zsh
@@ -4,21 +4,20 @@
 local SSH_ENV=$HOME/.ssh/environment
 
 function start_agent {
-     /usr/bin/ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
-     chmod 600 ${SSH_ENV}
-     . ${SSH_ENV} > /dev/null
-     /usr/bin/ssh-add;
+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
+  chmod 600 ${SSH_ENV}
+  . ${SSH_ENV} > /dev/null
+  /usr/bin/ssh-add;
 }
 
 # Source SSH settings, if applicable
 
 if [ -f "${SSH_ENV}" ]; then
-     . ${SSH_ENV} > /dev/null
-     #ps ${SSH_AGENT_PID} doesn't work under cywgin
-     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-         start_agent;
-     }
+  . ${SSH_ENV} > /dev/null
+  ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+    start_agent;
+  }
 else
-     start_agent;
+  start_agent;
 fi
 

From b9056303669806be8e1e90eacfc471590c39f353 Mon Sep 17 00:00:00 2001
From: Trevor Creech <trevor.creech@involver.com>
Date: Mon, 20 Sep 2010 17:31:17 -0700
Subject: [PATCH 044/907] Match xterm-color, the default OS X terminal

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

diff --git a/lib/functions.zsh b/lib/functions.zsh
index fcbe994be..561586cba 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -5,7 +5,7 @@ function title {
     print -nR $'\033k'$1$'\033'\\\
 
     print -nR $'\033]0;'$2$'\a'
-  elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then
+  elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then
     # Use this one instead for XTerms:
     print -nR $'\033]0;'$*$'\a'
   fi

From 26d97a9355d37c55e0b044d8dafc425cc0ca7217 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 30 Sep 2010 21:34:06 -0700
Subject: [PATCH 045/907] Reorganizing plugins so that each plugin has it's own
 directory now so that any plugin-specific functions can be bundled within
 there.

---
 oh-my-zsh.sh                                   | 2 +-
 plugins/{ => brew}/brew.plugin.zsh             | 0
 plugins/{ => dirpersist}/dirpersist.plugin.zsh | 0
 plugins/{ => git}/git.plugin.zsh               | 0
 plugins/{ => lighthouse}/lighthouse.plugin.zsh | 0
 plugins/{ => macports}/macports.plugin.zsh     | 0
 plugins/{ => mysql}/mysql-macports.plugin.zsh  | 0
 plugins/{ => osx}/osx.plugin.zsh               | 0
 plugins/{ => rails}/rails.plugin.zsh           | 0
 plugins/{ => ruby}/ruby.plugin.zsh             | 0
 plugins/{ => ssh-agent}/ssh-agent.plugin.zsh   | 0
 plugins/{ => textmate}/textmate.plugin.zsh     | 0
 plugins/{ => vi-mode}/vi-mode.plugin.zsh       | 0
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename plugins/{ => brew}/brew.plugin.zsh (100%)
 rename plugins/{ => dirpersist}/dirpersist.plugin.zsh (100%)
 rename plugins/{ => git}/git.plugin.zsh (100%)
 rename plugins/{ => lighthouse}/lighthouse.plugin.zsh (100%)
 rename plugins/{ => macports}/macports.plugin.zsh (100%)
 rename plugins/{ => mysql}/mysql-macports.plugin.zsh (100%)
 rename plugins/{ => osx}/osx.plugin.zsh (100%)
 rename plugins/{ => rails}/rails.plugin.zsh (100%)
 rename plugins/{ => ruby}/ruby.plugin.zsh (100%)
 rename plugins/{ => ssh-agent}/ssh-agent.plugin.zsh (100%)
 rename plugins/{ => textmate}/textmate.plugin.zsh (100%)
 rename plugins/{ => vi-mode}/vi-mode.plugin.zsh (100%)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c46aea7ac..848e48eb5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -12,7 +12,7 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
 
 # Load all of the plugins that were defined in ~/.zshrc
 plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin.plugin.zsh
+for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
diff --git a/plugins/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
similarity index 100%
rename from plugins/brew.plugin.zsh
rename to plugins/brew/brew.plugin.zsh
diff --git a/plugins/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
similarity index 100%
rename from plugins/dirpersist.plugin.zsh
rename to plugins/dirpersist/dirpersist.plugin.zsh
diff --git a/plugins/git.plugin.zsh b/plugins/git/git.plugin.zsh
similarity index 100%
rename from plugins/git.plugin.zsh
rename to plugins/git/git.plugin.zsh
diff --git a/plugins/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
similarity index 100%
rename from plugins/lighthouse.plugin.zsh
rename to plugins/lighthouse/lighthouse.plugin.zsh
diff --git a/plugins/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
similarity index 100%
rename from plugins/macports.plugin.zsh
rename to plugins/macports/macports.plugin.zsh
diff --git a/plugins/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
similarity index 100%
rename from plugins/mysql-macports.plugin.zsh
rename to plugins/mysql/mysql-macports.plugin.zsh
diff --git a/plugins/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
similarity index 100%
rename from plugins/osx.plugin.zsh
rename to plugins/osx/osx.plugin.zsh
diff --git a/plugins/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
similarity index 100%
rename from plugins/rails.plugin.zsh
rename to plugins/rails/rails.plugin.zsh
diff --git a/plugins/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
similarity index 100%
rename from plugins/ruby.plugin.zsh
rename to plugins/ruby/ruby.plugin.zsh
diff --git a/plugins/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
similarity index 100%
rename from plugins/ssh-agent.plugin.zsh
rename to plugins/ssh-agent/ssh-agent.plugin.zsh
diff --git a/plugins/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
similarity index 100%
rename from plugins/textmate.plugin.zsh
rename to plugins/textmate/textmate.plugin.zsh
diff --git a/plugins/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
similarity index 100%
rename from plugins/vi-mode.plugin.zsh
rename to plugins/vi-mode/vi-mode.plugin.zsh

From 7936bbbd5a3895caa7153e4d03740ac12a333862 Mon Sep 17 00:00:00 2001
From: Daniel Schauenberg <d@unwiredcouch.com>
Date: Fri, 1 Oct 2010 10:59:48 +0200
Subject: [PATCH 046/907] adapt brew,gem,pip plugin to new structure

---
 {functions => plugins}/brew/_brew | 0
 plugins/brew/brew.plugin.zsh      | 2 +-
 {functions => plugins}/gem/_gem   | 0
 plugins/{ => gem}/gem.plugin.zsh  | 2 +-
 {functions => plugins}/pip/_pip   | 0
 plugins/{ => pip}/pip.plugin.zsh  | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename {functions => plugins}/brew/_brew (100%)
 rename {functions => plugins}/gem/_gem (100%)
 rename plugins/{ => gem}/gem.plugin.zsh (67%)
 rename {functions => plugins}/pip/_pip (100%)
 rename plugins/{ => pip}/pip.plugin.zsh (67%)

diff --git a/functions/brew/_brew b/plugins/brew/_brew
similarity index 100%
rename from functions/brew/_brew
rename to plugins/brew/_brew
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index a30540966..353a18942 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,4 +1,4 @@
 # add brew completion function to path
-fpath=($ZSH/functions/brew $fpath)
+fpath=($ZSH/plugins/brew $fpath)
 autoload -U compinit
 compinit -i
diff --git a/functions/gem/_gem b/plugins/gem/_gem
similarity index 100%
rename from functions/gem/_gem
rename to plugins/gem/_gem
diff --git a/plugins/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
similarity index 67%
rename from plugins/gem.plugin.zsh
rename to plugins/gem/gem.plugin.zsh
index 0b6ef3c86..65d3766f3 100644
--- a/plugins/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1,4 +1,4 @@
 # add brew completion function to path
-fpath=($ZSH/functions/gem $fpath)
+fpath=($ZSH/plugins/gem $fpath)
 autoload -U compinit
 compinit -i
diff --git a/functions/pip/_pip b/plugins/pip/_pip
similarity index 100%
rename from functions/pip/_pip
rename to plugins/pip/_pip
diff --git a/plugins/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
similarity index 67%
rename from plugins/pip.plugin.zsh
rename to plugins/pip/pip.plugin.zsh
index 69e21f8d7..bf9f23968 100644
--- a/plugins/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -1,4 +1,4 @@
 # add brew completion function to path
-fpath=($ZSH/functions/pip $fpath)
+fpath=($ZSH/plugins/pip $fpath)
 autoload -U compinit
 compinit -i

From a4afcfddbf8c9e8769e4e78c23a144c9b3c9aaf3 Mon Sep 17 00:00:00 2001
From: Luke Randall <luke.randall@mit-can.com>
Date: Sun, 5 Sep 2010 16:52:38 +0200
Subject: [PATCH 047/907] Add lukerandall.zsh-theme

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

diff --git a/themes/lukerandall.zsh-theme b/themes/lukerandall.zsh-theme
new file mode 100644
index 000000000..24a0612b7
--- /dev/null
+++ b/themes/lukerandall.zsh-theme
@@ -0,0 +1,10 @@
+# ZSH Theme - Preview: http://cl.ly/f701d00760f8059e06dc
+# Thanks to gallifrey, upon whose theme this is based
+
+local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B»%b '
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"

From 541da0c9d1cdf88583490fa06b6e307ea09bfc94 Mon Sep 17 00:00:00 2001
From: Jake Bell <jake.b.bell@gmail.com>
Date: Fri, 1 Oct 2010 14:15:52 -0500
Subject: [PATCH 048/907] Removing capistrano aliases/functions from rails
 plugin (since cap is not rails-specific).

---
 plugins/cap/cap.plugin.zsh     | 21 +++++++++++++++++++++
 plugins/rails/rails.plugin.zsh | 23 -----------------------
 2 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 plugins/cap/cap.plugin.zsh

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
new file mode 100644
index 000000000..a0fa21d00
--- /dev/null
+++ b/plugins/cap/cap.plugin.zsh
@@ -0,0 +1,21 @@
+function _cap_does_task_list_need_generating () {
+  if [ ! -f .cap_tasks~ ]; then return 0;
+  else
+    accurate=$(stat -f%m .cap_tasks~)
+    changed=$(stat -f%m config/deploy.rb)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+function _cap () {
+  if [ -f config/deploy.rb ]; then
+    if _cap_does_task_list_need_generating; then
+      echo "\nGenerating .cap_tasks~..." > /dev/stderr
+      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
+> .cap_tasks~
+    fi
+    compadd `cat .cap_tasks~`
+  fi
+}
+
+compctl -K _cap cap
\ No newline at end of file
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 45bebb722..ac8119e83 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,4 +1,3 @@
-
 alias ss='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
@@ -9,28 +8,6 @@ alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'
 
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-function _cap () {
-  if [ -f config/deploy.rb ]; then
-    if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
-> .cap_tasks~
-    fi
-    compadd `cat .cap_tasks~`
-  fi
-}
-
-compctl -K _cap cap
-
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
 }

From 7fb0b210e88bcbdb71d2cb0022c35b2cc3810327 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 1 Oct 2010 14:11:53 -0700
Subject: [PATCH 049/907] merge steeef.zsh-theme from master

---
 themes/steeef.zsh-theme | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a54cdce14..abb8f2994 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -3,6 +3,9 @@
 #
 # vcs_info modifications from Bart Trojanowski's zsh prompt:
 # http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
+#
+# git untracked files modification from Brian Carper:
+# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
 function virtualenv_info {
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
@@ -17,6 +20,9 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 
+# enable VCS systems you use
+zstyle ':vcs_info:*' enable git svn
+
 # check-for-changes can be really slow.
 # you should disable it, if you work with large repositories
 zstyle ':vcs_info:*:prompt:*' check-for-changes true
@@ -31,8 +37,8 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 PR_RST="%{${reset_color}%}"
 FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
 FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
-FMT_UNSTAGED="%{$fg[yellow]%}!"
-FMT_STAGED="%{$fg[yellow]%}?"
+FMT_UNSTAGED="%{$fg[yellow]%}●"
+FMT_STAGED="%{$fg[green]%}●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -46,6 +52,9 @@ function steeef_preexec {
         *git*)
             PR_GIT_UPDATE=1
             ;;
+        *svn*)
+            PR_GIT_UPDATE=1
+            ;;
     esac
 }
 add-zsh-hook preexec steeef_preexec
@@ -56,6 +65,15 @@ function steeef_chpwd {
 add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
+    # check for untracked files or updated submodules, since vcs_info doesn't
+    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) || -n $(git ls-files -m --exclude-standard 2> /dev/null) ]]; then
+        PR_GIT_UPDATE=1
+        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
+    else
+        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
+    fi
+    zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
         vcs_info 'prompt'
         PR_GIT_UPDATE=

From 6fcf9393c31a51cef688b591de73817c5988c405 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 1 Oct 2010 14:17:13 -0700
Subject: [PATCH 050/907] merge steeef.zsh-theme from master (removed submodule
 check)

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index abb8f2994..a43192743 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -66,7 +66,7 @@ add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
     # check for untracked files or updated submodules, since vcs_info doesn't
-    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) || -n $(git ls-files -m --exclude-standard 2> /dev/null) ]]; then
+    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
         PR_GIT_UPDATE=1
         FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
     else

From 7405f5d9ff29f42e934fa5f3c87401437c16aedd Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 1 Oct 2010 14:40:06 -0700
Subject: [PATCH 051/907] fix untracked files checking

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a43192743..8c4c80265 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -66,7 +66,7 @@ add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
     # check for untracked files or updated submodules, since vcs_info doesn't
-    if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
         PR_GIT_UPDATE=1
         FMT_BRANCH="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
     else

From f294eeb57175f5ef86f903d41c84ecacd96fe00c Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Sat, 2 Oct 2010 19:49:16 +0200
Subject: [PATCH 052/907] added rkj theme - xion-chiamiov-plus + hg from
 thomasjbradley

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

diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
new file mode 100644
index 000000000..fa950b255
--- /dev/null
+++ b/themes/rkj.zsh-theme
@@ -0,0 +1,15 @@
+# user, host, full path, and time/date
+# on two lines for easier vgrepping
+# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
+
+function hg_prompt_info {
+    hg prompt --angle-brackets "\
+<hg:%{$fg[magenta]%}<branch>%{$reset_color%}>\
+</%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
+%{$fg[green]%}<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
+}
+
+PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(git_prompt_info)$(hg_prompt_info)>%{\e[0m%}%b '
+PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '

From f2f49f9571cf56b2fa672f16260c000050f9349b Mon Sep 17 00:00:00 2001
From: atom smith <re5etsmyth@gmail.com>
Date: Sun, 3 Oct 2010 17:41:45 -0400
Subject: [PATCH 053/907] adding my zsh-theme

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

diff --git a/themes/re5et.zsh-theme b/themes/re5et.zsh-theme
new file mode 100644
index 000000000..fadb1fef8
--- /dev/null
+++ b/themes/re5et.zsh-theme
@@ -0,0 +1,15 @@
+if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
+
+local return_code="%(?..%{$fg_bold[red]%}:( %?%{$reset_color%})"
+
+PROMPT='
+%{$fg_bold[cyan]%}%n%{$reset_color%}%{$fg[yellow]%}@%{$reset_color%}%{$fg_bold[blue]%}%m%{$reset_color%}:%{${fg_bold[green]}%}%~%{$reset_color%}$(git_prompt_info)
+%{${fg[$CARETCOLOR]}%}%# %{${reset_color}%}'
+
+RPS1='${return_code} %D - %*'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[magenta]%}^%{$reset_color%}%{$fg_bold[yellow]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} ±"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ?"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[red]%} ♥"
\ No newline at end of file

From ba9ae6a1e5fe1b45a58e655ab3413bb95a82573e Mon Sep 17 00:00:00 2001
From: atom smith <re5etsmyth@gmail.com>
Date: Sun, 3 Oct 2010 17:42:57 -0400
Subject: [PATCH 054/907] should have newline at end of file.

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

diff --git a/themes/re5et.zsh-theme b/themes/re5et.zsh-theme
index fadb1fef8..5bded76a3 100644
--- a/themes/re5et.zsh-theme
+++ b/themes/re5et.zsh-theme
@@ -12,4 +12,4 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[magenta]%}^%{$reset_color%}%{$fg_bold[ye
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} ±"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ?"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[red]%} ♥"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[red]%} ♥"

From 6d5e4eaebcde1c48413f89b4554983f489e4b017 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Mon, 4 Oct 2010 18:05:01 -0700
Subject: [PATCH 055/907] use 256 colors, if available

---
 themes/steeef.zsh-theme | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 8c4c80265..d8f9306cd 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -19,6 +19,20 @@ colors
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
+#use extended color pallete if available
+if [ $TERM = "xterm-256color" ]; then
+    turquoise="%F{81}"
+    orange="%F{166}"
+    purple="%F{135}"
+    hotpink="%F{161}"
+    limegreen="%F{118}"
+else
+    turquoise="$fg[cyan]"
+    orange="$fg[yellow]"
+    purple="$fg[magenta]"
+    hotpink="$fg[red]"
+    limegreen="$fg[green]"
+fi
 
 # enable VCS systems you use
 zstyle ':vcs_info:*' enable git svn
@@ -35,10 +49,10 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 # %R - repository path
 # %S - path in the repository
 PR_RST="%{${reset_color}%}"
-FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
-FMT_ACTION="(%{$fg[green]%}%a${PR_RST})"
-FMT_UNSTAGED="%{$fg[yellow]%}●"
-FMT_STAGED="%{$fg[green]%}●"
+FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
+FMT_UNSTAGED="%{$orange%}●"
+FMT_STAGED="%{$limegreen%}●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -68,9 +82,9 @@ 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="(%{$fg[magenta]%}%b%u%c%{$fg[red]%}●${PR_RST})"
+        FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
     else
-        FMT_BRANCH="(%{$fg[magenta]%}%b%u%c${PR_RST})"
+        FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
     fi
     zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
 
@@ -82,5 +96,5 @@ function steeef_precmd {
 add-zsh-hook precmd steeef_precmd
 
 PROMPT=$'
-%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}%~%{$reset_color%} $vcs_info_msg_0_
+%{$purple%}%n%{$reset_color%} at %{$orange%}%m%{$reset_color%} in %{$limegreen%}%~%{$reset_color%} $vcs_info_msg_0_
 $(virtualenv_info)$ '

From c6b339f532b05e907b0c554000643db5e896a75f Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Mon, 4 Oct 2010 22:08:38 -0700
Subject: [PATCH 056/907] merge master

---
 themes/steeef.zsh-theme | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index d8f9306cd..a5cf0f9a1 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -79,16 +79,16 @@ function steeef_chpwd {
 add-zsh-hook chpwd steeef_chpwd
 
 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="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
-    else
-        FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
-    fi
-    zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
-
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
+        # check for untracked files or updated submodules, since vcs_info doesn't
+        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+            PR_GIT_UPDATE=1
+            FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
+        else
+            FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+        fi
+        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
         vcs_info 'prompt'
         PR_GIT_UPDATE=
     fi

From d53d0eac070b270222c042c2e187dcf3a109b39a Mon Sep 17 00:00:00 2001
From: Phillip Ridlen <phillip@balcomagency.com>
Date: Tue, 5 Oct 2010 17:06:08 -0500
Subject: [PATCH 057/907] Add cloud.zsh-theme

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

diff --git a/themes/cloud.zsh-theme b/themes/cloud.zsh-theme
new file mode 100644
index 000000000..ad5e2834b
--- /dev/null
+++ b/themes/cloud.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg_bold[cyan]%}☁ %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}] %{$fg[yellow]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}]"
\ No newline at end of file

From 8059c0727a09257dc387aa9ba17dc99d1842aa19 Mon Sep 17 00:00:00 2001
From: Irakli Gozalishvili <rfobic@gmail.com>
Date: Sat, 9 Oct 2010 01:27:40 +0200
Subject: [PATCH 058/907] Improving git plugin so it can display much more
 data.

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

diff --git a/lib/git.zsh b/lib/git.zsh
index 889dd98df..57a78e27f 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -11,3 +11,31 @@ parse_git_dirty () {
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi
 }
+
+# get the status of the working tree
+git_prompt_status() {
+  INDEX=$(git status --porcelain 2> /dev/null)
+  STATUS=""
+  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+  fi
+  echo $STATUS
+}
+

From b6dde1e8cfb938e507e5e8db9eac99d28a020468 Mon Sep 17 00:00:00 2001
From: Irakli Gozalishvili <rfobic@gmail.com>
Date: Sat, 9 Oct 2010 01:49:35 +0200
Subject: [PATCH 059/907] Adding new gozilla theme

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

diff --git a/themes/gozilla.zsh-theme b/themes/gozilla.zsh-theme
new file mode 100644
index 000000000..3112b3670
--- /dev/null
+++ b/themes/gozilla.zsh-theme
@@ -0,0 +1,15 @@
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p%{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+RPROMPT='$(git_prompt_status)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="(%{%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ⚑%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}"
+

From deb0f7478b292b48338bc4d6098b8f6b013d0b4b Mon Sep 17 00:00:00 2001
From: Irakli Gozalishvili <rfobic@gmail.com>
Date: Sat, 9 Oct 2010 02:16:10 +0200
Subject: [PATCH 060/907] Fixing some minor redrew issue

---
 themes/gozilla.zsh-theme | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/themes/gozilla.zsh-theme b/themes/gozilla.zsh-theme
index 3112b3670..97566e380 100644
--- a/themes/gozilla.zsh-theme
+++ b/themes/gozilla.zsh-theme
@@ -1,8 +1,12 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p%{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-RPROMPT='$(git_prompt_status)'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="(%{%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}"
+
+RPROMPT='$(git_prompt_status)'
+
 ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗%{$reset_color%}"
@@ -10,6 +14,3 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ⚡%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ⚑%{$reset_color%}"
 
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}"
-

From aab235f6121a93b81a425d522a0c7f2aaac946bd Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Fri, 8 Oct 2010 22:44:42 -0700
Subject: [PATCH 061/907] functions: fix title() to not match any $TERM

On my linux virtual terminals, where TERM="linux", I was getting
annoying output that was messing up my prompt.

It turns out the title function was always matching on the elif
statement for xterm/rxvt no matter what and the linux vt doesn't know
what to do with the title special control sequence and thus was printing
out garbage.

Through experimentation I figured out that the || inside of the [[ ]]
did not work:

export TERM=linux
$ if [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then echo $TERM; fi
linux

$ if [[ $TERM =~ "^xterm" ]] || [[ $TERM == "rxvt" ]]; then echo $TERM; fi

Signed-off-by: Brandon Philips <brandon@ifup.org>

openSUSE running zsh 4.3.10
---
 lib/functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 561586cba..e494f1f4d 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -5,7 +5,7 @@ function title {
     print -nR $'\033k'$1$'\033'\\\
 
     print -nR $'\033]0;'$2$'\a'
-  elif [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then
+  elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]]; then
     # Use this one instead for XTerms:
     print -nR $'\033]0;'$*$'\a'
   fi

From df1e305736f23d8702a4d68b0fb8fc502e8c442a Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Fri, 8 Oct 2010 22:57:43 -0700
Subject: [PATCH 062/907] themes: add philips theme

Theme based on clean that is more suitable for white background
terminals.

Signed-off-by: Brandon Philips <brandon@ifup.org>
---
 themes/philips.zsh-theme | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 themes/philips.zsh-theme

diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
new file mode 100644
index 000000000..fa7c59035
--- /dev/null
+++ b/themes/philips.zsh-theme
@@ -0,0 +1,14 @@
+if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+
+PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
+RPROMPT='[%*]'
+
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}"
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'

From 249fe1471cde3b12366729e5a869dd56c26b07ce Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 14:29:24 +0100
Subject: [PATCH 063/907] adding github plugin

---
 plugins/github/_github           | 39 ++++++++++++++++++++++++++++++++
 plugins/github/github.plugin.zsh |  4 ++++
 2 files changed, 43 insertions(+)
 create mode 100644 plugins/github/_github
 create mode 100644 plugins/github/github.plugin.zsh

diff --git a/plugins/github/_github b/plugins/github/_github
new file mode 100644
index 000000000..5295081e5
--- /dev/null
+++ b/plugins/github/_github
@@ -0,0 +1,39 @@
+#compdef github
+#autoload
+
+# github zsh completion, based on homebrew completion
+
+local -a _1st_arguments
+_1st_arguments=(
+  'browse:Open this repo in a web browser'
+  'clone:Clone a repo'
+  'config:Automatically set configuration info, or pass args to specify'
+  'create-from-local:Create a new GitHub repository from the current local repository'
+  'create:Create a new empty GitHub repository'
+  'fetch:Fetch from a remote to a local branch'
+  'fetch_all:Fetch all refs from a user'
+  'fork:Forks a GitHub repository'
+  'home:Open this repos master branch in a web browser'
+  'ignore:Ignore a SHA from github network commits'
+  'info:Info about this project'
+  'issues:Project issues tools'
+  'network:Project network tools - sub-commands : web [user], list, fetch, commits'
+  'network --after:Only show commits after a certain date'
+  'network --applies:Filter commits to patches that apply cleanly'
+  'open:Open the given user/project in a web browser'
+  'pull-request:Generate the text for a pull request'
+  'pull:Pull from a remote'
+  'search:Search GitHub for the given repository name'
+  'track:Track another users repository'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "github subcommand" _1st_arguments
+  return
+fi
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
new file mode 100644
index 000000000..c23504b85
--- /dev/null
+++ b/plugins/github/github.plugin.zsh
@@ -0,0 +1,4 @@
+# add github completion function to path
+fpath=($ZSH/plugins/github $fpath)
+autoload -U compinit
+compinit -i

From dfbed8fd9894ec4b13745e9e08233a750c2369ee Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 15:03:08 +0100
Subject: [PATCH 064/907] added git log incl. stats for the past 5 commits

---
 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 655eaf728..d317d179d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -12,7 +12,7 @@ alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
-
+alias glg='git log --stat --max-count=5'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From fcd88edfb3464e46d3337c3ee72d28248e92ac79 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 15:18:35 +0100
Subject: [PATCH 065/907] adding comment and URL to github gem

---
 plugins/github/_github | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/github/_github b/plugins/github/_github
index 5295081e5..72178946a 100644
--- a/plugins/github/_github
+++ b/plugins/github/_github
@@ -1,3 +1,6 @@
+# in order to make this work, you would need to have the github gem installed
+# http://github.com/defunkt/github-gem
+
 #compdef github
 #autoload
 

From 210c76c35b1db7a761df45cd7f85d3b324f8e0b5 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 15:29:28 +0100
Subject: [PATCH 066/907] leaving out subcommands for now

---
 plugins/github/_github | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/github/_github b/plugins/github/_github
index 72178946a..b8e1a9ada 100644
--- a/plugins/github/_github
+++ b/plugins/github/_github
@@ -21,8 +21,6 @@ _1st_arguments=(
   'info:Info about this project'
   'issues:Project issues tools'
   'network:Project network tools - sub-commands : web [user], list, fetch, commits'
-  'network --after:Only show commits after a certain date'
-  'network --applies:Filter commits to patches that apply cleanly'
   'open:Open the given user/project in a web browser'
   'pull-request:Generate the text for a pull request'
   'pull:Pull from a remote'

From 061ea5c7c98ada295ae4623692e6811c0baab88d Mon Sep 17 00:00:00 2001
From: Irakli Gozalishvili <rfobic@gmail.com>
Date: Sat, 9 Oct 2010 18:06:00 +0200
Subject: [PATCH 067/907] changeing unicode characters that were causing issues

---
 themes/gozilla.zsh-theme | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/themes/gozilla.zsh-theme b/themes/gozilla.zsh-theme
index 97566e380..c6b752e9b 100644
--- a/themes/gozilla.zsh-theme
+++ b/themes/gozilla.zsh-theme
@@ -1,16 +1,15 @@
 PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
-ZSH_THEME_GIT_PROMPT_PREFIX="(%{%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-RPROMPT='$(git_prompt_status)'
-
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ⚡%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ⚑%{$reset_color%}"
+RPROMPT='$(git_prompt_status)%{$reset_color%}'
 
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
+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]%} ✱"

From 425b0ef89fcd40b6b235347e32d8efd44709a802 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 18:38:01 +0100
Subject: [PATCH 068/907] bugfix - moved gem info

---
 plugins/github/_github | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/github/_github b/plugins/github/_github
index b8e1a9ada..83e1713c7 100644
--- a/plugins/github/_github
+++ b/plugins/github/_github
@@ -1,9 +1,9 @@
-# in order to make this work, you would need to have the github gem installed
-# http://github.com/defunkt/github-gem
-
 #compdef github
 #autoload
 
+# in order to make this work, you will need to have the github gem installed
+# http://github.com/defunkt/github-gem
+
 # github zsh completion, based on homebrew completion
 
 local -a _1st_arguments

From dc12853b0c3e5af9e42f44cb9efdf57d44d20711 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 19:11:07 +0100
Subject: [PATCH 069/907] merging in changes from robby's repo

---
 lib/functions.zsh | 1 -
 lib/git.zsh       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index e494f1f4d..e3c0de43e 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -37,4 +37,3 @@ function take() {
   mkdir -p $1
   cd $1
 }
-
diff --git a/lib/git.zsh b/lib/git.zsh
index 57a78e27f..75fdc1f9c 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -38,4 +38,3 @@ git_prompt_status() {
   fi
   echo $STATUS
 }
-

From 8b4858b6646ef2ce1bf4ab33ba94db33a95559b4 Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Sat, 9 Oct 2010 16:52:53 -0700
Subject: [PATCH 070/907] themes: philips customize git/ls for developers

- Customize LS_COLORS for developers working on C code bases like the
  Kernel.
- Add a * to the dirty prompt. Missed this accidently. Oops.

Signed-off-by: Brandon Philips <brandon@ifup.org>
---
 themes/philips.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
index fa7c59035..c79525590 100644
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
@@ -7,8 +7,8 @@ RPROMPT='[%*]'
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="*"
 
 # LS colors, made with http://geoff.greer.fm/lscolors/
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
-export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:*.patch=00;34:*.o=00;32:*.so=01;35:*.ko=01;31:*.la=00;33'

From 4e433eb6bb578c864116cbcf0aa201227f80e4aa Mon Sep 17 00:00:00 2001
From: Florian Walch <florian.walch@gmx.at>
Date: Fri, 15 Oct 2010 11:05:47 +0200
Subject: [PATCH 071/907] Added own theme (based on robbyrussell)

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

diff --git a/themes/fwalch.zsh-theme b/themes/fwalch.zsh-theme
new file mode 100644
index 000000000..24edf55c0
--- /dev/null
+++ b/themes/fwalch.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From 60b560fc9ace116cde7e56954f386b1098751648 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian.walch@gmx.at>
Date: Fri, 15 Oct 2010 16:50:39 +0200
Subject: [PATCH 072/907] Added gpg-agent plugin

Based on ssh-agent plugin.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/gpg-agent/gpg-agent.plugin.zsh

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
new file mode 100644
index 000000000..8cc71fd57
--- /dev/null
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -0,0 +1,26 @@
+# Based on ssh-agent code
+
+local GPG_ENV=$HOME/.gnupg/gpg-agent.env
+
+function start_agent {
+  /usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV} > /dev/null
+  chmod 600 ${GPG_ENV}
+  . ${GPG_ENV} > /dev/null
+}
+
+# Source GPG agent settings, if applicable
+if [ -f "${GPG_ENV}" ]; then
+  . ${GPG_ENV} > /dev/null
+  ps -ef | grep ${SSH_AGENT_PID} | grep gpg-agent > /dev/null || {
+    start_agent;
+  }
+else
+  start_agent;
+fi
+
+export GPG_AGENT_INFO
+export SSH_AUTH_SOCK
+export SSH_AGENT_PID
+
+GPG_TTY=$(tty)
+export GPG_TTY

From 9b6dd1cd48a549d2868cfe16073bbd04357e27e5 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 10:39:33 -0700
Subject: [PATCH 073/907] merge with master

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a5cf0f9a1..07c1d3def 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [ $TERM = "xterm-256color" ]; then
+if [ $TERM = "xterm-256color" || $TERM = "linux" || $TERM = "rxvt-256color" || $TERM = "rxvt-unicode-256color" ]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From 810b8f5ce8a58b03afba4e6ec5937e2cd0bcab5c Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 10:42:49 -0700
Subject: [PATCH 074/907] merge with master

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 07c1d3def..6bca57eec 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [ $TERM = "xterm-256color" || $TERM = "linux" || $TERM = "rxvt-256color" || $TERM = "rxvt-unicode-256color" ]; then
+if [ [ $TERM = "xterm-256color" ] || [ $TERM = "linux"] || [ $TERM = "rxvt-256color" ] || [ $TERM = "rxvt-unicode-256color" ] ]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From d2bfdc2d89cb08a870169af4f394f27d2b9c0aed Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 10:51:58 -0700
Subject: [PATCH 075/907] merge theme fixes from master

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index 6bca57eec..f81300242 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [ [ $TERM = "xterm-256color" ] || [ $TERM = "linux"] || [ $TERM = "rxvt-256color" ] || [ $TERM = "rxvt-unicode-256color" ] ]; then
+if [[ $TERM = *256color* || $TERM = "linux" ]]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From 4ff0136079b8ffe29e0990d0a0ce8876554aa0d5 Mon Sep 17 00:00:00 2001
From: steeef <steeef@gmail.com>
Date: Fri, 22 Oct 2010 11:34:52 -0700
Subject: [PATCH 076/907] merge from master

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index f81300242..a2583b028 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -20,7 +20,7 @@ autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
 #use extended color pallete if available
-if [[ $TERM = *256color* || $TERM = "linux" ]]; then
+if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
     turquoise="%F{81}"
     orange="%F{166}"
     purple="%F{135}"

From baa46b39e34a88da00f19411841ca9456fac4493 Mon Sep 17 00:00:00 2001
From: Joseph Jon Booker <joe@neoturbine.net>
Date: Mon, 25 Oct 2010 16:02:16 -0500
Subject: [PATCH 077/907] command-not-found package in ubuntu

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

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
new file mode 100644
index 000000000..5ab03d5a9
--- /dev/null
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -0,0 +1,5 @@
+# Uses the command-not-found package zsh support
+# as seen in http://www.porcheron.info/command-not-found-for-zsh/
+# this is installed in Ubuntu
+
+source /etc/zsh_command_not_found

From ab170c38ea7f3db981303afc6eb4dabe7b37711b Mon Sep 17 00:00:00 2001
From: Tom Stuart <tom@therye.org>
Date: Tue, 2 Nov 2010 11:26:49 +0000
Subject: [PATCH 078/907] Fix lighthouse plugin error message

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

diff --git a/plugins/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh
index 4eb06a997..7661c6add 100644
--- a/plugins/lighthouse/lighthouse.plugin.zsh
+++ b/plugins/lighthouse/lighthouse.plugin.zsh
@@ -4,7 +4,7 @@
 # Example usage: http://screencast.com/t/ZDgwNDUwNT
 open_lighthouse_ticket () {
   if [ ! -f .lighthouse-url ]; then
-    echo "There is no .lighthouse file in the current directory..."
+    echo "There is no .lighthouse-url file in the current directory..."
     return 0;
   else
     lighthouse_url=$(cat .lighthouse-url);
@@ -13,4 +13,4 @@ open_lighthouse_ticket () {
   fi
 }
 
-alias lho='open_lighthouse_ticket'
\ No newline at end of file
+alias lho='open_lighthouse_ticket'

From 9465ba0de456d270418457b486c308a2d49ed9c6 Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Wed, 3 Nov 2010 16:57:15 -0400
Subject: [PATCH 079/907] Completion fixes

Use /etc/hosts in addtion to $HOME/.ssh/known_hosts as the source for
hostname completion

Turn on completion caching to speed up certain comands

When completing usernames, don't include system accounts by default
---
 lib/completion.zsh | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 52cc5b53c..9c2dfecca 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -34,9 +34,31 @@ zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 cdpath=(.)
 
+# use /etc/hosts and known_hosts for hostname completion
+[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
+[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
+hosts=(
+  "$_ssh_hosts[@]"
+  "$_etc_hosts[@]"
+  `hostname`
+  localhost
+)
+zstyle ':completion:*:hosts' hosts $hosts
+
+# Use caching so that commands like apt and dpkg complete are useable
+zstyle ':completion::complete:*' use-cache 1
+zstyle ':completion::complete:*' cache-path ~/.oh-my-zsh/cache/
+
+# Don't complete uninteresting users
+zstyle ':completion:*:*:*:users' ignored-patterns \
+        adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
+        dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
+        hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
+        mailman mailnull mldonkey mysql nagios \
+        named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
+        operator pcap postfix postgres privoxy pulse pvm quagga radvd \
+        rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs
+
+# ... unless we really want to.
+zstyle '*' single-ignored show
 
-# Load known hosts file for auto-completion with ssh and scp commands
-if [ -f ~/.ssh/known_hosts ]; then
-  zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
-  zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
-fi

From 9db8042c465faec4bc9ff591fe02e50694ab5c08 Mon Sep 17 00:00:00 2001
From: Claus Witt <claus@wittnezz.dk>
Date: Tue, 9 Nov 2010 14:56:26 +0100
Subject: [PATCH 080/907] Added phing plugin

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

diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/phing.plugin.zsh
new file mode 100644
index 000000000..80e334629
--- /dev/null
+++ b/plugins/phing/phing.plugin.zsh
@@ -0,0 +1,20 @@
+_phing_does_target_list_need_generating () {
+  if [ ! -f .phing_targets ]; then return 0;
+  else
+    accurate=$(stat -f%m .phing_targets)
+    changed=$(stat -f%m build.xml)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+_phing () {
+  if [ -f build.xml ]; then
+    if _phing_does_target_list_need_generating; then
+      echo "\nGenerating .phing_targets..." > /dev/stderr
+      phing -l |grep -v ":" |grep -v "^$"|grep -v "\-" > .phing_targets
+    fi
+    compadd `cat .phing_targets`
+  fi
+}
+
+compdef _phing phing

From 72d7c0363c849fe166577ad91f06ab087feb99b1 Mon Sep 17 00:00:00 2001
From: Ubiratan Pires Alberton <u.alberton@gmail.com>
Date: Fri, 30 Jul 2010 09:27:32 -0300
Subject: [PATCH 081/907] Added my own theme, based on macovsky-ruby and funky

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

diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
new file mode 100644
index 000000000..f0ee6a5bd
--- /dev/null
+++ b/themes/bira.zsh-theme
@@ -0,0 +1,14 @@
+# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+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='%{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v g)›%{$reset_color%}'
+local git_branch='$(git_prompt_info)%{$reset_color%}'
+
+PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
+╰─%B$%b "
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"

From 2a203b558fd6328c9a91e9dbbf145d91e7ba7ed1 Mon Sep 17 00:00:00 2001
From: NanoTech <nanotech008@gmail.com>
Date: Sun, 14 Nov 2010 16:51:19 -0600
Subject: [PATCH 082/907] themes/nanotech: Use the new built-in zsh color
 variables.

---
 themes/nanotech.zsh-theme | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/themes/nanotech.zsh-theme b/themes/nanotech.zsh-theme
index eddb23c94..5d3331639 100644
--- a/themes/nanotech.zsh-theme
+++ b/themes/nanotech.zsh-theme
@@ -1,7 +1,7 @@
-PROMPT=' %{$fg_bold[green]%}%2c %{$fg_bold[blue]%}%{[%}%{$reset_color%} '
-RPROMPT='$(git_prompt_info) %{$fg[blue]%}] %{$fg[green]%}%D{%L:%M} %{$fg[yellow]%}%D{%p}%{$reset_color%} '
+PROMPT='%F{green}%2c%F{blue} [%f '
+RPROMPT='$(git_prompt_info) %F{blue}] %F{green}%D{%L:%M} %F{yellow}%D{%p}%f'
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %F{red}*%f"
 ZSH_THEME_GIT_PROMPT_CLEAN=""

From 148c14e4f7e3ee9134807304a7c38682276e918c Mon Sep 17 00:00:00 2001
From: Fedyashev Nikita <loci.master@gmail.com>
Date: Mon, 15 Nov 2010 14:45:04 -0500
Subject: [PATCH 083/907] vagrant plugin autocompletion - initial version

---
 plugins/vagrant/_vagrant           | 139 +++++++++++++++++++++++++++++
 plugins/vagrant/vagrant.plugin.zsh |   3 +
 2 files changed, 142 insertions(+)
 create mode 100644 plugins/vagrant/_vagrant
 create mode 100644 plugins/vagrant/vagrant.plugin.zsh

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
new file mode 100644
index 000000000..4cd6a46d2
--- /dev/null
+++ b/plugins/vagrant/_vagrant
@@ -0,0 +1,139 @@
+#compdef vagrant 
+#autoload
+
+# vagrant zsh completion, based on homebrew completion
+
+__task_list ()
+{
+  local expl
+  declare -a tasks
+
+  tasks=(box destroy halt init package provision reload resume ssh ssh_config status suspend up version)
+
+  _wanted tasks expl 'help' compadd $tasks
+}
+
+__box_list ()
+{
+  _wanted application expl 'hxlp' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
+}
+
+__vagrant-box ()
+{
+ local curcontext="$curcontext" state line
+        typeset -A opt_args
+
+        _arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+        case $state in
+                (command)
+
+                       # local -a subcommands
+                       # subcommands=(
+                       #         'start:Start a new release branch'
+                       #         'finish:Finish a release branche.'
+                       #         'list:List all your release branches. (Alias to `git flow release`)'
+                       # )
+                       # _describe -t commands 'git flow release' subcommands
+                       # _arguments \
+                       # -v'[Verbose (more) output]'
+       _describe -t commands "gem subcommand" _box_arguments
+       return
+                ;;
+
+                (options)
+                        case $line[1] in
+
+                                (repackage)
+				       _arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-r'[Rebase instead of merge]'\
+							':feature:__box_list' 
+
+
+
+                                ;;
+                        esac
+                ;;
+         esac
+
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'box:Box commands'
+  'destroy:Destroys the vagrant environment'
+  'halt:Halts the currently running vagrant environment'
+  'help:[TASK] Describe available tasks or one specific task'
+  'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
+  'package:Packages a vagrant environment for distribution'
+  'provision:Run the provisioner'
+  'reload:Reload the vagrant environment'
+  'resume:Resumes a suspend vagrant environment'
+  'ssh:SSH into the currently running environment'
+  'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
+  'status:Shows the status of the current Vagrant environment.'
+  'suspend:Suspends the currently running vagrant environment'
+  'up:Creates the vagrant environment'
+  'version:Prints the Vagrant version information'
+)
+
+local -a _box_arguments
+_box_arguments=(
+  'add:NAME URI Add a box to the system'
+  'help:COMMAND Describe subcommands or one specific subcommand'
+  'list:Lists all installed boxes'
+  'remove:NAME Remove a box from the system'
+  'repackage:NAME Repackage an installed box into a `.box` file.'
+)
+
+local expl
+local -a boxes installed_boxes
+
+#_arguments \
+#  '(-v --version)'{-v,--version}'[show version]' \
+#  '(-h --help)'{-h,--help}'[show help]' \
+#  '*:: :->subcmds' && return 0
+        local curcontext="$curcontext" state line
+        typeset -A opt_args
+
+  _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+
+
+
+#echo $state
+#echo -e "\n\n\n\n"
+#echo $line[1]
+
+case $state in
+
+  (command)
+
+	  _describe -t commands "gem subcommand" _1st_arguments
+	  return
+  ;;
+
+  (options)
+
+    case $line[1] in
+
+      (help)
+	       _arguments \
+			-F'[Fetch from origin before performing finish]' \
+			-r'[Rebase instead of merge]'\
+				':feature:__task_list' 
+
+      ;;
+
+      (box)
+
+        __vagrant-box
+      ;;
+    esac
+  ;;
+esac
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
new file mode 100644
index 000000000..5e9bcf10a
--- /dev/null
+++ b/plugins/vagrant/vagrant.plugin.zsh
@@ -0,0 +1,3 @@
+fpath=($ZSH/plugins/vagrant $fpath)
+autoload -U compinit
+compinit -i

From ea274ab90c1a6d7f553e44ad7138f6205336b3b4 Mon Sep 17 00:00:00 2001
From: Fedyashev Nikita <loci.master@gmail.com>
Date: Mon, 15 Nov 2010 14:56:01 -0500
Subject: [PATCH 084/907] fixed formatting; dead code deleted

---
 plugins/vagrant/_vagrant | 147 +++++++++++++++------------------------
 1 file changed, 58 insertions(+), 89 deletions(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 4cd6a46d2..ea7fd5f74 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -5,134 +5,103 @@
 
 __task_list ()
 {
-  local expl
-  declare -a tasks
+    local expl
+    declare -a tasks
 
-  tasks=(box destroy halt init package provision reload resume ssh ssh_config status suspend up version)
+    tasks=(box destroy halt init package provision reload resume ssh ssh_config status suspend up version)
 
-  _wanted tasks expl 'help' compadd $tasks
+    _wanted tasks expl 'help' compadd $tasks
 }
 
 __box_list ()
 {
-  _wanted application expl 'hxlp' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
+    _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
 }
 
 __vagrant-box ()
 {
- local curcontext="$curcontext" state line
-        typeset -A opt_args
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
 
-        _arguments -C \
-		':command:->command' \
-		'*::options:->options'
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
 
-        case $state in
-                (command)
-
-                       # local -a subcommands
-                       # subcommands=(
-                       #         'start:Start a new release branch'
-                       #         'finish:Finish a release branche.'
-                       #         'list:List all your release branches. (Alias to `git flow release`)'
-                       # )
-                       # _describe -t commands 'git flow release' subcommands
-                       # _arguments \
-                       # -v'[Verbose (more) output]'
-       _describe -t commands "gem subcommand" _box_arguments
-       return
-                ;;
-
-                (options)
-                        case $line[1] in
-
-                                (repackage)
-				       _arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-r'[Rebase instead of merge]'\
-							':feature:__box_list' 
-
-
-
-                                ;;
-                        esac
-                ;;
-         esac
+   case $state in
+       (command)
+           _describe -t commands "gem subcommand" _box_arguments
+           return
+       ;;
 
+       (options)
+           case $line[1] in
+               (repackage|remove)
+                   _arguments \
+                       -F'[Fetch from origin before performing finish]' \
+                       -r'[Rebase instead of merge]'\
+                         ':feature:__box_list' 
+               ;;
+           esac
+       ;;
+    esac
 }
 
 local -a _1st_arguments
 _1st_arguments=(
-  'box:Box commands'
-  'destroy:Destroys the vagrant environment'
-  'halt:Halts the currently running vagrant environment'
-  'help:[TASK] Describe available tasks or one specific task'
-  'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
-  'package:Packages a vagrant environment for distribution'
-  'provision:Run the provisioner'
-  'reload:Reload the vagrant environment'
-  'resume:Resumes a suspend vagrant environment'
-  'ssh:SSH into the currently running environment'
-  'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
-  'status:Shows the status of the current Vagrant environment.'
-  'suspend:Suspends the currently running vagrant environment'
-  'up:Creates the vagrant environment'
-  'version:Prints the Vagrant version information'
+    'box:Box commands'
+    'destroy:Destroys the vagrant environment'
+    'halt:Halts the currently running vagrant environment'
+    'help:[TASK] Describe available tasks or one specific task'
+    'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
+    'package:Packages a vagrant environment for distribution'
+    'provision:Run the provisioner'
+    'reload:Reload the vagrant environment'
+    'resume:Resumes a suspend vagrant environment'
+    'ssh:SSH into the currently running environment'
+    'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
+    'status:Shows the status of the current Vagrant environment.'
+    'suspend:Suspends the currently running vagrant environment'
+    'up:Creates the vagrant environment'
+    'version:Prints the Vagrant version information'
 )
 
 local -a _box_arguments
 _box_arguments=(
-  'add:NAME URI Add a box to the system'
-  'help:COMMAND Describe subcommands or one specific subcommand'
-  'list:Lists all installed boxes'
-  'remove:NAME Remove a box from the system'
-  'repackage:NAME Repackage an installed box into a `.box` file.'
+    'add:NAME URI Add a box to the system'
+    'help:COMMAND Describe subcommands or one specific subcommand'
+    'list:Lists all installed boxes'
+    'remove:NAME Remove a box from the system'
+    'repackage:NAME Repackage an installed box into a `.box` file.'
 )
 
 local expl
 local -a boxes installed_boxes
 
-#_arguments \
-#  '(-v --version)'{-v,--version}'[show version]' \
-#  '(-h --help)'{-h,--help}'[show help]' \
-#  '*:: :->subcmds' && return 0
-        local curcontext="$curcontext" state line
-        typeset -A opt_args
+local curcontext="$curcontext" state line
+typeset -A opt_args
 
-  _arguments -C \
-        ':command:->command' \
-        '*::options:->options'
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
 
 
-
-
-#echo $state
-#echo -e "\n\n\n\n"
-#echo $line[1]
-
 case $state in
-
   (command)
-
-	  _describe -t commands "gem subcommand" _1st_arguments
-	  return
+      _describe -t commands "gem subcommand" _1st_arguments
+      return
   ;;
 
   (options)
-
     case $line[1] in
-
       (help)
-	       _arguments \
-			-F'[Fetch from origin before performing finish]' \
-			-r'[Rebase instead of merge]'\
-				':feature:__task_list' 
-
+         _arguments \
+             -F'[Fetch from origin before performing finish]' \
+             -r'[Rebase instead of merge]'\
+               ':feature:__task_list' 
       ;;
 
       (box)
-
-        __vagrant-box
+          __vagrant-box
       ;;
     esac
   ;;

From 6dbfdd9e31cefcb9510edf5e526cf572cbcfa776 Mon Sep 17 00:00:00 2001
From: Fedyashev Nikita <loci.master@gmail.com>
Date: Mon, 15 Nov 2010 15:18:58 -0500
Subject: [PATCH 085/907] improved formatting; redundant attributes deleted

---
 plugins/vagrant/_vagrant | 68 +++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index ea7fd5f74..483b29c53 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -1,7 +1,35 @@
 #compdef vagrant 
 #autoload
 
-# vagrant zsh completion, based on homebrew completion
+# vagrant zsh completion
+
+local -a _1st_arguments
+_1st_arguments=(
+    'box:Box commands'
+    'destroy:Destroys the vagrant environment'
+    'halt:Halts the currently running vagrant environment'
+    'help:[TASK] Describe available tasks or one specific task'
+    'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
+    'package:Packages a vagrant environment for distribution'
+    'provision:Run the provisioner'
+    'reload:Reload the vagrant environment'
+    'resume:Resumes a suspend vagrant environment'
+    'ssh:SSH into the currently running environment'
+    'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
+    'status:Shows the status of the current Vagrant environment.'
+    'suspend:Suspends the currently running vagrant environment'
+    'up:Creates the vagrant environment'
+    'version:Prints the Vagrant version information'
+)
+
+local -a _box_arguments
+_box_arguments=(
+    'add:NAME URI Add a box to the system'
+    'help:COMMAND Describe subcommands or one specific subcommand'
+    'list:Lists all installed boxes'
+    'remove:NAME Remove a box from the system'
+    'repackage:NAME Repackage an installed box into a `.box` file.'
+)
 
 __task_list ()
 {
@@ -36,43 +64,15 @@ __vagrant-box ()
        (options)
            case $line[1] in
                (repackage|remove)
-                   _arguments \
-                       -F'[Fetch from origin before performing finish]' \
-                       -r'[Rebase instead of merge]'\
-                         ':feature:__box_list' 
+                   _arguments ':feature:__box_list' 
                ;;
            esac
        ;;
     esac
 }
 
-local -a _1st_arguments
-_1st_arguments=(
-    'box:Box commands'
-    'destroy:Destroys the vagrant environment'
-    'halt:Halts the currently running vagrant environment'
-    'help:[TASK] Describe available tasks or one specific task'
-    'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
-    'package:Packages a vagrant environment for distribution'
-    'provision:Run the provisioner'
-    'reload:Reload the vagrant environment'
-    'resume:Resumes a suspend vagrant environment'
-    'ssh:SSH into the currently running environment'
-    'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
-    'status:Shows the status of the current Vagrant environment.'
-    'suspend:Suspends the currently running vagrant environment'
-    'up:Creates the vagrant environment'
-    'version:Prints the Vagrant version information'
-)
 
-local -a _box_arguments
-_box_arguments=(
-    'add:NAME URI Add a box to the system'
-    'help:COMMAND Describe subcommands or one specific subcommand'
-    'list:Lists all installed boxes'
-    'remove:NAME Remove a box from the system'
-    'repackage:NAME Repackage an installed box into a `.box` file.'
-)
+
 
 local expl
 local -a boxes installed_boxes
@@ -84,7 +84,6 @@ _arguments -C \
     ':command:->command' \
     '*::options:->options'
 
-
 case $state in
   (command)
       _describe -t commands "gem subcommand" _1st_arguments
@@ -94,10 +93,7 @@ case $state in
   (options)
     case $line[1] in
       (help)
-         _arguments \
-             -F'[Fetch from origin before performing finish]' \
-             -r'[Rebase instead of merge]'\
-               ':feature:__task_list' 
+         _arguments ':feature:__task_list' 
       ;;
 
       (box)

From bdaf872ce6e411f881e5e6138fc61a9c1645e67a Mon Sep 17 00:00:00 2001
From: Claus Witt <claus@wittnezz.dk>
Date: Wed, 17 Nov 2010 11:17:03 +0100
Subject: [PATCH 086/907] Removed the echo statement - no need for that.

---
 plugins/phing/phing.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/phing/phing.plugin.zsh b/plugins/phing/phing.plugin.zsh
index 80e334629..8f4adca08 100644
--- a/plugins/phing/phing.plugin.zsh
+++ b/plugins/phing/phing.plugin.zsh
@@ -10,7 +10,6 @@ _phing_does_target_list_need_generating () {
 _phing () {
   if [ -f build.xml ]; then
     if _phing_does_target_list_need_generating; then
-      echo "\nGenerating .phing_targets..." > /dev/stderr
       phing -l |grep -v ":" |grep -v "^$"|grep -v "\-" > .phing_targets
     fi
     compadd `cat .phing_targets`

From 57e0b57434eb7f3b7d0fe0ca4849478477404e43 Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Fri, 19 Nov 2010 20:25:19 +0100
Subject: [PATCH 087/907] changes

---
 themes/rkj.zsh-theme | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index fa950b255..af178b2b9 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -6,10 +6,24 @@ function hg_prompt_info {
     hg prompt --angle-brackets "\
 <hg:%{$fg[magenta]%}<branch>%{$reset_color%}>\
 </%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
-%{$fg[green]%}<status|modified|unknown><update>%{$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
 }
 
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"
+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]%}✈"
+
+function mygit() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(git_prompt_info)$(hg_prompt_info)>%{\e[0m%}%b '
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
+RPROMPT='$(mygit)'
+

From f624889aa4eacbd5f5f11ec02115abd59e567716 Mon Sep 17 00:00:00 2001
From: Julien Nicoulaud <julien.nicoulaud@gmail.com>
Date: Sat, 20 Nov 2010 18:06:23 +0100
Subject: [PATCH 088/907] Rename appearance.zsh so that it gets loaded after
 spectrum.zsh. Allows to use 256 colors in prompt themes.

---
 lib/{appearance.zsh => theme-and-appearance.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/{appearance.zsh => theme-and-appearance.zsh} (100%)

diff --git a/lib/appearance.zsh b/lib/theme-and-appearance.zsh
similarity index 100%
rename from lib/appearance.zsh
rename to lib/theme-and-appearance.zsh

From b0c39ec7f1625fafd4d51166b19d38f583a3cf9b Mon Sep 17 00:00:00 2001
From: Julien Nicoulaud <julien.nicoulaud@gmail.com>
Date: Sat, 20 Nov 2010 18:07:45 +0100
Subject: [PATCH 089/907] Add my prompt theme

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

diff --git a/themes/nicoulaj.zsh-theme b/themes/nicoulaj.zsh-theme
new file mode 100644
index 000000000..edcdb158d
--- /dev/null
+++ b/themes/nicoulaj.zsh-theme
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# ------------------------------------------------------------------------------
+# Prompt for the Zsh shell:
+#   * One line.
+#   * VCS info on the right prompt.
+#   * Only shows the path on the left prompt by default.
+#   * Crops the path to a defined length and only shows the path relative to
+#     the current VCS repository root.
+#   * Wears a different color wether the last command succeeded/failed.
+#   * Shows user@hostname if connected through SSH.
+#   * Shows if logged in as root or not.
+# ------------------------------------------------------------------------------
+
+# Customizable parameters.
+PROMPT_PATH_MAX_LENGTH=30
+PROMPT_DEFAULT_END=❯
+PROMPT_ROOT_END=❯❯❯
+PROMPT_SUCCESS_COLOR=$FG[071]
+PROMPT_FAILURE_COLOR=$FG[124]
+PROMPT_VCS_INFO_COLOR=$FG[242]
+
+# Set required options.
+setopt promptsubst
+
+# Load required modules.
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+# Add hook for calling vcs_info before each command.
+add-zsh-hook precmd vcs_info
+
+# Set vcs_info parameters.
+zstyle ':vcs_info:*' enable hg bzr git
+zstyle ':vcs_info:*:*' check-for-changes true # Can be slow on big repos.
+zstyle ':vcs_info:*:*' unstagedstr '!'
+zstyle ':vcs_info:*:*' stagedstr '+'
+zstyle ':vcs_info:*:*' actionformats "%S" "%r/%s/%b %u%c (%a)"
+zstyle ':vcs_info:*:*' formats "%S" "%r/%s/%b %u%c"
+zstyle ':vcs_info:*:*' nvcsformats "%$PROMPT_PATH_MAX_LENGTH<..<%~%<<" ""
+
+# Define prompts.
+PROMPT="%(0?.%{$PROMPT_SUCCESS_COLOR%}.%{$PROMPT_FAILURE_COLOR%})${SSH_TTY:+[%n@%m]}%{$FX[bold]%}%$PROMPT_PATH_MAX_LENGTH<..<"'${vcs_info_msg_0_%%.}'"%<<%(!.$PROMPT_ROOT_END.$PROMPT_DEFAULT_END)%{$FX[no-bold]%}%{$FX[reset]%} "
+RPROMPT="%{$PROMPT_VCS_INFO_COLOR%}"'$vcs_info_msg_1_'"%{$FX[reset]%}"

From 9b0a75ca84e9bb1956806f09ee7040ce8c0d647c Mon Sep 17 00:00:00 2001
From: Julien Nicoulaud <julien.nicoulaud@gmail.com>
Date: Sat, 20 Nov 2010 20:12:19 +0100
Subject: [PATCH 090/907] Avoid duplicate path cropping

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

diff --git a/themes/nicoulaj.zsh-theme b/themes/nicoulaj.zsh-theme
index edcdb158d..333aa5e70 100644
--- a/themes/nicoulaj.zsh-theme
+++ b/themes/nicoulaj.zsh-theme
@@ -36,7 +36,7 @@ zstyle ':vcs_info:*:*' unstagedstr '!'
 zstyle ':vcs_info:*:*' stagedstr '+'
 zstyle ':vcs_info:*:*' actionformats "%S" "%r/%s/%b %u%c (%a)"
 zstyle ':vcs_info:*:*' formats "%S" "%r/%s/%b %u%c"
-zstyle ':vcs_info:*:*' nvcsformats "%$PROMPT_PATH_MAX_LENGTH<..<%~%<<" ""
+zstyle ':vcs_info:*:*' nvcsformats "%~" ""
 
 # Define prompts.
 PROMPT="%(0?.%{$PROMPT_SUCCESS_COLOR%}.%{$PROMPT_FAILURE_COLOR%})${SSH_TTY:+[%n@%m]}%{$FX[bold]%}%$PROMPT_PATH_MAX_LENGTH<..<"'${vcs_info_msg_0_%%.}'"%<<%(!.$PROMPT_ROOT_END.$PROMPT_DEFAULT_END)%{$FX[no-bold]%}%{$FX[reset]%} "

From e5beb1a6b5f31d2fa1c77598ef48d888b773e26c Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 24 Nov 2010 18:03:14 +0100
Subject: [PATCH 091/907] add dieter theme v1

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

diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
new file mode 100644
index 000000000..5b61c80ce
--- /dev/null
+++ b/themes/dieter.zsh-theme
@@ -0,0 +1,33 @@
+# the idea of this theme is to contain a lot of info in a small string, by compressing some parts,
+# and colorcoding, which bring useful visual cues.  While limiting the amount of colors and such to keep
+# it easy on the eyes
+# exact return code (when >0) is on the right, so it stays out of the way
+
+# TODO: reset exit code visual cues (not exit code itself) after showing once
+# TODO: compress hostname in window title
+
+typeset -A host_repr
+host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
+
+
+# local time, color coded after last return code
+local time="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
+# user part, color coded after privileges
+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%}"
+# Compacted $PWD
+local pwd="%{$fg[blue]%}%c%{$reset_color%}"
+
+PROMPT='${time} ${user}${host} ${pwd} $(git_prompt_info)'
+
+# i would prefer 1 icon that shows the "most drastic" deviation from head, but lets see how this works out
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}?%{$fg[green]%}%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"
+
+# elaborate exitcode on the right when >0
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+RPS1="${return_code}"

From dc87b81b1b70d528643aece33dcb0f4c25621e72 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 24 Nov 2010 19:58:03 +0100
Subject: [PATCH 092/907] reset exit code visual cues (not exit code itself)
 after showing once

---
 themes/dieter.zsh-theme | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
index 5b61c80ce..a14829fc0 100644
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@@ -2,21 +2,25 @@
 # and colorcoding, which bring useful visual cues.  While limiting the amount of colors and such to keep
 # it easy on the eyes
 # exact return code (when >0) is on the right, so it stays out of the way
-
-# TODO: reset exit code visual cues (not exit code itself) after showing once
-# TODO: compress hostname in window title
+# The visual cues for >0 exit codes will only display once
+# (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
 
 typeset -A host_repr
 host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
 
 
 # local time, color coded after last return code
-local time="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
+time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
+time_disabled="%{$fg[green]%}%*%{$reset_color%}"
+time=$time_enabled
+
 # user part, color coded after privileges
 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%}"
+
 # Compacted $PWD
 local pwd="%{$fg[blue]%}%c%{$reset_color%}"
 
@@ -29,5 +33,21 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}?%{$fg[green]%}%{$rese
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"
 
 # elaborate exitcode on the right when >0
-local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-RPS1="${return_code}"
+return_code_enabled="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+return_code_disabled=
+return_code=$return_code_enabled
+
+RPS1='${return_code}'
+
+function accept-line-or-clear-warning () {
+	if [[ -z $BUFFER ]]; then
+		time=$time_disabled
+		return_code=$return_code_disabled
+	else
+		time=$time_enabled
+		return_code=$return_code_enabled
+	fi
+	zle accept-line
+}
+zle -N accept-line-or-clear-warning
+bindkey '^M' accept-line-or-clear-warning

From 0cd956c59692d5e4e7bc01138b96b1537b6d821a Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 24 Nov 2010 20:04:40 +0100
Subject: [PATCH 093/907] better phrasing/documentation

---
 themes/dieter.zsh-theme | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
index a14829fc0..0a5e9265b 100644
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@@ -1,20 +1,22 @@
-# the idea of this theme is to contain a lot of info in a small string, by compressing some parts,
-# and colorcoding, which bring useful visual cues.  While limiting the amount of colors and such to keep
-# it easy on the eyes
-# exact return code (when >0) is on the right, so it stays out of the way
-# The visual cues for >0 exit codes will only display once
+# the idea of this theme is to contain a lot of info in a small string, by
+# compressing some parts and colorcoding, which bring useful visual cues,
+# while limiting the amount of colors and such to keep it easy on the eyes.
+# When a command exited >0, the timestamp will be in red and the exit code
+# will be on the right edge.
+# The exit code visual cues will only display once.
 # (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
 
 typeset -A host_repr
+
+# translate hostnames into shortened, colorcoded strings
 host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
 
-
-# local time, color coded after last return code
+# local time, color coded by last return code
 time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
 time_disabled="%{$fg[green]%}%*%{$reset_color%}"
 time=$time_enabled
 
-# user part, color coded after privileges
+# user part, color coded by privileges
 local user="%(!.%{$fg[blue]%}.%{$fg[blue]%})%n%{$reset_color%}"
 
 # Hostname part.  compressed and colorcoded per host_repr array
@@ -26,7 +28,8 @@ local pwd="%{$fg[blue]%}%c%{$reset_color%}"
 
 PROMPT='${time} ${user}${host} ${pwd} $(git_prompt_info)'
 
-# i would prefer 1 icon that shows the "most drastic" deviation from head, but lets see how this works out
+# i would prefer 1 icon that shows the "most drastic" deviation from HEAD,
+# but lets see how this works out
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}?%{$fg[green]%}%{$reset_color%}"

From fa7036b4eef177f25478091e660fca52b9ac725d Mon Sep 17 00:00:00 2001
From: Claus Witt <claus@wittnezz.dk>
Date: Thu, 25 Nov 2010 21:48:07 +0100
Subject: [PATCH 094/907] Added ant plugin

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

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
new file mode 100644
index 000000000..0544ac92c
--- /dev/null
+++ b/plugins/ant/ant.plugin.zsh
@@ -0,0 +1,19 @@
+_ant_does_target_list_need_generating () {
+  if [ ! -f .ant_targets ]; then return 0;
+  else
+    accurate=$(stat -f%m .ant_targets)
+    changed=$(stat -f%m build.xml)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+_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
+    fi
+    compadd `cat .ant_targets`
+  fi
+}
+
+compdef _ant ant

From d02a3912cfd52636ad547fe0b1357303b77584a8 Mon Sep 17 00:00:00 2001
From: Fredrik Appelberg <fredrik.appelberg@gmail.com>
Date: Wed, 1 Dec 2010 09:56:54 +0100
Subject: [PATCH 095/907] maven plugin

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

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
new file mode 100644
index 000000000..abd0da185
--- /dev/null
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -0,0 +1,6 @@
+function listMavenCompletions { 
+	 reply=(
+		cli:execute cli:execute-phase archetype:generate compile clean install test test-compile deploy package cobertura:cobertura jetty:run gwt:run gwt:debug -DskipTests -Dmaven.test.skip=true -DarchetypeCatalog=http://tapestry.formos.com/maven-snapshot-repository -Dtest= `if [ -d ./src ] ; then find ./src -type f | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`); 
+}
+
+compctl -K listMavenCompletions mvn
\ No newline at end of file

From 1a673fc1d582463c17168557b95fe6a55e0757e5 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 1 Dec 2010 18:07:28 +0100
Subject: [PATCH 096/907] Don't export oh-my-zsh configuration paramaters to
 the environment

These variables are only used by oh-my-zsh, so there's no need
to populate the environment of all children with them.
---
 templates/zshrc.zsh-template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 8022b3506..69cbbb0fe 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,18 +1,18 @@
 # Path to your oh-my-zsh configuration.
-export ZSH=$HOME/.oh-my-zsh
+ZSH=$HOME/.oh-my-zsh
 
 # Set to the name theme to load.
 # Look in ~/.oh-my-zsh/themes/
-export ZSH_THEME="robbyrussell"
+ZSH_THEME="robbyrussell"
 
 # Set to this to use case-sensitive completion
-# export CASE_SENSITIVE="true"
+# CASE_SENSITIVE="true"
 
 # Comment this out to disable weekly auto-update checks
-# export DISABLE_AUTO_UPDATE="true"
+# DISABLE_AUTO_UPDATE="true"
 
 # Uncomment following line if you want to disable colors in ls
-# export DISABLE_LS_COLORS="true"
+# DISABLE_LS_COLORS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)

From d230d2e519fb4720671ff7acf2b5a05f640eaebe Mon Sep 17 00:00:00 2001
From: Igor Vinokurov <zynaps@zynaps.ru>
Date: Thu, 2 Dec 2010 03:49:13 +0300
Subject: [PATCH 097/907] gentoo-like theme w/ git_prompt_info

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

diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
new file mode 100644
index 000000000..cba143d42
--- /dev/null
+++ b/themes/gentoo.zsh-theme
@@ -0,0 +1,4 @@
+PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%#%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=") "

From 0e2d289fffbf15c95c5401aa484ad63a51e88e3c Mon Sep 17 00:00:00 2001
From: Daniel Karlsson <daniel@fraction4.com>
Date: Fri, 3 Dec 2010 15:51:34 +0100
Subject: [PATCH 098/907] Added new kardan theme.

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

diff --git a/themes/kardan.zsh-theme b/themes/kardan.zsh-theme
new file mode 100644
index 000000000..f2b036fde
--- /dev/null
+++ b/themes/kardan.zsh-theme
@@ -0,0 +1,12 @@
+# Comment 
+
+function get_host {
+	echo '@'`hostname`''
+}
+
+RPROMPT='%~$(git_prompt_info)$(get_host)' 
+export PS1='> '
+
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
\ No newline at end of file

From 17c6c0376084d09a6cf3d1260d65447ba179c694 Mon Sep 17 00:00:00 2001
From: Daniel Karlsson <daniel@fraction4.com>
Date: Fri, 3 Dec 2010 15:58:18 +0100
Subject: [PATCH 099/907] Updated the PROMT.

---
 themes/kardan.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/kardan.zsh-theme b/themes/kardan.zsh-theme
index f2b036fde..fd6586a9d 100644
--- a/themes/kardan.zsh-theme
+++ b/themes/kardan.zsh-theme
@@ -1,11 +1,11 @@
-# Comment 
+# Simple theme based on my old zsh settings.
 
 function get_host {
 	echo '@'`hostname`''
 }
 
-RPROMPT='%~$(git_prompt_info)$(get_host)' 
-export PS1='> '
+PROMPT='> '
+RPROMPT='%~$(git_prompt_info)$(get_host)'
 
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_PREFIX="("

From f2d60d3023b006e5e31928ed36491f4639a7a022 Mon Sep 17 00:00:00 2001
From: Jake Bell <jake.b.bell@gmail.com>
Date: Sun, 19 Dec 2010 21:08:21 -0600
Subject: [PATCH 100/907] Updating theunraveler theme to include more detailed
 git info.

---
 themes/theunraveler.zsh-theme | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler.zsh-theme
index 4eec8e827..e4bfb79c5 100644
--- a/themes/theunraveler.zsh-theme
+++ b/themes/theunraveler.zsh-theme
@@ -1,6 +1,16 @@
-# Comment 
+# Comment
 
-ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
-ZSH_THEME_GIT_PROMPT_SUFFIX=')'
+PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 
-PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
\ No newline at end of file
+RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
+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]%} ✱"
\ No newline at end of file

From 632181c3dc0930ddd147e11041f4ffe07b4ad18f Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 11:13:46 -0300
Subject: [PATCH 101/907] Fixed typo

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

diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index 65d3766f3..d4e5c6584 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1,4 +1,4 @@
-# add brew completion function to path
+# add gem completion function to path
 fpath=($ZSH/plugins/gem $fpath)
 autoload -U compinit
 compinit -i

From 8edf417375fa8468008fbea78b7532125ea6bd83 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:13:47 -0300
Subject: [PATCH 102/907] Aliased git checkout as `gco`

---
 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 d317d179d..09b1f16cc 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -8,6 +8,7 @@ alias gd='git diff | mate'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
+alias gco='git checkout'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gcount='git shortlog -sn'

From 960eb52366abe6e8951b8b20a9fb59ef6d50a3e8 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:19:59 -0300
Subject: [PATCH 103/907] A rails3 plugin based on the rails plugin

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

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
new file mode 100644
index 000000000..5c1930af3
--- /dev/null
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -0,0 +1,12 @@
+alias rs='ruby script/rails server'
+alias rg='ruby script/rails generate'
+alias rd='ruby script/rails destroy'
+alias rp='ruby script/rails plugin'
+alias rdbm='rake db:migrate db:test:clone'
+alias rc='ruby script/rails console'
+alias rd='ruby script/rais server --debugger'
+alias devlog='tail -f log/development.log'
+
+function remote_console() {
+  /usr/bin/env ssh $1 "( cd $2 && ruby script/rails console production )"
+}

From 6aa8ee2f515875e9a75b30b3a5734451f585a3f1 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:50:55 -0300
Subject: [PATCH 104/907] Removed remote_console. It doesn't handle rvm,
 capistrano, and so on.

---
 plugins/rails3/rails3.plugin.zsh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 5c1930af3..20ba0408c 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -6,7 +6,3 @@ alias rdbm='rake db:migrate db:test:clone'
 alias rc='ruby script/rails console'
 alias rd='ruby script/rais server --debugger'
 alias devlog='tail -f log/development.log'
-
-function remote_console() {
-  /usr/bin/env ssh $1 "( cd $2 && ruby script/rails console production )"
-}

From 1a8ceef514bc86f882adce1834bfab168afcb4d1 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Mon, 20 Dec 2010 12:57:23 -0300
Subject: [PATCH 105/907] Typo

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 09b1f16cc..71a62819b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -27,7 +27,7 @@ function current_branch() {
   echo ${ref#refs/heads/}
 }
 
-# these aliases take advangate of the previous function
+# these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 alias ggpush='git push origin $(current_branch)'
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

From 06472515e137df32ad2f898962a3ca05c24ad8d0 Mon Sep 17 00:00:00 2001
From: Jarin Udom <jarin@robotmo.de>
Date: Mon, 20 Dec 2010 13:51:29 -0800
Subject: [PATCH 106/907] Add superjarin theme that shows current Ruby version
 via RVM

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

diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
new file mode 100644
index 000000000..16eeb5316
--- /dev/null
+++ b/themes/superjarin.zsh-theme
@@ -0,0 +1,18 @@
+# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
+JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
+
+# Grab the current filepath, use shortcuts: ~/Desktop
+# Append the current git branch, if in a git repository
+JARIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+# Do nothing if the branch is clean (no changes).
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}>"
+
+# Add a yellow ✗ if the branch is dirty
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}> %{$fg[yellow]%}✗"
+
+# Put it all together!
+PROMPT="$JARIN_CURRENT_RUBY_ $JARIN_CURRENT_LOCA_ "
+

From 2b03b95122361fa73e7651d1a06730ae95548a14 Mon Sep 17 00:00:00 2001
From: Derek Prior <derekprior@gmail.com>
Date: Tue, 21 Dec 2010 14:28:40 -0500
Subject: [PATCH 107/907] Added function to mkdir and immediately change to it

---
 lib/directories.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index 56d7a2316..bb114f615 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -36,5 +36,9 @@ cd () {
 
 alias md='mkdir -p'
 alias rd=rmdir
+alias d='dirs -v'
 
-alias d='dirs -v'
\ No newline at end of file
+# mkdir & cd to it
+function mcd() { 
+  mkdir -p "$1" && cd "$1"; 
+}
\ No newline at end of file

From ff0b25b745494d96ae06694321b2299991620b14 Mon Sep 17 00:00:00 2001
From: SuprDewd <suprdewd@gmail.com>
Date: Fri, 24 Dec 2010 22:20:57 +0000
Subject: [PATCH 108/907] Added a function to extract various archives. Also an
 alias for the function.

---
 lib/aliases.zsh   |  2 ++
 lib/functions.zsh | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d2d3aed81..b47de5bde 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -21,3 +21,5 @@ alias ll='ls -l'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
+
+alias x=extract
diff --git a/lib/functions.zsh b/lib/functions.zsh
index e3c0de43e..99b75409c 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -37,3 +37,24 @@ function take() {
   mkdir -p $1
   cd $1
 }
+
+function extract() {
+  if [[ -f $1 ]]; then
+    case $1 in
+      *.tar.bz2) tar xvjf $1;;
+      *.tar.gz) tar xvzf $1;;
+      *.bz2) bunzip $1;;
+      *.rar) unrar $1;;
+      *.gz) gunzip $1;;
+      *.tar) tar xvf $1;;
+      *.tbz2) tar xvjf $1;;
+      *.tgz) tar xvzf $1;;
+      *.zip) unzip $1;;
+      *.Z) uncompress $1;;
+      *.7z) 7z x $1;;
+      *) echo "'$1' cannot be extracted via >extract<";;
+    esac
+  else
+    echo "'$1' is not a valid file"
+  fi
+}

From f0136f2aec4efdd11e976ddbbfd204ca5e113498 Mon Sep 17 00:00:00 2001
From: SuprDewd <suprdewd@gmail.com>
Date: Sat, 25 Dec 2010 13:28:16 +0000
Subject: [PATCH 109/907] Support for more archive formats.

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

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 99b75409c..4246f8811 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -43,6 +43,8 @@ function extract() {
     case $1 in
       *.tar.bz2) tar xvjf $1;;
       *.tar.gz) tar xvzf $1;;
+      *.tar.xz) tar xvJf $1;;
+      *.tar.lzma) tar --lzma -xvf $1;;
       *.bz2) bunzip $1;;
       *.rar) unrar $1;;
       *.gz) gunzip $1;;

From 943e09cd84baff55d36ebcfcf05b9fbfb4436a17 Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Tue, 28 Dec 2010 20:36:29 -0800
Subject: [PATCH 110/907] add "fishy" theme to emulate Fish shell's prompt

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

diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
new file mode 100644
index 000000000..f22eda868
--- /dev/null
+++ b/themes/fishy.zsh-theme
@@ -0,0 +1,9 @@
+# ZSH Theme emulating the Fish shell's default prompt.
+
+local user_color='green'; [ $UID -eq 0 ] && user_color='red'
+PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From 8d2b9d10e5105f9e0af0700e427e0567011ab45b Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Sat, 8 Jan 2011 18:15:57 -0800
Subject: [PATCH 111/907] avoid forking subshell to test if user is root

---
 themes/afowler.zsh-theme | 2 +-
 themes/arrow.zsh-theme   | 2 +-
 themes/clean.zsh-theme   | 2 +-
 themes/dst.zsh-theme     | 2 +-
 themes/jreese.zsh-theme  | 2 +-
 themes/philips.zsh-theme | 2 +-
 themes/pmcgee.zsh-theme  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index b5a9bb173..3a4753fc1 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
index a23efd1d7..d62dcdcb9 100644
--- a/themes/arrow.zsh-theme
+++ b/themes/arrow.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
 RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
diff --git a/themes/clean.zsh-theme b/themes/clean.zsh-theme
index 95f532a82..7ee29cb8c 100644
--- a/themes/clean.zsh-theme
+++ b/themes/clean.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="white"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="white"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
 RPROMPT='[%*]'
diff --git a/themes/dst.zsh-theme b/themes/dst.zsh-theme
index fa0d9cb06..3e2539d57 100644
--- a/themes/dst.zsh-theme
+++ b/themes/dst.zsh-theme
@@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 function prompt_char {
-	if [ "$(whoami)" = "root" ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
 }
 
 PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
diff --git a/themes/jreese.zsh-theme b/themes/jreese.zsh-theme
index 534664f11..0fa6b4ecd 100644
--- a/themes/jreese.zsh-theme
+++ b/themes/jreese.zsh-theme
@@ -1,6 +1,6 @@
 # ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
 
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \
diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
index fa7c59035..e7ea51a2f 100644
--- a/themes/philips.zsh-theme
+++ b/themes/philips.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
 RPROMPT='[%*]'
diff --git a/themes/pmcgee.zsh-theme b/themes/pmcgee.zsh-theme
index 4eb54df5b..e4e45c71a 100644
--- a/themes/pmcgee.zsh-theme
+++ b/themes/pmcgee.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 
 PROMPT='
 %{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%}

From 8294cf44d1d348fd1590ee28b5be8483fb012153 Mon Sep 17 00:00:00 2001
From: Michael Komitee <mkomitee@me.com>
Date: Sat, 8 Jan 2011 23:34:47 -0500
Subject: [PATCH 112/907] Postponing sourcing of the theme until after local
 customizations

---
 lib/appearance.zsh | 2 --
 oh-my-zsh.sh       | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/appearance.zsh b/lib/appearance.zsh
index ffee52b5e..aec67721a 100644
--- a/lib/appearance.zsh
+++ b/lib/appearance.zsh
@@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is c
 # Setup the prompt with pretty colors
 setopt prompt_subst
 
-# Load the theme
-source "$ZSH/themes/$ZSH_THEME.zsh-theme"
\ No newline at end of file
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 848e48eb5..291772dfe 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
 plugin=${plugin:=()}
 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
+# Load the theme
+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 then

From f5c45c23ee7958395e80f97228c4267bfd0d4e6c Mon Sep 17 00:00:00 2001
From: Danny Tatom <dannytatom@gmail.com>
Date: Sat, 8 Jan 2011 21:07:03 -0800
Subject: [PATCH 113/907] Added lambda theme

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

diff --git a/themes/lambda.zsh-theme b/themes/lambda.zsh-theme
new file mode 100644
index 000000000..63292d331
--- /dev/null
+++ b/themes/lambda.zsh-theme
@@ -0,0 +1,6 @@
+# ZSH Theme - Preview: http://cl.ly/350F0F0k1M2y3A2i3p1S
+
+PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "

From b61cae150a5f693ed1e2bd4a292feea899058e44 Mon Sep 17 00:00:00 2001
From: Francesco Lazzarino <flazzarino@gmail.com>
Date: Mon, 10 Jan 2011 10:16:04 -0500
Subject: [PATCH 114/907] theme based on afowler with vi-mode support

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

diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
new file mode 100644
index 000000000..280794f2b
--- /dev/null
+++ b/themes/flazz.zsh-theme
@@ -0,0 +1,19 @@
+if [ "$(whoami)" = "root" ]
+then CARETCOLOR="red"
+else CARETCOLOR="blue"
+fi
+
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%m%{${fg_bold[magenta]}%} :: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}%#%{${reset_color}%} '
+
+RPS1='$(vi_mode_prompt_info) ${return_code}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+
+MODE_INDICATOR="%{$fg_bold[magenta]%}<%{$reset_color%}%{$fg[magenta]%}<<%{$reset_color%}"
+
+# TODO use 265 colors
+#MODE_INDICATOR="$FX[bold]$FG[020]<$FX[no_bold]%{$fg[blue]%}<<%{$reset_color%}"
+# TODO use two lines if git

From 77d05fe8ab0f1b35af9332e889e384f935ce08f9 Mon Sep 17 00:00:00 2001
From: Robin Ramael <robin.ramael@gmail.com>
Date: Mon, 10 Jan 2011 17:01:11 +0100
Subject: [PATCH 115/907] Made git ignore everything  in custom, not only the
 .zsh files.

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f84db6dc2..8d19d100c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*.zsh
+custom/*
 !custom/example.zsh
\ No newline at end of file

From 664b97a3c8fc167bda2c64e48b18b27de8dce4cd Mon Sep 17 00:00:00 2001
From: Robin Ramael <robin.ramael@gmail.com>
Date: Mon, 10 Jan 2011 18:18:31 +0100
Subject: [PATCH 116/907] Added svn info in prompt with plugin.

If the svn plugin is used, svn info (repo name and wether the repo is dirty) is displayed in the prompt like with git. Just lke with git, the colors can be manipulated with variables (see awesomepanda theme for example).
---
 plugins/svn/svn.plugin.zsh    | 42 +++++++++++++++++++++++++++++++++++
 themes/awesomepanda.zsh-theme | 18 +++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 plugins/svn/svn.plugin.zsh
 create mode 100644 themes/awesomepanda.zsh-theme

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
new file mode 100644
index 000000000..45d461306
--- /dev/null
+++ b/plugins/svn/svn.plugin.zsh
@@ -0,0 +1,42 @@
+function svn_prompt_info {
+    if [[ -d .svn ]]; then
+        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
+$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+    fi
+}
+
+
+function in_svn() {
+    if [[ -d .svn ]]; then
+        echo 1
+    fi
+}
+
+function svn_get_repo_name {
+    if [ is_svn ]; then
+        svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
+    
+        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
+    fi
+}
+
+function svn_get_rev_nr {
+    if [ is_svn ]; then
+        svn info 2> /dev/null | sed -n s/Revision:\ //p
+    fi
+}
+
+function svn_dirty_choose {
+    if [ is_svn ]; then
+        s=$(svn status 2>/dev/null)
+        if [ $s ]; then 
+            echo $1
+        else 
+            echo $2
+        fi
+    fi
+}
+
+function svn_dirty {
+    svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+}
\ No newline at end of file
diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda.zsh-theme
new file mode 100644
index 000000000..411b89837
--- /dev/null
+++ b/themes/awesomepanda.zsh-theme
@@ -0,0 +1,18 @@
+# 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%}'
+
+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

From bcc235e1420f39a0dbd8a7672dffc0f0c81e9b53 Mon Sep 17 00:00:00 2001
From: Robin Ramael <robin.ramael@gmail.com>
Date: Mon, 10 Jan 2011 17:34:38 +0100
Subject: [PATCH 117/907] Added an option to remove file afterwards.

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

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 4246f8811..914f2ef25 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -39,6 +39,12 @@ function take() {
 }
 
 function extract() {
+    unset REMOVE_ARCHIVE
+    
+    if test "$1" = "-r"; then
+        REMOVE=1
+        shift
+    fi
   if [[ -f $1 ]]; then
     case $1 in
       *.tar.bz2) tar xvjf $1;;
@@ -56,7 +62,14 @@ function extract() {
       *.7z) 7z x $1;;
       *) echo "'$1' cannot be extracted via >extract<";;
     esac
+
+    if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
+        echo removing "$1";
+        /bin/rm "$1";
+    fi
+
   else
     echo "'$1' is not a valid file"
   fi
 }
+

From 26614b3478306d9f23ae9d817e70c1acba9b43de Mon Sep 17 00:00:00 2001
From: Stephen Middleton <rixius@gmail.com>
Date: Thu, 13 Jan 2011 23:52:41 -0600
Subject: [PATCH 118/907] add Rixius-Theme

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

diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
new file mode 100644
index 000000000..2a283ebca
--- /dev/null
+++ b/themes/rixius.zsh-theme
@@ -0,0 +1,16 @@
+function collapse_pwd {
+    echo $(pwd | sed -e "s,^$HOME,~,")
+}
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
+    echo "%{$fg[red]%}≈%{$reset_color%}"
+}
+
+PROMPT='
+%{$fg[magenta]%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
+$(prompt_char) '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
\ No newline at end of file

From 5cca63a770ed78e17ffdf13bfbed5defc56edb92 Mon Sep 17 00:00:00 2001
From: Stephen Middleton <rixius@gmail.com>
Date: Fri, 14 Jan 2011 00:05:06 -0600
Subject: [PATCH 119/907] changes to theme

---
 themes/rixius.zsh-theme | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
index 2a283ebca..322bdad24 100644
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@@ -6,11 +6,10 @@ function prompt_char {
     echo "%{$fg[red]%}≈%{$reset_color%}"
 }
 
-PROMPT='
-%{$fg[magenta]%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
+PROMPT='%{$fg[magenta]%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
 $(prompt_char) '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$bg[white]%}%{$fg[red]%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$bg[white]%}%{$fg[red]%}√%{$reset_color%}"
\ No newline at end of file

From c58942d3b25cf25867e3096e5f52f1c256647d8a Mon Sep 17 00:00:00 2001
From: Stephen Middleton <rixius@gmail.com>
Date: Fri, 14 Jan 2011 01:26:31 -0600
Subject: [PATCH 120/907] theme changes

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

diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
index 322bdad24..8837d8840 100644
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@@ -2,14 +2,18 @@ function collapse_pwd {
     echo $(pwd | sed -e "s,^$HOME,~,")
 }
 function prompt_char {
-    git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
-    echo "%{$fg[red]%}≈%{$reset_color%}"
+    echo -n "%{$bg[white]%}%{$fg[red]%}"
+    git branch >/dev/null 2>/dev/null && echo "±%{$reset_color%}" && return
+    echo "≥%{$reset_color%}"
 }
+RIXIUS_PRE="%{$bg[white]%}%{$fg[red]%}"
 
-PROMPT='%{$fg[magenta]%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
+PROMPT='
+%{$RIXIUS_PRE%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
 $(prompt_char) '
+RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$bg[white]%}%{$fg[red]%}!%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$bg[white]%}%{$fg[red]%}√%{$reset_color%}"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"
\ No newline at end of file

From 277f664df33d4a9078bb55e7ddf0a669ca63c462 Mon Sep 17 00:00:00 2001
From: Stephen Middleton <rixius@gmail.com>
Date: Fri, 14 Jan 2011 01:29:24 -0600
Subject: [PATCH 121/907] Personal Style

---
 themes/rixius.zsh-theme | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
index 8837d8840..3e5381425 100644
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@@ -1,3 +1,8 @@
+# /|/ Code by Stephen
+# /|/ "Rixius" Middleton
+# 
+# name in folder (github)
+# ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
 function collapse_pwd {
     echo $(pwd | sed -e "s,^$HOME,~,")
 }

From e7c8673a45b9a65a672d2bb8e4e0d3f54a910c7c Mon Sep 17 00:00:00 2001
From: Stephen Middleton <rixius@gmail.com>
Date: Fri, 14 Jan 2011 01:31:21 -0600
Subject: [PATCH 122/907] added newline

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

diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
index 3e5381425..c0c5c9c71 100644
--- a/themes/rixius.zsh-theme
+++ b/themes/rixius.zsh-theme
@@ -21,4 +21,4 @@ RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}'
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"
\ No newline at end of file
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"

From fcc7801435fd2c5c6defcfbfc736e22341500a9d Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@soundcloud.com>
Date: Mon, 24 Jan 2011 15:49:49 +0100
Subject: [PATCH 123/907] add missing unrar flag

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

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 914f2ef25..86545c7b6 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -52,7 +52,7 @@ function extract() {
       *.tar.xz) tar xvJf $1;;
       *.tar.lzma) tar --lzma -xvf $1;;
       *.bz2) bunzip $1;;
-      *.rar) unrar $1;;
+      *.rar) unrar x $1;;
       *.gz) gunzip $1;;
       *.tar) tar xvf $1;;
       *.tbz2) tar xvjf $1;;

From faac3ba8fcad6ad1742f82a7d508a37c0c70d809 Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Sun, 30 Jan 2011 08:21:49 +0100
Subject: [PATCH 124/907] Refactor window and tab title in tty

Term window title and tab title are now skinable
Tab title can be different from window title (when supported by term)
Default theme is optimized of usuability (no %u@%m: $~ in a 10 char tab)
Cleanup code duplication and add comment for supported terms
On osX it works great on iterm, and is decent once you tweak Terminal pref
Tested under GNU screen, iTerm and Apple Terminal, need to be tested on linux
TODO implement Konsole support (via dbus)
---
 lib/functions.zsh   | 23 ----------------------
 lib/termsupport.zsh | 47 +++++++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 914f2ef25..6f5d015f7 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,26 +1,3 @@
-## fixme, i duplicated this in xterms - oops
-function title {
-  if [[ $TERM == "screen" ]]; then
-    # Use these two for GNU Screen:
-    print -nR $'\033k'$1$'\033'\\\
-
-    print -nR $'\033]0;'$2$'\a'
-  elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]]; then
-    # Use this one instead for XTerms:
-    print -nR $'\033]0;'$*$'\a'
-  fi
-}
-
-function precmd {
-  title zsh "$PWD"
-}
-
-function preexec {
-  emulate -L zsh
-  local -a cmd; cmd=(${(z)1})
-  title $cmd[1]:t "$cmd[2,-1]"
-}
-
 function zsh_stats() {
   history | awk '{print $2}' | sort | uniq -c | sort -rn | head
 }
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index fef978748..e1e536690 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -1,21 +1,26 @@
-case "$TERM" in
-  xterm*|rxvt*)
-    preexec () {
-      print -Pn "\e]0;%n@%m: $1\a"  # xterm
-    }
-    precmd () {
-      print -Pn "\e]0;%n@%m: %~\a"  # xterm
-    }
-    ;;
-  screen*)
-    preexec () {
-      local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]}
-      echo -ne "\ek$CMD\e\\"
-      print -Pn "\e]0;%n@%m: $1\a"  # xterm
-    }
-    precmd () {
-      echo -ne "\ekzsh\e\\"
-      print -Pn "\e]0;%n@%m: %~\a"  # xterm
-    }
-    ;;
-esac
\ No newline at end of file
+#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 [[ "$TERM" == "screen" ]]; then 
+    print -Pn "\ek$1\e\\" #set screen hardstatus, usually truncated at 20 chars
+  elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+    print -Pn "\e]2;$2\a" #set window name
+    print -Pn "\e]1;$1\a" #set icon (=tab) name (will override window name on broken terminal)
+  fi
+}
+
+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
+function precmd {
+  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+}
+
+#Appears at the beginning of (and during) of command execution
+function preexec {
+  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+  title "$CMD" "%100>...>$2%<<"
+}

From 051fb5f1d5d0c72812989bd4dfd0be33f43d75ad Mon Sep 17 00:00:00 2001
From: Christopher Chow <soliah@gmail.com>
Date: Fri, 4 Feb 2011 01:37:39 +1100
Subject: [PATCH 125/907] Added time since last commit to Soliah theme and
 changed some colours.

---
 themes/Soliah.zsh-theme | 63 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 7ad876d41..1c0ab3cc9 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -1,6 +1,63 @@
-PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}%{$(git_prompt_info)%} $ '
+PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
+$ '
 
-ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
-ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}"
 
+# Text to display if the branch is dirty
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" 
+
+# Text to display if the branch is clean
+ZSH_THEME_GIT_PROMPT_CLEAN="" 
+
+# Colors vary depending on time lapsed.
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
+ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
+
+# Determine the time since last commit. If branch is clean,
+# use a neutral color, otherwise colors will vary according to time.
+function git_time_since_commit() {
+    if git rev-parse --git-dir > /dev/null 2>&1; then
+        # Only proceed if there is actually a commit.
+        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
+            # Get the last commit.
+            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+            now=`date +%s`
+            seconds_since_last_commit=$((now-last_commit))
+
+            # Totals
+            MINUTES=$((seconds_since_last_commit / 60))
+            HOURS=$((seconds_since_last_commit/3600))
+           
+            # Sub-hours and sub-minutes
+            DAYS=$((seconds_since_last_commit / 86400))
+            SUB_HOURS=$((HOURS % 24))
+            SUB_MINUTES=$((MINUTES % 60))
+            
+            if [[ -n $(git status -s 2> /dev/null) ]]; then
+                if [ "$MINUTES" -gt 30 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
+                elif [ "$MINUTES" -gt 10 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
+                else
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
+                fi
+            else
+                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            fi
+
+            if [ "$HOURS" -gt 24 ]; then
+                echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+            elif [ "$MINUTES" -gt 60 ]; then
+                echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+            else
+                echo "($COLOR${MINUTES}m%{$reset_color%}|"
+            fi
+        else
+            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            echo "($COLOR~|"
+        fi
+    fi
+}

From ae8b3b6dbaa444a1b08a63cadabaf3f1781b7c11 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 3 Feb 2011 16:47:08 -0500
Subject: [PATCH 126/907] Added sorin oh-my-zsh theme.

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

diff --git a/themes/sorin.zsh-theme b/themes/sorin.zsh-theme
new file mode 100644
index 000000000..601dbe5d7
--- /dev/null
+++ b/themes/sorin.zsh-theme
@@ -0,0 +1,48 @@
+# ------------------------------------------------------------------------------
+#          FILE:  sorin.zsh-theme
+#   DESCRIPTION:  oh-my-zsh theme file.
+#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
+#       VERSION:  1.0.2
+#    SCREENSHOT:  http://i.imgur.com/aipDQ.png
+# ------------------------------------------------------------------------------
+
+
+if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
+  MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
+  local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
+  
+  PROMPT='%{$fg[cyan]%}%c$(git_prompt_info) %(!.%{$fg_bold[red]%}#.%{$fg_bold[green]%}❯)%{$reset_color%} '
+
+  ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}git%{$reset_color%}:%{$fg[red]%}"
+  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+  ZSH_THEME_GIT_PROMPT_DIRTY=""
+  ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+  RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}'
+
+  ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+  ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+  ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+  ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+  ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+  ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+else 
+  MODE_INDICATOR="❮❮❮"
+  local return_status="%(?::⏎)"
+  
+  PROMPT='%c$(git_prompt_info) %(!.#.❯) '
+
+  ZSH_THEME_GIT_PROMPT_PREFIX=" git:"
+  ZSH_THEME_GIT_PROMPT_SUFFIX=""
+  ZSH_THEME_GIT_PROMPT_DIRTY=""
+  ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+  RPROMPT='${return_status}$(git_prompt_status)'
+
+  ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
+  ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
+  ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
+  ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
+  ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
+  ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
+fi

From cc90e3aa06cc3de32e4679dcccd0f00a2a4bdf79 Mon Sep 17 00:00:00 2001
From: Christopher Chow <soliah@gmail.com>
Date: Fri, 4 Feb 2011 11:33:20 +1100
Subject: [PATCH 127/907] Fixed auto update.

Paramater substitution instead of command subsitution was being used
causing the calculation of time since last check to be incorrect.
---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index c59ebaed4..4643739ca 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -16,7 +16,7 @@ then
     _update_zsh_update && return 0;
   fi
 
-  epoch_diff=$((${_current_epoch} - $LAST_EPOCH))
+  epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
   if [ $epoch_diff -gt 6 ]
   then
     echo "[Oh My Zsh] Would you like to check for updates?"

From 90a9a5f251b2273735b58be55014d94582f1db91 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 3 Feb 2011 23:24:33 -0500
Subject: [PATCH 128/907] Added modified while newly added and type change
 detection to git prompt modified status.

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

diff --git a/lib/git.zsh b/lib/git.zsh
index 75fdc1f9c..8512de8a4 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -26,6 +26,10 @@ git_prompt_status() {
   fi
   if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"

From 8aec32b48bb88e980150a43586e7e02b9156e165 Mon Sep 17 00:00:00 2001
From: Allan Caffee <allanc@aweber.com>
Date: Mon, 7 Feb 2011 15:09:06 -0500
Subject: [PATCH 129/907] Add vagrant completion for individual VMs

For multi-VM setups some commands take the name of
a virtual machine.  Read the Vagrantfile and offer
suggestions.
---
 plugins/vagrant/_vagrant | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 483b29c53..9bed1e3c6 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -46,6 +46,11 @@ __box_list ()
     _wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
 }
 
+__vm_list ()
+{
+    _wanted application expl 'command' compadd $(command grep Vagrantfile -oe '^[^#]*\.vm\.define *:\([a-zA-Z0-9]\+\)' 2>/dev/null | cut -d: -f2)
+}
+
 __vagrant-box ()
 {
     local curcontext="$curcontext" state line
@@ -99,6 +104,8 @@ case $state in
       (box)
           __vagrant-box
       ;;
+      (up|provision|package|destroy|reload|ssh|halt|resume|status)
+	_arguments ':feature:__vm_list'
     esac
   ;;
 esac

From 6b5c4e27b24f0652e7e53b6abfe9634589271572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadas=20Tamo=C5=A1auskas?= <TadasTamo@gmail.com>
Date: Sun, 13 Feb 2011 11:05:12 +0000
Subject: [PATCH 130/907] fixed typo in rails3 plugin and added one alias for
 migrating and redoing migration if it was successful

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

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 20ba0408c..6bf2ba088 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -3,6 +3,8 @@ alias rg='ruby script/rails generate'
 alias rd='ruby script/rails destroy'
 alias rp='ruby script/rails plugin'
 alias rdbm='rake db:migrate db:test:clone'
+alias rdbmr='rake db:migrate && rake db:migrate:redo'
 alias rc='ruby script/rails console'
-alias rd='ruby script/rais server --debugger'
+alias rd='ruby script/rails server --debugger'
 alias devlog='tail -f log/development.log'
+

From ab1cbe9038bee71bae1d5b7ce1d8cd9f6a94d7f3 Mon Sep 17 00:00:00 2001
From: Wim <ghostunderscore@gmail.com>
Date: Mon, 14 Feb 2011 01:19:01 -0800
Subject: [PATCH 131/907] Should use https for all GitHub urls.

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

diff --git a/README.textile b/README.textile
index 8b1b6875a..0659aded8 100644
--- a/README.textile
+++ b/README.textile
@@ -8,7 +8,7 @@ h2. Setup
 
 h3. The automatic installer... (do you trust me?)
 
-@wget http://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
@@ -38,7 +38,7 @@ h2. Usage
 * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
 ** example: @plugins=(git osx ruby)@
 * Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":http://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
+** 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...
 
 h2. Useful

From 6b610d7dd80ab6cf1142bc615931c17c41395f00 Mon Sep 17 00:00:00 2001
From: Myron Marston <myron.marston@gmail.com>
Date: Tue, 15 Feb 2011 11:27:25 -0800
Subject: [PATCH 132/907] Add bundler plugin with aliases.

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

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
new file mode 100644
index 000000000..fb40e2cec
--- /dev/null
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -0,0 +1,3 @@
+alias be="bundle exec"
+alias bi="bundle install"
+alias bu="bundle update"

From 792e50c917b7c854fbcadbce10a895ab7fbaa7ec Mon Sep 17 00:00:00 2001
From: Fredrik Appelberg <fredrik.appelberg@gmail.com>
Date: Wed, 16 Feb 2011 10:40:51 +0100
Subject: [PATCH 133/907] mvn plugin

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

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index abd0da185..e8af2f49d 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,6 +1,6 @@
 function listMavenCompletions { 
 	 reply=(
-		cli:execute cli:execute-phase archetype:generate compile clean install test test-compile deploy package cobertura:cobertura jetty:run gwt:run gwt:debug -DskipTests -Dmaven.test.skip=true -DarchetypeCatalog=http://tapestry.formos.com/maven-snapshot-repository -Dtest= `if [ -d ./src ] ; then find ./src -type f | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`); 
+		cli:execute cli:execute-phase archetype:generate generate-sources compile clean install test test-compile deploy package cobertura:cobertura jetty:run gwt:run gwt:debug -DskipTests -Dmaven.test.skip=true -DarchetypeCatalog=http://tapestry.formos.com/maven-snapshot-repository -Dtest= `if [ -d ./src ] ; then find ./src -type f | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`); 
 }
 
 compctl -K listMavenCompletions mvn
\ No newline at end of file

From 4b7038f8f46f842df02acdce9b8fb21f6f2b3050 Mon Sep 17 00:00:00 2001
From: Murilo Soares Pereira <murilo.soares3@gmail.com>
Date: Tue, 23 Nov 2010 02:05:33 -0200
Subject: [PATCH 134/907] Added my theme.

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

diff --git a/themes/murilo.zsh-theme b/themes/murilo.zsh-theme
new file mode 100644
index 000000000..310357b45
--- /dev/null
+++ b/themes/murilo.zsh-theme
@@ -0,0 +1,14 @@
+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='%{$fg[red]%}$(rvm_prompt_info)%{$reset_color%}'
+local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
+
+PROMPT="${user_host}:${current_dir} ${rvm_ruby}
+${git_branch} %B$%b "
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}"

From e0ab7f9fb5774381d846cd90d06a501ec91a3ee9 Mon Sep 17 00:00:00 2001
From: Murilo Soares Pereira <murilo.soares3@gmail.com>
Date: Wed, 24 Nov 2010 02:22:55 -0200
Subject: [PATCH 135/907] Renamed theme.

---
 themes/{murilo.zsh-theme => murilasso.zsh-theme} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename themes/{murilo.zsh-theme => murilasso.zsh-theme} (100%)

diff --git a/themes/murilo.zsh-theme b/themes/murilasso.zsh-theme
similarity index 100%
rename from themes/murilo.zsh-theme
rename to themes/murilasso.zsh-theme

From c52fea808210bb4f81915306855b6bd00a5fe219 Mon Sep 17 00:00:00 2001
From: Ben Langfeld <ben@langfeld.me>
Date: Fri, 18 Feb 2011 12:17:00 +0000
Subject: [PATCH 136/907] Make a cleaner version of the OS X tab function

---
 plugins/osx/osx.plugin.zsh | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index fce88c796..eb995eb2e 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,11 +1,32 @@
+function savepath() {
+  pwd > ~/.current_path~
+}
+
 function tab() {
-  osascript 2>/dev/null <<EOF
-    tell application "System Events"
-      tell process "Terminal" to keystroke "t" using command down
-    end
-    tell application "Terminal"
+savepath
+osascript >/dev/null <<EOF
+on do_submenu(app_name, menu_name, menu_item, submenu_item)
+    -- bring the target application to the front
+    tell application app_name
       activate
-      do script with command "cd \"$PWD\"; $*" in window 1
     end tell
+    tell application "System Events"
+      tell process app_name
+        tell menu bar 1
+          tell menu bar item menu_name
+            tell menu menu_name
+              tell menu item menu_item
+                tell menu menu_item
+                  click menu item submenu_item
+                end tell
+              end tell
+            end tell
+          end tell
+        end tell
+      end tell
+    end tell
+end do_submenu
+
+do_submenu("Terminal", "Shell", "New Tab", 1)
 EOF
-}
\ No newline at end of file
+}

From 6467e90efbb8a0064045ccd2c09f1b0513d782c3 Mon Sep 17 00:00:00 2001
From: Ben Langfeld <ben@langfeld.me>
Date: Fri, 18 Feb 2011 12:48:27 +0000
Subject: [PATCH 137/907] Add iTerm version of tab function (itab)

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

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index eb995eb2e..81eed5e92 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -30,3 +30,28 @@ end do_submenu
 do_submenu("Terminal", "Shell", "New Tab", 1)
 EOF
 }
+
+function itab() {
+savepath
+osascript >/dev/null <<EOF
+on do_submenu(app_name, menu_name, menu_item)
+    -- bring the target application to the front
+    tell application app_name
+      activate
+    end tell
+    tell application "System Events"
+      tell process app_name
+        tell menu bar 1
+          tell menu bar item menu_name
+            tell menu menu_name
+              click menu item menu_item
+            end tell
+          end tell
+        end tell
+      end tell
+    end tell
+end do_submenu
+
+do_submenu("iTerm", "Shell", "New Tab")
+EOF
+}

From 48ab2ad6e261fc30caa7fe17bd4d3435100c7f3d Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Tue, 22 Feb 2011 09:53:02 +0100
Subject: [PATCH 138/907] no hg & git status (sloooow)

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

diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index af178b2b9..4b49a2a09 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -23,7 +23,9 @@ function mygit() {
 }
 
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b '
+#PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
+#%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
-RPROMPT='$(mygit)'
+#RPROMPT='$(mygit)'
 

From 7f69551498a78a6b30d706c89808fcd2ba000045 Mon Sep 17 00:00:00 2001
From: Christopher Chow <soliah@gmail.com>
Date: Wed, 23 Feb 2011 02:56:25 +1100
Subject: [PATCH 139/907] Add tab completion for rvm.

---
 plugins/rvm/_rvm           | 147 +++++++++++++++++++++++++++++++++++++
 plugins/rvm/rvm.plugin.zsh |   3 +
 2 files changed, 150 insertions(+)
 create mode 100644 plugins/rvm/_rvm
 create mode 100644 plugins/rvm/rvm.plugin.zsh

diff --git a/plugins/rvm/_rvm b/plugins/rvm/_rvm
new file mode 100644
index 000000000..bba5304a0
--- /dev/null
+++ b/plugins/rvm/_rvm
@@ -0,0 +1,147 @@
+#compdef rvm
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+	'(- 1 *)'{-v,--version}'[display version information]' \
+	'(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
+	'(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
+	'(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
+	'(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
+	'(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
+	'-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
+	'-e[Execute code from the command line]:code' \
+	'(-G)-G[root gem path to use]:path:_files' \
+	'(--gems)--gems[Used to set the gems_flag, use with remove to remove gems]' \
+	'(--archive)--archive[Used to set the archive_flag, use with remove to remove archive]' \
+	'(--patch)--patch[With MRI Rubies you may specify one or more full paths to patches]' \
+	'(-C|--configure)'{-C,--configure}'=[custom configure options]' \
+	'(--nice)--nice[process niceness (for slow computers, default 0)]:number' \
+	'(--ree)--ree-options[Options passed directly to ree ./installer on the command line]:options' \
+	'(--head)--head[with update, updates rvm to git head version]' \
+	'(--rubygems)--rubygems[with update, updates rubygems for selected ruby]' \
+	'(--default)--default[with ruby select, sets a default ruby for new shells]' \
+	'(--debug)--debug[Toggle debug mode on for very verbose output]' \
+	'(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
+	'(--force)--force[Force install, removes old install & source before install]' \
+	'(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
+	'(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
+	'(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
+	'(--docs)--docs[with install, attempt to generate ri after installation]' \
+	'(--reconfigure)--reconfigure[Force ./configure on install even if Makefile already exists]' \
+	'1: :->cmds' \
+	'*: :->args' && ret=0
+
+case $state in
+	cmds)
+		cmds=( 
+            "version:show the rvm version installed in rvm_path"
+            "use:setup current shell to use a specific ruby version"
+            "reload:reload rvm source itself (useful after changing rvm source)"
+            "implode:(seppuku) removes the rvm installation completely. This means everything in $rvm_path (~/.rvm)."
+            "update:upgrades rvm to the latest version."
+            "reset:remove current and stored default & system settings."
+            "info :show the *current* environment information for current ruby"
+            "current:print the *current* ruby version and the name of any gemset being used."
+            "debug:show info plus additional information for common issues"
+            "install:install one or many ruby versions"
+            "uninstall:uninstall one or many ruby versions, leaves their sources"
+            "remove:uninstall one or many ruby versions and remove their sources"
+            "migrate:Lets you migrate all gemsets from one ruby to another."
+            "upgrade:Lets you upgrade from one version of a ruby to another, including migrating your gemsets semi-automatically."
+            "wrapper:generates a set of wrapper executables for a given ruby with the specified ruby and gemset combination. Used under the hood for passenger support and the like."
+            "cleanup:Lets you remove stale source folders / archives and other miscellaneous data associated with rvm."
+            "repair:Lets you repair parts of your environment e.g. wrappers, env files and and similar files (e.g. general maintenance)."
+            "snapshot:Lets your backup / restore an rvm installation in a lightweight manner."
+            "disk-usage:Tells you how much disk space rvm install is using."
+            "tools:Provides general information about the ruby environment, primarily useful when scripting rvm."
+            "docs:Tools to make installing ri and rdoc documentation easier."
+            "rvmrc:Tools related to managing rvmrc trust and loading."
+            "exec:runs an arbitrary command as a set operation."
+            "ruby:runs a named ruby file against specified and/or all rubies"
+            "gem:runs a gem command using selected ruby's 'gem'"
+            "rake:runs a rake task against specified and/or all rubies"
+            "tests:runs 'rake test' across selected ruby versions"
+            "specs:runs 'rake spec' across selected ruby versions"
+            "monitor:Monitor cwd for testing, run rake {spec,test} on changes."
+            "gemset:gemsets: http://rvm.beginrescueend.com/gemsets/"
+            "rubygems:Switches the installed version of rubygems for the current ruby."
+            "gemdir:display the path to the current gem directory (GEM_HOME)."
+            "srcdir:display the path to rvm source directory (may be yanked)"
+            "fetch:Performs an archive / src fetch only of the selected ruby."
+            "list:show currently installed rubies, interactive output."
+            "package:Install a dependency package {readline,iconv,zlib,openssl}"
+            "notes:Display notes, with operating system specifics."
+            "export:Temporarily set an environment variable in the current shell."
+            "unexport:Undo changes made to the environment by 'rvm export'."
+        )
+		_describe -t commands 'rvm command' cmds && ret=0
+		;;
+	args)
+		case $line[1] in
+			(use|uninstall|remove|list)
+				_values -S , 'rubies' $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') default system && ret=0
+				;;
+			(install|fetch)
+				_values -S , 'rubies' $(rvm list known_strings) && ret=0
+				;;
+			gemset)
+				if (( CURRENT == 3 )); then
+					_values 'gemset_commands' \
+                        'import' \
+                        'export' \
+                        'create' \
+                        'copy' \
+                        'rename' \
+                        'empty' \
+                        'delete' \
+                        'name' \
+                        'dir' \
+                        'list' \
+                        'list_all' \
+                        'gemdir' \
+                        'install' \
+                        'pristine' \
+                        'clear' \
+                        'use' \
+                        'update' \
+                        'unpack' \
+                        'globalcache'
+				else
+					_values -S , 'gemsets' $(rvm gemset list | grep -v gemset 2>/dev/null)
+				fi
+				ret=0
+				;;
+			package)
+				if (( CURRENT == 3 )); then
+					_values 'package_commands' \
+                        'install' \
+                        'uninstall'  
+				else
+					_values 'packages' \
+                        'readline' \
+                        'iconv' \
+                        'curl' \
+                        'openssl' \
+                        'zlib' \
+                        'autoconf' \
+                        'ncurses' \
+                        'pkgconfig' \
+                        'gettext' \
+                        'glib' \
+                        'mono' \
+                        'llvm' \
+                        'libxml2' \
+                        'libxslt' \
+                        'libyaml'
+				fi
+				ret=0
+				;;
+			*)
+				(( ret )) && _message 'no more arguments'
+				;;
+		esac
+		;;
+esac
+
+return ret
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
new file mode 100644
index 000000000..ef934d547
--- /dev/null
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -0,0 +1,3 @@
+fpath=($ZSH/plugins/rvm $fpath)
+autoload -U compinit
+compinit -i

From 4144f4beea4e56231adeb3574d3516b35c3331cf Mon Sep 17 00:00:00 2001
From: Christopher Chow <soliah@gmail.com>
Date: Wed, 23 Feb 2011 03:05:25 +1100
Subject: [PATCH 140/907] Add tab completion to bundler plugin.

---
 plugins/bundler/_bundler           | 82 ++++++++++++++++++++++++++++++
 plugins/bundler/bundler.plugin.zsh |  4 ++
 2 files changed, 86 insertions(+)
 create mode 100644 plugins/bundler/_bundler

diff --git a/plugins/bundler/_bundler b/plugins/bundler/_bundler
new file mode 100644
index 000000000..5d22cac9a
--- /dev/null
+++ b/plugins/bundler/_bundler
@@ -0,0 +1,82 @@
+#compdef bundle
+
+local curcontext="$curcontext" state line _gems _opts ret=1
+
+_arguments -C -A "-v" -A "--version" \
+	'(- 1 *)'{-v,--version}'[display version information]' \
+	'1: :->cmds' \
+	'*:: :->args' && ret=0
+
+case $state in
+	cmds)
+		_values "bundle command" \
+			"install[Install the gems specified by the Gemfile or Gemfile.lock]" \
+			"update[Update dependencies to their latest versions]" \
+			"package[Package the .gem files required by your application]" \
+			"exec[Execute a script in the context of the current bundle]" \
+			"config[Specify and read configuration options for bundler]" \
+			"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]" \
+			"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]" \
+			"help[Describe available tasks or one specific task]"
+		ret=0
+		;;
+	args)
+		case $line[1] in
+			help)
+				_values 'commands' \
+                    'install' \
+                    'update' \
+                    'package' \
+                    'exec' \
+                    'config' \
+                    'check' \
+                    'list' \
+                    'show' \
+                    'console' \
+                    'open' \
+                    'viz' \
+                    'init' \
+                    'gem' \
+                    'help' && ret=0
+				;;
+			install)
+				_arguments \
+					'(--no-color)--no-color[disable colorization in output]' \
+					'(--local)--local[do not attempt to connect to rubygems.org]' \
+					'(--quiet)--quiet[only output warnings and errors]' \
+					'(--gemfile)--gemfile=-[use the specified gemfile instead of Gemfile]:gemfile' \
+					'(--system)--system[install to the system location]' \
+					'(--deployment)--deployment[install using defaults tuned for deployment environments]' \
+					'(--frozen)--frozen[do not allow the Gemfile.lock to be updated after this install]' \
+					'(--path)--path=-[specify a different path than the system default]:path:_files' \
+					'(--binstubs)--binstubs=-[generate bin stubs for bundled gems to ./bin]:directory:_files' \
+					'(--without)--without=-[exclude gems that are part of the specified named group]:groups'
+				ret=0
+				;;
+			exec)
+				_normal && ret=0
+				;;
+			(open|show)
+				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
+				if [[ $_gems != "" ]]; then
+					_values 'gems' $_gems && ret=0
+				fi
+				;;
+			*)
+				_opts=(  $(bundle help $line[1] | sed -e '/^  \[-/!d; s/^  \[\(-[^=]*\)=.*/\1/') )
+				_opts+=( $(bundle help $line[1] | sed -e '/^  -/!d; s/^  \(-.\), \[\(-[^=]*\)=.*/\1 \2/') )
+				if [[ $_opts != "" ]]; then
+					_values 'options' $_opts && ret=0
+				fi
+				;;
+		esac
+		;;
+esac
+
+return ret
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fb40e2cec..caa2f6771 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,3 +1,7 @@
+fpath=($ZSH/plugins/bundler $fpath)
+autoload -U compinit
+compinit -i
+
 alias be="bundle exec"
 alias bi="bundle install"
 alias bu="bundle update"

From fadd5f74ce205ddb14735354170150745ae42ca6 Mon Sep 17 00:00:00 2001
From: Stephen Eley <sfeley@gmail.com>
Date: Tue, 22 Feb 2011 14:03:48 -0500
Subject: [PATCH 141/907] Crunch theme (by Stephen Eley)

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

diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
new file mode 100644
index 000000000..7dd5816ee
--- /dev/null
+++ b/themes/crunch.zsh-theme
@@ -0,0 +1,37 @@
+# CRUNCH - created from Steve Eley's cat waxing.
+# Initially hacked from the Dallas theme. Thanks, Dallas Reedy.
+#
+# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine, 
+# and eschews the standard space-consuming user and hostname info.  Instead, only the 
+# things that vary in my own workflow are shown:
+#
+# * The time (not the date)
+# * The RVM version (omitting the interpreter name if it's just 'ruby')
+# * The current directory
+# * The Git branch and its 'dirty' state
+# 
+# Colors are at the top so you can mess with those separately if you like.
+# For the most part I stuck with Dallas's.
+
+CRUNCH_BRACKET_COLOR="%{$fg[white]%}"
+CRUNCH_TIME_COLOR="%{$fg[yellow]%}"
+CRUNCH_RVM_COLOR="%{$fg[magenta]%}"
+CRUNCH_DIR_COLOR="%{$fg[cyan]%}"
+CRUNCH_GIT_BRANCH_COLOR="%{$fg[green]%}"
+CRUNCH_GIT_CLEAN_COLOR="%{$fg[green]%}"
+CRUNCH_GIT_DIRTY_COLOR="%{$fg[red]%}"
+
+# These Git variables are used by the oh-my-zsh git_prompt_info helper:
+ZSH_THEME_GIT_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR:$CRUNCH_GIT_BRANCH_COLOR"
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_CLEAN=" $CRUNCH_GIT_CLEAN_COLOR✓"
+ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
+
+# Our elements:
+CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
+CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\$(~/.rvm/bin/rvm-prompt v g)$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
+CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
+CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
+
+# Put it all together!
+PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%{$reset_color%}"

From d926a55872b5a12ab8b987e9d86c02358d0c825e Mon Sep 17 00:00:00 2001
From: Stephen Eley <sfeley@gmail.com>
Date: Tue, 22 Feb 2011 14:38:37 -0500
Subject: [PATCH 142/907] Refined RVM prompt in Crunch theme

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

diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
index 7dd5816ee..2473cd230 100644
--- a/themes/crunch.zsh-theme
+++ b/themes/crunch.zsh-theme
@@ -6,7 +6,7 @@
 # things that vary in my own workflow are shown:
 #
 # * The time (not the date)
-# * The RVM version (omitting the interpreter name if it's just 'ruby')
+# * The RVM version and gemset (omitting the 'ruby' name if it's MRI)
 # * The current directory
 # * The Git branch and its 'dirty' state
 # 
@@ -29,7 +29,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
 
 # Our elements:
 CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
-CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\$(~/.rvm/bin/rvm-prompt v g)$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
+CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
 CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
 CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
 

From 9d991a5080bea5c71e1b5f6838d5498c908c434b Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 00:21:49 -0500
Subject: [PATCH 143/907] ssh-agent plugin now ends in "-$HOST" so an agent is
 started properly with nfs shared homes.

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

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index ce0d645c1..0efc4546f 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,7 +1,7 @@
 # Based on code from Joseph M. Reagle
 # http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
 
-local SSH_ENV=$HOME/.ssh/environment
+local SSH_ENV=$HOME/.ssh/environment-$HOST
 
 function start_agent {
   /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}

From 0504a01012b88e6eb74040ed599bddf29163fd69 Mon Sep 17 00:00:00 2001
From: Fredrik Appelberg <fredrik.appelberg@gmail.com>
Date: Mon, 7 Mar 2011 13:49:30 +0100
Subject: [PATCH 144/907] .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8d19d100c..2cf593269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ locals.zsh
 log/.zsh_history
 projects.zsh
 custom/*
-!custom/example.zsh
\ No newline at end of file
+!custom/example.zshcache
+cache/

From c2e8bed253d25699f826fd7b65d965944b42a21c Mon Sep 17 00:00:00 2001
From: Fredrik Appelberg <fredrik.appelberg@gmail.com>
Date: Mon, 7 Mar 2011 14:22:06 +0100
Subject: [PATCH 145/907] Added a plugin for GNU Screen.

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

diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
new file mode 100644
index 000000000..ba7ac67e7
--- /dev/null
+++ b/plugins/screen/screen.plugin.zsh
@@ -0,0 +1,54 @@
+# if using GNU screen, let the zsh tell screen what the title and hardstatus
+# of the tab window should be.
+if [[ $TERM == "screen" ]]; then
+  if [[ $_GET_PATH == '' ]]; then
+    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^~$USER/~/"'
+  fi
+  if [[ $_GET_HOST == '' ]]; then
+    _GET_HOST='echo $HOST | sed "s/\..*//"'
+  fi
+
+  # use the current user as the prefix of the current tab title 
+  TAB_TITLE_PREFIX='"`'$_GET_HOST'`:`'$_GET_PATH' | sed "s:..*/::"`$PROMPT_CHAR"'
+  # when at the shell prompt, show a truncated version of the current path (with
+  # standard ~ replacement) as the rest of the title.
+  TAB_TITLE_PROMPT='$SHELL:t'
+  # when running a command, show the title of the command as the rest of the
+  # title (truncate to drop the path to the command)
+  TAB_TITLE_EXEC='$cmd[1]:t'
+
+  # use the current path (with standard ~ replacement) in square brackets as the
+  # prefix of the tab window hardstatus.
+  TAB_HARDSTATUS_PREFIX='"[`'$_GET_PATH'`] "'
+  # when at the shell prompt, use the shell name (truncated to remove the path to
+  # the shell) as the rest of the title
+  TAB_HARDSTATUS_PROMPT='$SHELL:t'
+  # when running a command, show the command name and arguments as the rest of
+  # the title
+  TAB_HARDSTATUS_EXEC='$cmd'
+
+  # tell GNU screen what the tab window title ($1) and the hardstatus($2) should be
+  function screen_set()
+  {
+    # set the tab window title (%t) for screen
+    print -nR $'\033k'$1$'\033'\\\
+
+    # set hardstatus of tab window (%h) for screen
+    print -nR $'\033]0;'$2$'\a'
+  }
+  # called by zsh before executing a command
+  function preexec()
+  {
+    local -a cmd; cmd=(${(z)1}) # the command string
+    eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_EXEC"
+    eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_EXEC"
+    screen_set $tab_title $tab_hardstatus
+  }
+  # called by zsh before showing the prompt
+  function precmd()
+  {
+    eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_PROMPT"
+    eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_PROMPT"
+    screen_set $tab_title $tab_hardstatus
+  }
+fi
\ No newline at end of file

From d807221f607cc7ef02e17a9aa60b1f5f18a886ab Mon Sep 17 00:00:00 2001
From: Fredrik Appelberg <fredrik.appelberg@gmail.com>
Date: Mon, 7 Mar 2011 14:36:12 +0100
Subject: [PATCH 146/907] fix to avoid parse errors if $TERM is empty

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

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

From f1af41589960f7fc98d270c70a80b351b703e53e Mon Sep 17 00:00:00 2001
From: Fredrik Appelberg <fredrik.appelberg@scanpix.se>
Date: Wed, 9 Mar 2011 12:19:01 +0100
Subject: [PATCH 147/907] figuring out home dir on unix systems as well

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

diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index ba7ac67e7..98178e807 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -2,7 +2,7 @@
 # of the tab window should be.
 if [[ $TERM == "screen" ]]; then
   if [[ $_GET_PATH == '' ]]; then
-    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^~$USER/~/"'
+    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
   fi
   if [[ $_GET_HOST == '' ]]; then
     _GET_HOST='echo $HOST | sed "s/\..*//"'

From c3a58b00040018743ead1e6672910433fc1ca7c2 Mon Sep 17 00:00:00 2001
From: Woody Gilk <woody.gilk@gmail.com>
Date: Fri, 11 Mar 2011 21:44:12 -0600
Subject: [PATCH 148/907] Enable alias completion, do not limit completion to
 just files

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

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 9c2dfecca..e8e9776a5 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -4,6 +4,7 @@ unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
 setopt auto_menu         # show completion menu on succesive tab press
 setopt complete_in_word
+setopt complete_aliases
 setopt always_to_end
 
 WORDCHARS=''

From a2d0bd7c296706b3a2f6b0125ab79748a95bb90c Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Sat, 12 Mar 2011 16:23:55 +0100
Subject: [PATCH 149/907] add 'lol' plugin (based on lolbash)

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

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
new file mode 100644
index 000000000..a7153bb57
--- /dev/null
+++ b/plugins/lol/lol.plugin.zsh
@@ -0,0 +1,26 @@
+# LOL!!1
+# Source: http://aur.archlinux.org/packages/lolbash/lolbash/lolbash.sh
+
+alias wtf='dmesg'
+alias onoz='cat /var/log/errors.log'
+alias rtfm='man'
+
+alias visible='echo'
+alias invisible='cat'
+alias moar='more'
+
+alias icanhas='mkdir'
+alias donotwant='rm'
+alias dowant='cp'
+alias gtfo='mv'
+
+alias hai='cd'
+alias plz='pwd'
+
+alias inur='locate'
+
+alias nomz='ps -aux'
+alias nomnom='killall'
+
+alias cya='reboot'
+alias kthxbai='halt'

From a6b8bec8ecdb48a059f73e82a1df0bf3387beccc Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Sat, 12 Mar 2011 16:24:20 +0100
Subject: [PATCH 150/907] add completion plugin 'cpanm' for cpanminus

---
 plugins/cpanm/_cpanm           | 67 ++++++++++++++++++++++++++++++++++
 plugins/cpanm/cpanm.plugin.zsh |  4 ++
 2 files changed, 71 insertions(+)
 create mode 100644 plugins/cpanm/_cpanm
 create mode 100644 plugins/cpanm/cpanm.plugin.zsh

diff --git a/plugins/cpanm/_cpanm b/plugins/cpanm/_cpanm
new file mode 100644
index 000000000..58451d35a
--- /dev/null
+++ b/plugins/cpanm/_cpanm
@@ -0,0 +1,67 @@
+#compdef cpanm
+
+##
+# cpanminus Z Shell completion script
+##
+#
+# Current supported cpanm version: 1.4000 (Tue Mar  8 01:00:49 PST 2011)
+#
+# The latest code is always located at:
+#   https://github.com/rshhh/cpanminus/blob/master/etc/_cpanm
+#
+
+local arguments curcontext="$curcontext"
+typeset -A opt_args
+
+
+arguments=(
+
+# Commands
+#  '(--install -i)'{--install,-i}'[Installs the modules]'
+  '(- :)--self-upgrade[Upgrades itself]'
+  '(- :)--info[Displays distribution info on CPAN]'
+  '(--installdeps)--installdeps[Only install dependencies]'
+  '(--look)--look[Download/unpack the distribution and then open the directory with your shell]'
+  '(- :)'{--help,-h}'[Displays help information]'
+  '(- :)'{--version,-V}'[Displays software version]'
+
+# Options
+  {--force,-f}'[Force install]'
+  {--notest,-n}'[Do not run unit tests]'
+  {--sudo,-S}'[sudo to run install commands]'
+  '(-v --verbose --quiet -q)'{--verbose,-v}'[Turns on chatty output]'
+  '(-q --quiet --verbose -v)'{--quiet,-q}'[Turns off all output]'
+  {--local-lib,-l}'[Specify the install base to install modules]'
+  {--local-lib-contained,-L}'[Specify the install base to install all non-core modules]'
+  '--mirror[Specify the base URL for the mirror (e.g. http://cpan.cpantesters.org/)]:URLs:_urls'
+  '--mirror-only[Use the mirror\''s index file instead of the CPAN Meta DB]'
+  '--prompt[Prompt when configure/build/test fails]'
+  '--reinstall[Reinstall the distribution even if you already have the latest version installed]'
+  '--interactive[Turn on interactive configure]'
+
+  '--scandeps[Scan the depencencies of given modules and output the tree in a text format]'
+  '--format[Specify what format to display the scanned dependency tree]:scandeps format:(tree json yaml dists)'
+
+  '--save-dists[Specify the optional directory path to copy downloaded tarballs]'
+#  '--uninst-shadows[Uninstalls the shadow files of the distribution that you\''re installing]'
+
+  '--auto-cleanup[Number of days that cpanm\''s work directories expire in. Defaults to 7]'
+  '(--no-man-pages)--man-pages[Generates man pages for executables (man1) and libraries (man3)]'
+  '(--man-pages)--no-man-pages[Do not generate man pages]'
+
+
+  # Note: Normally with "--lwp", "--wget" and "--curl" options set to true (which is the default) cpanm tries LWP,
+  #            Wget, cURL and HTTP::Tiny (in that order) and uses the first one available.
+  # (So that the exclusions are not enabled here for the completion)
+  '(--lwp)--lwp[Use LWP module to download stuff]'
+  '(--wget)--wget[Use GNU Wget (if available) to download stuff]'
+  '(--curl)--curl[Use cURL (if available) to download stuff]'
+
+# Other completions
+  '*:Local directory or archive:_files -/ -g "*.(tar.gz|tgz|tar.bz2|zip)(-.)"'
+  #  '*::args: _normal' # this looks for default files (any files)
+)
+_arguments -s $arguments \
+  && return 0
+
+return 1
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
new file mode 100644
index 000000000..af52d3e8b
--- /dev/null
+++ b/plugins/cpanm/cpanm.plugin.zsh
@@ -0,0 +1,4 @@
+# add cpanm completion function to path
+fpath=($ZSH/plugins/cpanm $fpath)
+autoload -U compinit
+compinit -i

From f90cb7e7b9f8a3743071d6d15ca441f293379517 Mon Sep 17 00:00:00 2001
From: Alessandro Ghedini <al3xbio@gmail.com>
Date: Sat, 12 Mar 2011 16:25:27 +0100
Subject: [PATCH 151/907] add 'deb' plugin with Debian's apt aliases

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

diff --git a/plugins/deb/deb.plugin.zsh b/plugins/deb/deb.plugin.zsh
new file mode 100644
index 000000000..732294a87
--- /dev/null
+++ b/plugins/deb/deb.plugin.zsh
@@ -0,0 +1,12 @@
+# Aliases
+alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
+		--no-gui --disable-columns search"	# search package
+alias ad="sudo apt-get update"				# update packages lists
+alias au="sudo apt-get update && \
+		sudo apt-get dselect-upgrade"		# upgrade packages
+alias ai="sudo apt-get install"				# install package
+alias ar="sudo apt-get remove --purge && \
+		sudo apt-get autoremove --purge"	# remove package
+alias ap="apt-cache policy"				# apt policy
+alias av="apt-cache show"				# show package info
+alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache

From fa344733e5d7cee33e4c3ba6a9a7241c7b6377ca Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 13 Mar 2011 16:08:12 -0600
Subject: [PATCH 152/907] Add completion for port command

---
 plugins/macports/_port               | 89 ++++++++++++++++++++++++++++
 plugins/macports/macports.plugin.zsh |  5 ++
 2 files changed, 94 insertions(+)
 create mode 100644 plugins/macports/_port

diff --git a/plugins/macports/_port b/plugins/macports/_port
new file mode 100644
index 000000000..06d7fb426
--- /dev/null
+++ b/plugins/macports/_port
@@ -0,0 +1,89 @@
+#compdef port
+
+local subcmds 
+
+# we cache the list of ports
+# we shall use some cache policy to avoid problems with new ports
+if (( ! $+portlist )); then
+	portlist=($(port echo all; echo "all current active inactive installed uninstalled outdated"))
+fi
+
+subcmds=(
+'activate'
+'archive'
+'build'
+'cat'
+'clean'
+'configure'
+'contents'
+'deactivate'
+'dependents'
+'deps'
+'destroot'
+'dir'
+'distcheck'
+'distclean'
+'dmg'
+'echo'
+'edit'
+'extract'
+'fetch'
+'file'
+'help'
+'info'
+'install' 
+'installed' 
+'list'
+'livecheck'
+'location'
+'mpkg'
+'outdated'
+'patch'
+'pkg'
+'provides'
+'rpmpackage'
+'search'
+'selfupdate'
+'sync'
+'test'
+'unarchive'
+'uninstall'
+'upgrade' 
+'variants'
+'version'
+)
+
+_arguments -C \
+'-v[verbose mode (generate verbose messages)]' \
+'-d[debug mode (generate debugging messages)]' \
+'-q[quiet mode (suppress messages)]' \
+'-D[specify portdir]' \
+'-k[keep mode (do not autoclean after install)]' \
+'-n[dont follow dependencies in upgrade (only for upgrading)]' \
+'-a[upgrade all installed ports (only for upgrading)]' \
+'-u[uninstall non-active ports when upgrading and uninstalling]' \
+'-f[force mode (ignore state file)]' \
+'-s[source-only mode]' \
+'-b[binary-only mode]' \
+'-o[honor state files older than Portfile]' \
+'*::command:->command' \
+&& return 0
+
+case $state in
+	command)
+	if ((CURRENT == 1)); then
+		state=subcommands
+	else
+		state=portname
+	fi
+	;;
+esac
+
+case $state in
+	subcommands)
+	_describe -t commands 'port commands' subcmds
+	;;
+	portname)
+	_describe -t commands 'available ports' portlist
+	;;
+esac
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 9564829b0..cbbc49265 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -5,3 +5,8 @@ alias psu="sudo port selfupdate"
 alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
+
+# add macports completion function to path
+fpath=($ZSH/plugins/macports $fpath)
+autoload -U compinit
+compinit -i

From d4ea399b04ef57dd31097eadc316305d1e42a194 Mon Sep 17 00:00:00 2001
From: Matt Cable <wozz@wookie.net>
Date: Sun, 13 Mar 2011 17:10:13 -0600
Subject: [PATCH 153/907] Re-order title/tab setting to make window titles work
 on OSX terminal which doesn't support tabs titles.

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

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

From 5bbd87a33380ab4fb9cab6688b11cb98faa61cd7 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <danielbarrettbolton@gmail.com>
Date: Mon, 14 Mar 2011 01:43:33 -0400
Subject: [PATCH 154/907] add Perl plugins file

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

diff --git a/plugins/perl/perl.plugin.zsh b/plugins/perl/perl.plugin.zsh
new file mode 100644
index 000000000..f94c4195d
--- /dev/null
+++ b/plugins/perl/perl.plugin.zsh
@@ -0,0 +1,62 @@
+# https://github.com/dbbolton
+#
+# Below are some useful Perl-related aliases/functions that I use with zsh.
+
+
+# Aliases ###################################################################
+
+# perlbrew ########
+alias pbi='perlbrew install'
+alias pbl='perlbrew list'
+alias pbo='perlbrew off'
+alias pbs='perlbrew switch'
+alias pbu='perlbrew use'
+
+# Perl ############
+
+# perldoc`
+alias pd='perldoc'
+
+# use perl like awk/sed
+alias ple='perl -wlne'
+
+# show the latest stable release of Perl
+alias latest-perl='curl -s http://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
+
+
+
+# Functions #################################################################
+
+# 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
+
+	# if the file exists, just open it
+	[[ -e $1 ]] && print "$1 exists; not modifying.\n" && $EDITOR $1
+
+	# if it doesn't, make it, and open it
+	[[ ! -e $1 ]] && print '#!/usr/bin/perl'"\n"'use strict;'"\n"'use warnings;'\
+		"\n\n" > $1 && $EDITOR $1
+}
+
+
+# pgs - Perl Global Substitution
+# find pattern		= 1st arg
+# replace pattern	= 2nd arg
+# filename			= 3rd arg
+pgs() { # [find] [replace] [filename]
+    perl -i.orig -pe 's/'"$1"'/'"$2"'/g' "$3"
+}
+
+
+# Perl grep, because 'grep -P' is terrible. Lets you work with pipes or files.
+prep() { # [pattern] [filename unless STDOUT]
+    perl -nle 'print if /'"$1"'/;' $2
+}
+
+# say - append a newline to 'print'
+say() {
+    print "$1\n"
+}
+

From 6654d5dd9982fb2f67c49e87b8b242c3964537b7 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjkirch+github@gmail.com>
Date: Tue, 15 Mar 2011 00:41:51 +0000
Subject: [PATCH 155/907] Make personal theme based on dst

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

diff --git a/themes/tjkirch.zsh-theme b/themes/tjkirch.zsh-theme
new file mode 100644
index 000000000..3e2539d57
--- /dev/null
+++ b/themes/tjkirch.zsh-theme
@@ -0,0 +1,16 @@
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+function prompt_char {
+	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+}
+
+PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
+)
+%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info)
+%_ $(prompt_char) '
+
+RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'

From 1b7868adca07d4a77b0d5b15d305eb6e15be9fe7 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjkirch+github@gmail.com>
Date: Tue, 15 Mar 2011 00:42:12 +0000
Subject: [PATCH 156/907] Remove unnecessary whitespace

---
 themes/tjkirch.zsh-theme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/tjkirch.zsh-theme b/themes/tjkirch.zsh-theme
index 3e2539d57..5c5364002 100644
--- a/themes/tjkirch.zsh-theme
+++ b/themes/tjkirch.zsh-theme
@@ -1,4 +1,3 @@
-
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"

From e1f37e311fe895916a5e821266617ddb3f26fef1 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjkirch+github@gmail.com>
Date: Tue, 15 Mar 2011 00:42:51 +0000
Subject: [PATCH 157/907] Sweet lightning bolt on uncommitted git changes

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

diff --git a/themes/tjkirch.zsh-theme b/themes/tjkirch.zsh-theme
index 5c5364002..1a93502f8 100644
--- a/themes/tjkirch.zsh-theme
+++ b/themes/tjkirch.zsh-theme
@@ -1,6 +1,6 @@
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 function prompt_char {

From cb2362c006b25f8f2c655a50999c57ae48597c6b Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjkirch+github@gmail.com>
Date: Tue, 15 Mar 2011 00:43:22 +0000
Subject: [PATCH 158/907] Actually show return code on failure

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

diff --git a/themes/tjkirch.zsh-theme b/themes/tjkirch.zsh-theme
index 1a93502f8..458ee1721 100644
--- a/themes/tjkirch.zsh-theme
+++ b/themes/tjkirch.zsh-theme
@@ -7,7 +7,7 @@ function prompt_char {
 	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
 }
 
-PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
+PROMPT='%(?, ,%{$fg[red]%}FAIL: $?%{$reset_color%}
 )
 %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info)
 %_ $(prompt_char) '

From 92cacc9552e720b7b29d788fdb24bd46548f5846 Mon Sep 17 00:00:00 2001
From: Tom Kirchner <tjkirch+github@gmail.com>
Date: Tue, 15 Mar 2011 00:43:37 +0000
Subject: [PATCH 159/907] No space before prompt char at beginning of line

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

diff --git a/themes/tjkirch.zsh-theme b/themes/tjkirch.zsh-theme
index 458ee1721..446cde724 100644
--- a/themes/tjkirch.zsh-theme
+++ b/themes/tjkirch.zsh-theme
@@ -10,6 +10,6 @@ function prompt_char {
 PROMPT='%(?, ,%{$fg[red]%}FAIL: $?%{$reset_color%}
 )
 %{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info)
-%_ $(prompt_char) '
+%_$(prompt_char) '
 
 RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'

From ce41d0e5bdf7df7e4261ad6e5b3e3c0fa59dd890 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <danielbarrettbolton@gmail.com>
Date: Tue, 15 Mar 2011 20:31:14 -0400
Subject: [PATCH 160/907] Add debian plugins file

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

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
new file mode 100644
index 000000000..f8865a412
--- /dev/null
+++ b/plugins/debian/debian.plugin.zsh
@@ -0,0 +1,60 @@
+# https://github.com/dbbolton/
+#
+# Debian-related zsh aliases and functions for zsh
+
+
+# Aliases ###################################################################
+
+# Some self-explanatory aliases
+alias afs='apt-file search --regexp'
+alias aps='aptitude search'
+alias apsrc='apt-get source'
+alias apv='apt-cache policy'
+
+alias apdg='su -c "aptitude update && aptitude safe-upgrade"'
+alias apud='su -c "aptitude update"'
+alias apug='su -c "aptitude safe-upgrade"'
+
+# print all installed packages
+alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
+
+# Install all .deb files in the current directory.
+# Warning: you will need to put the glob in single quotes if you use:
+# glob_subst
+alias di='su -c "dpkg -i ./*.deb"'
+
+# Create a basic .deb package
+alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
+
+# Remove ALL kernel images and headers EXCEPT the one in use
+alias kclean='su -c '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
+
+
+
+# Functions #################################################################
+
+# create a simple script that can be used to 'duplicate' a system
+apt-copy() {
+	print '#!/bin/sh'"\n" > apt-copy.sh
+
+	list=$(perl -m'AptPkg::Cache' -e '$c=AptPkg::Cache->new; for (keys %$c){ push @a, $_ if $c->{$_}->{'CurrentState'} eq 'Installed';} print "$_ " for sort @a;')
+
+	print 'aptitude install '"$list\n" >> apt-copy.sh
+
+	chmod +x apt-copy.sh
+}
+
+
+# Kernel-package building shortcut
+dbb-build () {
+	MAKEFLAGS=''		# temporarily unset MAKEFLAGS ( '-j3' will fail )
+	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
+}
+
+

From 52df85440ee8ead8f17d3aa3e1fedf187162313c Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 16 Mar 2011 12:20:35 -0700
Subject: [PATCH 161/907] Revert "Re-order title/tab setting to make window
 titles work on OSX terminal which" Was causing iTerm title to disappear
 entirely..

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

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

From 7cc4ab9b3f79ed2e56c8bebeb6fbd4b870b53de2 Mon Sep 17 00:00:00 2001
From: James Frasca <james@roundeights.com>
Date: Thu, 17 Mar 2011 11:22:51 -0700
Subject: [PATCH 162/907] Added the Frisk theme

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

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
new file mode 100644
index 000000000..f181aec90
--- /dev/null
+++ b/themes/frisk.zsh-theme
@@ -0,0 +1,10 @@
+PROMPT=$'
+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
+%{$fg_bold[black]%}>%{$reset_color%} '
+
+PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 4facba9824b7c3d0115c5f66e5b1517bd5674027 Mon Sep 17 00:00:00 2001
From: Joakim Ekberg <jocke.ekberg@gmail.com>
Date: Thu, 17 Mar 2011 22:29:58 +0100
Subject: [PATCH 163/907] Added terminal party theme.

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

diff --git a/themes/terminalparty.zsh-theme b/themes/terminalparty.zsh-theme
new file mode 100644
index 000000000..73653aca8
--- /dev/null
+++ b/themes/terminalparty.zsh-theme
@@ -0,0 +1,9 @@
+PROMPT='%{$fg[green]%} %% '
+# RPS1='%{$fg[blue]%}%~%{$reset_color%} '
+RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}'
+
+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 2d5412e99be6d9fab50169ad0cf290e022fc6e9b Mon Sep 17 00:00:00 2001
From: James Smith <james@loopj.com>
Date: Sat, 19 Mar 2011 17:50:24 -0700
Subject: [PATCH 164/907] Added new function git_remote_status to check if we
 are ahead, behind or diverged from the remote branch

---
 lib/git.zsh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/git.zsh b/lib/git.zsh
index 8512de8a4..75367f877 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -4,6 +4,7 @@ function git_prompt_info() {
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
+# get dirty status of the current working tree
 parse_git_dirty () {
   if [[ -n $(git status -s 2> /dev/null) ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
@@ -12,6 +13,26 @@ parse_git_dirty () {
   fi
 }
 
+# get the difference between the local and remote branches
+git_remote_status() {
+    remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
+    if [[ -n ${remote} ]] ; then
+        ahead=$(git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
+        behind=$(git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
+
+        if [ $ahead -eq 0 ] && [ $behind -gt 0 ]
+        then
+            echo "$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
+        elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
+        then
+            echo "$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
+        elif [ $ahead -gt 0 ] && [ $behind -gt 0 ]
+        then
+            echo "$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
+        fi
+    fi
+}
+
 # get the status of the working tree
 git_prompt_status() {
   INDEX=$(git status --porcelain 2> /dev/null)

From a15a8c4a98bc1aff024c3ef44dec48309ff4f90b Mon Sep 17 00:00:00 2001
From: James Smith <james@loopj.com>
Date: Sat, 19 Mar 2011 17:51:22 -0700
Subject: [PATCH 165/907] New theme 'intheloop' which demonstrates the
 git_remote_status function

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

diff --git a/themes/intheloop.zsh-theme b/themes/intheloop.zsh-theme
new file mode 100644
index 000000000..c4736422d
--- /dev/null
+++ b/themes/intheloop.zsh-theme
@@ -0,0 +1,18 @@
+# ZSH theme by James Smith (http://loopj.com)
+# A multiline prompt with username, hostname, full path, return status, git branch, git dirty status, git remote status
+
+local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
+
+PROMPT='
+%{$fg_bold[grey]%}[%{$reset_color%}%{$fg_bold[green]%}%n@%m%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%} %{$fg_bold[blue]%}%10c%{$reset_color%} $(git_prompt_info) $(git_remote_status)
+%{$fg_bold[cyan]%}❯%{$reset_color%} '
+
+RPROMPT='${return_status}%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[grey]%}(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[grey]%}) %{$fg[yellow]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[grey]%})"
+ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="%{$fg_bold[magenta]%}↓%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="%{$fg_bold[magenta]%}↑%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="%{$fg_bold[magenta]%}↕%{$reset_color%}"
\ No newline at end of file

From d03a6176aacd583993c02c7e837d10751c431875 Mon Sep 17 00:00:00 2001
From: Sankara Rameswaran <sankara@bankbazaar.com>
Date: Wed, 2 Mar 2011 15:20:43 +0530
Subject: [PATCH 166/907] Lein completion

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

diff --git a/plugins/lein/lein.plugin.zsh b/plugins/lein/lein.plugin.zsh
new file mode 100644
index 000000000..19af3556a
--- /dev/null
+++ b/plugins/lein/lein.plugin.zsh
@@ -0,0 +1,27 @@
+function _lein_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "clean:remove compiled files and dependencies from project"
+          "compile:ahead-of-time compile the project"
+          "deps:download and install all dependencies"
+          "help:display a list of tasks or help for a given task"
+          "install:install the project and its dependencies in your local repository"
+          "jar:create a jar file containing the compiled .class files"
+          "new:create a new project skeleton"
+          "pom:write a pom.xml file to disk for maven interop"
+          "test:run the project's tests"
+          "uberjar:Create a jar including the contents of each of deps"
+          "upgrade:upgrade leiningen to the latest stable release"
+          "version:print leiningen's version"
+        )
+        _describe -t subcommands 'leiningen subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+compdef _lein_commands lein

From e8a7a31ef66093f1b1ab034e84e01a147fa8b28a Mon Sep 17 00:00:00 2001
From: Lorrin Nelson <lhn@mult.ifario.us>
Date: Mon, 7 Feb 2011 23:21:46 -0800
Subject: [PATCH 167/907] Make command-not-found no-op when support not
 available (e.g. not on Ubuntu)

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

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 5ab03d5a9..567da1b45 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -2,4 +2,4 @@
 # as seen in http://www.porcheron.info/command-not-found-for-zsh/
 # this is installed in Ubuntu
 
-source /etc/zsh_command_not_found
+[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found

From 06063ab695ecfe6fa7737511a070b24412ee1b2a Mon Sep 17 00:00:00 2001
From: Lorrin Nelson <lhn_github@nerdylorrin.net>
Date: Wed, 23 Mar 2011 21:20:08 -0700
Subject: [PATCH 168/907] Introduce DISABLE_AUTO_TITLE option

---
 lib/termsupport.zsh          | 10 +++++++---
 templates/zshrc.zsh-template |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e1e536690..b250833ed 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -16,11 +16,15 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
 #Appears when you have the prompt
 function precmd {
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
+    title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  fi
 }
 
 #Appears at the beginning of (and during) of command execution
 function preexec {
-  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  title "$CMD" "%100>...>$2%<<"
+  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
+    local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+    title "$CMD" "%100>...>$2%<<"
+  fi
 }
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 8022b3506..506daa9a2 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -14,6 +14,9 @@ export ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable colors in ls
 # export DISABLE_LS_COLORS="true"
 
+# Uncomment following line if you want to disable autosetting terminal title.
+# export DISABLE_AUTO_TITLE="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git)

From 2497c57976b1e5002ebecd7ffa5c35bc87ada903 Mon Sep 17 00:00:00 2001
From: Simon Elsbrock <simon@iodev.org>
Date: Thu, 24 Mar 2011 09:47:48 +0100
Subject: [PATCH 169/907] fixed wget command in readme

github uses a wildcard certificate which is not accepted by wget
---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 0659aded8..86d2652bb 100644
--- a/README.textile
+++ b/README.textile
@@ -8,7 +8,7 @@ h2. Setup
 
 h3. The automatic installer... (do you trust me?)
 
-@wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
@@ -66,4 +66,4 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
 
 h3. Send us your theme!
 
-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
\ No newline at end of file
+I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.

From d5ce689a0c10f71967dcc163cd66ef9bd2778416 Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Sat, 26 Mar 2011 15:06:30 +0100
Subject: [PATCH 170/907] Add a plugin to support kate the kde texteditor

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

diff --git a/plugins/kate/kate.plugin.zsh b/plugins/kate/kate.plugin.zsh
new file mode 100644
index 000000000..eb16522ac
--- /dev/null
+++ b/plugins/kate/kate.plugin.zsh
@@ -0,0 +1,9 @@
+
+# Kate
+# Start kate always silent
+alias kate='kate >/dev/null 2>&1'
+
+function kt () {
+  cd $1
+  kate $1
+}
\ No newline at end of file

From 16f9dfb3aa6d301d4345df9af017bd6982273919 Mon Sep 17 00:00:00 2001
From: "Matthew M. Nelson" <dogenpunk@gmail.com>
Date: Thu, 31 Mar 2011 13:51:29 -0500
Subject: [PATCH 171/907] Adding dogenpunk theme

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

diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
new file mode 100644
index 000000000..f4d65ab74
--- /dev/null
+++ b/themes/dogenpunk.zsh-theme
@@ -0,0 +1,85 @@
+# -----------------------------------------------------------------------------
+#          FILE: dogenpunk.zsh-theme
+#   DESCRIPTION: oh-my-zsh theme file.
+#        AUTHOR: Matthew Nelson (dogenpunk@gmail.com)
+#       VERSION: 0.1
+#    SCREENSHOT: coming soon
+# -----------------------------------------------------------------------------
+
+MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
+local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
+
+PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ओम् %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
+%{$fg[red]%}%!%{$reset_color%} $(prompt_char) '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[green]%}git%{$reset_color%}@%{$bg[white]%}%{$fg[black]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+
+function prompt_char() {
+  git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
+  hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
+  echo "%{$fg[cyan]%}◯ %{$reset_color%}"
+}
+
+# Colors vary depending on time lapsed.
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
+ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
+
+# Determine the time since last commit. If branch is clean,
+# use a neutral color, otherwise colors will vary according to time.
+function git_time_since_commit() {
+    if git rev-parse --git-dir > /dev/null 2>&1; then
+        # Only proceed if there is actually a commit.
+        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
+            # Get the last commit.
+            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+            now=`date +%s`
+            seconds_since_last_commit=$((now-last_commit))
+
+            # Totals
+            MINUTES=$((seconds_since_last_commit / 60))
+            HOURS=$((seconds_since_last_commit/3600))
+
+            # Sub-hours and sub-minutes
+            DAYS=$((seconds_since_last_commit / 86400))
+            SUB_HOURS=$((HOURS % 24))
+            SUB_MINUTES=$((MINUTES % 60))
+
+            if [[ -n $(git status -s 2> /dev/null) ]]; then
+                if [ "$MINUTES" -gt 30 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
+                elif [ "$MINUTES" -gt 10 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
+                else
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
+                fi
+            else
+                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            fi
+
+            if [ "$HOURS" -gt 24 ]; then
+                echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+            elif [ "$MINUTES" -gt 60 ]; then
+                echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+            else
+                echo "($COLOR${MINUTES}m%{$reset_color%}|"
+            fi
+        else
+            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            echo "($COLOR~|"
+        fi
+    fi
+}

From 57f55e69ed967e93c0fd44a6a7e470781eb38029 Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 13:50:05 +0200
Subject: [PATCH 172/907] Zsh will now complete git aliases with git stuff

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 71a62819b..fc4e56fac 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,19 +1,34 @@
 # Aliases
 alias g='git'
+compdef g=git
 alias gst='git status'
+compdef gst=git
 alias gl='git pull'
+compdef gl=git
 alias gup='git fetch && git rebase'
+compdef gup=git
 alias gp='git push'
+compdef gp=git
 alias gd='git diff | mate'
+compdef gd=git
 alias gdv='git diff -w "$@" | vim -R -'
+compdef gdv=git
 alias gc='git commit -v'
+compdef gc=git
 alias gca='git commit -v -a'
+compdef gca=git
 alias gco='git checkout'
+compdef gco=git
 alias gb='git branch'
+compdef gb=git
 alias gba='git branch -a'
+compdef gba=git
 alias gcount='git shortlog -sn'
+compdef gcount=git
 alias gcp='git cherry-pick'
+compdef gcp=git
 alias glg='git log --stat --max-count=5'
+compdef glg=git
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
@@ -29,5 +44,8 @@ function current_branch() {
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
+compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
+compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+compdef ggpnp=git

From 2e9492969b0ea90932ad3f4298330b75ef8cf2ce Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 15:43:39 +0200
Subject: [PATCH 173/907] Completions are git subdommand-aware now

---
 plugins/git/git.plugin.zsh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fc4e56fac..8470c28a4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -2,15 +2,16 @@
 alias g='git'
 compdef g=git
 alias gst='git status'
-compdef gst=git
+compdef _git gst=git-status
 alias gl='git pull'
-compdef gl=git
+compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
 compdef gup=git
 alias gp='git push'
-compdef gp=git
+compdef _git gp=git-push
 alias gd='git diff | mate'
-compdef gd=git
+# WTF is mate??
+compdef _git gd=git-diff
 alias gdv='git diff -w "$@" | vim -R -'
 compdef gdv=git
 alias gc='git commit -v'
@@ -18,20 +19,21 @@ compdef gc=git
 alias gca='git commit -v -a'
 compdef gca=git
 alias gco='git checkout'
-compdef gco=git
+compdef _git gco=git-checkout
 alias gb='git branch'
-compdef gb=git
+compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef gba=git
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'
-compdef gcp=git
+compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=5'
-compdef glg=git
+compdef _git glg=git-log
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+compdef git-svn-dcommit-push=git
 
 #
 # Will return the current branch name

From 4cd4167c8d988656eed4896d6d1343e311ce078c Mon Sep 17 00:00:00 2001
From: Jakub Nawalaniec <pielgrzym@prymityw.pl>
Date: Sun, 3 Apr 2011 21:28:19 +0200
Subject: [PATCH 174/907] Further git completion improovements

In detail:
gup - now completes with remotes like git fetch would
gdv - got git diff completions
gc/gca - now zsh will suggest files in staging area
gba - suggestions as for git branch
---
 plugins/git/git.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8470c28a4..9fe7a6467 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -6,24 +6,24 @@ compdef _git gst=git-status
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git fetch && git rebase'
-compdef gup=git
+compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 alias gd='git diff | mate'
 # WTF is mate??
 compdef _git gd=git-diff
 alias gdv='git diff -w "$@" | vim -R -'
-compdef gdv=git
+compdef _git gdv=git-diff
 alias gc='git commit -v'
-compdef gc=git
+compdef _git gc=git-commit
 alias gca='git commit -v -a'
-compdef gca=git
+compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
-compdef gba=git
+compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcp='git cherry-pick'

From d138751cbd721bf7036e88cb1a2bafc9ebb87366 Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 4 Apr 2011 13:30:39 +0200
Subject: [PATCH 175/907] Escape characters used in escape sequence to avoid
 triggering bugs in Apple Terminal

Closes #45 #57 #58 #86.
---
 lib/termsupport.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index b250833ed..494ef8923 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -4,10 +4,10 @@
 #Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
   if [[ "$TERM" == "screen" ]]; then 
-    print -Pn "\ek$1\e\\" #set screen hardstatus, usually truncated at 20 chars
+    print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-    print -Pn "\e]2;$2\a" #set window name
-    print -Pn "\e]1;$1\a" #set icon (=tab) name (will override window name on broken terminal)
+    print -Pn "\e]2;$2:q\a" #set window name
+    print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
   fi
 }
 

From a3e92892bbc95acc270d93b45be05c55348da55c Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 4 Apr 2011 13:44:48 +0200
Subject: [PATCH 176/907] Command title behavior no longer depend on local zsh
 configuration

Fix by derekjw. closes #52.
---
 lib/termsupport.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 494ef8923..42bbb9ef2 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -3,7 +3,7 @@
 #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 [[ "$TERM" == "screen" ]]; then 
+  if [[ $TERM =~ "^screen" ]]; then 
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
@@ -24,6 +24,8 @@ function precmd {
 #Appears at the beginning of (and during) of command execution
 function preexec {
   if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
+    emulate -L zsh
+    setopt extended_glob
     local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
     title "$CMD" "%100>...>$2%<<"
   fi

From 0cc0915bf83c1915575182d1287abfc6dd3e6f3c Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 4 Apr 2011 14:02:50 +0200
Subject: [PATCH 177/907] Refactor DISABLE_AUTO_TITLE to be more DRY

---
 lib/termsupport.zsh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 42bbb9ef2..3152751e4 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -3,6 +3,7 @@
 #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 {
+  [ "$DISABLE_AUTO_TITLE" != "true" ] || return
   if [[ $TERM =~ "^screen" ]]; then 
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
@@ -16,17 +17,13 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
 
 #Appears when you have the prompt
 function precmd {
-  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
-    title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
-  fi
+  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 }
 
 #Appears at the beginning of (and during) of command execution
 function preexec {
-  if [ "$DISABLE_AUTO_TITLE" != "true" ]; then
-    emulate -L zsh
-    setopt extended_glob
-    local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-    title "$CMD" "%100>...>$2%<<"
-  fi
+  emulate -L zsh
+  setopt extended_glob
+  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+  title "$CMD" "%100>...>$2%<<"
 }

From 993e05da50543b9c2dcc5e4fedb93afd1c8b020c Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Fri, 8 Apr 2011 10:12:22 -0400
Subject: [PATCH 178/907] Replace redundant calls to compinit with a single
 call.

---
 lib/completion.zsh                   | 3 ---
 lib/key-bindings.zsh                 | 2 --
 oh-my-zsh.sh                         | 4 ++++
 plugins/brew/brew.plugin.zsh         | 2 --
 plugins/cpanm/cpanm.plugin.zsh       | 2 --
 plugins/gem/gem.plugin.zsh           | 2 --
 plugins/github/github.plugin.zsh     | 2 --
 plugins/macports/macports.plugin.zsh | 2 --
 plugins/pip/pip.plugin.zsh           | 2 --
 plugins/vagrant/vagrant.plugin.zsh   | 2 --
 10 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e8e9776a5..3c5a41e14 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -9,9 +9,6 @@ setopt always_to_end
 
 WORDCHARS=''
 
-autoload -U compinit
-compinit -i
-
 zmodload -i zsh/complist
 
 ## case-insensitive (all),partial-word and then substring completion
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 7196a88ff..c7ad907d7 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,6 +1,4 @@
 # TODO: Explain what some of this does..
-autoload -U compinit
-compinit -i
 
 bindkey -e
 bindkey '\ew' kill-region
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 291772dfe..805e92428 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -17,6 +17,10 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
+# Load and run compinit
+autoload -U compinit
+compinit -i
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 then
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 353a18942..079c0fba0 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,4 +1,2 @@
 # add brew completion function to path
 fpath=($ZSH/plugins/brew $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
index af52d3e8b..8425b5ad8 100644
--- a/plugins/cpanm/cpanm.plugin.zsh
+++ b/plugins/cpanm/cpanm.plugin.zsh
@@ -1,4 +1,2 @@
 # add cpanm completion function to path
 fpath=($ZSH/plugins/cpanm $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
index d4e5c6584..cdfad7ad6 100644
--- a/plugins/gem/gem.plugin.zsh
+++ b/plugins/gem/gem.plugin.zsh
@@ -1,4 +1,2 @@
 # add gem completion function to path
 fpath=($ZSH/plugins/gem $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index c23504b85..0858783cc 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,4 +1,2 @@
 # add github completion function to path
 fpath=($ZSH/plugins/github $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index cbbc49265..492a665b5 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -8,5 +8,3 @@ alias pup="psu && puo"
 
 # add macports completion function to path
 fpath=($ZSH/plugins/macports $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index bf9f23968..740f96207 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -1,4 +1,2 @@
 # add brew completion function to path
 fpath=($ZSH/plugins/pip $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
index 5e9bcf10a..98d2d705c 100644
--- a/plugins/vagrant/vagrant.plugin.zsh
+++ b/plugins/vagrant/vagrant.plugin.zsh
@@ -1,3 +1 @@
 fpath=($ZSH/plugins/vagrant $fpath)
-autoload -U compinit
-compinit -i

From ef4175981b78ca6ef24f7776ab213f3b71488472 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Fri, 8 Apr 2011 11:10:14 -0400
Subject: [PATCH 179/907] Moved the single compinit call from oh-my-zsh.sh to
 lib/completion.zsh

---
 lib/completion.zsh | 4 ++++
 oh-my-zsh.sh       | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 3c5a41e14..21735e7e9 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,3 +60,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
+# Load and run compinit
+autoload -U compinit
+compinit -i
+
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 805e92428..3970a497e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -18,8 +18,8 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
 # Load and run compinit
-autoload -U compinit
-compinit -i
+#autoload -U compinit
+#compinit -i
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]

From 235733e5e224539cf5002a02694d021902fd9550 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Fri, 8 Apr 2011 11:12:21 -0400
Subject: [PATCH 180/907] Removed commented out code.

---
 oh-my-zsh.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 3970a497e..291772dfe 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -17,10 +17,6 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
-# Load and run compinit
-#autoload -U compinit
-#compinit -i
-
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 then

From 91e4f3d667cc04148fafc4675174424daf5f6b5a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 4 Apr 2011 00:54:43 +0200
Subject: [PATCH 181/907] Fix `gdv`: make it a function, and use `view`.

I've changed it to use `view` instead of `vim -R` to make it hopefully
more editor-agnostic.
---
 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 8470c28a4..b21c6a8e0 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -12,7 +12,7 @@ compdef _git gp=git-push
 alias gd='git diff | mate'
 # WTF is mate??
 compdef _git gd=git-diff
-alias gdv='git diff -w "$@" | vim -R -'
+gdv() { git diff -w "$@" | view - }
 compdef gdv=git
 alias gc='git commit -v'
 compdef gc=git

From b3a78d2b287cc9789d1c791a91448c40dcab2e23 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:19:15 +0200
Subject: [PATCH 182/907] Using git-diff instead of git diff

---
 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 85eabced0..bc340e86b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -9,7 +9,7 @@ alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
-gdv() { git diff -w "$@" | view - }
+gdv() { git-diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
 compdef _git gc=git-commit

From f9282283822771a7f471547569de481a66a70b0f Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 20 Mar 2011 16:29:00 -0400
Subject: [PATCH 183/907] Added npm plugin.

---
 plugins/npm/_npm           | 19 +++++++++++++++++++
 plugins/npm/npm.plugin.zsh |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/npm/_npm
 create mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/npm/_npm b/plugins/npm/_npm
new file mode 100644
index 000000000..24b536188
--- /dev/null
+++ b/plugins/npm/_npm
@@ -0,0 +1,19 @@
+#compdef npm
+
+# Node Package Manager 0.3.15 completion, letting npm do all the completion work
+
+_npm() {
+  compadd -- $(_npm_complete $words)
+}
+
+# We want to show all errors of any substance, but never the "npm (not )ok" one.
+# (Also doesn't consider "ERR! no match found" worth breaking the terminal for.)
+_npm_complete() {
+  local ask_npm
+  ask_npm=(npm completion --color false --loglevel error -- $@)
+  { _call_program npm $ask_npm 2>&1 >&3 \
+  | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \
+  } 3>&1
+}
+
+_npm "$@"
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 000000000..826f0f7b0
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1,4 @@
+# add npm completion function to path
+fpath=($ZSH/plugins/npm $fpath)
+autoload -U compinit
+compinit -i

From 8883ace767997d1a629c165780af303f715ee78d Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:24:06 +0200
Subject: [PATCH 184/907] Revert "Enable alias completion, do not limit
 completion to just files"

This reverts commit c3a58b00040018743ead1e6672910433fc1ca7c2.
---
 lib/completion.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e8e9776a5..9c2dfecca 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -4,7 +4,6 @@ unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
 setopt auto_menu         # show completion menu on succesive tab press
 setopt complete_in_word
-setopt complete_aliases
 setopt always_to_end
 
 WORDCHARS=''

From 0447a0ec11ad56d24ad391e9149c8d7e0429b205 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 01:04:10 -0500
Subject: [PATCH 185/907] added hub plugin from defunkt

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

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
new file mode 100644
index 000000000..e82a0ec25
--- /dev/null
+++ b/plugins/hub/hub.plugin.zsh
@@ -0,0 +1,5 @@
+# hub alias from defunkt
+# https://github.com/defunkt/hub
+if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
+    eval $( hub alias -s $( ps -o comm= -p $$ ) )
+fi

From 8ed33a8ccc5e926e84bf522951ecf80e97e2a8e6 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Tue, 1 Mar 2011 21:34:25 -0500
Subject: [PATCH 186/907] no need for an extra fork

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

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
index e82a0ec25..9f95c6361 100644
--- a/plugins/hub/hub.plugin.zsh
+++ b/plugins/hub/hub.plugin.zsh
@@ -1,5 +1,5 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
 if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
-    eval $( hub alias -s $( ps -o comm= -p $$ ) )
+    eval $( hub alias -s zsh )
 fi

From 2717e147b303beef0f84e6dfbb2db562c8fc6740 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Wed, 2 Mar 2011 20:00:40 -0500
Subject: [PATCH 187/907] blueyed's ZSH-fu is much stronger than mine.

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

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
index 9f95c6361..48e1fa4ad 100644
--- a/plugins/hub/hub.plugin.zsh
+++ b/plugins/hub/hub.plugin.zsh
@@ -1,5 +1,5 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
-if [ $( which hub > /dev/null 2>&1 ; echo -n $? ) -lt 1 ]; then
-    eval $( hub alias -s zsh )
+if which hub > /dev/null; then
+    eval $(hub alias -s zsh)
 fi

From 277057cb6399769340d41bba9421464c58742026 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Thu, 3 Mar 2011 21:36:35 -0500
Subject: [PATCH 188/907] Moved this to the existing github plugin

---
 plugins/hub/hub.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 plugins/hub/hub.plugin.zsh

diff --git a/plugins/hub/hub.plugin.zsh b/plugins/hub/hub.plugin.zsh
deleted file mode 100644
index 48e1fa4ad..000000000
--- a/plugins/hub/hub.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-# hub alias from defunkt
-# https://github.com/defunkt/hub
-if which hub > /dev/null; then
-    eval $(hub alias -s zsh)
-fi

From 9406ae7929bc1d3a063b65e7559a28268aaf0a7a Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Thu, 3 Mar 2011 21:38:56 -0500
Subject: [PATCH 189/907] Whoops, this was supposed to be in the last commit!

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

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index c23504b85..72e9b07b9 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,3 +1,9 @@
+# hub alias from defunkt
+# https://github.com/defunkt/hub
+if which hub > /dev/null; then
+    eval $(hub alias -s zsh)
+fi
+
 # add github completion function to path
 fpath=($ZSH/plugins/github $fpath)
 autoload -U compinit

From f0922006aba68e485480a81d83ba53b201270a69 Mon Sep 17 00:00:00 2001
From: Theodore Robert Campbell Jr <trcjr@stupidfoot.com>
Date: Sat, 19 Mar 2011 10:29:22 -0400
Subject: [PATCH 190/907] changes recommended by blueyed

---
 plugins/github/github.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 72e9b07b9..8d4580654 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,7 +1,8 @@
 # hub alias from defunkt
 # https://github.com/defunkt/hub
-if which hub > /dev/null; then
-    eval $(hub alias -s zsh)
+if [ "$commands[(I)hub]" ]; then
+    # eval `hub alias -s zsh`
+    function git(){hub "$@"}
 fi
 
 # add github completion function to path

From 7d71148490511ae2ef849a9d95de07ec4a751121 Mon Sep 17 00:00:00 2001
From: Dmitry Maksimov <dmtmax@gmail.com>
Date: Sat, 26 Feb 2011 10:04:45 +0300
Subject: [PATCH 191/907] kolo.zsh-theme

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

diff --git a/themes/kolo.zsh-theme b/themes/kolo.zsh-theme
new file mode 100644
index 000000000..6e04e1595
--- /dev/null
+++ b/themes/kolo.zsh-theme
@@ -0,0 +1,21 @@
+autoload -U colors && colors
+
+autoload -Uz vcs_info
+
+zstyle ':vcs_info:*' stagedstr '%F{green}●'
+zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:*' enable git svn
+precmd () {
+    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
+    } else {
+        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+    }
+
+    vcs_info
+}
+
+setopt prompt_subst
+PROMPT='%B%F{magenta}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}%% '

From 849e2834fb1e4fe27a0b5f997733fd2ae4d8f9b7 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 12 Apr 2011 10:36:45 +0200
Subject: [PATCH 192/907] Updating the README... now links to contributors page

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

diff --git a/README.textile b/README.textile
index 86d2652bb..d01c3310a 100644
--- a/README.textile
+++ b/README.textile
@@ -54,12 +54,6 @@ 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).
 
-h2. Thanks
-
-* Rick Olson (technoweenie) might remember some of the configuration, which I took from a pastie a few years ago.
-* Marcel (noradio) provided Rick the original zsh configuration.
-* Nicholas (ulysses) for the "rake autocompletion code":http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh.
-
 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!
@@ -67,3 +61,11 @@ I'm far from being a zsh-expert and suspect there are many ways to improve. If y
 h3. Send us your theme!
 
 I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
+
+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!
\ No newline at end of file

From 6cbd15f4035ffd79e6e325a256f87443c106c2c6 Mon Sep 17 00:00:00 2001
From: James Frasca <james@roundeights.com>
Date: Thu, 17 Mar 2011 11:22:51 -0700
Subject: [PATCH 193/907] Added the Frisk theme

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

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
new file mode 100644
index 000000000..f181aec90
--- /dev/null
+++ b/themes/frisk.zsh-theme
@@ -0,0 +1,10 @@
+PROMPT=$'
+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
+%{$fg_bold[black]%}>%{$reset_color%} '
+
+PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 971b071dc67f423d8b2a6f476e1dd58819049f41 Mon Sep 17 00:00:00 2001
From: kphoen <geek63@gmail.com>
Date: Mon, 7 Mar 2011 15:15:46 +0100
Subject: [PATCH 194/907] Add: new theme

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

diff --git a/themes/kphoen.zsh-theme b/themes/kphoen.zsh-theme
new file mode 100644
index 000000000..0e9b5e73c
--- /dev/null
+++ b/themes/kphoen.zsh-theme
@@ -0,0 +1,50 @@
+# ------------------------------------------------------------------------------
+#          FILE:  kphoen.zsh-theme
+#   DESCRIPTION:  oh-my-zsh theme file.
+#        AUTHOR:  Kévin Gomez (geek63@gmail.com)
+#       VERSION:  1.0.0
+#    SCREENSHOT:
+# ------------------------------------------------------------------------------
+
+
+if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
+    PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)]
+%# '
+
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
+    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_DIRTY=""
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    # display exitcode on the right when >0
+    return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+    RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}'
+
+    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+else
+    PROMPT='[%n@%m:%~$(git_prompt_info)]
+%# '
+
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on"
+    ZSH_THEME_GIT_PROMPT_SUFFIX=""
+    ZSH_THEME_GIT_PROMPT_DIRTY=""
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    # display exitcode on the right when >0
+    return_code="%(?..%? ↵)"
+
+    RPROMPT='${return_code}$(git_prompt_status)'
+
+    ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
+fi

From 16ac094a43052fb57eda9503174006a84a61a414 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Tue, 12 Apr 2011 09:28:15 -0400
Subject: [PATCH 195/907] Moved compinit call back to oh-my-zsh.sh, after
 plugins are loaded

---
 lib/completion.zsh | 4 ----
 oh-my-zsh.sh       | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 21735e7e9..3c5a41e14 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,7 +60,3 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-# Load and run compinit
-autoload -U compinit
-compinit -i
-
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 291772dfe..84a850ca3 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,6 +14,10 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
 plugin=${plugin:=()}
 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
+# Load and run compinit
+autoload -U compinit
+compinit -i
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 

From 6bf906a2622ddea1e9aae5d23c544d37fc4b6a76 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Tue, 12 Apr 2011 17:41:09 -0400
Subject: [PATCH 196/907] Optimize plugin loading so that only one call to
 compinit is required

---
 oh-my-zsh.sh                         | 13 +++++++++++--
 plugins/brew/brew.plugin.zsh         |  2 --
 plugins/cpanm/cpanm.plugin.zsh       |  2 --
 plugins/gem/gem.plugin.zsh           |  2 --
 plugins/github/github.plugin.zsh     |  2 --
 plugins/macports/macports.plugin.zsh |  2 --
 plugins/pip/pip.plugin.zsh           |  2 --
 plugins/vagrant/vagrant.plugin.zsh   |  1 -
 8 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 plugins/brew/brew.plugin.zsh
 delete mode 100644 plugins/cpanm/cpanm.plugin.zsh
 delete mode 100644 plugins/gem/gem.plugin.zsh
 delete mode 100644 plugins/github/github.plugin.zsh
 delete mode 100644 plugins/pip/pip.plugin.zsh
 delete mode 100644 plugins/vagrant/vagrant.plugin.zsh

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 84a850ca3..0c85de714 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -10,14 +10,23 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
 # Load all of your custom configurations from custom/
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
-# Load all of the plugins that were defined in ~/.zshrc
+# Add all defined plugins to fpath
 plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 
 # Load and run compinit
 autoload -U compinit
 compinit -i
 
+# Load all of the plugins that were defined in ~/.zshrc
+for plugin ($plugins)
+do
+  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]
+  then
+    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+  fi
+done
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
deleted file mode 100644
index 079c0fba0..000000000
--- a/plugins/brew/brew.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/brew $fpath)
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
deleted file mode 100644
index 8425b5ad8..000000000
--- a/plugins/cpanm/cpanm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add cpanm completion function to path
-fpath=($ZSH/plugins/cpanm $fpath)
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
deleted file mode 100644
index cdfad7ad6..000000000
--- a/plugins/gem/gem.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add gem completion function to path
-fpath=($ZSH/plugins/gem $fpath)
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
deleted file mode 100644
index 0858783cc..000000000
--- a/plugins/github/github.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 492a665b5..277352e32 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -6,5 +6,3 @@ alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
 
-# add macports completion function to path
-fpath=($ZSH/plugins/macports $fpath)
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
deleted file mode 100644
index 740f96207..000000000
--- a/plugins/pip/pip.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/pip $fpath)
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
deleted file mode 100644
index 98d2d705c..000000000
--- a/plugins/vagrant/vagrant.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-fpath=($ZSH/plugins/vagrant $fpath)

From 757ebfcbd20b0893d8c9529eed2dfd428868f431 Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Tue, 12 Apr 2011 17:50:15 -0400
Subject: [PATCH 197/907] Moved the plugin fpath loop and compinit so they
 happen before custom scripts are loaded.

---
 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 0c85de714..ad4b268ae 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -7,9 +7,6 @@ fpath=($ZSH/functions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
-# Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
-
 # Add all defined plugins to fpath
 plugin=${plugin:=()}
 for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
@@ -18,6 +15,9 @@ for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 autoload -U compinit
 compinit -i
 
+# Load all of your custom configurations from custom/
+for config_file ($ZSH/custom/*.zsh) source $config_file
+
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins)
 do

From 911837c48fc6387daa341b3cc5be21b1b1cade57 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 13 Apr 2011 00:30:45 +0200
Subject: [PATCH 198/907] github plugin: check for `ruby`.

I've run into the issue where a stripped down container had no Ruby
installed, which caused `hub` to fail.

Therefore I've added an extra check to verify that `ruby` is in the
commands list before setting up this alias/function.
---
 plugins/github/github.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 8d4580654..18fff1755 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,6 +1,5 @@
-# hub alias from defunkt
-# https://github.com/defunkt/hub
-if [ "$commands[(I)hub]" ]; then
+# Setup hub function for git, if it is available; http://github.com/defunkt/hub
+if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then
     # eval `hub alias -s zsh`
     function git(){hub "$@"}
 fi

From 796f5164f306da2f4e6ab7cbadc17b78f5f683af Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Tue, 12 Apr 2011 19:53:55 -0400
Subject: [PATCH 199/907] Minor reformatting

---
 oh-my-zsh.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index ad4b268ae..c7a4c320a 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -19,10 +19,8 @@ compinit -i
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
 # Load all of the plugins that were defined in ~/.zshrc
-for plugin ($plugins)
-do
-  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]
-  then
+for plugin ($plugins); do
+  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
   fi
 done

From 14a1877311bd0a9cf9c4db0e44e55da0fba77c5c Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 16:48:47 +0200
Subject: [PATCH 200/907] New plugin git-svn installing git project
 git-svn-clone-externals

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

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

From d6c150decca10ba2a3566fe1dc1144f7e37f1c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Di=C3=B3genes?= <diofeher@gmail.com>
Date: Wed, 13 Apr 2011 11:55:24 -0300
Subject: [PATCH 201/907] adding python plugin with some aliases

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

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
new file mode 100644
index 000000000..fde54fa88
--- /dev/null
+++ b/plugins/python/python.plugin.zsh
@@ -0,0 +1,5 @@
+# Find python file
+alias pyfind='find . -name "*.py"'
+
+# Remove python compiled byte-code
+alias pycrm='rm `find . | grep -E "*.(pyc|pyo)$"`'

From ca4dabb45e14d8cd38e07c4ffadf9473ceb2193b Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 17:23:25 +0200
Subject: [PATCH 202/907] New tool require_tool.sh

---
 tools/require_tool.sh | 161 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100755 tools/require_tool.sh

diff --git a/tools/require_tool.sh b/tools/require_tool.sh
new file mode 100755
index 000000000..42da2ccf9
--- /dev/null
+++ b/tools/require_tool.sh
@@ -0,0 +1,161 @@
+__require_tool_version_compare ()
+{
+  (
+    # Locally ignore failures, otherwise we'll exit whenever $1 and $2
+    # are not equal!
+    set +e
+
+awk_strverscmp='
+  # Use only awk features that work with 7th edition Unix awk (1978).
+  # My, what an old awk you have, Mr. Solaris!
+  END {
+    while (length(v1) || length(v2)) {
+      # Set d1 to be the next thing to compare from v1, and likewise for d2.
+      # Normally this is a single character, but if v1 and v2 contain digits,
+      # compare them as integers and fractions as strverscmp does.
+      if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) {
+	# Split v1 and v2 into their leading digit string components d1 and d2,
+	# and advance v1 and v2 past the leading digit strings.
+	for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue
+	for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue
+	d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1)
+	d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1)
+	if (d1 ~ /^0/) {
+	  if (d2 ~ /^0/) {
+	    # Compare two fractions.
+	    while (d1 ~ /^0/ && d2 ~ /^0/) {
+	      d1 = substr(d1, 2); len1--
+	      d2 = substr(d2, 2); len2--
+	    }
+	    if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) {
+	      # The two components differ in length, and the common prefix
+	      # contains only leading zeros.  Consider the longer to be less.
+	      d1 = -len1
+	      d2 = -len2
+	    } else {
+	      # Otherwise, compare as strings.
+	      d1 = "x" d1
+	      d2 = "x" d2
+	    }
+	  } else {
+	    # A fraction is less than an integer.
+	    exit 1
+	  }
+	} else {
+	  if (d2 ~ /^0/) {
+	    # An integer is greater than a fraction.
+	    exit 2
+	  } else {
+	    # Compare two integers.
+	    d1 += 0
+	    d2 += 0
+	  }
+	}
+      } else {
+	# The normal case, without worrying about digits.
+	if (v1 == "") d1 = v1; else { d1 = substr(v1, 1, 1); v1 = substr(v1,2) }
+	if (v2 == "") d2 = v2; else { d2 = substr(v2, 1, 1); v2 = substr(v2,2) }
+      }
+      if (d1 < d2) exit 1
+      if (d1 > d2) exit 2
+    }
+  }
+'
+    awk "$awk_strverscmp" v1="$1" v2="$2" /dev/null
+    case $? in
+      1)  echo '<';;
+      0)  echo '=';;
+      2)  echo '>';;
+    esac
+  )
+}
+
+
+__require_tool_fatal ()
+{
+    echo $@ >/dev/stderr
+    return 1
+}
+
+# Usage: require_tool program version
+# Returns: 0 if $1 version if greater equals than $2, 1 otherwise.
+# In case of error, message is written on error output.
+#
+# Example: require_tool gcc 4.6
+# Use GCC environment variable if defined instead of lookup for the tool
+# in the environment.
+require_tool ()
+{
+  envvar_name=$(echo $1 | tr '[:lower:]' '[:upper:]')
+  tool=$(printenv $envvar_name || echo $1)
+  local version=$($tool --version 2>/dev/null| \
+    sed -n 's/.*[^0-9.]\([0-9][0-9.]*\).*/\1/p;q')
+  if test x"$version" = x ; then
+      echo "$tool is required" >/dev/stderr
+      return 1
+  fi
+  case $(__require_tool_version_compare "$2" "$version") in
+    '>')
+	  echo "$1 $2 or better is required: this is $tool $version" >/dev/stderr
+	  return 1
+	  ;;
+  esac
+}
+
+usage() {
+    cat <<EOF
+NAME
+    require_tool.sh - Ensure version of a tool is greater than the one expected
+
+SYNOPSYS
+    require_tool.sh [ -h ]
+                    [ --help ]
+                    [ TOOL MIN_VERSION ]
+
+DESCRIPTION
+    TOOL is the name or path of the program to check. If the name is specified, its
+    path is deduced from PATH environment variable. If environment variable TOOL
+    (in upper-case characters) is defined, considers its value as path to the tool.
+
+    MIN_VERSION is a string representing the minimum required version.
+
+BEHAVIOR
+    * locate path to the program.
+    * execute $ TOOL_PATH --version
+    * extract version from standard output.
+    * compare this version to the expected one.
+
+OPTIONS
+    -h --help
+        Display this message and exit 0
+
+ERRORS
+    if program is not found or its version is prior to expected version,
+    a message is written to error output.
+
+EXIT VALUE
+    returns 0 if program version if greater equals than expected version,
+    returns 1 otherwise.
+
+EXAMPLE
+    $ require_tool.sh emacs 23
+    $ CC=g++ require_tool.sh cc 4.6
+    $ require_tool.sh zsh 4.5
+
+EOF
+}
+
+for arg in $@; do
+    case $arg in
+        -h|--help)
+            usage
+            exit 0
+            ;;
+    esac
+done
+if [ $# -gt 2 ] ; then
+    echo "ERROR: expecting 2 parameters. Please see option --help"
+    exit 1
+fi
+
+require_tool $@

From bbf1f87ee6aa73a11bcb0a3b33fbe7349d20ebcb Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 17:24:44 +0200
Subject: [PATCH 203/907] Fix version parsing. Now working with command $ zsh
 --version

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

diff --git a/tools/require_tool.sh b/tools/require_tool.sh
index 42da2ccf9..1fa77f77a 100755
--- a/tools/require_tool.sh
+++ b/tools/require_tool.sh
@@ -89,7 +89,7 @@ require_tool ()
   envvar_name=$(echo $1 | tr '[:lower:]' '[:upper:]')
   tool=$(printenv $envvar_name || echo $1)
   local version=$($tool --version 2>/dev/null| \
-    sed -n 's/.*[^0-9.]\([0-9][0-9.]*\).*/\1/p;q')
+    sed -n 's/.*[^0-9.]\([0-9]*\.[0-9.]*\).*/\1/p;q')
   if test x"$version" = x ; then
       echo "$tool is required" >/dev/stderr
       return 1

From 2fba4486bfa63cf2a4a11a34c94ce123127ef4c9 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 17:34:51 +0200
Subject: [PATCH 204/907] Add new plugin emacs, to take benefit of daemon
 capabilities of emacs >=23

---
 plugins/emacs/emacs.plugin.zsh | 11 +++++++++++
 plugins/emacs/emacsclient.sh   | 10 ++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 plugins/emacs/emacs.plugin.zsh
 create mode 100755 plugins/emacs/emacsclient.sh

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
new file mode 100644
index 000000000..bca79e70e
--- /dev/null
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -0,0 +1,11 @@
+# Use daemon capabilities of emacs 23
+if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
+    export EDITOR="$ZSH/plugins/emacs/emacsclient.sh"
+    alias emacs="$EDITOR --no-wait"
+    alias e=emacs
+
+    alias emasc=emacs
+    alias emcas=emacs
+    # create a new X frame
+    alias emacs_frame='emacsclient --alternate-editor "" --create-frame'
+fi
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
new file mode 100755
index 000000000..3475926a6
--- /dev/null
+++ b/plugins/emacs/emacsclient.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Starts emacs daemon if not already started.
+
+x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
+if [ -z "$x" ] ;then
+    emacsclient --alternate-editor "" --create-frame $@
+else
+    emacsclient --alternate-editor "" $@
+fi

From df0b37f9db3f8a1d445bebf30d04039eb247ab71 Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 17:45:04 +0200
Subject: [PATCH 205/907] Merge branch 'master'; commit
 'ca4dabb45e14d8cd38e07c4ffadf9473ceb2193b' into require_tool


From 0c032aaf81afcb134668a462a9ea028e6fc64eeb Mon Sep 17 00:00:00 2001
From: Tristan Carel <tcarel@exalead.com>
Date: Wed, 13 Apr 2011 17:46:36 +0200
Subject: [PATCH 206/907] Removing master stuff

---
 plugins/emacs/emacs.plugin.zsh     | 11 -----------
 plugins/emacs/emacsclient.sh       | 10 ----------
 plugins/git-svn/.gitignore         |  1 -
 plugins/git-svn/git-svn.plugin.zsh | 10 ----------
 4 files changed, 32 deletions(-)
 delete mode 100644 plugins/emacs/emacs.plugin.zsh
 delete mode 100755 plugins/emacs/emacsclient.sh
 delete mode 100644 plugins/git-svn/.gitignore
 delete mode 100644 plugins/git-svn/git-svn.plugin.zsh

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
deleted file mode 100644
index bca79e70e..000000000
--- a/plugins/emacs/emacs.plugin.zsh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use daemon capabilities of emacs 23
-if "$ZSH/tools/require_tool.sh" emacs 23 2>/dev/null ; then
-    export EDITOR="$ZSH/plugins/emacs/emacsclient.sh"
-    alias emacs="$EDITOR --no-wait"
-    alias e=emacs
-
-    alias emasc=emacs
-    alias emcas=emacs
-    # create a new X frame
-    alias emacs_frame='emacsclient --alternate-editor "" --create-frame'
-fi
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
deleted file mode 100755
index 3475926a6..000000000
--- a/plugins/emacs/emacsclient.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Starts emacs daemon if not already started.
-
-x=`emacsclient --alternate-editor '' --eval '(x-display-list)' 2>/dev/null`
-if [ -z "$x" ] ;then
-    emacsclient --alternate-editor "" --create-frame $@
-else
-    emacsclient --alternate-editor "" $@
-fi
diff --git a/plugins/git-svn/.gitignore b/plugins/git-svn/.gitignore
deleted file mode 100644
index bf5e1a14f..000000000
--- a/plugins/git-svn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-git-svn-clone-externals
diff --git a/plugins/git-svn/git-svn.plugin.zsh b/plugins/git-svn/git-svn.plugin.zsh
deleted file mode 100644
index 062d63e05..000000000
--- a/plugins/git-svn/git-svn.plugin.zsh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-if ! [ -d "$ZSH/plugins/git-svn/git-svn-clone-externals" ] ;then
-    git clone https://github.com/andrep/git-svn-clone-externals.git
-fi
-export PATH="$ZSH/plugins/git-svn/git-svn-clone-externals:$PATH"
-
-function git_svn_update {
-    (cd "$ZSH/plugins/git-svn/git-svn-clone-externals" && \
-        git pull origin master)
-}

From 60bae66bbfebe7bf78378564ffe9aed00c3342b4 Mon Sep 17 00:00:00 2001
From: Simon <contact@saimon.org>
Date: Thu, 7 Apr 2011 10:23:06 +0200
Subject: [PATCH 207/907] new yum plugin with useful aliases

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

diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
new file mode 100644
index 000000000..d6ba7ed62
--- /dev/null
+++ b/plugins/yum/yum.plugin.zsh
@@ -0,0 +1,12 @@
+## Aliases
+
+alias ys="yum search"                       # search package
+alias yp="yum info"                         # show package info
+alias yl="yum list"                         # list packages
+alias yli="yum list installed"              # print all installed packages
+
+alias yu="sudo yum update"                  # upgrate packages
+alias yi="sudo yum install"                 # install package
+alias yr="sudo yum remove"                  # remove package
+alias yrl="sudo yum remove --remove-leaves" # remove package and leaves
+alias yc="sudo yum clean all"               # clean cache

From b2d5b4365019a466fb8481598de87159704ded7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Di=C3=B3genes?= <diofeher@gmail.com>
Date: Thu, 14 Apr 2011 12:15:26 -0300
Subject: [PATCH 208/907] refactored pycrm command

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

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index fde54fa88..3ea34d718 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -2,4 +2,4 @@
 alias pyfind='find . -name "*.py"'
 
 # Remove python compiled byte-code
-alias pycrm='rm `find . | grep -E "*.(pyc|pyo)$"`'
+alias pyclean='find . -type f -name "*.py[co]" -exec rm -f \{\} \;'

From 14f07ebc68da8b06cdb0a4fdb435ac928ff419f1 Mon Sep 17 00:00:00 2001
From: alexandru <alex@hackd.net>
Date: Thu, 14 Apr 2011 16:22:18 -0700
Subject: [PATCH 209/907] redis-cli completion plugin

---
 plugins/redis-cli/_redis-cli           | 142 +++++++++++++++++++++++++
 plugins/redis-cli/redis-cli.plugin.zsh |   4 +
 2 files changed, 146 insertions(+)
 create mode 100644 plugins/redis-cli/_redis-cli
 create mode 100644 plugins/redis-cli/redis-cli.plugin.zsh

diff --git a/plugins/redis-cli/_redis-cli b/plugins/redis-cli/_redis-cli
new file mode 100644
index 000000000..3789add18
--- /dev/null
+++ b/plugins/redis-cli/_redis-cli
@@ -0,0 +1,142 @@
+#compdef redis-cli rec
+#autoload
+
+#redis cli completion, based off homebrew completion (ref. 2011-04-14)
+
+local -a _1st_arguments
+_1st_arguments=(
+  'append:append a value to a key'
+  'auth:authenticate to the server'
+  'bgrewriteeaof:asynchronously rewrite the append-only file'
+  'bgsave:asynchornously save the dataset to disk'
+  'blpop:remove and get the first element in a list, or block until one is available'
+  'brpop:remove and get the last element in a list, or block until one is available'
+  'brpoplpush:pop a value from a list, push it to another list and return it; or block until one is available'
+  # 'config get:get the value of a configuration parameter'
+  # 'config set:set a configuration parameter to the given value'
+  # 'config resetstat: reset the stats returned by INFO'
+  'dbsize:return the number of keys in the selected database'
+  # 'debug object:get debugging information about a key'
+  # 'debug setgfault:make the server crash'
+  'decr:decrement the integer value of a key by one'
+  'decrby:decrement the integet value of a key by the given number'
+  'del:delete a key'
+  'discard:discard all commands issued after MULTI'
+  'echo:echo the given string'
+  'exec:execute all commands issued after a MULTI'
+  'exists:determine if a key exists'
+  'expire:set the time to live for a key, in seconds'
+  'expireat:set the expiration for a key as a UNIX timestamp'
+  'flushall:remove all keys from all databases'
+  'flushdb:remove all keys from the current database'
+  'get:get the value of a key'
+  'getbit:returns the bit value at offset in the string value stored at key'
+  'getrange:get a substring of the string stored at a key'
+  'getset:set the string value of a key and return its old value'
+  'hdel:delete a hash field'
+  'hexists:determine if a hash field exists'
+  'hget:get the value of a hash field'
+  'hgetall:get all the fields and values in a hash'
+  'hincrby:increment the integer value of a hash field by the given number'
+  'hkeys:get all the fields in a hash'
+  'hlen:get the number of fields in a hash'
+  'hmget:get the values of all the given hash fields'
+  'hmset:set multiple hash fields to multiple values'
+  'hset:set the string value of a hash field'
+  'hsetnx:set the value of a hash field, only if the field does not exist'
+  'hvals:get all the values in a hash'
+  'incr:increment the integer value of a key by one'
+  'incrby:increment the integer value of a key by the given number'
+  'info:get information and statistics about the server'
+  'keys:find all keys matching the given pattern'
+  'lastsave:get the UNIX timestamp of the last successful save to disk'
+  'lindex:get an element from a list by its index'
+  'linset:insert an element before or after another element in a list'
+  'llen:get the length of a list'
+  'lpop:remove and get the first element in a list'
+  'lpush:prepend a value to a list'
+  'lpushx:prepend a value to a list, only if the list exists'
+  'lrange:get a range of elements from a list'
+  'lrem:remove elements from a list'
+  'lset:set the value of an element in a list by its index'
+  'ltrim:trim a list to the specified range'
+  'mget:get the values of all the given keys'
+  'monitor:listen for all requests received by the server in real time'
+  'move:move a key to another database'
+  'mset:set multiple keys to muliple values'
+  'msetnx:set multiple keys tom ultiple values, only if none of the keys exist'
+  'multi:mark the start of a transaction block'
+  'object:inspect the internals of Redis objects'
+  'persist:remove the expiration from a key'
+  'ping:ping the server'
+  'psubscribe:listen for messages published to channels matching the given patterns'
+  'publish:post a message to a channel'
+  'punsubscribe:stop listening for messages posted to channels matching the given patterns'
+  'quit:close the connection'
+  'randomkey:return a random key from the keyspace'
+  'rename:rename a key'
+  'renamenx:rename a key, only if the new key does not exist'
+  'rpop:remove and get the last element in a list'
+  'rpoplpush:remove the last element in a list, append it to another list and return it'
+  'rpush:append a value to a list'
+  'rpushx:append a value to a list, only if the list exists'
+  'sadd:add a member to a set'
+  'save:synchronously save the dataset to disk'
+  'scard:get the number of members in a set'
+  'sdiff:subtract multiple sets'
+  'sdiffstore:subtract multiple sets and store the resulting set in a key'
+  'select:change the selected database for the current connection'
+  'set:set the string value of a key'
+  'setbit:sets or clears the bit at offset in the string value stored at key'
+  'setex:set the value and expiration of a key'
+  'setnx:set the value of a key, only if the key does not exist'
+  'setrange:overwrite part of a string at key starting at the specified offset'
+  'shutdown:synchronously save the dataset to disk and then shut down the server'
+  'sinter:intersect multiple sets'
+  'sinterstore:intersect multiple sets and store the resulting set in a key'
+  'sismember:determine if a given value is a member of a set'
+  'slaveof:make the server a slave of another instance, or promote it as master'
+  'smembers:get all the members in a set'
+  'smove:move a member from one set to another'
+  'sort:sort the elements in a list, set or sorted set'
+  'spop:remove and return a random member from a set'
+  'srandmember:get a random member from a set'
+  'srem:remove a member from a set'
+  'strlen:get the length of the value stored in a key'
+  'subscribe:listen for messages published to the given channels'
+  'sunion:add multiple sets'
+  'sunionstore:add multiple sets and store the resulting set in a key'
+  'ttl:get the time to live for a key'
+  'type:determine the type stored at key'
+  'unsubscribe:stop listening for messages posted to the given channels'
+  'unwatch:forget about all watched keys'
+  'watch:watch the given keys to determine execution of the MULTI/EXEC block'
+  'zadd:add a member to a sorted set, or update its score if it already exists'
+  'zcard:get the number of members in a sorted set'
+  'zcount:count the members in a sorted set with scores within the given values'
+  'zincrby:increment the score of a member in a sorted set'
+  'zinterstore:intersect multiple sorted sets and store the resulting sorted set in a new key'
+  'zrange:return a range of members in a sorted set, by index'
+  'zrangebyscore:return a range of members in a sorted set, by score'
+  'zrank:determine the index of a member in a sorted set'
+  'zrem:remove a member from a sorted set'
+  'zremrangebyrank:remove all members in a sorted set within the given indexes'
+  'zremrangebyscore:remove all members in a sorted set within the given scores'
+  'zrevrange:return a range of membrs in a sorted set, by index, with scores ordered from high to low'
+  'zrevrangebyscore:return a range of members in a sorted set, by score, with scores ordered from high to low'
+  'zrevrank:determine the index of a member in a sorted set, with scores ordered from high to low'
+  'zscore:get the score associated with the given member in a sorted set'
+  'zunionstore:add multiple sorted sets and store te resulting sorted set in a new key'
+)
+
+local expl
+
+_arguments \
+  '(-v --version)'{-v,--version}'[show version]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "redis-cli subcommand" _1st_arguments
+  return
+fi
\ No newline at end of file
diff --git a/plugins/redis-cli/redis-cli.plugin.zsh b/plugins/redis-cli/redis-cli.plugin.zsh
new file mode 100644
index 000000000..af5a843c9
--- /dev/null
+++ b/plugins/redis-cli/redis-cli.plugin.zsh
@@ -0,0 +1,4 @@
+# add redis completion function to path
+fpath=($ZSH/plugins/redis-cli $fpath)
+autoload -U compinit
+compinit -i

From 5bcfab37312511a7ffc3e8242ba8b8a622ecf061 Mon Sep 17 00:00:00 2001
From: Jonathan Tron <jonathan@tron.name>
Date: Sat, 16 Apr 2011 14:44:38 +0200
Subject: [PATCH 210/907] Add new jonathan theme

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

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
new file mode 100644
index 000000000..add485279
--- /dev/null
+++ b/themes/jonathan.zsh-theme
@@ -0,0 +1,137 @@
+function precmd {
+    local TERMWIDTH
+    (( TERMWIDTH = ${COLUMNS} - 1 ))
+
+
+    ###
+    # Truncate the path if it's too long.
+    
+    PR_FILLBAR=""
+    PR_PWDLEN=""
+    
+    local promptsize=${#${(%):---(%n@%m:%l)---()--}}
+    local rubyprompt=`rvm_prompt_info`
+    local rubypromptsize=${#${rubyprompt}}
+    local pwdsize=${#${(%):-%~}}
+    
+    if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then
+      ((PR_PWDLEN=$TERMWIDTH - $promptsize))
+    else
+      PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
+    fi
+
+}
+
+
+setopt extended_glob
+preexec () {
+    if [[ "$TERM" == "screen" ]]; then
+	local CMD=${1[(wr)^(*=*|sudo|-*)]}
+	echo -n "\ek$CMD\e\\"
+    fi
+}
+
+
+setprompt () {
+    ###
+    # Need this so the prompt will work.
+
+    setopt prompt_subst
+
+
+    ###
+    # See if we can use colors.
+
+    autoload colors zsh/terminfo
+    if [[ "$terminfo[colors]" -ge 8 ]]; then
+	colors
+    fi
+    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}]%}'
+	(( count = $count + 1 ))
+    done
+    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+
+    ###
+    # Modify Git prompt
+    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
+    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+    ZSH_THEME_GIT_PROMPT_DIRTY=""
+    ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+
+    ###
+    # See if we can use extended characters to look nicer.
+    
+    typeset -A altchar
+    set -A altchar ${(s..)terminfo[acsc]}
+    PR_SET_CHARSET="%{$terminfo[enacs]%}"
+    PR_SHIFT_IN="%{$terminfo[smacs]%}"
+    PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
+    PR_HBAR=${altchar[q]:--}
+    PR_ULCORNER=${altchar[l]:--}
+    PR_LLCORNER=${altchar[m]:--}
+    PR_LRCORNER=${altchar[j]:--}
+    PR_URCORNER=${altchar[k]:--}
+
+    
+    ###
+    # Decide if we need to set titlebar text.
+    
+    case $TERM in
+	xterm*)
+	    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
+	    ;;
+	screen)
+	    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
+	    ;;
+	*)
+	    PR_TITLEBAR=''
+	    ;;
+    esac
+    
+    
+    ###
+    # Decide whether to set a screen title
+    if [[ "$TERM" == "screen" ]]; then
+	PR_STITLE=$'%{\ekzsh\e\\%}'
+    else
+	PR_STITLE=''
+    fi
+    
+    
+    ###
+    # Finally, the prompt.
+
+    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
+$PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_GREEN%$PR_PWDLEN<...<%~%<<\
+$PR_GREY)`rvm_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
+$PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
+
+$PR_CYAN$PR_SHIFT_IN$PR_LLCORNER$PR_BLUE$PR_HBAR$PR_SHIFT_OUT(\
+$PR_YELLOW%D{%H:%M:%S}\
+$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_SHIFT_IN$PR_HBAR\
+$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
+>$PR_NO_COLOUR '
+
+    # display exitcode on the right when >0
+    return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
+    RPROMPT=' $return_code$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_BLUE$PR_HBAR$PR_SHIFT_OUT\
+($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_SHIFT_OUT$PR_NO_COLOUR'
+
+    PS2='$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
+$PR_BLUE$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT(\
+$PR_LIGHT_GREEN%_$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
+$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT$PR_NO_COLOUR '
+}
+
+setprompt

From 1e2152fcf3103c3acbae49caa0f6184b55c7bb17 Mon Sep 17 00:00:00 2001
From: Arthur Kalmenson <arthur.kalm@gmail.com>
Date: Mon, 18 Apr 2011 07:48:35 -0400
Subject: [PATCH 211/907] Make the chsh more reliable.

---
 tools/install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 6e3872bb9..2d5fde4c8 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -22,7 +22,12 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."
 echo "export PATH=$PATH" >> ~/.zshrc
 
 echo "Time to change your default shell to zsh!"
-chsh -s "/usr/bin/env zsh"
+if [ -f /bin/zsh ]
+then
+  chsh -s /bin/zsh
+else
+  chsh -s "/usr/bin/env zsh"
+fi
 
 echo '         __                                     __  '
 echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '

From 5f415c465a576a78d7e1577e472309fdd4c7621f Mon Sep 17 00:00:00 2001
From: Arthur Kalmenson <arthur.kalm@gmail.com>
Date: Mon, 18 Apr 2011 07:50:14 -0400
Subject: [PATCH 212/907] Change URL to https since most corporate environments
 block git port.

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

diff --git a/tools/install.sh b/tools/install.sh
index 2d5fde4c8..1b8c80f21 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -5,7 +5,7 @@ then
 fi
 
 echo "Cloning Oh My Zsh..."
-/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
 
 echo "Looking for an existing zsh config..."
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]

From 1354eb124893df9c8f60f668550efcafb94eb05f Mon Sep 17 00:00:00 2001
From: Arthur Kalmenson <arthur.kalm@gmail.com>
Date: Mon, 18 Apr 2011 22:51:28 -0400
Subject: [PATCH 213/907] Changed to use which.

---
 tools/install.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 1b8c80f21..8ed1403af 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -22,12 +22,7 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."
 echo "export PATH=$PATH" >> ~/.zshrc
 
 echo "Time to change your default shell to zsh!"
-if [ -f /bin/zsh ]
-then
-  chsh -s /bin/zsh
-else
-  chsh -s "/usr/bin/env zsh"
-fi
+chsh -s `which zsh`
 
 echo '         __                                     __  '
 echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '

From c7c959de60add8371e08926d642b2bbb7406ce84 Mon Sep 17 00:00:00 2001
From: Arthur Kalmenson <arthur.kalm@gmail.com>
Date: Tue, 19 Apr 2011 19:01:18 -0400
Subject: [PATCH 214/907] Make the delete key work correctly, instead of
 outputting a ~

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

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 7196a88ff..e12d8010e 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -22,6 +22,10 @@ bindkey ' ' magic-space    # also do history expansion on space
 
 bindkey '^[[Z' reverse-menu-complete
 
+# Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
+bindkey "^[[3~" delete-char
+bindkey "^[3;5~" delete-char
+
 # consider emacs keybindings:
 
 #bindkey -e  ## emacs key bindings

From 7d9628b2dcccb5627c59380de331e3c906c8164d Mon Sep 17 00:00:00 2001
From: Arthur Kalmenson <arthur.kalm@gmail.com>
Date: Tue, 19 Apr 2011 22:40:46 -0400
Subject: [PATCH 215/907] Added bindings for Gnome terminal.

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

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index e12d8010e..a7d5095ec 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -25,6 +25,7 @@ bindkey '^[[Z' reverse-menu-complete
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
 bindkey "^[[3~" delete-char
 bindkey "^[3;5~" delete-char
+bindkey "\e[3~" delete-char
 
 # consider emacs keybindings:
 

From 886af72125a108c2f928474c7f817dd2c164795e Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Wed, 20 Apr 2011 01:30:52 -0400
Subject: [PATCH 216/907] Remove fpath/compinit code from github and npm
 plugins

---
 plugins/github/github.plugin.zsh | 4 ----
 plugins/npm/npm.plugin.zsh       | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 8d4580654..df7053ba7 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -5,7 +5,3 @@ if [ "$commands[(I)hub]" ]; then
     function git(){hub "$@"}
 fi
 
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
-autoload -U compinit
-compinit -i
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
deleted file mode 100644
index 826f0f7b0..000000000
--- a/plugins/npm/npm.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# add npm completion function to path
-fpath=($ZSH/plugins/npm $fpath)
-autoload -U compinit
-compinit -i

From 96ec1e12498fb2c3200fef941ad6eadece723a0d Mon Sep 17 00:00:00 2001
From: Alexander Rinass <alex@rinass.net>
Date: Wed, 20 Apr 2011 15:50:55 +0200
Subject: [PATCH 217/907] Fixed folder naming for mysql-macports plugin and
 improved start/stop scripts.

---
 plugins/mysql-macports/mysql-macports.plugin.zsh | 8 ++++++++
 plugins/mysql/mysql-macports.plugin.zsh          | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 plugins/mysql-macports/mysql-macports.plugin.zsh
 delete mode 100644 plugins/mysql/mysql-macports.plugin.zsh

diff --git a/plugins/mysql-macports/mysql-macports.plugin.zsh b/plugins/mysql-macports/mysql-macports.plugin.zsh
new file mode 100644
index 000000000..c39563fe4
--- /dev/null
+++ b/plugins/mysql-macports/mysql-macports.plugin.zsh
@@ -0,0 +1,8 @@
+# commands to control local mysql-server installation
+# paths are for osx installation via macports
+
+alias mysqlstart='sudo /opt/local/share/mysql5/mysql/mysql.server start'
+alias mysqlstop='sudo /opt/local/share/mysql5/mysql/mysql.server stop'
+alias mysqlrestart='sudo /opt/local/share/mysql5/mysql/mysql.server restart'
+
+alias mysqlstatus='mysqladmin5 -u root -p ping'
diff --git a/plugins/mysql/mysql-macports.plugin.zsh b/plugins/mysql/mysql-macports.plugin.zsh
deleted file mode 100644
index 63b881c9f..000000000
--- a/plugins/mysql/mysql-macports.plugin.zsh
+++ /dev/null
@@ -1,6 +0,0 @@
-# commands to control local mysql-server installation
-# paths are for osx installtion via macports
-
-alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
-alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
-alias mysqlstatus='mysqladmin5 -u root -p ping'
\ No newline at end of file

From 34f1944016a7671fe47aca99f18f25d19f6ff5dc Mon Sep 17 00:00:00 2001
From: Alexander Rinass <alex@rinass.net>
Date: Wed, 20 Apr 2011 15:54:51 +0200
Subject: [PATCH 218/907] Added start/stop aliases for Apache 2 installation
 via macports.

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

diff --git a/plugins/apache2-macports/apache2-macports.plugin.zsh b/plugins/apache2-macports/apache2-macports.plugin.zsh
new file mode 100644
index 000000000..1caa4cf9d
--- /dev/null
+++ b/plugins/apache2-macports/apache2-macports.plugin.zsh
@@ -0,0 +1,6 @@
+# commands to control local apache2 server installation
+# paths are for osx installation via macports
+
+alias apache2start='sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper start'
+alias apache2stop='sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper stop'
+alias apache2restart='sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper restart'

From eb3d1576bf593c900d0e0fd9465ca3a076779fe0 Mon Sep 17 00:00:00 2001
From: Christopher Chow <soliah@gmail.com>
Date: Thu, 21 Apr 2011 21:40:34 +1000
Subject: [PATCH 219/907] Made my them display the current rvm gemset and check
 for detached head state in git.

---
 themes/Soliah.zsh-theme | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 1c0ab3cc9..237e70fda 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
+PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(check_git_prompt_info)
 $ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
@@ -16,6 +16,29 @@ ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
 
+
+# Git sometimes goes into a detached head state. git_prompt_info doesn't
+# return anything in this case. So wrap it in another function and check
+# for an empty string.
+function check_git_prompt_info() {
+    if git rev-parse --git-dir > /dev/null 2>&1; then
+        if [[ -z $(git_prompt_info) ]]; then
+            echo "%{$fg[magenta]%}detached-head%{$reset_color%})"
+        else
+            echo "$(git_prompt_info)"
+        fi
+    fi
+}
+
+# Determine if we are using a gemset.
+function rvm_gemset() {
+    GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
+    if [[ -n $GEMSET ]]; then
+        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
+    fi 
+
+}
+
 # Determine the time since last commit. If branch is clean,
 # use a neutral color, otherwise colors will vary according to time.
 function git_time_since_commit() {
@@ -49,15 +72,15 @@ function git_time_since_commit() {
             fi
 
             if [ "$HOURS" -gt 24 ]; then
-                echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+                echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
             elif [ "$MINUTES" -gt 60 ]; then
-                echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+                echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
             else
-                echo "($COLOR${MINUTES}m%{$reset_color%}|"
+                echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
             fi
         else
             COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
-            echo "($COLOR~|"
+            echo "($(rvm_gemset)$COLOR~|"
         fi
     fi
 }

From 6f53b3130d5aee8461b0be30e5589e5673929318 Mon Sep 17 00:00:00 2001
From: Ilmari Vacklin <ilmari@dicole.com>
Date: Fri, 22 Apr 2011 00:16:29 +0300
Subject: [PATCH 220/907] Add 'upgrade' to brew completions.

---
 plugins/brew/_brew | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index 4e590ac63..cee1e25f0 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -31,6 +31,7 @@ _1st_arguments=(
   'search:search for a formula (/regex/ or string)'
   'unlink:unlink a formula'
   'update:freshen up links'
+  'upgrade:upgrade outdated formulae'
   'uses:show formulas which depend on a formula'
 )
 

From 5a957c4d2ecc12e90304d13b3ae724843f0fcb7b Mon Sep 17 00:00:00 2001
From: Corey Donohoe <atmos@atmos.org>
Date: Thu, 21 Apr 2011 15:53:44 -0700
Subject: [PATCH 221/907] support non-standard rvm install prefixes

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

diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index f0ee6a5bd..5642eaeb8 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -3,7 +3,7 @@ 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='%{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v g)›%{$reset_color%}'
+local rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
 local git_branch='$(git_prompt_info)%{$reset_color%}'
 
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}

From 07cee28e31753f8cf424e413aa5f9754720d367b Mon Sep 17 00:00:00 2001
From: Felipe Gallois <felipe@gallois.com.br>
Date: Sat, 23 Apr 2011 17:31:15 -0300
Subject: [PATCH 222/907] added custom theme, based on eastwood

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

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
new file mode 100644
index 000000000..259640ba4
--- /dev/null
+++ b/themes/gallois.zsh-theme
@@ -0,0 +1,19 @@
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+}
+
+#RVM and git settings
+if [[ -s ~/.rvm/scripts/rvm ]] ; then 
+  RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
+fi
+
+PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '

From 1783b16d25029b72bdd1aa164f3e76fd29702e70 Mon Sep 17 00:00:00 2001
From: Florian Adamsky <Florian.Adamsky@iem.fh-friedberg.de>
Date: Tue, 26 Apr 2011 23:22:42 +0200
Subject: [PATCH 223/907] added alias for apt-cache search

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

diff --git a/plugins/deb/deb.plugin.zsh b/plugins/deb/deb.plugin.zsh
index 732294a87..1b35a0646 100644
--- a/plugins/deb/deb.plugin.zsh
+++ b/plugins/deb/deb.plugin.zsh
@@ -9,4 +9,5 @@ alias ar="sudo apt-get remove --purge && \
 		sudo apt-get autoremove --purge"	# remove package
 alias ap="apt-cache policy"				# apt policy
 alias av="apt-cache show"				# show package info
+alias acs="apt-cache search"                            # search package
 alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache

From 57d699ee33e5d4673d8c6a2a9ba42bd25d7b737c Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Wed, 27 Apr 2011 19:46:23 -0400
Subject: [PATCH 224/907] redis-cli.plugin.zsh removed, adding to the fpath
 isn't needed now

---
 plugins/redis-cli/redis-cli.plugin.zsh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 plugins/redis-cli/redis-cli.plugin.zsh

diff --git a/plugins/redis-cli/redis-cli.plugin.zsh b/plugins/redis-cli/redis-cli.plugin.zsh
deleted file mode 100644
index af5a843c9..000000000
--- a/plugins/redis-cli/redis-cli.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-# add redis completion function to path
-fpath=($ZSH/plugins/redis-cli $fpath)
-autoload -U compinit
-compinit -i

From 14404eb7a00dcbafcaf81402844f0eb24243cbbb Mon Sep 17 00:00:00 2001
From: Justin Riley <justin.t.riley@gmail.com>
Date: Thu, 28 Apr 2011 15:29:27 -0400
Subject: [PATCH 225/907] add my custom zsh prompt

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

diff --git a/themes/jtriley.zsh-theme b/themes/jtriley.zsh-theme
new file mode 100644
index 000000000..ec62a2208
--- /dev/null
+++ b/themes/jtriley.zsh-theme
@@ -0,0 +1,8 @@
+#PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d
+%{$fg_bold[yellow]%}%% $(git_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]%})"

From 58a7cf19b7af136c5f59ee706ffe4772871f00fa Mon Sep 17 00:00:00 2001
From: Pat Regan <thehead@patshead.com>
Date: Thu, 28 Apr 2011 19:12:05 -0400
Subject: [PATCH 226/907] Move sourcing of custom to below plugins

---
 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 c7a4c320a..bf108afce 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -15,9 +15,6 @@ for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 autoload -U compinit
 compinit -i
 
-# Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
-
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
   if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
@@ -25,6 +22,9 @@ for plugin ($plugins); do
   fi
 done
 
+# Load all of your custom configurations from custom/
+for config_file ($ZSH/custom/*.zsh) source $config_file
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 

From 077baa7bb1aba75d3005b7c6e5df4f53e0ea15d1 Mon Sep 17 00:00:00 2001
From: "Juan G. Hurtado" <juan.g.hurtado@gmail.com>
Date: Fri, 29 Apr 2011 09:22:56 +0200
Subject: [PATCH 227/907] Adds new prompt methods on Git lib

Modifies the Git lib file (lib/git.zsh), adding three new prompt
methods:

- git_prompt_ahead(): Shows the content of the custom var
  $ZSH_THEME_GIT_PROMPT_AHEAD if the local repository has
  commits ahead from the remote origin repository

- git_prompt_short_sha(): Shows last commit SHA hash in short
  mode wrapped between the content of the custom vars
  $ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
  $ZSH_THEME_GIT_PROMPT_SHA_AFTER

- git_prompt_long_sha(): Shows last commit SHA hash in long
  mode wrapped between the content of the custom vars
  $ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
  $ZSH_THEME_GIT_PROMPT_SHA_AFTER
---
 lib/git.zsh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 8512de8a4..e96f075be 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -4,7 +4,8 @@ function git_prompt_info() {
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
-parse_git_dirty () {
+# Checks if working tree is dirty
+parse_git_dirty() {
   if [[ -n $(git status -s 2> /dev/null) ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
@@ -12,7 +13,24 @@ parse_git_dirty () {
   fi
 }
 
-# get the status of the working tree
+# Checks if there are commits ahead from remote
+function git_prompt_ahead() {
+  if $(echo "$(git log origin/master..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+    echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
+  fi
+}
+
+# Formats prompt string for current git commit short SHA
+function git_prompt_short_sha() {
+  SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
+}
+
+# Formats prompt string for current git commit long SHA
+function git_prompt_long_sha() {
+  SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
+}
+
+# Get the status of the working tree
 git_prompt_status() {
   INDEX=$(git status --porcelain 2> /dev/null)
   STATUS=""
@@ -41,4 +59,4 @@ git_prompt_status() {
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   echo $STATUS
-}
+}
\ No newline at end of file

From 6f7d51c68d4de102f295d3b543ccb5c61dea2c3c Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 29 Apr 2011 11:24:29 +0200
Subject: [PATCH 228/907] Feature: Random themes now supported. Just set your
 theme to 'random' and it'll load a different theme each time oh-my-zsh is
 started. Closes #309

---
 oh-my-zsh.sh                 | 14 +++++++++++++-
 templates/zshrc.zsh-template |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 291772dfe..1e735b058 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -15,7 +15,19 @@ plugin=${plugin:=()}
 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
 # Load the theme
-source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+# Check for updates on initial load...
+if [ "$ZSH_THEME" = "random" ]
+then
+  themes=($ZSH/themes/*zsh-theme)
+  N=${#themes[@]}
+  ((N=RANDOM%N))
+  RANDOM_THEME=${themes[$N]}
+  source "$RANDOM_THEME"
+  echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
+else
+  source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+fi
+
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 506daa9a2..576d45eaa 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,8 +1,10 @@
 # Path to your oh-my-zsh configuration.
 export ZSH=$HOME/.oh-my-zsh
 
-# Set to the name theme to load.
+# Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
 export ZSH_THEME="robbyrussell"
 
 # Set to this to use case-sensitive completion

From 7377ba3f7a08bb11114ddae1b421599e4073da96 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <compufreak@gmail.com>
Date: Fri, 29 Apr 2011 11:54:31 +0200
Subject: [PATCH 229/907] Added git-flow plugin

---
 .gitignore                           |   3 +-
 plugins/git-flow/git-flow.plugin.zsh | 332 +++++++++++++++++++++++++++
 2 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 plugins/git-flow/git-flow.plugin.zsh

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

From 86fa4385c51d6778b1358d6f7134c1243feace87 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Fri, 29 Apr 2011 10:59:59 +0100
Subject: [PATCH 230/907] Rails 3 aliases now work with Rails 2 as well.

---
 plugins/rails3/rails3.plugin.zsh | 34 +++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 6bf2ba088..f669ef047 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -1,10 +1,30 @@
-alias rs='ruby script/rails server'
-alias rg='ruby script/rails generate'
-alias rd='ruby script/rails destroy'
-alias rp='ruby script/rails plugin'
+# Rails 3 aliases, backwards-compatible with Rails 2.
+
+function _bundle_command {
+  if command -v bundle && [ -e "Gemfile" ]; then
+    bundle exec $@
+  else
+    $@
+  fi
+}
+
+function _rails_command () {
+  if [ -e "script/server" ]; then
+    ruby script/$@
+  else
+    ruby script/rails $@
+  fi
+}
+
+alias rc='_rails_command console'
+alias rd='_rails_command destroy'
+alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
-alias rdbmr='rake db:migrate && rake db:migrate:redo'
-alias rc='ruby script/rails console'
-alias rd='ruby script/rails server --debugger'
+alias rg='_rails_command generate'
+alias rp='_rails_command plugin'
+alias rs='_rails_command server'
+alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
 
+alias rspec='_bundle_command rspec'
+alias cuke='_bundle_command cucumber'

From 208b225a2f12076099255c329abbb3569723b39b Mon Sep 17 00:00:00 2001
From: "Juan G. Hurtado" <juan.g.hurtado@gmail.com>
Date: Fri, 29 Apr 2011 13:11:38 +0200
Subject: [PATCH 231/907] Custom theme with Git support

This is my personal oh-my-zsh theme. It has Git support through
methods found in Git lib file of oh-my-zsh. It uses:

- parse_git_dirty()
- git_prompt_ahead()
- current_branch()
- git_prompt_short_sha()
- git_prompt_status()

It also shows user name, machine name and current path. You can
take a look at a screenshot at http://goo.gl/ZVoyk
---
 themes/juanghurtado.zsh-theme | 46 +++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 themes/juanghurtado.zsh-theme

diff --git a/themes/juanghurtado.zsh-theme b/themes/juanghurtado.zsh-theme
new file mode 100644
index 000000000..2f715cc9e
--- /dev/null
+++ b/themes/juanghurtado.zsh-theme
@@ -0,0 +1,46 @@
+# ------------------------------------------------------------------------
+# Juan G. Hurtado oh-my-zsh theme
+# (Needs Git plugin for current_branch method)
+# ------------------------------------------------------------------------
+
+# Color shortcuts
+RED=$fg[red]
+YELLOW=$fg[yellow]
+GREEN=$fg[green]
+WHITE=$fg[white]
+BLUE=$fg[blue]
+RED_BOLD=$fg_bold[red]
+YELLOW_BOLD=$fg_bold[yellow]
+GREEN_BOLD=$fg_bold[green]
+WHITE_BOLD=$fg_bold[white]
+BLUE_BOLD=$fg_bold[blue]
+RESET_COLOR=$reset_color
+
+# Format for git_prompt_info()
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+
+# Format for parse_git_dirty()
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}(*)"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Format for git_prompt_status()
+ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged"
+ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted"
+ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed"
+ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified"
+ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added"
+ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked"
+
+# Format for git_prompt_ahead()
+ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)"
+
+# Format for git_prompt_long_sha() and git_prompt_short_sha()
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"
+ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
+
+# Prompt format
+PROMPT='
+%{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
+%{$BLUE%}>%{$RESET_COLOR%} '
+RPROMPT='%{$GREEN_BOLD%}$(current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
\ No newline at end of file

From 6d899e23917ea9278b06f60df6b5cc4fcd5b60c3 Mon Sep 17 00:00:00 2001
From: Matt Sacks <matt.s.sacks@gmail.com>
Date: Fri, 29 Apr 2011 08:28:46 -0400
Subject: [PATCH 232/907] Add muse theme for 256 color terminals

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

diff --git a/themes/muse.zsh-theme b/themes/muse.zsh-theme
new file mode 100644
index 000000000..4bd8fb825
--- /dev/null
+++ b/themes/muse.zsh-theme
@@ -0,0 +1,30 @@
+#!/usr/bin/env zsh
+#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+setopt promptsubst
+
+autoload -U add-zsh-hook
+
+PROMPT_SUCCESS_COLOR=$FG[117]
+PROMPT_FAILURE_COLOR=$FG[124]
+PROMPT_VCS_INFO_COLOR=$FG[242]
+PROMPT_PROMPT=$FG[077]
+GIT_DIRTY_COLOR=$FG[133]
+GIT_CLEAN_COLOR=$FG[118]
+GIT_PROMPT_INFO=$FG[012]
+
+PROMPT='%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ%{$reset_color%} '
+
+#RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%})"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"

From 626fa5b1d83abb145452deaa610fc8f7a59293c1 Mon Sep 17 00:00:00 2001
From: nebirhos <nebirhos@aol.com>
Date: Fri, 29 Apr 2011 17:12:40 +0200
Subject: [PATCH 233/907] fixed autoupdate

---
 tools/check_for_upgrade.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 4643739ca..e1e4eb99f 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -25,10 +25,11 @@ then
     if [ "$line" = Y ] || [ "$line" = y ]
     then
       /bin/sh $ZSH/tools/upgrade.sh
+      # update the zsh file
+      _update_zsh_update
     fi
   fi
+else
+  # create the zsh file
+  _update_zsh_update
 fi
-
-# update the zsh file
-_update_zsh_update
-

From 5f103c750891b926aab9f24f896853ea2a0493d5 Mon Sep 17 00:00:00 2001
From: Luke Randall <luke.randall@mit-can.com>
Date: Wed, 13 Oct 2010 16:54:12 +0200
Subject: [PATCH 234/907] Add fine-grained git prompt status to
 lukerandall.zsh-theme

---
 themes/lukerandall.zsh-theme | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/themes/lukerandall.zsh-theme b/themes/lukerandall.zsh-theme
index 24a0612b7..f4045bd8e 100644
--- a/themes/lukerandall.zsh-theme
+++ b/themes/lukerandall.zsh-theme
@@ -3,8 +3,22 @@
 
 local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(git_prompt_info)%{$reset_color%}%B»%b '
+function my_git_prompt_info() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  GIT_STATUS=$(git_prompt_status)
+  [[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS"
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(my_git_prompt_info)%{$reset_color%}%B»%b '
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
+ZSH_THEME_GIT_PROMPT_ADDED="+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="*"
+ZSH_THEME_GIT_PROMPT_RENAMED="~"
+ZSH_THEME_GIT_PROMPT_DELETED="!"
+ZSH_THEME_GIT_PROMPT_UNMERGED="?"
+

From e3cede37a0ac1ef427fb07b6f79839b8c6a64780 Mon Sep 17 00:00:00 2001
From: "Renaud (Nel) Morvan" <nel@w3fu.com>
Date: Mon, 2 May 2011 13:51:16 +0200
Subject: [PATCH 235/907] Relax pattern matching on TERM. Closes #320.

---
 lib/termsupport.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 3152751e4..22e7f372f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -4,9 +4,9 @@
 #Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
   [ "$DISABLE_AUTO_TITLE" != "true" ] || return
-  if [[ $TERM =~ "^screen" ]]; then 
+  if [[ "$TERM" == screen* ]]; then 
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
-  elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
     print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
   fi

From e1210cdfaab6baba2eeb62599fea832ea446af85 Mon Sep 17 00:00:00 2001
From: Jonas Huckestein <jonas.huckestein@gmail.com>
Date: Tue, 3 May 2011 14:07:35 -0700
Subject: [PATCH 236/907] added my theme

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

diff --git a/themes/jispwoso.zsh-theme b/themes/jispwoso.zsh-theme
new file mode 100644
index 000000000..cdfef3871
--- /dev/null
+++ b/themes/jispwoso.zsh-theme
@@ -0,0 +1,4 @@
+PROMPT=$'%{$fg[green]%}%n@%m: %{$reset_color%}%{$fg[blue]%}%/%{$reset_color%}
+%{$fg_bold[red]%}➜ %{$reset_color%} '
+
+PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"

From bd1a78ae34cc3ce81a7b858f459ad0ad8da2cf62 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 5 May 2011 18:41:05 -0400
Subject: [PATCH 237/907] Added Compleat - Completion for Human Beings plugin.

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

diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
new file mode 100644
index 000000000..8d16a5687
--- /dev/null
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#          FILE:  compleat.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
+#       VERSION:  1.0.0
+# ------------------------------------------------------------------------------
+
+
+if (( ${+commands[compleat]} )); then
+  local prefix="${commands[compleat]:h:h}"
+  local setup="${prefix}/share/compleat-1.0/compleat_setup" 
+
+  if [[ -f "$setup" ]]; then
+    if ! bashcompinit >/dev/null 2>&1; then
+      autoload -U bashcompinit
+      bashcompinit -i
+    fi
+
+    source "$setup" 
+  fi
+fi
+

From e129fc5a285ccc8ff3c6ae9770908a0b5c2836e7 Mon Sep 17 00:00:00 2001
From: "Juan G. Hurtado" <juan.g.hurtado@gmail.com>
Date: Mon, 9 May 2011 13:32:42 +0200
Subject: [PATCH 238/907] Adds support for $(current_branch) on
 git_parse_ahead()

Changes method git_parse_ahead() on git.zsh lib file. Before this
change it checked directly against origin/master branch. Now it
uses $(current_branch) to check for not pushed changes against
the current remote branch.
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index e96f075be..2ace3d0e0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -15,7 +15,7 @@ parse_git_dirty() {
 
 # Checks if there are commits ahead from remote
 function git_prompt_ahead() {
-  if $(echo "$(git log origin/master..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+  if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
     echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
 }

From 5440815c8303e715f04da48fb85e5d05400afb7d Mon Sep 17 00:00:00 2001
From: Justin Riley <justin.t.riley@gmail.com>
Date: Mon, 9 May 2011 10:19:10 -0400
Subject: [PATCH 239/907] remove git status from prompt

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

diff --git a/themes/jtriley.zsh-theme b/themes/jtriley.zsh-theme
index ec62a2208..15d77ed23 100644
--- a/themes/jtriley.zsh-theme
+++ b/themes/jtriley.zsh-theme
@@ -1,6 +1,6 @@
 #PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d
-%{$fg_bold[yellow]%}%% $(git_prompt_info)%{$reset_color%}"
+%{$fg_bold[yellow]%}%% %{$reset_color%}"
 
 #ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 #ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From e199e1dae8f43e3de3bfd59696226497a7c3c3d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurri=C3=ABn=20Stutterheim?= <j.stutterheim@me.com>
Date: Sun, 15 May 2011 15:02:46 +0200
Subject: [PATCH 240/907] Add norm theme

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

diff --git a/themes/norm.zsh-theme b/themes/norm.zsh-theme
new file mode 100644
index 000000000..933fad2ad
--- /dev/null
+++ b/themes/norm.zsh-theme
@@ -0,0 +1,4 @@
+PROMPT='%{$fg[yellow]%}λ %{$fg[green]%}${PWD/#$HOME/~} %{$fg[yellow]%}→ $(git_prompt_info)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"

From 1d9eacb34f59f3bf82a9de0d7b474cb4c501e3fd Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Thu, 19 May 2011 10:55:19 +0100
Subject: [PATCH 241/907] Plugin to make WOL nice & easy

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

diff --git a/plugins/wakeonlan/wakeonlan.plugin.zsh b/plugins/wakeonlan/wakeonlan.plugin.zsh
new file mode 100644
index 000000000..08db1bdea
--- /dev/null
+++ b/plugins/wakeonlan/wakeonlan.plugin.zsh
@@ -0,0 +1,15 @@
+function wake() {
+  local config_file=~/.wakeonlan/$1
+  if [[ ! -f $config_file ]]; then
+    echo "ERROR: There is no configuration file at \"$config_file\"."
+    return
+  fi
+
+  which wakeonlan > /dev/null
+  if [[ ! $? == 0 ]]; then
+    echo "ERROR: Can't find \"wakeonlan\".  Are you sure it's installed?"
+    return
+  fi
+
+  wakeonlan -f $config_file
+}

From 31ef6199675be846e473c20681da339b6ea864cd Mon Sep 17 00:00:00 2001
From: Jacob Atzen <jacob@incremental.dk>
Date: Thu, 19 May 2011 16:20:30 +0200
Subject: [PATCH 242/907] Add autojump plugin

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
new file mode 100644
index 000000000..da0a12765
--- /dev/null
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -0,0 +1,3 @@
+if [ -f `brew --prefix`/etc/autojump ]; then
+  . `brew --prefix`/etc/autojump
+fi

From bde77af40d28ed7a308a843d8bcad556d8115f84 Mon Sep 17 00:00:00 2001
From: Jacob Atzen <jacob@incremental.dk>
Date: Thu, 19 May 2011 16:33:29 +0200
Subject: [PATCH 243/907] TextMate automatically forks into the background

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

diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index 7b73e2751..7c4c14a5f 100644
--- a/plugins/textmate/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
@@ -1,9 +1,9 @@
 
 # TextMate
-alias et='mate . &'
-alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
-alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
-alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
+alias et='mate .'
+alias ett='mate app config lib db public spec test Rakefile Capfile Todo'
+alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
+alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 
 # Editor Ruby file in TextMate
 alias mr='mate CHANGELOG app config db lib public script spec test'

From 8454542ddc33c4907bb864054b9adb0cf61d9002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurri=C3=ABn=20Stutterheim?= <j.stutterheim@me.com>
Date: Fri, 20 May 2011 13:21:04 +0200
Subject: [PATCH 244/907] Update, no more full path

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

diff --git a/themes/norm.zsh-theme b/themes/norm.zsh-theme
index 933fad2ad..5f0ad03ee 100644
--- a/themes/norm.zsh-theme
+++ b/themes/norm.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg[yellow]%}λ %{$fg[green]%}${PWD/#$HOME/~} %{$fg[yellow]%}→ $(git_prompt_info)%{$reset_color%}'
+PROMPT='%{$fg[yellow]%}λ %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"

From 210c1ef86deed805b3c5b25833d4b128f758b610 Mon Sep 17 00:00:00 2001
From: Jan-Oliver Jahner <jan-oliver.jahner@tolingo.com>
Date: Fri, 20 May 2011 15:14:10 +0200
Subject: [PATCH 245/907] Added 'simple' theme.

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

diff --git a/themes/simple.zsh-theme b/themes/simple.zsh-theme
new file mode 100644
index 000000000..a88d9d72a
--- /dev/null
+++ b/themes/simple.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg[green]%}%~%{$fg_bold[blue]%}$(git_prompt_info)%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_GIT_PROMPT_DIRTY=" ✗"
+ZSH_THEME_GIT_PROMPT_CLEAN=" ✔"

From 093f9077f5b358803a810d65fb0d4729477905cf Mon Sep 17 00:00:00 2001
From: Oliver Braun <ob@obraun.net>
Date: Fri, 20 May 2011 22:26:45 +0200
Subject: [PATCH 246/907] Added obraun theme which is a slightly modified
 version of an already existing theme.

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

diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
new file mode 100644
index 000000000..08d137665
--- /dev/null
+++ b/themes/obraun.zsh-theme
@@ -0,0 +1,11 @@
+if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%{$fg[green]%}[%*]%{$reset_color%} %{$fg_no_bold[cyan]%}%n %{${fg_bold[blue]}%}::%{$reset_color%} %{$fg[yellow]%}%m%{$reset_color%} %{$fg_no_bold[magenta]%} ➜ %{$reset_color%} %{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
+
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+

From 1aacb74caf6800fe895ab3a40584c08bfded451e Mon Sep 17 00:00:00 2001
From: Guten <ywzhaifei1@gmail.com>
Date: Sun, 22 May 2011 21:27:30 +0800
Subject: [PATCH 247/907] add custom completion support

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

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 3ea88e924..a3d276df5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,7 +1,7 @@
 # Initializes Oh My Zsh
 
 # add a function path
-fpath=($ZSH/functions $fpath)
+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

From 5c1b341132119f08047a506e2c2b06fa0c0db52e Mon Sep 17 00:00:00 2001
From: Casey Watson <watsoncj@gmail.com>
Date: Tue, 24 May 2011 12:15:58 -0600
Subject: [PATCH 248/907] Fix to random theme selection

 - themes array is 1-based

 - theme files names are located in indicies 1 through N inclusive

 - this resolves an issue where you would occasionally see: "no such
   file or directory. Random theme '' loaded..."
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 3ea88e924..2a206798d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -31,7 +31,7 @@ if [ "$ZSH_THEME" = "random" ]
 then
   themes=($ZSH/themes/*zsh-theme)
   N=${#themes[@]}
-  ((N=RANDOM%N))
+  ((N=(RANDOM%N)+1))
   RANDOM_THEME=${themes[$N]}
   source "$RANDOM_THEME"
   echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."

From f78218f625846afe2b6a487d18b0d7c65daa4edf Mon Sep 17 00:00:00 2001
From: Pete Clark <pete.clark@gmail.com>
Date: Tue, 24 May 2011 15:25:18 -0400
Subject: [PATCH 249/907] Adds compl .swp caches to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4b555067e..ecb8e46bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ projects.zsh
 custom/*
 !custom/example.zsh
 cache
+*.swp

From 5da609e2c96c100c3c862e83f96e618d693c934f Mon Sep 17 00:00:00 2001
From: Pete Clark <pete.clark@gmail.com>
Date: Tue, 24 May 2011 15:28:42 -0400
Subject: [PATCH 250/907] Adds the _task script included with TaskWarrior

On my Ubuntu system this file was found in
/usr/share/doc/task/scripts/zsh/_task.gz
---
 plugins/taskwarrior/_task | 280 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 plugins/taskwarrior/_task

diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
new file mode 100644
index 000000000..5bffa9119
--- /dev/null
+++ b/plugins/taskwarrior/_task
@@ -0,0 +1,280 @@
+#compdef task
+#
+# zsh completion for taskwarrior
+#
+# Copyright 2010 - 2011 Johannes Schlatow
+# Copyright 2009 P.C. Shyamshankar
+# All rights reserved.
+#
+# This script is part of the taskwarrior project.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the
+#
+#     Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor,
+#     Boston, MA
+#     02110-1301
+#     USA
+#
+typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
+_task_projects=($(task _projects))
+_task_tags=($(task _tags))
+_task_ids=($(task _ids))
+_task_config=($(task _config))
+_task_modifiers=(
+	'before' \
+	'after' \
+	'none' \
+	'any' \
+	'is' \
+	'isnt' \
+	'has' \
+	'hasnt' \
+	'startswith' \
+	'endswith' \
+	'word' \
+	'noword'
+)
+_task_cmds=($(task _commands))
+_task_zshcmds=( ${(f)"$(task _zshcommands)"} )
+
+
+_task_idCmds=(
+	'append' \
+	'prepend' \
+	'annotate' \
+	'denotate' \
+	'edit' \
+	'duplicate' \
+	'info' \
+	'start' \
+	'stop' \
+	'done'
+)
+
+_task_idCmdsDesc=(
+	'append:Appends more description to an existing task.' \
+	'prepend:Prepends more description to an existing task.' \
+	'annotate:Adds an annotation to an existing task.' \
+	'denotate:Deletes an annotation of an existing task.' \
+	'edit:Launches an editor to let you modify a task directly.' \
+	'duplicate:Duplicates the specified task, and allows modifications.' \
+	'info:Shows all data, metadata for specified task.' \
+	'start:Marks specified task as started.' \
+	'stop:Removes the start time from a task.' \
+	'done:Marks the specified task as completed.'
+)
+
+_task() {
+    _arguments -s -S \
+        "*::task command:_task_commands"
+    return 0
+}
+
+local -a reply args word
+word=$'[^\0]#\0'
+
+# priorities
+local -a task_priorities
+_regex_words values 'task priorities' \
+	'H:High' \
+	'M:Middle' \
+	'L:Low'
+task_priorities=("$reply[@]")
+
+# projects
+local -a task_projects
+task_projects=(
+	/"$word"/
+	":values:task projects:compadd -a _task_projects"
+)
+
+local -a _task_dates
+_regex_words values 'task dates' \
+	'tod*ay:Today' \
+	'yes*terday:Yesterday' \
+	'tom*orrow:Tomorrow' \
+	'sow:Start of week' \
+	'soww:Start of work week' \
+	'socw:Start of calendar week' \
+	'som:Start of month' \
+	'soy:Start of year' \
+	'eow:End of week' \
+	'eoww:End of work week' \
+	'eocw:End of calendar week' \
+	'eom:End of month' \
+	'eoy:End of year' \
+	'mon:Monday' \
+	'tue:Tuesday'\
+	'wed:Wednesday' \
+	'thu:Thursday' \
+	'fri:Friday' \
+	'sat:Saturday' \
+	'sun:Sunday'
+_task_dates=("$reply[@]")
+
+local -a _task_reldates
+_regex_words values 'task reldates' \
+	'hrs:n hours' \
+	'day:n days' \
+	'1st:first' \
+	'2nd:second' \
+	'3rd:third' \
+	'th:4th, 5th, etc.' \
+	'wks:weeks'
+_task_reldates=("$reply[@]")
+
+task_dates=(
+	\( "$_task_dates[@]" \|
+    \( /$'[0-9][0-9]#'/- \( "$_task_reldates[@]" \) \)
+	\)
+)
+
+_regex_words values 'task frequencies' \
+	'daily:Every day' \
+	'day:Every day' \
+	'weekdays:Every day skipping weekend days' \
+	'weekly:Every week' \
+	'biweekly:Every two weeks' \
+	'fortnight:Every two weeks' \
+	'quarterly:Every three months' \
+	'semiannual:Every six months' \
+	'annual:Every year' \
+	'yearly:Every year' \
+	'biannual:Every two years' \
+	'biyearly:Every two years'
+_task_freqs=("$reply[@]")
+
+local -a _task_frequencies
+_regex_words values 'task frequencies' \
+	'd:days' \
+	'w:weeks' \
+	'q:quarters' \
+	'y:years'
+_task_frequencies=("$reply[@]")
+
+task_freqs=(
+	\( "$_task_freqs[@]" \|
+     \( /$'[0-9][0-9]#'/- \( "$_task_frequencies[@]" \) \)
+	\)
+)
+
+# attributes
+local -a task_attributes
+_regex_words -t ':' default 'task attributes' \
+	'pro*ject:Project name:$task_projects' \
+	'du*e:Due date:$task_dates' \
+	'wa*it:Date until task becomes pending:$task_dates' \
+	're*cur:Recurrence frequency:$task_freqs' \
+	'pri*ority:priority:$task_priorities' \
+	'un*til:Recurrence end date:$task_dates' \
+	'fg:Foreground color' \
+	'bg:Background color' \
+	'li*mit:Desired number of rows in report'
+task_attributes=("$reply[@]")
+
+args=(
+	\( "$task_attributes[@]" \|
+	\( /'(project|due|wait|recur|priority|until|fg|bg|limit).'/- \( /$'[^:]#:'/ ":default:modifiers:compadd -S ':' -a _task_modifiers" \) \) \|
+	\( /'(rc).'/- \( /$'[^:]#:'/ ":arguments:config:compadd -S ':' -a _task_config" \) \) \|
+	\( /'(+|-)'/- \( /"$word"/ ":values:remove tag:compadd -a _task_tags" \) \) \|
+	\( /"$word"/ \)
+	\) \#
+)
+_regex_arguments _task_attributes "${args[@]}"
+
+## task commands
+
+# default completion
+(( $+functions[_task_default] )) ||
+_task_default() {
+	_task_attributes "$@"
+}
+
+# commands expecting an ID
+(( $+functions[_task_id] )) ||
+_task_id() {
+	if (( CURRENT < 3 )); then
+		# update IDs
+		_task_zshids=( ${(f)"$(task _zshids)"} )
+		_describe -t values 'task IDs' _task_zshids
+	else
+		_task_attributes "$@"
+	fi
+}
+
+# merge completion
+(( $+functions[_task_merge] )) ||
+_task_merge() {
+	# TODO match URIs in .taskrc
+	_files
+}
+
+# push completion
+(( $+functions[_task_push] )) ||
+_task_push() {
+	# TODO match URIs in .taskrc
+	_files
+}
+
+# pull completion
+(( $+functions[_task_pull] )) ||
+_task_pull() {
+	# TODO match URIs in .taskrc
+	_files
+}
+
+
+# modify (task [0-9]* ...) completion
+(( $+functions[_task_modify] )) ||
+_task_modify() {
+	_describe -t commands 'task command' _task_idCmdsDesc
+	_task_attributes "$@"
+}
+
+## first level completion => task sub-command completion
+(( $+functions[_task_commands] )) ||
+_task_commands() {
+    local cmd ret=1
+	if (( CURRENT == 1 )); then
+		# update IDs
+		_task_zshids=( ${(f)"$(task _zshids)"} )
+
+		_describe -t commands 'task command' _task_zshcmds
+		_describe -t values 'task IDs' _task_zshids
+		# TODO match more than one ID
+	elif [[ $words[1] =~ ^[0-9]*$ ]] then
+		 _call_function ret _task_modify
+		 return ret
+	else
+#        local curcontext="${curcontext}"
+#        cmd="${_task_cmds[(r)$words[1]:*]%%:*}"
+		  cmd="${_task_cmds[(r)$words[1]]}"
+		  idCmd="${(M)_task_idCmds[@]:#$words[1]}"
+        if (( $#cmd )); then
+#            curcontext="${curcontext%:*:*}:task-${cmd}"
+
+				if (( $#idCmd )); then
+					_call_function ret _task_id
+				else
+					_call_function ret _task_${cmd} ||
+						_call_function ret _task_default ||
+							_message "No command remaining."
+				fi
+        else
+            _message "Unknown subcommand ${cmd}"
+        fi
+        return ret
+    fi
+}

From 1e86678f9d3c8c979ff8d3c8b5aac19e9e611441 Mon Sep 17 00:00:00 2001
From: Pete Clark <pete.clark@gmail.com>
Date: Tue, 24 May 2011 15:29:05 -0400
Subject: [PATCH 251/907] Adds oh-my-zsh plugin to load TaskWarrior completions

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

diff --git a/plugins/taskwarrior/taskwarrior.plugin.zsh b/plugins/taskwarrior/taskwarrior.plugin.zsh
new file mode 100644
index 000000000..c1830042e
--- /dev/null
+++ b/plugins/taskwarrior/taskwarrior.plugin.zsh
@@ -0,0 +1,21 @@
+################################################################################
+# Author: Pete Clark
+# Email: pete[dot]clark[at]gmail[dot]com
+# Version: 0.1 (05/24/2011)
+# License: WTFPL<http://sam.zoy.org/wtfpl/>
+#
+# This oh-my-zsh plugin adds smart tab completion for
+# TaskWarrior<http://taskwarrior.org/>. It uses the zsh tab completion
+# script (_task) distributed with TaskWarrior for the completion definitions.
+#
+# Typing task[tabtab] will give you a list of current tasks, task 66[tabtab]
+# gives a list of available modifications for that task, etc.
+################################################################################
+
+zstyle ':completion:*:*:task:*' verbose yes
+zstyle ':completion:*:*:task:*:descriptions' format '%U%B%d%b%u'
+
+zstyle ':completion:*:*:task:*' group-name ''
+
+alias t=task
+compdef _task t=task

From 21276546e9614576ce6e1a6be1393abce393d04f Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Wed, 23 Feb 2011 00:38:15 -0800
Subject: [PATCH 252/907] fishy theme: text indicators for $? and git status

The git status indicators were taken from sorin.zsh-theme and changed to
use ASCII symbols instead of Unicode ones because my preferred terminal
font, DejaVu Sans Mono, renders Unicode symbols poorly and also because
Unicode rendering is not available in standard Linux virtual terminals.
---
 themes/fishy.zsh-theme | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index f22eda868..f9e506cae 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -3,7 +3,18 @@
 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
 PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
-RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
+RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" "
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"

From f8aae64e478066be7d05f5eb6970c356cafcfd36 Mon Sep 17 00:00:00 2001
From: Jake Bell <jake@theunraveler.com>
Date: Thu, 26 May 2011 12:34:37 -0500
Subject: [PATCH 253/907] Adding ability to override plugins from the custom
 directory.

---
 .gitignore                        | 1 +
 README.textile                    | 6 ++++--
 custom/example/example.plugin.zsh | 2 ++
 oh-my-zsh.sh                      | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 custom/example/example.plugin.zsh

diff --git a/.gitignore b/.gitignore
index 4b555067e..8fdfae286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ locals.zsh
 log/.zsh_history
 projects.zsh
 custom/*
+!custom/example
 !custom/example.zsh
 cache
diff --git a/README.textile b/README.textile
index d01c3310a..2dbfbe5a6 100644
--- a/README.textile
+++ b/README.textile
@@ -48,7 +48,9 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
 h3. Customization
 
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
-If you have many functions which go good together you can put them as a *.plugin.zsh file in the @plugin/@ directory and then enable this plugin.
+If you have many functions which go good together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
+If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
+
 
 h3. Uninstalling
 
@@ -68,4 +70,4 @@ 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!
\ No newline at end of file
+Thank you so much!
diff --git a/custom/example/example.plugin.zsh b/custom/example/example.plugin.zsh
new file mode 100644
index 000000000..406f27445
--- /dev/null
+++ b/custom/example/example.plugin.zsh
@@ -0,0 +1,2 @@
+# Add your own custom plugins in the custom/plugins directory. Plugins placed
+# here will override ones with the same name in the main plugins directory.
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c8f1a33b8..dbff1ced9 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -17,7 +17,9 @@ compinit -i
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+  if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then
+    source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh
+  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
   fi
 done

From 1816e957770f8e3f0ad22658f741c5f0492da982 Mon Sep 17 00:00:00 2001
From: alanpeabody <gapeabody@gmail.com>
Date: Thu, 26 May 2011 23:56:45 -0400
Subject: [PATCH 254/907] Added my own theme.

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

diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody.zsh-theme
new file mode 100644
index 000000000..1f66f1ec3
--- /dev/null
+++ b/themes/alanpeabody.zsh-theme
@@ -0,0 +1,22 @@
+
+local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
+local pwd='%{$fg[blue]%}%~%{$reset_color%}'
+local rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
+local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+
+PROMPT="${user} ${pwd}$ "
+RPROMPT="${return_code} ${git_branch} ${rvm}"
+

From 04573324d52aaadf947f3a80190e4f54d8580932 Mon Sep 17 00:00:00 2001
From: Martin Thurau <martin.thurau@gmail.com>
Date: Fri, 27 May 2011 16:58:14 +0200
Subject: [PATCH 255/907] Added compatibility for the linux 'stat' command for
 the ant plugin

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

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index 0544ac92c..23bc7756a 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -1,8 +1,15 @@
+stat -f%m . > /dev/null 2>&1
+if [ "$?" = 0 ]; then
+	stat_cmd=(stat -f%m)
+else
+	stat_cmd=(stat -L --format=%y)
+fi
+
 _ant_does_target_list_need_generating () {
   if [ ! -f .ant_targets ]; then return 0;
   else
-    accurate=$(stat -f%m .ant_targets)
-    changed=$(stat -f%m build.xml)
+    accurate=$($stat_cmd -f%m .ant_targets)
+    changed=$($stat_cmd -f%m build.xml)
     return $(expr $accurate '>=' $changed)
   fi
 }

From 3e433165502a01028fcd0368161a2193eaeb386c Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:16:06 -0400
Subject: [PATCH 256/907] Ruby Switching Helpers

Add helper functions to switch gemsets on ruby-1.8.7-p334 and ruby-1.9.2-p180.
Add completion definitions for helper functions.
---
 plugins/rvm/rvm.plugin.zsh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ef934d547..274123836 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,3 +1,28 @@
 fpath=($ZSH/plugins/rvm $fpath)
 autoload -U compinit
 compinit -i
+
+local ruby18='ruby-1.8.7-p334'
+local ruby19='ruby-1.9.2-p180'
+
+function rb18 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby18"
+	else
+		rvm use "$ruby18@$1"
+	fi
+}
+
+_rb18() {compadd `ls -1 $rvm_path/gems | grep "^$ruby18@" | sed -e "s/^$ruby18@//" | awk '{print $1}'`}
+compdef _rb18 rb18
+
+function rb19 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby19"
+	else
+		rvm use "$ruby19@$1"
+	fi
+}
+
+_rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
+compdef _rb19 rb19

From e703c9591c64cd23bb0f0e1a892fbed0efe74fa7 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:23:06 -0400
Subject: [PATCH 257/907] Helpful Listing Aliases

Add alias to list installed rubies. Add alias to list gemsets in active ruby.
---
 plugins/rvm/rvm.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 274123836..ba780c97d 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -2,6 +2,9 @@ fpath=($ZSH/plugins/rvm $fpath)
 autoload -U compinit
 compinit -i
 
+alias rubies='rvm list rubies'
+alias gemsets='rvm gemset list'
+
 local ruby18='ruby-1.8.7-p334'
 local ruby19='ruby-1.9.2-p180'
 

From 9f34bbedc8d4843b0ed50f76d38b63e5aa48cc8b Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:35:54 -0400
Subject: [PATCH 258/907] RVM Update Helpers

Add helper function to get rvm head. Add helper function to link zsh
completion that comes with rvm into om-my-zsh plugin directory, but don't
overwrite the completion that comes with oh-my-zsh (oh-my-zsh's completion is
better, but I want to be able to compare).
---
 plugins/rvm/rvm.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index ba780c97d..509dcbd98 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -29,3 +29,12 @@ function rb19 {
 
 _rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
 compdef _rb19 rb19
+
+function rvm-update {
+	rvm get head
+	rvm reload # TODO: Reload rvm completion?
+}
+
+function rvm-link-completion {
+	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
+}

From 572b27b75724d00fbc99ef64de3dbd21a28c8194 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:50:06 -0400
Subject: [PATCH 259/907] Gem List Helper

Add helper function to list gems in a pretty way (only with rvm, for now). Add
missng EOF newline and a todo to the ruby plugin.
---
 plugins/ruby/ruby.plugin.zsh |  4 +++-
 plugins/rvm/rvm.plugin.zsh   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 82bf5d49d..08ca9c601 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -1,4 +1,6 @@
+# TODO: Make this compatible with rvm.
+#       Run sudo gem on the system ruby, not the active ruby.
 alias sgem='sudo gem'
 
 # Find ruby file
-alias rfind='find . -name *.rb | xargs grep -n'
\ No newline at end of file
+alias rfind='find . -name *.rb | xargs grep -n'
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 509dcbd98..8a3ec788a 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -38,3 +38,15 @@ function rvm-update {
 function rvm-link-completion {
 	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
 }
+
+# TODO: Make this usable w/o rvm.
+function gems {
+	local current_ruby=`rvm-prompt i v p`
+	local current_gemset=`rvm-prompt g`
+
+	gem list $@ | sed \
+		-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
+		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+}

From e263f1f0057f6cac15ef588c681e6f49713c3975 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 10:57:48 -0400
Subject: [PATCH 260/907] Brew Plugin

Merge completion with official brew completion. Add a helper to link official
completion into oh-my-zsh plugin (without overwriting). Add an alias to list
installed brews. Add brews to the path (in a somewhat strange way).
---
 plugins/brew/_brew           | 24 +++++++++++++++++-------
 plugins/brew/brew.plugin.zsh | 13 +++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 plugins/brew/brew.plugin.zsh

diff --git a/plugins/brew/_brew b/plugins/brew/_brew
index cee1e25f0..1dcf0a4bf 100644
--- a/plugins/brew/_brew
+++ b/plugins/brew/_brew
@@ -25,10 +25,12 @@ _1st_arguments=(
   'link:link a formula'
   'list:list files in a formula or not-installed formulae'
   'log:git commit log for a formula'
+  'missing:check all installed formuale for missing dependencies.'
   'outdated:list formulas for which a newer version is available'
   '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)'
   'unlink:unlink a formula'
   'update:freshen up links'
   'upgrade:upgrade outdated formulae'
@@ -36,10 +38,14 @@ _1st_arguments=(
 )
 
 local expl
-local -a formula installed_formulae
+local -a formulae installed_formulae
 
 _arguments \
-  '(-v --verbose)'{-v,--verbose}'[verbose]' \
+  '(-v)-v[verbose]' \
+  '(--cellar)--cellar[brew cellar]' \
+  '(--config)--config[brew configuration]' \
+  '(--env)--env[brew environment]' \
+  '(--repository)--repository[brew repository]' \
   '(--version)--version[version information]' \
   '(--prefix)--prefix[where brew lives on this system]' \
   '(--cache)--cache[brew cache]' \
@@ -51,20 +57,24 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  list)
+  search|-S)
+    _arguments \
+      '(--macports)--macports[search the macports repository]' \
+      '(--fink)--fink[search the fink repository]' ;;
+  list|ls)
     _arguments \
       '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+      '(--versions)--versions[list all installed versions of a formula]' \
       '1: :->forms' &&  return 0
 
       if [[ "$state" == forms ]]; then
         _brew_installed_formulae
-        _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
+        _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
       fi ;;
-  install|home|log|info|uses|cat|deps)
+  install|home|homepage|log|info|abv|uses|cat|deps|edit|options)
     _brew_all_formulae
     _wanted formulae expl 'all formulae' compadd -a formulae ;;
-  remove|edit|xo)
+  remove|rm|uninstall|unlink|cleanup|link|ln)
     _brew_installed_formulae
     _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
 esac
-
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
new file mode 100644
index 000000000..f584a4684
--- /dev/null
+++ b/plugins/brew/brew.plugin.zsh
@@ -0,0 +1,13 @@
+# Move /usr/local/bin (path where brews are linked) to the front of the path
+# This will allow us to override system binaries like ruby with our brews
+# TODO: Do this in a more compatible way.
+#       What if someone doesn't have /usr/bin in their path?
+export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
+
+alias brews='brew list -1'
+
+function brew-link-completion {
+	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
+}

From befb02e3da0573fa788114e1c18c70b75f787f1f Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 11:09:37 -0400
Subject: [PATCH 261/907] Pow! Restart Helper

Add helper function to restart an app running on Pow!
---
 plugins/pow/pow.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 plugins/pow/pow.plugin.zsh

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
new file mode 100644
index 000000000..6b2a6f2be
--- /dev/null
+++ b/plugins/pow/pow.plugin.zsh
@@ -0,0 +1,10 @@
+# Thanks to Christopher Sexton
+# https://gist.github.com/965032
+function kapow {
+	touch ~/.pow/$1/tmp/restart.txt
+	if [ $? -eq 0 ]; then
+		echo "$fg[yellow]Pow restarting $1...$reset_color"
+	fi
+}
+
+compctl -W ~/.pow -/ kapow

From d72b9c5ec5d55765998bb301b3425fbe84012c1f Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 11:20:48 -0400
Subject: [PATCH 262/907] Node.js Helpers

Add helper function to open node api in browser. Add binaries installed via
npm to path. Tell node where to find things (what things?).
---
 plugins/node/node.plugin.zsh | 8 ++++++++
 plugins/npm/npm.plugin.zsh   | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 plugins/node/node.plugin.zsh
 create mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
new file mode 100644
index 000000000..18f35333c
--- /dev/null
+++ b/plugins/node/node.plugin.zsh
@@ -0,0 +1,8 @@
+# This works if you installed node via homebrew.
+export NODE_PATH="/usr/local/lib/node"
+
+# Open the node api for your current version to the optional section.
+# TODO: Make the section part easier to use.
+function node-api {
+	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
+}
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 000000000..0b0a30e11
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1,2 @@
+# TODO: Don't do this in such a weird way.
+export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`

From 18293cd724224282d6ca473fcbe6e7439d3eac0c Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 11:27:50 -0400
Subject: [PATCH 263/907] OS X Helpers

Add helper aliases for show/hide files. Add helper alias to recursively delete
.DS_Store files.
---
 plugins/osx/osx.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 81eed5e92..a65ca642a 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,3 +1,9 @@
+alias showfiles='defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder'
+alias hidefiles='defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder'
+
+# Recursively delete .DS_Store files
+alias rm-dsstore="find . -name '*.DS_Store' -type f -delete"
+
 function savepath() {
   pwd > ~/.current_path~
 }

From 18ab94bccd3cfe64f81ab2ea0e09ce4a630a21bc Mon Sep 17 00:00:00 2001
From: brian tse <briankftse@gmail.com>
Date: Sat, 28 May 2011 23:57:32 +0800
Subject: [PATCH 264/907] Add new 'minimal' theme

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

diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
new file mode 100644
index 000000000..ee3ab6b22
--- /dev/null
+++ b/themes/minimal.zsh-theme
@@ -0,0 +1,15 @@
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local cb=$(current_branch)
+  if [ -n "$cb" ]; then
+    echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+}
+
+
+PROMPT='%2~ $(git_custom_status) »%b '
\ No newline at end of file

From ace84c8b7eb8b50842798bac9811d02928f58dd3 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 13:06:03 -0400
Subject: [PATCH 265/907] Cleanup

Add missing newlines at EOF. Remove redundant comment. Fix grammar in comment.
---
 plugins/cap/cap.plugin.zsh           | 2 +-
 plugins/compleat/compleat.plugin.zsh | 2 --
 plugins/github/github.plugin.zsh     | 1 -
 plugins/textmate/textmate.plugin.zsh | 4 +---
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index a0fa21d00..8336182d5 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -18,4 +18,4 @@ function _cap () {
   fi
 }
 
-compctl -K _cap cap
\ No newline at end of file
+compctl -K _cap cap
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
index 8d16a5687..38f1b396a 100644
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -5,7 +5,6 @@
 #       VERSION:  1.0.0
 # ------------------------------------------------------------------------------
 
-
 if (( ${+commands[compleat]} )); then
   local prefix="${commands[compleat]:h:h}"
   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
@@ -19,4 +18,3 @@ if (( ${+commands[compleat]} )); then
     source "$setup" 
   fi
 fi
-
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index df7053ba7..1eb338113 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -4,4 +4,3 @@ if [ "$commands[(I)hub]" ]; then
     # eval `hub alias -s zsh`
     function git(){hub "$@"}
 fi
-
diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index 7c4c14a5f..aa2f75f4f 100644
--- a/plugins/textmate/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
@@ -1,11 +1,9 @@
-
-# TextMate
 alias et='mate .'
 alias ett='mate app config lib db public spec test Rakefile Capfile Todo'
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 
-# Editor Ruby file in TextMate
+# Edit Ruby app in TextMate
 alias mr='mate CHANGELOG app config db lib public script spec test'
 
 function tm() {

From 18bfb14a2f774b115c8634cdaa3864cbdee91a94 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sat, 28 May 2011 13:12:03 -0400
Subject: [PATCH 266/907] Thor

Add plugin with completion for thor.
---
 plugins/thor/_thor | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/thor/_thor

diff --git a/plugins/thor/_thor b/plugins/thor/_thor
new file mode 100644
index 000000000..9f7ed5aef
--- /dev/null
+++ b/plugins/thor/_thor
@@ -0,0 +1,4 @@
+#compdef thor
+#autoload
+
+compadd `thor list | grep thor | cut -d " " -f 2`

From 3b8f65477e989d534d2ce19aaec65ab2c1179aa3 Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Sat, 13 Nov 2010 09:08:24 -0800
Subject: [PATCH 267/907] Fixed cap plugin

---
 plugins/cap/cap.plugin.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index a0fa21d00..a9db4381b 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -11,11 +11,10 @@ function _cap () {
   if [ -f config/deploy.rb ]; then
     if _cap_does_task_list_need_generating; then
       echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
-> .cap_tasks~
+      cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
     fi
     compadd `cat .cap_tasks~`
   fi
 }
 
-compctl -K _cap cap
\ No newline at end of file
+compdef _cap cap

From 205e2f4842d1d1808b0d8d16bcfd1daeadb111d9 Mon Sep 17 00:00:00 2001
From: Magnus Woldrich <m@japh.se>
Date: Sun, 29 May 2011 11:55:24 +0200
Subject: [PATCH 268/907] add trapd00r theme

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

diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
new file mode 100644
index 000000000..cba14c42c
--- /dev/null
+++ b/themes/trapd00r.zsh-theme
@@ -0,0 +1,95 @@
+# Name:   trapd00r zsh theme
+# Author: Magnus Woldrich <m@japh.se>
+#
+# This theme needs a terminal supporting 256 colors as well as unicode. It also
+# needs the script that splits up the current path and makes it fancy as located
+# here: https://github.com/trapd00r/utils/blob/master/zsh_path
+#
+# By default it spans over two lines like so:
+#
+# scp1@shiva:pts/9-> /home » scp1 (0)
+# >
+#
+# that's  user@host:pts/-> splitted path (return status)
+#
+# If the current directory is a git repository, we span 3 lines;
+#
+# git❨ master ❩ DIRTY
+# scp1@shiva:pts/4-> /home » scp1 » dev » utils (0)
+# >
+
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+local c0=$( printf "\e[m")
+local c1=$( printf "\e[38;5;245m")
+local c2=$( printf "\e[38;5;250m")
+local c3=$( printf "\e[38;5;242m")
+local c4=$( printf "\e[38;5;197m")
+local c5=$( printf "\e[38;5;225m")
+local c6=$( printf "\e[38;5;240m")
+local c7=$( printf "\e[38;5;242m")
+local c8=$( printf "\e[38;5;244m")
+local c9=$( printf "\e[38;5;162m")
+local c10=$(printf "\e[1m")
+local c11=$(printf "\e[38;5;208m\e[1m")
+local c12=$(printf "\e[38;5;142m\e[1m")
+local c13=$(printf "\e[38;5;196m\e[1m")
+
+
+# We dont want to use the extended colorset in the TTY / VC.
+if [ "$TERM" = "linux" ]; then
+    c1=$( printf "\e[34;1m")
+    c2=$( printf "\e[35m")
+    c3=$( printf "\e[31m")
+    c4=$( printf "\e[31;1m")
+    c5=$( printf "\e[32m")
+    c6=$( printf "\e[32;1m")
+    c7=$( printf "\e[33m")
+    c8=$( printf "\e[33;1m")
+    c9=$( printf "\e[34m")
+
+    c11=$(printf "\e[35;1m")
+    c12=$(printf "\e[36m")
+    c13=$(printf "\e[31;1m")
+fi
+
+zstyle ':vcs_info:*' actionformats \
+    '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+
+zstyle ':vcs_info:*' formats \
+    "%{$c8%}%s%%{$c7%}❨ %{$c9%}%{$c11%}%b%{$c7%} ❩%{$reset_color%}%f "
+
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git
+
+add-zsh-hook precmd prompt_jnrowe_precmd
+
+prompt_jnrowe_precmd () {
+  vcs_info
+  if [ "${vcs_info_msg_0_}" = "" ]; then
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
+> '
+
+# modified, to be commited
+  elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='${vcs_info_msg_0_}%{$30%} %{$bg_bold[red]%}%{$fg_bold[cyan]%}C%{$fg_bold[black]%}OMMIT%{$reset_color%}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+> '
+
+  elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
+    dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
+    PROMPT='${vcs_info_msg_0_}%{$bg_bold[red]%}%{$fg_bold[blue]%}D%{$fg_bold[black]%}IRTY%{$reset_color%}
+%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+%{$c13%}>%{$c0%} '
+  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%}
+> '
+fi
+}
+
+#  vim: set ft=zsh sw=2 et tw=0:

From 1c2eb40e876db3d2bfad22a0b52f0d410e1d51f3 Mon Sep 17 00:00:00 2001
From: nebirhos <nebirhos@aol.com>
Date: Thu, 26 May 2011 20:00:23 +0200
Subject: [PATCH 269/907] Added nebirhos theme

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

diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme
new file mode 100644
index 000000000..c49df972e
--- /dev/null
+++ b/themes/nebirhos.zsh-theme
@@ -0,0 +1,17 @@
+# Based on robbyrussell's theme, with host and rvm indicators. Example:
+# @host ➜ currentdir rvm:(rubyversion@gemset) git:(branchname)
+
+# Get the current ruby version in use with RVM:
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
+    RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} "
+fi
+
+# Get the host name (first 4 chars)
+HOST_PROMPT_="%{$fg_bold[red]%}@$HOST[0,4] ➜  %{$fg_bold[cyan]%}%c "
+GIT_PROMPT="%{$fg_bold[blue]%}\$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}"
+PROMPT="$HOST_PROMPT_$RUBY_PROMPT_$GIT_PROMPT"
+
+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 1e3b441ce7e0b8706867801c1e5e7ca6760ff17e Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 10:07:15 -0400
Subject: [PATCH 270/907] Rollback of Pull #366

sorin-ionescu had some good points.
---
 plugins/brew/brew.plugin.zsh | 12 ------------
 plugins/node/node.plugin.zsh |  5 +----
 plugins/npm/npm.plugin.zsh   |  2 --
 plugins/rvm/rvm.plugin.zsh   |  9 ++-------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index f584a4684..c2e95884e 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,13 +1 @@
-# Move /usr/local/bin (path where brews are linked) to the front of the path
-# This will allow us to override system binaries like ruby with our brews
-# TODO: Do this in a more compatible way.
-#       What if someone doesn't have /usr/bin in their path?
-export PATH=`echo $PATH | sed -e 's|/usr/local/bin||' -e 's|::|:|g'` # Remove /usr/local/bin
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/bin:&|'`     # Add it in front of /usr/bin
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/sbin:&|'`    # Add /usr/local/sbin
-
 alias brews='brew list -1'
-
-function brew-link-completion {
-	ln -s "$(brew --prefix)/Library/Contributions/brew_zsh_completion.zsh" "$ZSH/plugins/brew/_brew.official"
-}
diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 18f35333c..519bc18da 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,8 +1,5 @@
-# This works if you installed node via homebrew.
-export NODE_PATH="/usr/local/lib/node"
-
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
-function node-api {
+function node-docs {
 	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
 }
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
deleted file mode 100644
index 0b0a30e11..000000000
--- a/plugins/npm/npm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO: Don't do this in such a weird way.
-export PATH=`echo $PATH | sed -e 's|/usr/bin|/usr/local/share/npm/bin:&|'`
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 8a3ec788a..40fd88c1a 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,5 @@
-fpath=($ZSH/plugins/rvm $fpath)
-autoload -U compinit
-compinit -i
+# What does this really do?
+# fpath=($ZSH/plugins/rvm $fpath)
 
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
@@ -35,10 +34,6 @@ function rvm-update {
 	rvm reload # TODO: Reload rvm completion?
 }
 
-function rvm-link-completion {
-	ln -s "$rvm_path/scripts/zsh/Completion/_rvm" "$ZSH/plugins/rvm/_rvm.official"
-}
-
 # TODO: Make this usable w/o rvm.
 function gems {
 	local current_ruby=`rvm-prompt i v p`

From 9801ad6453caa05925847f63401e6266378eb2de Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Mon, 30 May 2011 11:10:08 -0400
Subject: [PATCH 271/907] Remove Uneeded Lines

---
 plugins/rvm/rvm.plugin.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 40fd88c1a..24621fe0b 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,6 +1,3 @@
-# What does this really do?
-# fpath=($ZSH/plugins/rvm $fpath)
-
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 

From 93dab36fcb7f138aba32e5102c621180055d67fe Mon Sep 17 00:00:00 2001
From: Second Planet <contact@secondplanetanimation.com>
Date: Mon, 30 May 2011 19:10:26 -0400
Subject: [PATCH 272/907] added humza.zsh-theme

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

diff --git a/themes/humza.zsh-theme b/themes/humza.zsh-theme
new file mode 100644
index 000000000..107886295
--- /dev/null
+++ b/themes/humza.zsh-theme
@@ -0,0 +1,26 @@
+# ZSH THEME Preview: https://skitch.com/huyy/rk979/humza.zshtheme
+
+let TotalBytes=0
+for Bytes in $(ls -l | grep "^-" | awk '{ print $5 }')
+do
+   let TotalBytes=$TotalBytes+$Bytes
+done
+		# should it say b, kb, Mb, or Gb
+if [ $TotalBytes -lt 1024 ]; then
+   TotalSize=$(echo -e "scale=3 \n$TotalBytes \nquit" | bc)
+   suffix="b"
+elif [ $TotalBytes -lt 1048576 ]; then
+   TotalSize=$(echo -e "scale=3 \n$TotalBytes/1024 \nquit" | bc)
+   suffix="kb"
+elif [ $TotalBytes -lt 1073741824 ]; then
+   TotalSize=$(echo -e "scale=3 \n$TotalBytes/1048576 \nquit" | bc)
+   suffix="Mb"
+else
+   TotalSize=$(echo -e "scale=3 \n$TotalBytes/1073741824 \nquit" | bc)
+   suffix="Gb"
+fi
+
+PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) greetings, earthling %{$fg[green]%}[%{$reset_color%}%{$TotalSize%}%{$suffix%}%{$fg[green]%}]%{$fg[red]%}$%{$reset_color%} ☞ '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}±("
+ZSH_THEME_GIT_PROMPT_SUFFIX=");%{$reset_color%}"

From 714cfb1db2966ddfc0330a09e620164189233b49 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 31 May 2011 11:46:26 +0200
Subject: [PATCH 273/907] Add guru theme

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

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
new file mode 100644
index 000000000..2a2223528
--- /dev/null
+++ b/themes/guru.zsh-theme
@@ -0,0 +1,98 @@
+#-------------------------------------------------------------------------------
+# Guru theme for oh-my-zsh by Adam Lindberg
+# (Needs Git plugin for current_branch method)
+#-------------------------------------------------------------------------------
+
+
+# Color shortcuts
+R=$fg[red]
+Y=$fg[yellow]
+G=$fg[green]
+M=$fg[magenta]
+W=$fg[white]
+B=$fg[black]
+RB=$fg_bold[red]
+YB=$fg_bold[yellow]
+GB=$fg_bold[green]
+MB=$fg_bold[magenta]
+WB=$fg_bold[white]
+BB=$fg_bold[black]
+RESET=$reset_color
+
+if [ "$(whoami)" = "root" ]; then
+    PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
+else
+    PROMPTCOLOR="%{$BB%}" PREFIX="---";
+fi
+
+local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
+
+GIT_PREFIX="%{$YB%}‹"
+GIT_SUFFIX="%{$YB%}›"
+
+# Get the status of the working tree (copied and modified from git.zsh)
+custom_git_prompt_status() {
+  INDEX=$(git status --porcelain 2> /dev/null)
+  STATUS=""
+  # Non-staged
+  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+  fi
+  # Staged
+  if $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_DELETED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^A' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
+  fi
+  echo $STATUS
+}
+
+# get the name of the branch we are on (copied and modified from git.zsh)
+function custom_git_prompt() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_ahead)$(parse_git_dirty)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+PROMPT='${PROMPTCOLOR}$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
+
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➝"
+
+# Staged
+ZSH_THEME_GIT_PROMPT_STAGED_ADDED="%{$G%}A"
+ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED="%{$G%}M"
+ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
+ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
+
+# Not-staged
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}??"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"
+
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}* "
+
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 9c306670a73ec3e313666fc497952153bdc16220 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 31 May 2011 14:07:38 +0200
Subject: [PATCH 274/907] Improve unicode characters and git status

---
 themes/guru.zsh-theme | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index 2a2223528..c63f1082a 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -64,13 +64,18 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^A' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
   fi
+
+  if $(echo "$STATUS" &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_STATUS_PREFIX$STATUS"
+  fi
+
   echo $STATUS
 }
 
 # get the name of the branch we are on (copied and modified from git.zsh)
 function custom_git_prompt() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_ahead)$(parse_git_dirty)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(git_prompt_ahead)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
 PROMPT='${PROMPTCOLOR}$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
@@ -79,7 +84,12 @@ RPS1="${return_code}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$YB%}›%{$RESET%} "
 
-ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➝"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$BB%}➔"
+
+ZSH_THEME_GIT_STATUS_PREFIX=" "
 
 # Staged
 ZSH_THEME_GIT_PROMPT_STAGED_ADDED="%{$G%}A"
@@ -88,11 +98,7 @@ ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R"
 ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D"
 
 # Not-staged
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}??"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}⁇"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU"
-
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}* "
-
-ZSH_THEME_GIT_PROMPT_CLEAN=""

From f4878971752b6d76743c29d6f478d20c84755b8e Mon Sep 17 00:00:00 2001
From: Brian Riddle <brian.riddle@tv4.se>
Date: Tue, 31 May 2011 14:16:43 +0200
Subject: [PATCH 275/907] fix double -f and corrected format.

-f%m was getting called twice in the stat_cmd
corrected format of stat command from y to Y.
---
 plugins/ant/ant.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
index 23bc7756a..691d4d2db 100644
--- a/plugins/ant/ant.plugin.zsh
+++ b/plugins/ant/ant.plugin.zsh
@@ -2,14 +2,14 @@ stat -f%m . > /dev/null 2>&1
 if [ "$?" = 0 ]; then
 	stat_cmd=(stat -f%m)
 else
-	stat_cmd=(stat -L --format=%y)
+	stat_cmd=(stat -L --format=%Y)
 fi
 
 _ant_does_target_list_need_generating () {
   if [ ! -f .ant_targets ]; then return 0;
   else
-    accurate=$($stat_cmd -f%m .ant_targets)
-    changed=$($stat_cmd -f%m build.xml)
+    accurate=$($stat_cmd .ant_targets)
+    changed=$($stat_cmd build.xml)
     return $(expr $accurate '>=' $changed)
   fi
 }

From c014dca141588737a13c4e3974adb4afd58c09bb Mon Sep 17 00:00:00 2001
From: Michael Hanson <michael.b.hanson@gmail.com>
Date: Tue, 31 May 2011 15:13:23 -0700
Subject: [PATCH 276/907] Fix deleted in git.zsh

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

diff --git a/lib/git.zsh b/lib/git.zsh
index 2ace3d0e0..ce4de5598 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -52,11 +52,11 @@ git_prompt_status() {
   if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   echo $STATUS
-}
\ No newline at end of file
+}

From 23a082df129b12b6edf8ea04432b0cb2be0588fd Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 1 Jun 2011 09:33:12 +0200
Subject: [PATCH 277/907] Revert "Added my zsh theme file, heavily based on
 sjl's" as it relies on a dotfile to be in ~/bin.

This reverts commit f2f34f5404e8ab674a0e345a709783b6c56a3b72.
---
 themes/thomasjbradley.zsh-theme | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 themes/thomasjbradley.zsh-theme

diff --git a/themes/thomasjbradley.zsh-theme b/themes/thomasjbradley.zsh-theme
deleted file mode 100644
index 857301d19..000000000
--- a/themes/thomasjbradley.zsh-theme
+++ /dev/null
@@ -1,29 +0,0 @@
-function prompt_char {
-    git branch >/dev/null 2>/dev/null && echo '±' && return
-    hg root >/dev/null 2>/dev/null && echo '☿' && return
-    echo '○'
-}
-
-function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
-}
-
-function hg_prompt_info {
-    hg prompt --angle-brackets "\
-< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
-< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
-%{$fg[green]%}<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
-}
-
-PROMPT='
-%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info)
-$(virtualenv_info)$(prompt_char) '
-
-ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-. ~/bin/dotfiles/zsh/aliases

From a9b6f081b4a405dd1365df9c35aa3603196e3fc7 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Wed, 1 Jun 2011 10:11:06 +0200
Subject: [PATCH 278/907] Remove extra space when no status

---
 themes/guru.zsh-theme | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index c63f1082a..aa7b28b34 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -27,9 +27,6 @@ fi
 
 local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
 
-GIT_PREFIX="%{$YB%}‹"
-GIT_SUFFIX="%{$YB%}›"
-
 # Get the status of the working tree (copied and modified from git.zsh)
 custom_git_prompt_status() {
   INDEX=$(git status --porcelain 2> /dev/null)
@@ -65,7 +62,7 @@ custom_git_prompt_status() {
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS"
   fi
 
-  if $(echo "$STATUS" &> /dev/null); then
+  if $(echo -n "$STATUS" | grep '.*' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_STATUS_PREFIX$STATUS"
   fi
 

From 0d476e02cd1b5660b09acde25725191044f062ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Had=C5=BEi=C4=87?= <milos.hadzic@gmail.com>
Date: Wed, 1 Jun 2011 12:45:15 +0200
Subject: [PATCH 279/907] Adds my theme

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

diff --git a/themes/miloshadzic.zsh-theme b/themes/miloshadzic.zsh-theme
new file mode 100644
index 000000000..ad5394423
--- /dev/null
+++ b/themes/miloshadzic.zsh-theme
@@ -0,0 +1,8 @@
+# Yay! High voltage and arrows!
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+PROMPT='%{$fg[cyan]%}%1~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%} '

From 5aa6b0fae5f1fa82c90003c2020849b4bb87c9e8 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 1 May 2011 11:46:11 -0400
Subject: [PATCH 280/907] Replaced npm 0.x completion with 1.0 completion.

---
 plugins/npm/_npm           | 19 -------------------
 plugins/npm/npm.plugin.zsh |  1 +
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 plugins/npm/_npm
 create mode 100644 plugins/npm/npm.plugin.zsh

diff --git a/plugins/npm/_npm b/plugins/npm/_npm
deleted file mode 100644
index 24b536188..000000000
--- a/plugins/npm/_npm
+++ /dev/null
@@ -1,19 +0,0 @@
-#compdef npm
-
-# Node Package Manager 0.3.15 completion, letting npm do all the completion work
-
-_npm() {
-  compadd -- $(_npm_complete $words)
-}
-
-# We want to show all errors of any substance, but never the "npm (not )ok" one.
-# (Also doesn't consider "ERR! no match found" worth breaking the terminal for.)
-_npm_complete() {
-  local ask_npm
-  ask_npm=(npm completion --color false --loglevel error -- $@)
-  { _call_program npm $ask_npm 2>&1 >&3 \
-  | egrep -v '^(npm (not |)ok|ERR! no match found)$' >&2; \
-  } 3>&1
-}
-
-_npm "$@"
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
new file mode 100644
index 000000000..c3eb91d31
--- /dev/null
+++ b/plugins/npm/npm.plugin.zsh
@@ -0,0 +1 @@
+eval "$(npm completion 2>/dev/null)"

From f401d6ef78a94b723ce841b77151eaac477b8074 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Tue, 22 Feb 2011 23:32:50 -0500
Subject: [PATCH 281/907] Vastly improved osx plugin.

---
 plugins/osx/osx.plugin.zsh | 138 +++++++++++++++++++++++--------------
 1 file changed, 87 insertions(+), 51 deletions(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index a65ca642a..682bb2667 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,63 +1,99 @@
-alias showfiles='defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder'
-alias hidefiles='defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder'
+# ------------------------------------------------------------------------------
+#          FILE:  osx.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
+#       VERSION:  1.0.1
+# ------------------------------------------------------------------------------
 
-# Recursively delete .DS_Store files
-alias rm-dsstore="find . -name '*.DS_Store' -type f -delete"
-
-function savepath() {
-  pwd > ~/.current_path~
-}
 
 function tab() {
-savepath
-osascript >/dev/null <<EOF
-on do_submenu(app_name, menu_name, menu_item, submenu_item)
-    -- bring the target application to the front
-    tell application app_name
-      activate
-    end tell
-    tell application "System Events"
-      tell process app_name
-        tell menu bar 1
-          tell menu bar item menu_name
-            tell menu menu_name
-              tell menu item menu_item
-                tell menu menu_item
-                  click menu item submenu_item
-                end tell
-              end tell
-            end tell
+  local command="cd \\\"$PWD\\\""
+  (( $# > 0 )) && command="${command}; $*"
+
+  the_app=$(
+    osascript 2>/dev/null <<EOF
+      tell application "System Events"
+        name of first item of (every process whose frontmost is true)
+      end tell
+EOF
+  )
+
+  [[ "$the_app" == 'Terminal' ]] && {
+    osascript 2>/dev/null <<EOF
+      tell application "System Events"
+        tell process "Terminal" to keystroke "t" using command down
+        tell application "Terminal" to do script "${command}" in front window
+      end tell
+EOF
+  }
+
+  [[ "$the_app" == 'iTerm' ]] && {
+    osascript 2>/dev/null <<EOF
+      tell application "iTerm"
+        set current_terminal to current terminal
+        tell current_terminal
+          launch session "Default Session"
+          set current_session to current session
+          tell current_session
+            write text "${command}"
           end tell
         end tell
       end tell
-    end tell
-end do_submenu
+EOF
+  }
+}
 
-do_submenu("Terminal", "Shell", "New Tab", 1)
+function pfd() {
+  osascript 2>/dev/null <<EOF
+    tell application "Finder"
+      return POSIX path of (target of window 1 as alias)
+    end tell
 EOF
 }
 
-function itab() {
-savepath
-osascript >/dev/null <<EOF
-on do_submenu(app_name, menu_name, menu_item)
-    -- bring the target application to the front
-    tell application app_name
-      activate
-    end tell
-    tell application "System Events"
-      tell process app_name
-        tell menu bar 1
-          tell menu bar item menu_name
-            tell menu menu_name
-              click menu item menu_item
-            end tell
-          end tell
-        end tell
-      end tell
-    end tell
-end do_submenu
-
-do_submenu("iTerm", "Shell", "New Tab")
+function pfs() {
+  osascript 2>/dev/null <<EOF
+    set output to ""
+    tell application "Finder" to set the_selection to selection
+    set item_count to count the_selection
+    repeat with item_index from 1 to count the_selection
+      if item_index is less than item_count then set the_delimiter to "\n"
+      if item_index is item_count then set the_delimiter to ""
+      set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
+    end repeat
 EOF
 }
+
+function cdf() {
+  cd "$(pfd)"
+}
+
+function pushdf() {
+  pushd "$(pfd)"
+}
+
+function quick-look() {
+  (( $# > 0 )) && qlmanage -p $* &>/dev/null &
+}
+
+function man-preview() {
+  man -t "$@" | open -f -a Preview
+}
+
+function trash() {
+  local trash_dir="${HOME}/.Trash"
+  local temp_ifs=$IFS
+  IFS=$'\n'
+  for item in "$@"; do
+    if [[ -e "$item" ]]; then
+      item_name="$(basename $item)"
+      if [[ -e "${trash_dir}/${item_name}" ]]; then
+        mv -f "$item" "${trash_dir}/${item_name} $(date "+%H-%M-%S")"
+      else
+        mv -f "$item" "${trash_dir}/"
+      fi
+    fi
+  done
+  IFS=$temp_ifs
+}
+

From 5e5096dad60ef0f41aea384c1e249a3bf0377be6 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Fri, 22 Apr 2011 19:13:37 -0400
Subject: [PATCH 282/907] Added man-preview completion suggested by @webflo.

---
 plugins/osx/_man-preview | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 plugins/osx/_man-preview

diff --git a/plugins/osx/_man-preview b/plugins/osx/_man-preview
new file mode 100644
index 000000000..6cc344ad4
--- /dev/null
+++ b/plugins/osx/_man-preview
@@ -0,0 +1,5 @@
+#compdef man-preview
+#autoload
+
+_man
+

From 1db6575f14d07b9ed3b0ce530837a8a0713b69d0 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 3 Feb 2011 22:46:52 -0500
Subject: [PATCH 283/907] Added extract plugin.

---
 lib/aliases.zsh                    |  1 -
 lib/functions.zsh                  | 35 -------------
 plugins/extract/_extract           |  8 +++
 plugins/extract/extract.plugin.zsh | 83 ++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 36 deletions(-)
 create mode 100644 plugins/extract/_extract
 create mode 100644 plugins/extract/extract.plugin.zsh

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index b47de5bde..0555be264 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -22,4 +22,3 @@ alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
 
-alias x=extract
diff --git a/lib/functions.zsh b/lib/functions.zsh
index b29d3e482..ef7cc6383 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -15,38 +15,3 @@ function take() {
   cd $1
 }
 
-function extract() {
-    unset REMOVE_ARCHIVE
-    
-    if test "$1" = "-r"; then
-        REMOVE=1
-        shift
-    fi
-  if [[ -f $1 ]]; then
-    case $1 in
-      *.tar.bz2) tar xvjf $1;;
-      *.tar.gz) tar xvzf $1;;
-      *.tar.xz) tar xvJf $1;;
-      *.tar.lzma) tar --lzma -xvf $1;;
-      *.bz2) bunzip $1;;
-      *.rar) unrar x $1;;
-      *.gz) gunzip $1;;
-      *.tar) tar xvf $1;;
-      *.tbz2) tar xvjf $1;;
-      *.tgz) tar xvzf $1;;
-      *.zip) unzip $1;;
-      *.Z) uncompress $1;;
-      *.7z) 7z x $1;;
-      *) echo "'$1' cannot be extracted via >extract<";;
-    esac
-
-    if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
-        echo removing "$1";
-        /bin/rm "$1";
-    fi
-
-  else
-    echo "'$1' is not a valid file"
-  fi
-}
-
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
new file mode 100644
index 000000000..dca890954
--- /dev/null
+++ b/plugins/extract/_extract
@@ -0,0 +1,8 @@
+#compdef extract
+#autoload
+
+_arguments \
+  '(-r --remove)'{-r,--remove}'[Remove archive.]' \
+  "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0
+
+
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
new file mode 100644
index 000000000..c58692fbf
--- /dev/null
+++ b/plugins/extract/extract.plugin.zsh
@@ -0,0 +1,83 @@
+# ------------------------------------------------------------------------------
+#          FILE:  extract.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
+#       VERSION:  1.0.0
+# ------------------------------------------------------------------------------
+
+
+function extract() {
+  local remove_archive
+  local success
+  local file_name
+  local extract_dir
+
+  if (( $# == 0 )); then
+    echo "Usage: extract [-option] [file ...]"
+    echo
+    echo Options:
+    echo "    -r, --remove    Remove archive."
+    echo
+    echo "Report bugs to <sorin.ionescu@gmail.com>."
+  fi
+
+  remove_archive=1
+  if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
+    remove_archive=0 
+    shift
+  fi
+
+  while (( $# > 0 )); do
+    if [[ ! -f "$1" ]]; then
+      echo "extract: '$1' is not a valid file" 1>&2
+      shift
+      continue
+    fi
+
+    success=0
+    file_name="$( basename "$1" )"
+    extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
+    case "$1" in
+      (*.tar.gz|*.tgz) tar xvzf "$1" ;;
+      (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
+      (*.tar.xz|*.txz) tar xvJf "$1" ;;
+      # (*.tar.xz|*.txz) xzcat "$1" | tar xvf - ;;
+      (*.tar.lzma|*.tlz) tar --lzma -xvf "$1" ;;
+      # (*.tar.lzma|*.tlz) lzcat "$1" | tar xvf - ;;
+      (*.tar) tar xvf "$1" ;;
+      (*.gz) gunzip "$1" ;;
+      (*.bz2) bunzip2 "$1" ;;
+      (*.xz) unxz "$1" ;;
+      (*.lzma) unlzma "$1" ;;
+      (*.Z) uncompress "$1" ;;
+      (*.zip) unzip "$1" -d $extract_dir ;;
+      (*.rar) unrar e -ad "$1" ;;
+      (*.7z) 7za x "$1" ;;
+      (*.deb)
+        mkdir -p "$extract_dir/control"
+        mkdir -p "$extract_dir/data"
+        cd "$extract_dir"; ar vx "../${1}" > /dev/null
+        cd control; tar xzvf ../control.tar.gz
+        cd ../data; tar xzvf ../data.tar.gz
+        cd ..; rm *.tar.gz debian-binary
+        cd ..
+      ;;
+      (*) 
+        echo "extract: '$1' cannot be extracted" 1>&2
+        success=1 
+      ;; 
+    esac
+
+    (( success = $success > 0 ? $success : $? ))
+    (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
+    shift
+  done
+}
+
+alias x=extract
+
+# add extract completion function to path
+fpath=($ZSH/plugins/extract $fpath)
+autoload -U compinit
+compinit -i
+

From a5c383258b760ad1c34d550edb86d7d63e8f5877 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 17 Apr 2011 23:17:48 -0400
Subject: [PATCH 284/907] Handle tar.xz and tar.lzma better (credit: @gwjo).

---
 plugins/extract/extract.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index c58692fbf..8cc17f7d4 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -2,7 +2,7 @@
 #          FILE:  extract.plugin.zsh
 #   DESCRIPTION:  oh-my-zsh plugin file.
 #        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.0
+#       VERSION:  1.0.1
 # ------------------------------------------------------------------------------
 
 
@@ -40,10 +40,12 @@ function extract() {
     case "$1" in
       (*.tar.gz|*.tgz) tar xvzf "$1" ;;
       (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
-      (*.tar.xz|*.txz) tar xvJf "$1" ;;
-      # (*.tar.xz|*.txz) xzcat "$1" | tar xvf - ;;
-      (*.tar.lzma|*.tlz) tar --lzma -xvf "$1" ;;
-      # (*.tar.lzma|*.tlz) lzcat "$1" | tar xvf - ;;
+      (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
+        && tar --xz -xvf "$1" \
+        || xzcat "$1" | tar xvf - ;;
+      (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \
+        && tar --lzma -xvf "$1" \
+        || lzcat "$1" | tar xvf - ;;
       (*.tar) tar xvf "$1" ;;
       (*.gz) gunzip "$1" ;;
       (*.bz2) bunzip2 "$1" ;;

From bf86502b6940d938c488254befdf9461cb50591b Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 3 Feb 2011 17:25:45 -0500
Subject: [PATCH 285/907] Added gnu-utils plugin.

---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 80 ++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 plugins/gnu-utils/gnu-utils.plugin.zsh

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
new file mode 100644
index 000000000..e59265d66
--- /dev/null
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -0,0 +1,80 @@
+# ------------------------------------------------------------------------------
+#          FILE:  gnu-utils.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh plugin file.
+#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
+#       VERSION:  1.0.0
+# ------------------------------------------------------------------------------
+
+
+if [[ -x "${commands[gwhoami]}" ]]; then 
+  __gnu_utils() {
+    emulate -L zsh
+    local gcmds
+    local gcmd
+    local cmd
+    local prefix
+
+    # coreutils 
+    gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
+    'gchown' 'gchroot' 'gcksum' 'gcomm' 'gcp' 'gcsplit' 'gcut' 'gdate'
+    'gdd' 'gdf' 'gdir' 'gdircolors' 'gdirname' 'gdu' 'gecho' 'genv' 'gexpand'
+    'gexpr' 'gfactor' 'gfalse' 'gfmt' 'gfold' 'ggroups' 'ghead' 'ghostid'
+    'gid' 'ginstall' 'gjoin' 'gkill' 'glink' 'gln' 'glogname' 'gls' 'gmd5sum'
+    'gmkdir' 'gmkfifo' 'gmknod' 'gmktemp' 'gmv' 'gnice' 'gnl' 'gnohup' 'gnproc'
+    'god' 'gpaste' 'gpathchk' 'gpinky' 'gpr' 'gprintenv' 'gprintf' 'gptx' 'gpwd'
+    'greadlink' 'grm' 'grmdir' 'gruncon' 'gseq' 'gsha1sum' 'gsha224sum'
+    'gsha256sum' 'gsha384sum' 'gsha512sum' 'gshred' 'gshuf' 'gsleep' 'gsort'
+    'gsplit' 'gstat' 'gstty' 'gsum' 'gsync' 'gtac' 'gtail' 'gtee' 'gtest'
+    'gtimeout' 'gtouch' 'gtr' 'gtrue' 'gtruncate' 'gtsort' 'gtty' 'guname'
+    'gunexpand' 'guniq' 'gunlink' 'guptime' 'gusers' 'gvdir' 'gwc' 'gwho'
+    'gwhoami' 'gyes')
+
+    # Not part of coreutils, installed separately.
+    gcmds+=('gsed' 'gtar' 'gtime')
+
+    for gcmd in "${gcmds[@]}"; do
+      #
+      # This method allows for builtin commands to be primary but it's
+      # lost if hash -r or rehash -f is executed. Thus, those two 
+      # functions have to be wrapped.
+      #
+      (( ${+commands[$gcmd]} )) && hash ${gcmd[2,-1]}=${commands[$gcmd]}
+
+      #
+      # This method generates wrapper functions.
+      # It will override shell builtins.
+      #
+      # (( ${+commands[$gcmd]} )) && \
+      # eval "function $gcmd[2,-1]() { \"${prefix}/${gcmd//"["/"\\["}\" \"\$@\"; }"
+
+      #
+      # This method is inflexible since the aliases are at risk of being
+      # overriden resulting in the BSD coreutils being called.
+      #
+      # (( ${+commands[$gcmd]} )) && \
+      # alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"
+    done
+
+    return 0
+  }
+  __gnu_utils;
+
+  function hash() {
+    if [[ "$*" =~ "-(r|f)" ]]; then
+      builtin hash "$@"
+      __gnu_utils
+    else
+      builtin hash "$@"
+    fi
+  }
+
+  function rehash() {
+    if [[ "$*" =~ "-f" ]]; then
+      builtin rehash "$@"
+      __gnu_utils
+    else
+      builtin rehash "$@"
+    fi
+  }
+fi
+

From c1b5d72830629c737f40abebf87fcca797bf730c Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Wed, 1 Jun 2011 20:38:25 -0700
Subject: [PATCH 286/907] add "sunaku" theme, see http://ompldr.org/vOHcwZg

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

diff --git a/themes/sunaku.zsh-theme b/themes/sunaku.zsh-theme
new file mode 100644
index 000000000..440fa90b4
--- /dev/null
+++ b/themes/sunaku.zsh-theme
@@ -0,0 +1,26 @@
+# Git-centric variation of the "fishy" theme.
+# See screenshot at http://ompldr.org/vOHcwZg
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[magenta]%}!"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}>"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[cyan]%}#"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[yellow]%}?"
+
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=" "
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+local user_color='green'
+test $UID -eq 0 && user_color='red'
+
+PROMPT='%(?..%{$fg_bold[red]%}exit %?
+%{$reset_color%})'\
+'%{$bold_color%}$(git_prompt_status)%{$reset_color%}'\
+'$(git_prompt_info)'\
+'%{$fg[$user_color]%}%~%{$reset_color%}'\
+'%(!.#.>) '
+
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'

From 9b63a03bcfb7a6c34281d7d905575c5647e9c8d2 Mon Sep 17 00:00:00 2001
From: Matt Doran <matt.doran@papercut.com>
Date: Sat, 4 Jun 2011 00:32:05 +1000
Subject: [PATCH 287/907] Fix typos in the svn plugin that would cause calls to
 'svn' when not in an svn working copy.

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 45d461306..86050227d 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -13,7 +13,7 @@ function in_svn() {
 }
 
 function svn_get_repo_name {
-    if [ is_svn ]; then
+    if [ in_svn ]; then
         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
     
         svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
@@ -21,13 +21,13 @@ function svn_get_repo_name {
 }
 
 function svn_get_rev_nr {
-    if [ is_svn ]; then
+    if [ in_svn ]; then
         svn info 2> /dev/null | sed -n s/Revision:\ //p
     fi
 }
 
 function svn_dirty_choose {
-    if [ is_svn ]; then
+    if [ in_svn ]; then
         s=$(svn status 2>/dev/null)
         if [ $s ]; then 
             echo $1
@@ -39,4 +39,4 @@ function svn_dirty_choose {
 
 function svn_dirty {
     svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
-}
\ No newline at end of file
+}

From 0c41b1cdc3ff7b00ffb2310b91becb91b31704f7 Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Fri, 3 Jun 2011 14:05:25 -0400
Subject: [PATCH 288/907] Colorize Install & Upgrade Scripts

Make tools/install.sh and tools/upgrade.sh pretty.
---
 tools/install.sh | 28 ++++++++++++++--------------
 tools/upgrade.sh | 21 +++++++++++----------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 8ed1403af..aedb706da 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,36 +1,36 @@
 if [ -d ~/.oh-my-zsh ]
 then
-  echo "You already have Oh My Zsh installed. You'll need to remove ~/.oh-my-zsh if you want to install"
+  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install"
   exit
 fi
 
-echo "Cloning Oh My Zsh..."
+echo "\033[0;34mCloning Oh My Zsh...\033[0m"
 /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
 
-echo "Looking for an existing zsh config..."
+echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 then
-  echo "Found ~/.zshrc. Backing up to ~/.zshrc.pre-oh-my-zsh";
+  echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m";
   cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
   rm ~/.zshrc;
 fi
 
-echo "Using the Oh My Zsh template file and adding it to ~/.zshrc"
+echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 
-echo "Copying your current PATH and adding it to the end of ~/.zshrc for you."
+echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
 echo "export PATH=$PATH" >> ~/.zshrc
 
-echo "Time to change your default shell to zsh!"
+echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
 chsh -s `which zsh`
 
-echo '         __                                     __  '
-echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
-echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
-echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
-echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
-echo '                        /____/'
+echo "\033[0;32m"'         __                                     __   '"\033[0m"
+echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
+echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
+echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
+echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
+echo "\033[0;32m"'                        /____/                       '"\033[0m"
 
-echo "\n\n ....is now installed."
+echo "\n\n \033[0;32m....is now installed.\033[0m"
 /usr/bin/env zsh
 source ~/.zshrc
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6bdd02e38..7e5cc7655 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,12 +1,13 @@
 current_path=`pwd`
-echo "Upgrading Oh My Zsh"
+echo "\033[0;34mUpgrading Oh My Zsh\033[0m"
 ( cd $ZSH && git pull origin master )
-echo '         __                                     __  '
-echo '  ____  / /_     ____ ___  __  __   ____  _____/ /_ '
-echo ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
-echo '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
-echo '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
-echo '                        /____/'
-echo "Hooray! Oh My Zsh has been updated and/or is at the current version. \nAny new updates will be reflected when you start your next terminal session."
-echo "To keep up on the latest, be sure to follow Oh My Zsh on twitter: http://twitter.com/ohmyzsh"
-cd $current_path
\ No newline at end of file
+echo "\033[0;32m"'         __                                     __   '"\033[0m"
+echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
+echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
+echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
+echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
+echo "\033[0;32m"'                        /____/                       '"\033[0m"
+echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
+echo "\033[0;34mAny new updates will be reflected when you start your next terminal session.\033[0m"
+echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
+cd $current_path

From 7c9474508cade14102a2fe1c63ad845fda521bec Mon Sep 17 00:00:00 2001
From: vguerci <vguerci@gmail.com>
Date: Sat, 4 Jun 2011 11:02:25 +0200
Subject: [PATCH 289/907] [upgrade] before init (no reload needed unless
 oh-my-zsh.sh has been modified)

---
 oh-my-zsh.sh     | 17 ++++++++---------
 tools/upgrade.sh |  1 -
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index dbff1ced9..2157c38a0 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,11 @@
+# Check for updates on initial load...
+if [ "$DISABLE_AUTO_UPDATE" = "true" ]
+then
+  return
+else
+  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
+fi
+
 # Initializes Oh My Zsh
 
 # add a function path
@@ -28,7 +36,6 @@ done
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
 # Load the theme
-# Check for updates on initial load...
 if [ "$ZSH_THEME" = "random" ]
 then
   themes=($ZSH/themes/*zsh-theme)
@@ -41,11 +48,3 @@ else
   source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 fi
 
-
-# Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
-then
-  return
-else
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
-fi
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 7e5cc7655..e30488822 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -8,6 +8,5 @@ echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m
 echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
 echo "\033[0;32m"'                        /____/                       '"\033[0m"
 echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
-echo "\033[0;34mAny new updates will be reflected when you start your next terminal session.\033[0m"
 echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
 cd $current_path

From 9b4a89f327a045ed5e756ae4e75d1aac68803164 Mon Sep 17 00:00:00 2001
From: Michael Komitee <mkomitee@me.com>
Date: Sat, 4 Jun 2011 14:03:10 -0400
Subject: [PATCH 290/907] Fix bug from Pull request #395     #395 broke
 oh-my-zsh for users who disable check-for-updates

---
 oh-my-zsh.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 2157c38a0..d72d90cf9 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,8 +1,6 @@
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
+if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  return
-else
   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
 

From 35b879a17b965b0ea28009c4561962c9ed17ef1f Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Sat, 4 Jun 2011 21:07:55 -0400
Subject: [PATCH 291/907] Add support for agent forwarding

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 52 ++++++++++++++++++++------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 0efc4546f..0f5b03d26 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,23 +1,51 @@
-# Based on code from Joseph M. Reagle
-# http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+#
+# INSTRUCTIONS
+#
+#   To enabled agent forwarding support add the following to
+#   your .zshrc file:
+#
+#     zstyle :omz:plugins:ssh-agent agent-forwarding on
+#
+#
+# CREDITS
+#
+#   Based on code from Joseph M. Reagle
+#   http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
+#
+#   Agent forwarding support based on ideas from
+#   Florent Thoumie and Jonas Pfenniger
+#
 
-local SSH_ENV=$HOME/.ssh/environment-$HOST
+local _plugin__ssh_env=$HOME/.ssh/environment-$HOST
+local _plugin__forwarding
 
-function start_agent {
-  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${SSH_ENV}
-  chmod 600 ${SSH_ENV}
-  . ${SSH_ENV} > /dev/null
+function _plugin__start_agent()
+{
+  /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
+  chmod 600 ${_plugin__ssh_env}
+  . ${_plugin__ssh_env} > /dev/null
   /usr/bin/ssh-add;
 }
 
-# Source SSH settings, if applicable
+# test if agent-forwarding is enabled
+zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
+if [[ ${_plugin__forwarding} == "yes" && -z $SSH_AGENT_PID && -n "$SSH_AUTH_SOCK" ]]; then
+  # No PID but a AUTH_SOCK means agent forwarding is enabled
+  # Add a nifty symlink for screen/tmux 
+  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
 
-if [ -f "${SSH_ENV}" ]; then
-  . ${SSH_ENV} > /dev/null
+elif [ -f "${_plugin__ssh_env}" ]; then
+  # Source SSH settings, if applicable
+  . ${_plugin__ssh_env} > /dev/null
   ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-    start_agent;
+    _plugin__start_agent;
   }
 else
-  start_agent;
+  _plugin__start_agent;
 fi
 
+# tidy up after ourselves
+unfunction _plugin__start_agent
+unset _plugin__forwarding
+unset _plugin__ssh_env
+

From 40b7f2099d393950e26d1a9720743e161b1abe49 Mon Sep 17 00:00:00 2001
From: gwjo <gowen72@gmail.com>
Date: Sat, 4 Jun 2011 22:16:10 -0400
Subject: [PATCH 292/907] Add support for loading mulitple identities

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 0f5b03d26..c4e92a1fe 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -6,6 +6,11 @@
 #
 #     zstyle :omz:plugins:ssh-agent agent-forwarding on
 #
+#   To load multiple identies use the identities style, For
+#   example:
+#
+#     zstyle :omz:plugins:ssh-agent id_rsa id_rsa2 id_github
+#
 #
 # CREDITS
 #
@@ -21,17 +26,23 @@ local _plugin__forwarding
 
 function _plugin__start_agent()
 {
+  local -a identities
+
+  # start ssh-agent and setup environment
   /usr/bin/env ssh-agent | sed 's/^echo/#echo/' > ${_plugin__ssh_env}
   chmod 600 ${_plugin__ssh_env}
   . ${_plugin__ssh_env} > /dev/null
-  /usr/bin/ssh-add;
+
+  # load identies
+  zstyle -a :omz:plugins:ssh-agent identities identities 
+  echo starting...
+  /usr/bin/ssh-add $HOME/.ssh/${^identities}
 }
 
 # test if agent-forwarding is enabled
 zstyle -b :omz:plugins:ssh-agent agent-forwarding _plugin__forwarding
-if [[ ${_plugin__forwarding} == "yes" && -z $SSH_AGENT_PID && -n "$SSH_AUTH_SOCK" ]]; then
-  # No PID but a AUTH_SOCK means agent forwarding is enabled
-  # Add a nifty symlink for screen/tmux 
+if [[ ${_plugin__forwarding} == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
+  # Add a nifty symlink for screen/tmux if agent forwarding
   [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
 
 elif [ -f "${_plugin__ssh_env}" ]; then

From 25adbe81a55664335e0166c202b8d8424a67c8aa Mon Sep 17 00:00:00 2001
From: Andrew Hodges <betawaffle@gmail.com>
Date: Sun, 29 May 2011 09:32:44 -0400
Subject: [PATCH 293/907] Aliases

Modify directory listing aliases to make more sense. Remove conflicting helper
function (mcd conflicts with mtools).
---
 lib/aliases.zsh     | 3 ++-
 lib/directories.zsh | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index b47de5bde..8c510e0ef 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -16,8 +16,9 @@ alias history='fc -l 1'
 
 # List direcory contents
 alias lsa='ls -lah'
-alias l='ls -la'
+alias l='ls -lA1'
 alias ll='ls -l'
+alias la='ls -lA'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
diff --git a/lib/directories.zsh b/lib/directories.zsh
index bb114f615..7f74d924f 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -37,8 +37,3 @@ cd () {
 alias md='mkdir -p'
 alias rd=rmdir
 alias d='dirs -v'
-
-# mkdir & cd to it
-function mcd() { 
-  mkdir -p "$1" && cd "$1"; 
-}
\ No newline at end of file

From 715be61966acecb4d30953e3dd4c9d8a3f8637eb Mon Sep 17 00:00:00 2001
From: Clement Girault <sub@transatmedia.com>
Date: Mon, 6 Jun 2011 01:37:07 +1000
Subject: [PATCH 294/907] New theme, Read contents for further customising.

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

diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
new file mode 100644
index 000000000..7cb27934d
--- /dev/null
+++ b/themes/wedisagree.zsh-theme
@@ -0,0 +1,107 @@
+# On a mac with snow leopard, for nicer terminal colours:
+
+# - Install SIMBL: http://www.culater.net/software/SIMBL/SIMBL.php
+# - Download'Terminal-Colours': http://bwaht.net/code/TerminalColours.bundle.zip
+# - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist)
+# - Open Terminal preferences. Go to Settings -> Text -> More
+# - Change default colours to your liking.
+# 
+# Here are the colours from Textmate's Monokai theme:
+# 
+# Black: 0, 0, 0
+# Red: 229, 34, 34
+# Green: 166, 227, 45
+# Yellow: 252, 149, 30
+# Blue: 196, 141, 255
+# Magenta: 250, 37, 115
+# Cyan: 103, 217, 240
+# White: 242, 242, 242
+
+# Thanks to Steve Losh: http://stevelosh.com/blog/2009/03/candy-colored-terminal/
+
+# The prompt
+
+PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
+
+# The right-hand prompt
+
+RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}'
+
+# Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
+# %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
+
+# local time, color coded by last return code
+time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
+time_disabled="%{$fg[green]%}%*%{$reset_color%}"
+time=$time_enabled
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" ☁  %{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%} ☂" # Ⓓ
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" # ⓣ
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ☀" # Ⓞ
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✚" # ⓐ ⑃
+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]%} ♒" # ⓤ ⑊
+
+# More symbols to choose from:
+# ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
+# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠ 
+# ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟  ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ
+
+# Determine if we are using a gemset.
+function rvm_gemset() {
+    GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
+    if [[ -n $GEMSET ]]; then
+        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
+    fi 
+}
+
+# Determine the time since last commit. If branch is clean,
+# use a neutral color, otherwise colors will vary according to time.
+function git_time_since_commit() {
+    if git rev-parse --git-dir > /dev/null 2>&1; then
+        # Only proceed if there is actually a commit.
+        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
+            # Get the last commit.
+            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+            now=`date +%s`
+            seconds_since_last_commit=$((now-last_commit))
+
+            # Totals
+            MINUTES=$((seconds_since_last_commit / 60))
+            HOURS=$((seconds_since_last_commit/3600))
+           
+            # Sub-hours and sub-minutes
+            DAYS=$((seconds_since_last_commit / 86400))
+            SUB_HOURS=$((HOURS % 24))
+            SUB_MINUTES=$((MINUTES % 60))
+            
+            if [[ -n $(git status -s 2> /dev/null) ]]; then
+                if [ "$MINUTES" -gt 30 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
+                elif [ "$MINUTES" -gt 10 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
+                else
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
+                fi
+            else
+                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            fi
+
+            if [ "$HOURS" -gt 24 ]; then
+                echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+            elif [ "$MINUTES" -gt 60 ]; then
+                echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
+            else
+                echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
+            fi
+        else
+            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            echo "($(rvm_gemset)$COLOR~|"
+        fi
+    fi
+}
\ No newline at end of file

From 5444d2088c97dc776dcbd17acf55dd54b9d7060a Mon Sep 17 00:00:00 2001
From: thunfischbrot <moritz@moritzsuess.de>
Date: Sun, 5 Jun 2011 15:19:46 -0700
Subject: [PATCH 295/907] Included some essential aliases, inspired by
 http://lolcode.com/

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

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index a7153bb57..e455527e7 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -8,19 +8,30 @@ alias rtfm='man'
 alias visible='echo'
 alias invisible='cat'
 alias moar='more'
+alias tldr='less'
+alias alwayz='tail -f'
 
 alias icanhas='mkdir'
+alias gimmeh='touch'
 alias donotwant='rm'
 alias dowant='cp'
 alias gtfo='mv'
+alias nowai='chmod'
 
 alias hai='cd'
+alias iz='ls'
 alias plz='pwd'
+alias ihasbucket='df -h'
 
 alias inur='locate'
+alias iminurbase='finger'
+
+alias btw='nice'
+alias obtw='nohup'
 
 alias nomz='ps -aux'
 alias nomnom='killall'
 
+alias byes='exit'
 alias cya='reboot'
 alias kthxbai='halt'

From f0451195f63b3607461bda1570c5fb2a4e429b3e Mon Sep 17 00:00:00 2001
From: Maxim Filatov <pipopolam@gmail.com>
Date: Sun, 5 Jun 2011 16:57:21 -0700
Subject: [PATCH 296/907] Dollar sign instead of percent in unprivileged user
 prompt (as in real gentoo)

---
 themes/gentoo.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index cba143d42..ee205d248 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -1,4 +1,8 @@
-PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%#%{$reset_color%} '
+function prompt_char {
+	if [ $UID -eq 0 ]; then echo "#"; else echo $; fi
+}
+
+PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%_$(prompt_char)%{$reset_color%} '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") "

From 70cb607b7bee04ceef74d6f7aa80589e009e4c78 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:28:43 +0200
Subject: [PATCH 297/907] Remove unused colors and use original prompt color

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

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index aa7b28b34..b99cd816e 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -6,23 +6,17 @@
 
 # Color shortcuts
 R=$fg[red]
-Y=$fg[yellow]
 G=$fg[green]
 M=$fg[magenta]
-W=$fg[white]
-B=$fg[black]
 RB=$fg_bold[red]
 YB=$fg_bold[yellow]
-GB=$fg_bold[green]
-MB=$fg_bold[magenta]
-WB=$fg_bold[white]
-BB=$fg_bold[black]
+BB=$fg_bold[blue]
 RESET=$reset_color
 
 if [ "$(whoami)" = "root" ]; then
     PROMPTCOLOR="%{$RB%}" PREFIX="-!-";
 else
-    PROMPTCOLOR="%{$BB%}" PREFIX="---";
+    PROMPTCOLOR="" PREFIX="---";
 fi
 
 local return_code="%(?..%{$R%}%? ↵%{$RESET%})"
@@ -75,7 +69,8 @@ function custom_git_prompt() {
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(git_prompt_ahead)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
-PROMPT='${PROMPTCOLOR}$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
+# %B sets bold text
+PROMPT='%B$PREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} '
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$YB%}‹"

From 915c28752eb8bfb9610e14f62161ab3bd573d218 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:32:48 +0200
Subject: [PATCH 298/907] Add email address

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

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index b99cd816e..cbd56194f 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Guru theme for oh-my-zsh by Adam Lindberg
+# Guru theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
 # (Needs Git plugin for current_branch method)
 #-------------------------------------------------------------------------------
 

From 73946a6066fa8bf740b4765b7e204df9599f9689 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:40:18 +0200
Subject: [PATCH 299/907] Add note about Solarized color theme

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

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index cbd56194f..a5ffdb722 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -1,9 +1,9 @@
 #-------------------------------------------------------------------------------
 # Guru theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
+# Intended to be used with Solarized: http://ethanschoonover.com/solarized
 # (Needs Git plugin for current_branch method)
 #-------------------------------------------------------------------------------
 
-
 # Color shortcuts
 R=$fg[red]
 G=$fg[green]

From 4a7392fdd0be8fafcaffccc206f23c7746129fb8 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:40:32 +0200
Subject: [PATCH 300/907] Fix git R and M status when used together

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

diff --git a/themes/guru.zsh-theme b/themes/guru.zsh-theme
index a5ffdb722..dfec3dfb5 100644
--- a/themes/guru.zsh-theme
+++ b/themes/guru.zsh-theme
@@ -35,7 +35,7 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^.M ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
@@ -46,7 +46,7 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_DELETED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^R' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^M  ' &> /dev/null); then

From d99284f6b569a0860ed14330c8c9eaf5f0441fe8 Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Tue, 7 Jun 2011 15:42:55 +0200
Subject: [PATCH 301/907] Rename guru theme to sunrise

---
 themes/{guru.zsh-theme => sunrise.zsh-theme} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename themes/{guru.zsh-theme => sunrise.zsh-theme} (97%)

diff --git a/themes/guru.zsh-theme b/themes/sunrise.zsh-theme
similarity index 97%
rename from themes/guru.zsh-theme
rename to themes/sunrise.zsh-theme
index dfec3dfb5..15004084d 100644
--- a/themes/guru.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Guru theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
+# Sunrise theme for oh-my-zsh by Adam Lindberg (eproxus@gmail.com)
 # Intended to be used with Solarized: http://ethanschoonover.com/solarized
 # (Needs Git plugin for current_branch method)
 #-------------------------------------------------------------------------------

From b02094e50fe3cd2e3f8ba911d19257dda047bf48 Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Tue, 7 Jun 2011 14:06:24 -0700
Subject: [PATCH 302/907] Change plugin name from cap to capistrano

---
 plugins/{cap/cap.plugin.zsh => capistrano/capistrano.plugin.zsh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/{cap/cap.plugin.zsh => capistrano/capistrano.plugin.zsh} (100%)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
similarity index 100%
rename from plugins/cap/cap.plugin.zsh
rename to plugins/capistrano/capistrano.plugin.zsh

From 3eae652a6d4bc5f280bb7f9d33000f378becf13c Mon Sep 17 00:00:00 2001
From: Adam Lindberg <eproxus@gmail.com>
Date: Wed, 8 Jun 2011 16:33:29 +0100
Subject: [PATCH 303/907] Fix MM lines being read correctly

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

diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 15004084d..88b371d79 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -49,7 +49,7 @@ custom_git_prompt_status() {
   if $(echo "$INDEX" | grep '^R' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^M' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A' &> /dev/null); then

From f9bf396e4ac68299f1370ed54350cc14ce954eea Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@bluekai.com>
Date: Thu, 9 Jun 2011 21:22:33 -0700
Subject: [PATCH 304/907] Add Django plugin. This is a slight modification of
 the Django zsh completions that I found at
 https://raw.github.com/technolize/zsh-completion-funcs/master/_manage.py

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

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
new file mode 100644
index 000000000..1d72a2f2c
--- /dev/null
+++ b/plugins/django/django.plugin.zsh
@@ -0,0 +1,222 @@
+#compdef manage.py
+
+typeset -ga nul_args
+nul_args=(
+  '--settings=-[the Python path to a settings module.]:file:_files'
+  '--pythonpath=-[a directory to add to the Python path.]::directory:_directories'
+  '--traceback[print traceback on exception.]'
+  "--version[show program's version number and exit.]"
+  {-h,--help}'[show this help message and exit.]'
+)
+
+_managepy-adminindex(){
+  _arguments -s : \
+    $nul_args \
+    '*::directory:_directories' && ret=0
+}
+
+_managepy-createcachetable(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-dbshell(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-diffsettings(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-dumpdata(){
+  _arguments -s : \
+    '--format=-[specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
+    '--indent=-[specifies the indent level to use when pretty-printing output.]:' \
+    $nul_args \
+    '*::appname:_applist' && ret=0
+}
+
+_managepy-flush(){
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $nul_args && ret=0
+}
+
+_managepy-help(){
+  _arguments -s : \
+    '*:command:_managepy_cmds' \
+    $nul_args && ret=0
+}
+
+_managepy_cmds(){
+    local line
+    local -a cmd
+    _call_program help-command ./manage.py help \
+      |& sed -n '/^ /s/[(), ]/ /gp' \
+      | while read -A line; do cmd=($line $cmd) done
+    _describe -t managepy-command 'manage.py command' cmd
+}
+
+_managepy-inspectdb(){
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-loaddata(){
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '*::file:_files' \
+    $nul_args && ret=0
+}
+
+_managepy-reset(){
+  _arguments -s : \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    '*::appname:_applist' \
+    $nul_args && ret=0
+}
+
+_managepy-runfcgi(){
+  local state
+  
+  local fcgi_opts
+  fcgi_opts=(
+    'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
+    'host[hostname to listen on..]:'
+    'port[port to listen on.]:'
+    'socket[UNIX socket to listen on.]::file:_files'
+    'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
+    'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
+    'maxspare[max number of spare processes / threads.]:'
+    'minspare[min number of spare processes / threads.]:'
+    'maxchildren[hard limit number of processes / threads.]:'
+    'daemonize[whether to detach from terminal.]:boolean:(False True)'
+    'pidfile[write the spawned process-id to this file.]:file:_files'
+    'workdir[change to this directory when daemonizing.]:directory:_files'
+    'outlog[write stdout to this file.]:file:_files'
+    'errlog[write stderr to this file.]:file:_files'
+  )
+  
+  _arguments -s : \
+    $nul_args \
+    '*: :_values "FCGI Setting" $fcgi_opts' && ret=0
+}
+
+_managepy-runserver(){
+  _arguments -s : \
+    '--noreload[tells Django to NOT use the auto-reloader.]' \
+    '--adminmedia[specifies the directory from which to serve admin media.]:directory:_files' \
+    $nul_args && ret=0
+}
+
+_managepy-shell(){
+  _arguments -s : \
+    '--plain[tells Django to use plain Python, not IPython.]' \
+    $nul_args && ret=0
+}
+
+_managepy-sql(){}
+_managepy-sqlall(){}
+_managepy-sqlclear(){}
+_managepy-sqlcustom(){}
+_managepy-sqlflush(){}
+_managepy-sqlindexes(){}
+_managepy-sqlinitialdata(){}
+_managepy-sqlreset(){}
+_managepy-sqlsequencereset(){}
+_managepy-startapp(){}
+
+_managepy-syncdb() {
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    $nul_args && ret=0
+}
+
+_managepy-test() {
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--noinput[tells Django to NOT prompt the user for input of any kind.]' \
+    '*::appname:_applist' \
+    $nul_args && ret=0
+}
+
+_managepy-testserver() {
+  _arguments -s : \
+    '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))' \
+    '--addrport=-[port number or ipaddr:port to run the server on.]' \
+    '*::fixture:_files' \
+    $nul_args && ret=0
+}
+
+_managepy-validate() {
+  _arguments -s : \
+    $nul_args && ret=0
+}
+
+_managepy-commands() {
+  local -a commands
+  
+  commands=(
+    'adminindex:prints the admin-index template snippet for the given app name(s).'
+    'createcachetable:creates the table needed to use the SQL cache backend.'
+    'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
+    "diffsettings:displays differences between the current settings.py and Django's default settings."
+    'dumpdata:Output the contents of the database as a fixture of the given format.'
+    'flush:Executes ``sqlflush`` on the current database.'
+    'help:manage.py help.'
+    'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
+    'loaddata:Installs the named fixture(s) in the database.'
+    'reset:Executes ``sqlreset`` for the given app(s) in the current database.'
+    'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
+    'runserver:Starts a lightweight Web server for development.'
+    'shell:Runs a Python interactive interpreter.'
+    'sql:Prints the CREATE TABLE SQL statements for the given app name(s).'
+    'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
+    'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
+    'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
+    'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
+    'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
+    "sqlinitialdata:RENAMED: see 'sqlcustom'"
+    'sqlreset:Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).'
+    'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
+    "startapp:Creates a Django app directory structure for the given app name in this project's directory."
+    "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
+    'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
+    'testserver:Runs a development server with data from the given fixture(s).'
+    'validate:Validates all installed models.'
+  )
+  
+  _describe -t commands 'manage.py command' commands && ret=0
+}
+
+_applist() {
+  local line
+  local -a apps
+  _call_program help-command "python -c \"import os.path as op, re, django.conf, sys;\\
+                                          bn=op.basename(op.abspath(op.curdir));[sys\\
+                                          .stdout.write(str(re.sub(r'^%s\.(.*?)$' %
+                                          bn, r'\1', i)) + '\n') for i in django.conf.settings.\\
+                                          INSTALLED_APPS if re.match(r'^%s' % bn, i)]\"" \
+                             | while read -A line; do apps=($line $apps) done
+  _values 'Application' $apps && ret=0
+}
+
+_managepy() {
+  local curcontext=$curcontext ret=1
+  
+  if ((CURRENT == 2)); then
+    _managepy-commands
+  else
+    shift words
+    (( CURRENT -- ))
+    curcontext="${curcontext%:*:*}:managepy-$words[1]:"
+    _call_function ret _managepy-$words[1]
+  fi
+}
+
+compdef _managepy manage.py
+compdef _managepy django

From 55eda0c48b42e3ccd1b12579cd46d20332b828c1 Mon Sep 17 00:00:00 2001
From: ptrv <mail@petervasil.net>
Date: Fri, 10 Jun 2011 15:38:59 +0200
Subject: [PATCH 305/907] Added mercurial plugin with aliases.

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

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
new file mode 100644
index 000000000..2988f0a46
--- /dev/null
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -0,0 +1,14 @@
+
+# Mercurial
+alias hgc='hg commit -v'
+alias hgb='hg branch -v'
+alias hgba='hg branches'
+alias hgco='hg checkout'
+alias hgd='hg diff'
+alias hged='hg diffmerge'
+# pull and update
+alias hgl='hg pull -u -v'
+alias hgp='hg push -v'
+alias hgs='hg status -v'
+# this is the 'git commit --amend' equivalent
+alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'

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

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

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

From 527355eae3c8b019ce203c38b6aa5ffd818c3640 Mon Sep 17 00:00:00 2001
From: Marius Ghita <mhitza@gmail.com>
Date: Wed, 15 Jun 2011 01:17:22 +0300
Subject: [PATCH 307/907] When the theme choice is left out, oh-my-zsh will not
 try to load it

---
 oh-my-zsh.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index d72d90cf9..c4522491b 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -43,6 +43,9 @@ then
   source "$RANDOM_THEME"
   echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
 else
-  source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+  if [ ! "$ZSH_THEME" = ""  ]
+  then
+    source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+  fi
 fi
 

From c5a01fe422c0b511be5972735b1dd9ac22a82dff Mon Sep 17 00:00:00 2001
From: meh <meh@paranoici.org>
Date: Wed, 15 Jun 2011 16:15:52 +0200
Subject: [PATCH 308/907] rsync: add plugin

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

diff --git a/plugins/rsync/rsync.plugin.zsh b/plugins/rsync/rsync.plugin.zsh
new file mode 100644
index 000000000..5e28f346c
--- /dev/null
+++ b/plugins/rsync/rsync.plugin.zsh
@@ -0,0 +1,15 @@
+function copy {
+    rsync -av --progress -h "$1" "$2"
+}
+
+function move {
+    rsync -av --progress -h --remove-source-files "$1" "$2"
+}
+
+function update {
+    rsync -avu --progress -h "$1" "$2"
+}
+
+function synchronize {
+    rsync -avu --delete --progress -h "$1" "$2"
+}

From f22460f18125421a73a60893ae97ed545465bca7 Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@sunblu.sh>
Date: Sat, 18 Jun 2011 19:24:55 -0400
Subject: [PATCH 309/907] Add ohmyzsh theme, my version of dogenpunk

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

diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
new file mode 100644
index 000000000..fcb4858de
--- /dev/null
+++ b/themes/smt.zsh-theme
@@ -0,0 +1,91 @@
+# -----------------------------------------------------------------------------
+#          FILE: smt.zsh-theme
+#   DESCRIPTION: oh-my-zsh theme file, based on dogenpunk by Matthew Nelson.
+#        AUTHOR: Stephen Tudor (stephen@tudorstudio.com
+#       VERSION: 0.1
+#    SCREENSHOT: coming soon
+# -----------------------------------------------------------------------------
+
+MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
+local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%} "
+
+ZSH_THEME_GIT_PROMPT_PREFIX="|"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[red]%}!%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+
+# Format for git_prompt_long_sha() and git_prompt_short_sha()
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE="➤ %{$fg_bold[yellow]%}"
+ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
+
+function prompt_char() {
+  git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return
+  hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return
+  echo "%{$fg[cyan]%}◯%{$reset_color%}"
+}
+
+# Colors vary depending on time lapsed.
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
+ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
+ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
+
+# Determine the time since last commit. If branch is clean,
+# use a neutral color, otherwise colors will vary according to time.
+function git_time_since_commit() {
+    if git rev-parse --git-dir > /dev/null 2>&1; then
+        # Only proceed if there is actually a commit.
+        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
+            # Get the last commit.
+            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+            now=`date +%s`
+            seconds_since_last_commit=$((now-last_commit))
+
+            # Totals
+            MINUTES=$((seconds_since_last_commit / 60))
+            HOURS=$((seconds_since_last_commit/3600))
+
+            # Sub-hours and sub-minutes
+            DAYS=$((seconds_since_last_commit / 86400))
+            SUB_HOURS=$((HOURS % 24))
+            SUB_MINUTES=$((MINUTES % 60))
+
+            if [[ -n $(git status -s 2> /dev/null) ]]; then
+                if [ "$MINUTES" -gt 30 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
+                elif [ "$MINUTES" -gt 10 ]; then
+                    COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
+                else
+                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
+                fi
+            else
+                COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            fi
+
+            if [ "$HOURS" -gt 24 ]; then
+                echo "[$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
+            elif [ "$MINUTES" -gt 60 ]; then
+                echo "[$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
+            else
+                echo "[$COLOR${MINUTES}m%{$reset_color%}]"
+            fi
+        else
+            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
+            echo "[$COLOR~]"
+        fi
+    fi
+}
+
+PROMPT='
+%{$fg[blue]%}%m%{$reset_color%} 寿帝文 %{$fg[cyan]%}%~ %{$reset_color%}$(git_prompt_short_sha)$(git_prompt_info)
+%{$fg[red]%}%!%{$reset_color%} $(prompt_char) : '
+
+RPROMPT='${return_status}$(git_time_since_commit)$(git_prompt_status)%{$reset_color%}'

From 03f71d14dd1866b9da58f28f8f40f5c12bf3072f Mon Sep 17 00:00:00 2001
From: Stephen Tudor <smt@sunblu.sh>
Date: Sun, 19 Jun 2011 12:22:23 -0400
Subject: [PATCH 310/907] Changed kanji to fuku (good luck)

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

diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index fcb4858de..7a287523e 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -85,7 +85,7 @@ function git_time_since_commit() {
 }
 
 PROMPT='
-%{$fg[blue]%}%m%{$reset_color%} 寿帝文 %{$fg[cyan]%}%~ %{$reset_color%}$(git_prompt_short_sha)$(git_prompt_info)
+%{$fg[blue]%}%m%{$reset_color%} 福 %{$fg[cyan]%}%~ %{$reset_color%}$(git_prompt_short_sha)$(git_prompt_info)
 %{$fg[red]%}%!%{$reset_color%} $(prompt_char) : '
 
 RPROMPT='${return_status}$(git_time_since_commit)$(git_prompt_status)%{$reset_color%}'

From 929c64e4c6f53e926757b7d9d89ab7da4f9a0d0d Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Tue, 21 Jun 2011 12:09:57 +0300
Subject: [PATCH 311/907] Create gnzh theme

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

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
new file mode 100644
index 000000000..a984d25fa
--- /dev/null
+++ b/themes/gnzh.zsh-theme
@@ -0,0 +1,47 @@
+# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
+# Based on bira theme
+
+# load some modules
+autoload -U colors zsh/terminfo # Used in the colour alias below
+colors
+setopt prompt_subst
+
+# make some aliases for the colours: (coud use normal escap.seq's too)
+for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
+  eval PR_$color='%{$fg[${(L)color}]%}'
+done
+eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
+eval PR_BOLD="%{$terminfo[bold]%}"
+
+# Check the UID
+if [[ $UID -ge 1000 ]]; then # normal user
+  eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}'
+  eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
+  local PR_PROMPT='$PR_NO_COLOR➤ $PR_NO_COLOR'
+elif [[ $UID -eq 0 ]]; then # root
+  eval PR_USER='${PR_RED}%n${PR_NO_COLOR}'
+  eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
+  local PR_PROMPT='$PR_RED➤ $PR_NO_COLOR'
+fi
+
+# Check if we are on SSH or not
+if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then 
+  eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
+else
+  eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
+fi
+
+local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
+
+local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
+local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
+local rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
+
+#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
+PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
+╰─$PR_PROMPT "
+RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$PR_NO_COLOR%}"

From a335e9df9f13a5caa2b83cad9ebcfaa25b748202 Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Tue, 21 Jun 2011 13:50:39 +0300
Subject: [PATCH 312/907] plugin for vundle (vim plugins managment system) that
 provide vundle, vundle-update and vundle-init aliases

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

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
new file mode 100644
index 000000000..7caed4715
--- /dev/null
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -0,0 +1,3 @@
+alias vundle-init='git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle'
+alias vundle='vim -c "execute \"BundleInstall\" | q"'
+alias vundle-update='vim -c "execute \"BundleInstall!\" | q"'

From 7ef7ffc5ebd21bff4ab8e42989c63ba8204c0e5b Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Tue, 21 Jun 2011 14:53:11 +0300
Subject: [PATCH 313/907] removing useless line

---
 themes/gnzh.zsh-theme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index a984d25fa..357798cf6 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -38,7 +38,6 @@ local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
 local rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 
-#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
 ╰─$PR_PROMPT "
 RPS1="${return_code}"

From b727e337adb0264b3d03ffdd0a4af3ba9802572a Mon Sep 17 00:00:00 2001
From: Sagie Maoz <sagiem@gmail.com>
Date: Mon, 27 Jun 2011 01:37:27 -0700
Subject: [PATCH 314/907] Updated the frisk theme to display Bazaar branch
 information as well (based on zedtux.zsh-theme http://j.mp/ikTZJj)

---
 themes/frisk.zsh-theme | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme
index f181aec90..2c999a6a6 100644
--- a/themes/frisk.zsh-theme
+++ b/themes/frisk.zsh-theme
@@ -1,10 +1,22 @@
 PROMPT=$'
-%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)$(bzr_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
 %{$fg_bold[black]%}>%{$reset_color%} '
 
 PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}"
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
+GIT_CB="git::"
+ZSH_THEME_SCM_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+## Bazaar integration
+bzr_prompt_info() {
+	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
+	if [ -n "$BZR_CB" ]; then
+		BZR_DIRTY=""
+		[[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}"
+		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
+	fi
+}

From e43eec99f94c00a6a9d2b30f9c449aff5ab0dfe5 Mon Sep 17 00:00:00 2001
From: Matthew McCullough <matthewm@ambientideas.com>
Date: Tue, 28 Jun 2011 19:42:50 -0600
Subject: [PATCH 315/907] Added cloudapp from @holman of @GitHub fame

---
 plugins/cloudapp/cloudapp.plugin.zsh |  2 +
 plugins/cloudapp/cloudapp.rb         | 60 ++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 plugins/cloudapp/cloudapp.plugin.zsh
 create mode 100755 plugins/cloudapp/cloudapp.rb

diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
new file mode 100644
index 000000000..99252f690
--- /dev/null
+++ b/plugins/cloudapp/cloudapp.plugin.zsh
@@ -0,0 +1,2 @@
+#!/bin/zsh
+alias cloudapp=$ZSH/plugins/cloudapp/cloudapp.rb
diff --git a/plugins/cloudapp/cloudapp.rb b/plugins/cloudapp/cloudapp.rb
new file mode 100755
index 000000000..a11cfdb32
--- /dev/null
+++ b/plugins/cloudapp/cloudapp.rb
@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+#
+# cloudapp
+# Zach Holman / @holman
+#
+# Uploads a file from the command line to CloudApp, drops it into your 
+# clipboard (on a Mac, at least).
+#
+# Example:
+#
+#   cloudapp drunk-blake.png
+#
+# This requires Aaron Russell's cloudapp_api gem:
+#
+#   gem install cloudapp_api
+#
+# Requires you set your CloudApp credentials in ~/.cloudapp as a simple file of:
+#
+#   email
+#   password
+
+require 'rubygems'
+begin
+  require 'cloudapp_api'
+rescue LoadError
+  puts "You need to install cloudapp_api: gem install cloudapp_api"
+  exit!(1)
+end
+
+config_file = "#{ENV['HOME']}/.cloudapp"
+unless File.exist?(config_file)
+  puts "You need to type your email and password (one per line) into "+
+       "`~/.cloudapp`"
+  exit!(1)
+end
+
+email,password = File.read(config_file).split("\n")
+
+class HTTParty::Response
+  # Apparently HTTPOK.ok? IS NOT OKAY WTFFFFFFFFFFUUUUUUUUUUUUUU
+  # LETS MONKEY PATCH IT I FEEL OKAY ABOUT IT
+  def ok? ; true end
+end
+
+if ARGV[0].nil?
+   puts "You need to specify a file to upload."
+   exit!(1)
+end
+
+CloudApp.authenticate(email,password)
+url = CloudApp::Item.create(:upload, {:file => ARGV[0]}).url
+
+# Say it for good measure.
+puts "Uploaded to #{url}."
+
+# Get the embed link.
+url = "#{url}/#{ARGV[0].split('/').last}"
+
+# Copy it to your (Mac's) clipboard.
+`echo '#{url}' | tr -d "\n" | pbcopy`

From 499819ced108aa4b0d90dd0ac922a174c965d814 Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Wed, 29 Jun 2011 10:26:42 +0300
Subject: [PATCH 316/907] vundle plugin refactored first it checks existens of
 vundle plugin, if plugin dont exist run git clone

---
 plugins/vundle/vundle.plugin.zsh | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 7caed4715..39c36ac59 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -1,3 +1,22 @@
-alias vundle-init='git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle'
-alias vundle='vim -c "execute \"BundleInstall\" | q"'
-alias vundle-update='vim -c "execute \"BundleInstall!\" | q"'
+function vundle-init () {
+  if [ ! -d ~/.vim/bundle/vundle/ ]
+  then
+    mkdir -p ~/.vim/bundle/vundle/
+  fi
+
+  if [ ! -d ~/.vim/bundle/vundle/.git/ ]
+  then
+    git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+  fi
+}
+
+function vundle () {
+  vundle-init
+  vim -c "execute \"BundleInstall\" | q"
+}
+
+
+function vundle-update () {
+  vundle-init
+  vim -c "execute \"BundleInstall!\" | q"
+}

From 053cb24d3160d69cb6c9579a3f154f45a72f065c Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Thu, 30 Jun 2011 11:45:24 +0300
Subject: [PATCH 317/907] added tip about vundle configutarion after git clone

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

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 39c36ac59..1e2e1f088 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -7,6 +7,7 @@ function vundle-init () {
   if [ ! -d ~/.vim/bundle/vundle/.git/ ]
   then
     git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+    echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n"
   fi
 }
 

From b61fcb64abfd733a95f0e83e3009086959623252 Mon Sep 17 00:00:00 2001
From: Frank Louwers <frank@openminds.be>
Date: Thu, 30 Jun 2011 15:19:50 +0200
Subject: [PATCH 318/907] knife autocompletion

---
 plugins/knife/_knife | 174 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 plugins/knife/_knife

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
new file mode 100644
index 000000000..7f8c95ee5
--- /dev/null
+++ b/plugins/knife/_knife
@@ -0,0 +1,174 @@
+#compdef knife
+
+# These flags should be available everywhere according to man knife
+knife_general_flags=( --help --server-url --key --config --editor --format --log_level --logfile --no-editor --user --print-after --version --yes )
+
+# knife has a very special syntax, some example calls are:
+# knife status
+# knife cookbook list
+# knife role show ROLENAME
+# knife data bag show DATABAGNAME
+# knife role show ROLENAME --attribute ATTRIBUTENAME
+# knife cookbook show COOKBOOKNAME COOKBOOKVERSION recipes
+
+# The -Q switch in compadd allow for completions of things like "data bag" without having to go through two rounds of completion and avoids zsh inserting a \ for escaping spaces
+_knife() {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+  cloudproviders=(bluebox ec2 rackspace slicehost terremark)
+  _arguments \
+    '1: :->knifecmd'\
+    '2: :->knifesubcmd'\
+    '3: :->knifesubcmd2' \
+    '4: :->knifesubcmd3' \
+    '5: :->knifesubcmd4' \
+    '6: :->knifesubcmd5'
+  
+  case $state in
+  knifecmd)
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec index node recipe role search ssh status windows $cloudproviders
+  ;;
+  knifesubcmd)
+    case $words[2] in
+    (bluebox|ec2|rackspace|slicehost|terremark)
+      compadd "$@" server images
+    ;;
+    client)
+      compadd -Q "$@" "bulk delete" list create show delete edit reregister
+    ;;
+    configure)
+      compadd "$@" client
+    ;;
+    cookbook)
+      compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
+    ;;
+    node)
+     compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
+    ;;
+    recipe)
+     compadd "$@" list
+    ;;
+    role)
+      compadd -Q "$@" "bulk delete" create delete edit "from file" list show
+    ;; 
+    windows)
+      compadd "$@" bootstrap
+    ;;
+    *)
+    _arguments '2:Subsubcommands:($(_knife_options1))'
+    esac
+   ;;
+   knifesubcmd2)
+    case $words[3] in
+     server)
+      compadd "$@" list create delete
+    ;;
+     images)
+      compadd "$@" list
+    ;;
+     site)
+      compadd "$@" vendor show share search download list unshare
+    ;;
+     (show|delete|edit)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_remote))'
+    ;;
+    (upload|test)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_local) --all)'
+    ;;
+    list)
+     compadd -a "$@" knife_general_flags
+    ;;
+    bag)
+      compadd -Q "$@" show edit list "from file" create delete
+    ;;
+    *)
+      _arguments '3:Subsubcommands:($(_knife_options2))'
+    esac
+   ;;
+   knifesubcmd3)
+     case $words[3] in
+      show)
+       case $words[2] in
+       cookbook)
+          versioncomp=1
+          _arguments '4:Cookbookversions:($(_cookbook_versions) latest)'
+       ;;
+       (node|client|role)
+         compadd "$@" --attribute
+       esac
+     esac
+     case $words[4] in
+     (show|edit)
+     _arguments '4:Subsubsubcommands:($(_chef_$words[2]_$words[3]s_remote))'
+    ;;
+     file)
+     _arguments '*:file or directory:_files -g "*.(rb|json)"'
+    ;;
+      list)
+     compadd -a "$@" knife_general_flags
+    ;;
+        *)
+       _arguments '*:Subsubcommands:($(_knife_options3))'
+    esac
+    ;;
+    knifesubcmd4)
+      if (( versioncomp > 0 )); then
+        compadd "$@" attributes definitions files libraries providers recipes resources templates
+      else
+       _arguments '*:Subsubcommands:($(_knife_options2))'
+      fi
+    ;; 
+    knifesubcmd5) 
+      _arguments '*:Subsubcommands:($(_knife_options3))'
+   esac
+}
+
+# Helper functions to provide the argument completion for several depths of commands
+_knife_options1() {
+ ( for line in $( knife $words[2] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options2() {
+ ( for line in $( knife $words[2] $words[3] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options3() {
+ ( for line in $( knife $words[2] $words[3] $words[4] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+# The chef_x_remote functions use knife to get a list of objects of type x on the server
+_chef_roles_remote() {
+ (knife role list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_clients_remote() {
+ (knife client list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_nodes_remote() {
+ (knife node list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_cookbooks_remote() {
+ (knife cookbook list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_sitecookbooks_remote() {
+ (knife cookbook site list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_data_bags_remote() {
+ (knife data bag list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+# The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server
+_chef_cookbooks_local() {
+ (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done)
+}
+
+# This function extracts the available cookbook versions on the chef server
+_cookbook_versions() {
+  (knife cookbook show $words[4] | grep -v $words[4] | grep -v -E '\]|\[|\{|\}' | sed 's/ //g' | sed 's/"//g')
+}
+
+_knife "$@"

From 8f62ef490de6945308c144a3bee7c3509a16d421 Mon Sep 17 00:00:00 2001
From: Dan Poggi <dan.poggi@gmail.com>
Date: Tue, 12 Jul 2011 23:20:21 -0400
Subject: [PATCH 319/907] Added 'dpoggi' theme

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

diff --git a/themes/dpoggi.zsh-theme b/themes/dpoggi.zsh-theme
new file mode 100644
index 000000000..6469a2009
--- /dev/null
+++ b/themes/dpoggi.zsh-theme
@@ -0,0 +1,14 @@
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\
+%{$reset_color%}:%{$fg[magenta]%}%~\
+$(git_prompt_info) \
+%{$fg[red]%}%(!.#.»)%{$reset_color%} '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='${return_code}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}("
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}○%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%})%{$reset_color%}"

From 9e8194355c1a4f69dc52fbe2699fbce1be5c6493 Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 13:13:39 +0200
Subject: [PATCH 320/907] Added bundler-exec plugin

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 plugins/bundler-exec/bundler-exec.plugin.zsh

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
new file mode 100644
index 000000000..966725976
--- /dev/null
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -0,0 +1,37 @@
+# This plugin is based on https://github.com/gma/bundler-exec
+# modify the BUNDLED_COMMANDS if needed
+
+BUNDLED_COMMANDS=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
+
+## Functions
+
+bundler-installed()
+{
+    which bundle > /dev/null 2>&1
+}
+
+within-bundled-project()
+{
+    local dir="$(pwd)"
+    while [ "$(dirname $dir)" != "/" ]; do
+        [ -f "$dir/Gemfile" ] && return
+        dir="$(dirname $dir)"
+    done
+    false
+}
+
+run-with-bundler()
+{
+    local command="$1"
+    shift
+    if bundler-installed && within-bundled-project; then
+        bundle exec $command "$@"
+    else
+        $command "$@"
+    fi
+}
+
+## Main program
+for CMD in $BUNDLED_COMMANDS; do
+   alias $CMD="run-with-bundler $CMD"
+done

From 05883f383143fa4821a5b07a748a800c0299f1fd Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 15:52:58 +0200
Subject: [PATCH 321/907] use lowercase for variablenames

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

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 966725976..cfab16c5e 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -1,7 +1,7 @@
 # This plugin is based on https://github.com/gma/bundler-exec
 # modify the BUNDLED_COMMANDS if needed
 
-BUNDLED_COMMANDS=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
+bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
 
 ## Functions
 
@@ -32,6 +32,6 @@ run-with-bundler()
 }
 
 ## Main program
-for CMD in $BUNDLED_COMMANDS; do
-   alias $CMD="run-with-bundler $CMD"
+for cmd in $bundled_commands; do
+   alias $cmd="run-with-bundler $cmd"
 done

From 3aee5c19412dea541495e10f1c4cc7a6d8e4af50 Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 19:16:04 +0200
Subject: [PATCH 322/907] changed names of functions and variables to fit
 naming conventions

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index cfab16c5e..4684dcb8d 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -5,26 +5,26 @@ bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spor
 
 ## Functions
 
-bundler-installed()
+_bundler-installed()
 {
     which bundle > /dev/null 2>&1
 }
 
-within-bundled-project()
+_within-bundled-project()
 {
-    local dir="$(pwd)"
-    while [ "$(dirname $dir)" != "/" ]; do
-        [ -f "$dir/Gemfile" ] && return
-        dir="$(dirname $dir)"
+    local check_dir=$PWD
+    while [ "$(dirname $check_dir)" != "/" ]; do
+        [ -f "$check_dir/Gemfile" ] && return
+        dir="$(dirname $check_dir)"
     done
     false
 }
 
-run-with-bundler()
+_run-with-bundler()
 {
     local command="$1"
     shift
-    if bundler-installed && within-bundled-project; then
+    if _bundler-installed && _within-bundled-project; then
         bundle exec $command "$@"
     else
         $command "$@"
@@ -33,5 +33,5 @@ run-with-bundler()
 
 ## Main program
 for cmd in $bundled_commands; do
-   alias $cmd="run-with-bundler $cmd"
+   alias $cmd="_run-with-bundler $cmd"
 done

From 86958a32f3d3e647fc61e92700a9ce393e11a3cb Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 20:28:27 +0200
Subject: [PATCH 323/907] forgot to rename one variable

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

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 4684dcb8d..bc4d35a84 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -15,7 +15,7 @@ _within-bundled-project()
     local check_dir=$PWD
     while [ "$(dirname $check_dir)" != "/" ]; do
         [ -f "$check_dir/Gemfile" ] && return
-        dir="$(dirname $check_dir)"
+        check_dir="$(dirname $check_dir)"
     done
     false
 }
@@ -27,7 +27,7 @@ _run-with-bundler()
     if _bundler-installed && _within-bundled-project; then
         bundle exec $command "$@"
     else
-        $command "$@"
+      $command "$@"
     fi
 }
 

From 69d30a6302f8c7daf6ad5ecf23224074789843db Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Jun 2011 23:16:47 +0200
Subject: [PATCH 324/907] Moved opening braces

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index bc4d35a84..09f44ed5e 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -1,17 +1,15 @@
 # This plugin is based on https://github.com/gma/bundler-exec
-# modify the BUNDLED_COMMANDS if needed
+# modify the bundled_commands if needed
 
 bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
 
 ## Functions
 
-_bundler-installed()
-{
+_bundler-installed() {
     which bundle > /dev/null 2>&1
 }
 
-_within-bundled-project()
-{
+_within-bundled-project() {
     local check_dir=$PWD
     while [ "$(dirname $check_dir)" != "/" ]; do
         [ -f "$check_dir/Gemfile" ] && return
@@ -20,8 +18,7 @@ _within-bundled-project()
     false
 }
 
-_run-with-bundler()
-{
+_run-with-bundler() {
     local command="$1"
     shift
     if _bundler-installed && _within-bundled-project; then

From 37fcd4af049ad9b755d7b1d32cf63b537da0342c Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:39:23 +0100
Subject: [PATCH 325/907] update bundled commands

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

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 09f44ed5e..61829eb2c 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -1,7 +1,7 @@
 # This plugin is based on https://github.com/gma/bundler-exec
 # modify the bundled_commands if needed
 
-bundled_commands=(cucumber heroku rackup rails rake rspec ruby shotgun spec spork)
+bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
 
 ## Functions
 

From a77e6fb003cc80fbbff5d453a5ca3d38638d99ed Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:40:23 +0100
Subject: [PATCH 326/907] fix indentation

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
index 61829eb2c..3417ea81c 100644
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ b/plugins/bundler-exec/bundler-exec.plugin.zsh
@@ -6,29 +6,29 @@ bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgu
 ## Functions
 
 _bundler-installed() {
-    which bundle > /dev/null 2>&1
+  which bundle > /dev/null 2>&1
 }
 
 _within-bundled-project() {
-    local check_dir=$PWD
-    while [ "$(dirname $check_dir)" != "/" ]; do
-        [ -f "$check_dir/Gemfile" ] && return
-        check_dir="$(dirname $check_dir)"
-    done
-    false
+  local check_dir=$PWD
+  while [ "$(dirname $check_dir)" != "/" ]; do
+    [ -f "$check_dir/Gemfile" ] && return
+    check_dir="$(dirname $check_dir)"
+  done
+  false
 }
 
 _run-with-bundler() {
-    local command="$1"
-    shift
-    if _bundler-installed && _within-bundled-project; then
-        bundle exec $command "$@"
-    else
-      $command "$@"
-    fi
+  local command="$1"
+  shift
+  if _bundler-installed && _within-bundled-project; then
+    bundle exec $command "$@"
+  else
+    $command "$@"
+  fi
 }
 
 ## Main program
 for cmd in $bundled_commands; do
-   alias $cmd="_run-with-bundler $cmd"
+  alias $cmd="_run-with-bundler $cmd"
 done

From 60e104acd1710c04057d079cfa5ac9316762f580 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:41:09 +0100
Subject: [PATCH 327/907] merge bundler and bundle-exec plugins

---
 plugins/bundler-exec/bundler-exec.plugin.zsh | 34 --------------------
 plugins/bundler/bundler.plugin.zsh           | 34 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 plugins/bundler-exec/bundler-exec.plugin.zsh

diff --git a/plugins/bundler-exec/bundler-exec.plugin.zsh b/plugins/bundler-exec/bundler-exec.plugin.zsh
deleted file mode 100644
index 3417ea81c..000000000
--- a/plugins/bundler-exec/bundler-exec.plugin.zsh
+++ /dev/null
@@ -1,34 +0,0 @@
-# This plugin is based on https://github.com/gma/bundler-exec
-# modify the bundled_commands if needed
-
-bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
-
-## Functions
-
-_bundler-installed() {
-  which bundle > /dev/null 2>&1
-}
-
-_within-bundled-project() {
-  local check_dir=$PWD
-  while [ "$(dirname $check_dir)" != "/" ]; do
-    [ -f "$check_dir/Gemfile" ] && return
-    check_dir="$(dirname $check_dir)"
-  done
-  false
-}
-
-_run-with-bundler() {
-  local command="$1"
-  shift
-  if _bundler-installed && _within-bundled-project; then
-    bundle exec $command "$@"
-  else
-    $command "$@"
-  fi
-}
-
-## Main program
-for cmd in $bundled_commands; do
-  alias $cmd="_run-with-bundler $cmd"
-done
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index fb40e2cec..fcf3e85fc 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,3 +1,37 @@
 alias be="bundle exec"
 alias bi="bundle install"
 alias bu="bundle update"
+
+# The following is based on https://github.com/gma/bundler-exec
+
+bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+
+## Functions
+
+_bundler-installed() {
+  which bundle > /dev/null 2>&1
+}
+
+_within-bundled-project() {
+  local check_dir=$PWD
+  while [ "$(dirname $check_dir)" != "/" ]; do
+    [ -f "$check_dir/Gemfile" ] && return
+    check_dir="$(dirname $check_dir)"
+  done
+  false
+}
+
+_run-with-bundler() {
+  local command="$1"
+  shift
+  if _bundler-installed && _within-bundled-project; then
+    bundle exec $command "$@"
+  else
+    $command "$@"
+  fi
+}
+
+## Main program
+for cmd in $bundled_commands; do
+  alias $cmd="_run-with-bundler $cmd"
+done

From ba5fa3abc8ccf1f05e48c9b201282792c956c337 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:41:36 +0100
Subject: [PATCH 328/907] alias bundle list

---
 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 fcf3e85fc..c91dc9ab9 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,5 +1,6 @@
 alias be="bundle exec"
 alias bi="bundle install"
+alias bl="bundle list"
 alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec

From 7d19ae8fab80c826156f984aa6dd8221a9aaada0 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 13 Jul 2011 22:42:44 +0100
Subject: [PATCH 329/907] clean up rails plugin, removing bundler-specific
 logic

---
 plugins/rails3/rails3.plugin.zsh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index f669ef047..f4ee637e6 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -1,13 +1,5 @@
 # Rails 3 aliases, backwards-compatible with Rails 2.
 
-function _bundle_command {
-  if command -v bundle && [ -e "Gemfile" ]; then
-    bundle exec $@
-  else
-    $@
-  fi
-}
-
 function _rails_command () {
   if [ -e "script/server" ]; then
     ruby script/$@
@@ -25,6 +17,3 @@ alias rp='_rails_command plugin'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
-
-alias rspec='_bundle_command rspec'
-alias cuke='_bundle_command cucumber'

From 6774fb3d59365ddb8520cdb4d46444720f788be0 Mon Sep 17 00:00:00 2001
From: Brandon Konkle <brandon.konkle@gmail.com>
Date: Wed, 13 Jul 2011 23:23:01 -0700
Subject: [PATCH 330/907] Minor corrections to deletion detection in
 git_prompt_status

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

diff --git a/lib/git.zsh b/lib/git.zsh
index ce4de5598..f04343650 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -52,7 +52,9 @@ git_prompt_status() {
   if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
+  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then

From 913cf5325264960d4c1dfe678a2adadeaecdbf6a Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Thu, 14 Jul 2011 17:34:18 +0100
Subject: [PATCH 331/907] refactor _run-with-bundler

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

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c91dc9ab9..e98bb4b46 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -23,12 +23,10 @@ _within-bundled-project() {
 }
 
 _run-with-bundler() {
-  local command="$1"
-  shift
   if _bundler-installed && _within-bundled-project; then
-    bundle exec $command "$@"
+    bundle exec $@
   else
-    $command "$@"
+    $@
   fi
 }
 

From 9308a7d472a1dea6610887b98d6d789741f96a49 Mon Sep 17 00:00:00 2001
From: Adam Blinkinsop <blinks@acm.org>
Date: Thu, 14 Jul 2011 11:04:46 -0700
Subject: [PATCH 332/907] Added a new theme.

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

diff --git a/themes/blinks.zsh-theme b/themes/blinks.zsh-theme
new file mode 100644
index 000000000..3db7012f4
--- /dev/null
+++ b/themes/blinks.zsh-theme
@@ -0,0 +1,20 @@
+# https://github.com/blinks zsh theme
+
+function _prompt_char() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    echo "%{%F{blue}%}±%{%f%k%b%}"
+  else
+    echo ' '
+  fi
+}
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" [%{%B%F{blue}%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{%f%k%b%K{black}%B%F{green}%}]"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{%F{red}%}*%{%f%k%b%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+PROMPT='%{%f%k%b%}
+%{%K{black}%B%F{green}%}%n%{%B%F{blue}%}@%{%B%F{cyan}%}%m%{%B%F{green}%} %{%b%F{yellow}%K{black}%}%~%{%B%F{green}%}$(git_prompt_info)%E%{%f%k%b%}
+%{%K{black}%}$(_prompt_char)%{%K{black}%} %#%{%f%k%b%} '
+
+RPROMPT='!%{%B%F{cyan}%}%!%{%f%k%b%}'

From caa1cc70678e15fe0da93a89e52f543c6bda7494 Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Thu, 14 Jul 2011 21:41:26 -0700
Subject: [PATCH 333/907] zsh-history-substring-search plugin at 15f63de

https://github.com/sunaku/zsh-history-substring-search
---
 README                              |   7 +
 history-substring-search.plugin.zsh |  12 +
 history-substring-search.zsh        | 642 ++++++++++++++++++++++++++++
 3 files changed, 661 insertions(+)
 create mode 100644 README
 create mode 100644 history-substring-search.plugin.zsh
 create mode 100644 history-substring-search.zsh

diff --git a/README b/README
new file mode 100644
index 000000000..be11adf76
--- /dev/null
+++ b/README
@@ -0,0 +1,7 @@
+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/history-substring-search.plugin.zsh b/history-substring-search.plugin.zsh
new file mode 100644
index 000000000..99a5922c5
--- /dev/null
+++ b/history-substring-search.plugin.zsh
@@ -0,0 +1,12 @@
+# This file integrates the history-substring-search script into oh-my-zsh.
+
+source "$ZSH/plugins/history-substring-search/history-substring-search.zsh"
+
+if test "$CASE_SENSITIVE" = true; then
+  unset HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
+fi
+
+if test "$DISABLE_COLOR" = true; then
+  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+  unset HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+fi
diff --git a/history-substring-search.zsh b/history-substring-search.zsh
new file mode 100644
index 000000000..53f707c79
--- /dev/null
+++ b/history-substring-search.zsh
@@ -0,0 +1,642 @@
+#!/usr/bin/env zsh
+#
+# This is a clean-room implementation of the Fish[1] shell's history search
+# feature, where you can type in any part of any previously entered command
+# and press the UP and DOWN arrow keys to cycle through the matching commands.
+#
+#-----------------------------------------------------------------------------
+# Usage
+#-----------------------------------------------------------------------------
+#
+# 1. Load this script into your interactive ZSH session:
+#
+#       % source history-substring-search.zsh
+#
+#    If you want to use the zsh-syntax-highlighting[6] script along with this
+#    script, then make sure that you load it *before* you load this script:
+#
+#       % source zsh-syntax-highlighting.zsh
+#       % source history-substring-search.zsh
+#
+# 2. Type any part of any previous command and then:
+#
+#     * Press the UP arrow key to select the nearest command that (1) contains
+#       your query and (2) is older than the current command in the command
+#       history.
+#
+#     * Press the DOWN arrow key to select the nearest command that (1)
+#       contains your query and (2) is newer than the current command in the
+#       command history.
+#
+#     * Press ^U (the Control and U keys simultaneously) to abort the search.
+#
+# 3. If a matching command spans more than one line of text, press the LEFT
+#    arrow key to move the cursor away from the end of the command, and then:
+#
+#     * Press the UP arrow key to move the cursor to the line above.  When the
+#       cursor reaches the first line of the command, pressing the UP arrow
+#       key again will cause this script to perform another search.
+#
+#     * Press the DOWN arrow key to move the cursor to the line below.  When
+#       the cursor reaches the last line of the command, pressing the DOWN
+#       arrow key again will cause this script to perform another search.
+#
+#-----------------------------------------------------------------------------
+# Configuration
+#-----------------------------------------------------------------------------
+#
+# This script defines the following global variables. You may override their
+# default values only after having loaded this script into your ZSH session.
+#
+# * HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND is a global variable that defines
+#   how the query should be highlighted inside a matching command. Its default
+#   value causes this script to highlight using bold, white text on a magenta
+#   background. See the "Character Highlighting" section in the zshzle(1) man
+#   page to learn about the kinds of values you may assign to this variable.
+#
+# * HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND is a global variable that
+#   defines how the query should be highlighted when no commands in the
+#   history match it. Its default value causes this script to highlight using
+#   bold, white text on a red background. See the "Character Highlighting"
+#   section in the zshzle(1) man page to learn about the kinds of values you
+#   may assign to this variable.
+#
+# * HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS is a global variable that defines
+#   how the command history will be searched for your query. Its default value
+#   causes this script to perform a case-insensitive search. See the "Globbing
+#   Flags" section in the zshexpn(1) man page to learn about the kinds of
+#   values you may assign to this variable.
+#
+#-----------------------------------------------------------------------------
+# History
+#-----------------------------------------------------------------------------
+#
+# This script was originally written by Peter Stephenson[2], who published it
+# to the ZSH users mailing list (thereby making it public domain) in September
+# 2009. It was later revised by Guido van Steen and released under the BSD
+# license (see below) as part of the fizsh[3] project in January 2011.
+#
+# It was later extracted from fizsh[3] release 1.0.1, refactored heavily, and
+# repackaged as both an oh-my-zsh plugin[4] and as an independently loadable
+# ZSH script[5] by Suraj N. Kurapati in 2011.
+#
+# It was further developed[4] by Guido van Steen, Suraj N. Kurapati, Sorin
+# Ionescu, and Vincent Guerci in 2011.
+#
+# [1]: http://fishshell.com
+# [2]: http://www.zsh.org/mla/users/2009/msg00818.html
+# [3]: http://sourceforge.net/projects/fizsh/
+# [4]: https://github.com/robbyrussell/oh-my-zsh/pull/215
+# [5]: https://github.com/sunaku/zsh-history-substring-search
+# [6]: https://github.com/nicoulaj/zsh-syntax-highlighting
+#
+##############################################################################
+#
+# Copyright (c) 2009 Peter Stephenson
+# Copyright (c) 2011 Guido van Steen
+# Copyright (c) 2011 Suraj N. Kurapati
+# Copyright (c) 2011 Sorin Ionescu
+# Copyright (c) 2011 Vincent Guerci
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  * Redistributions in binary form must reproduce the above
+#    copyright notice, this list of conditions and the following
+#    disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#
+#  * Neither the name of the FIZSH nor the names of its contributors
+#    may be used to endorse or promote products derived from this
+#    software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+#-----------------------------------------------------------------------------
+# configuration variables
+#-----------------------------------------------------------------------------
+
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
+HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
+
+#-----------------------------------------------------------------------------
+# the main ZLE widgets
+#-----------------------------------------------------------------------------
+
+function history-substring-search-up() {
+  _history-substring-search-begin
+
+  _history-substring-search-up-history ||
+  _history-substring-search-up-buffer ||
+  _history-substring-search-up-search
+
+  _history-substring-search-end
+}
+
+function history-substring-search-down() {
+  _history-substring-search-begin
+
+  _history-substring-search-down-history ||
+  _history-substring-search-down-buffer ||
+  _history-substring-search-down-search
+
+  _history-substring-search-end
+}
+
+zle -N history-substring-search-up
+zle -N history-substring-search-down
+
+bindkey '\e[A' history-substring-search-up
+bindkey '\e[B' history-substring-search-down
+
+#-----------------------------------------------------------------------------
+# implementation details
+#-----------------------------------------------------------------------------
+
+setopt extendedglob
+zmodload -F zsh/parameter
+
+#
+# We have to "override" some keys and widgets if the
+# zsh-syntax-highlighting plugin has not been loaded:
+#
+# https://github.com/nicoulaj/zsh-syntax-highlighting
+#
+if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
+  #
+  # Dummy implementation of _zsh_highlight()
+  # that simply removes existing highlights
+  #
+  function _zsh_highlight() {
+    region_highlight=()
+  }
+
+  #
+  # Remove existing highlights when the user
+  # inserts printable characters into $BUFFER
+  #
+  function ordinary-key-press() {
+    if [[ $KEYS == [[:print:]] ]]; then
+      region_highlight=()
+    fi
+    zle .self-insert
+  }
+  zle -N self-insert ordinary-key-press
+
+  #
+  # Override ZLE widgets to invoke _zsh_highlight()
+  #
+  # https://github.com/nicoulaj/zsh-syntax-highlighting/blob/
+  # bb7fcb79fad797a40077bebaf6f4e4a93c9d8163/zsh-syntax-highlighting.zsh#L121
+  #
+  #--------------8<-------------------8<-------------------8<-----------------
+  #
+  # Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+  # All rights reserved.
+  #
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions are
+  # met:
+  #
+  #  * Redistributions of source code must retain the above copyright
+  #    notice, this list of conditions and the following disclaimer.
+  #
+  #  * Redistributions in binary form must reproduce the above copyright
+  #    notice, this list of conditions and the following disclaimer in the
+  #    documentation and/or other materials provided with the distribution.
+  #
+  #  * Neither the name of the zsh-syntax-highlighting contributors nor the
+  #    names of its contributors may be used to endorse or promote products
+  #    derived from this software without specific prior written permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  # IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+  # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
+  zmodload zsh/zleparameter 2>/dev/null || {
+    echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter, exiting.' >&2
+    return -1
+  }
+
+  # Override ZLE widgets to make them invoke _zsh_highlight.
+  for event in ${${(f)"$(zle -la)"}:#(_*|orig-*|.run-help|.which-command)}; do
+    if [[ "$widgets[$event]" == completion:* ]]; then
+      eval "zle -C orig-$event ${${${widgets[$event]}#*:}/:/ } ; $event() { builtin zle orig-$event && _zsh_highlight } ; zle -N $event"
+    else
+      case $event in
+        accept-and-menu-complete)
+          eval "$event() { builtin zle .$event && _zsh_highlight } ; zle -N $event"
+          ;;
+
+        # The following widgets should NOT remove any previously
+        # applied highlighting. Therefore we do not remap them.
+        .forward-char|.backward-char|.up-line-or-history|.down-line-or-history)
+          ;;
+
+        .*)
+          clean_event=$event[2,${#event}] # Remove the leading dot in the event name
+          case ${widgets[$clean_event]-} in
+            (completion|user):*)
+              ;;
+            *)
+              eval "$clean_event() { builtin zle $event && _zsh_highlight } ; zle -N $clean_event"
+              ;;
+          esac
+          ;;
+        *)
+          ;;
+      esac
+    fi
+  done
+  unset event clean_event
+  #-------------->8------------------->8------------------->8-----------------
+fi
+
+function _history-substring-search-begin() {
+  _history_substring_search_move_cursor_eol=false
+  _history_substring_search_query_highlight=
+
+  #
+  # Continue using the previous $_history_substring_search_result by default,
+  # unless the current query was cleared or a new/different query was entered.
+  #
+  if [[ -z $BUFFER || $BUFFER != $_history_substring_search_result ]]; then
+    #
+    # For the purpose of highlighting we will also keep
+    # a version without doubly-escaped meta characters.
+    #
+    _history_substring_search_query=$BUFFER
+
+    #
+    # $BUFFER contains the text that is in the command-line currently.
+    # we put an extra "\\" before meta characters such as "\(" and "\)",
+    # so that they become "\\\(" and "\\\)".
+    #
+    _history_substring_search_query_escaped=${BUFFER//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
+
+    #
+    # Find all occurrences of the search query in the history file.
+    #
+    # (k) turns it an array of line numbers.
+    #
+    # (on) seems to remove duplicates, which are default
+    #      options. They can be turned off by (ON).
+    #
+    _history_substring_search_matches=(${(kon)history[(R)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)*${_history_substring_search_query_escaped}*]})
+
+    #
+    # Define the range of values that $_history_substring_search_match_index
+    # can take: [0, $_history_substring_search_matches_count_plus].
+    #
+    _history_substring_search_matches_count=$#_history_substring_search_matches
+    _history_substring_search_matches_count_plus=$(( _history_substring_search_matches_count + 1 ))
+    _history_substring_search_matches_count_sans=$(( _history_substring_search_matches_count - 1 ))
+
+    #
+    # If $_history_substring_search_match_index is equal to
+    # $_history_substring_search_matches_count_plus, this indicates that we
+    # are beyond the beginning of $_history_substring_search_matches.
+    #
+    # If $_history_substring_search_match_index is equal to 0, this indicates
+    # that we are beyond the end of $_history_substring_search_matches.
+    #
+    # If we have initially pressed "up" we have to initialize
+    # $_history_substring_search_match_index to
+    # $_history_substring_search_matches_count_plus so that it will be
+    # decreased to $_history_substring_search_matches_count.
+    #
+    # If we have initially pressed "down" we have to initialize
+    # $_history_substring_search_match_index to
+    # $_history_substring_search_matches_count so that it will be increased to
+    # $_history_substring_search_matches_count_plus.
+    #
+    if [[ $WIDGET == history-substring-search-down ]]; then
+       _history_substring_search_match_index=$_history_substring_search_matches_count
+    else
+      _history_substring_search_match_index=$_history_substring_search_matches_count_plus
+    fi
+  fi
+}
+
+function _history-substring-search-end() {
+  _history_substring_search_result=$BUFFER
+
+  # move the cursor to the end of the command line
+  if [[ $_history_substring_search_move_cursor_eol == true ]]; then
+    CURSOR=${#BUFFER}
+  fi
+
+  # highlight command line using zsh-syntax-highlighting
+  _zsh_highlight
+
+  # highlight the search query inside the command line
+  if [[ -n $_history_substring_search_query_highlight && -n $_history_substring_search_query ]]; then
+    #
+    # The following expression yields a variable $MBEGIN, which
+    # indicates the begin position + 1 of the first occurrence
+    # of _history_substring_search_query_escaped in $BUFFER.
+    #
+    : ${(S)BUFFER##(#m$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)($_history_substring_search_query##)}
+    local begin=$(( MBEGIN - 1 ))
+    local end=$(( begin + $#_history_substring_search_query ))
+    region_highlight+=("$begin $end $_history_substring_search_query_highlight")
+  fi
+
+  # For debugging purposes:
+  # zle -R "mn: "$_history_substring_search_match_index" m#: "${#_history_substring_search_matches}
+  # read -k -t 200 && zle -U $REPLY
+
+  # Exit successfully from the history-substring-search-* widgets.
+  true
+}
+
+function _history-substring-search-up-buffer() {
+  #
+  # Check if the UP arrow was pressed to move the cursor within a multi-line
+  # buffer. This amounts to three tests:
+  #
+  # 1. $#buflines -gt 1.
+  #
+  # 2. $CURSOR -ne $#BUFFER.
+  #
+  # 3. Check if we are on the first line of the current multi-line buffer.
+  #    If so, pressing UP would amount to leaving the multi-line buffer.
+  #
+  #    We check this by adding an extra "x" to $LBUFFER, which makes
+  #    sure that xlbuflines is always equal to the number of lines
+  #    until $CURSOR (including the line with the cursor on it).
+  #
+  local buflines XLBUFFER xlbuflines
+  buflines=(${(f)BUFFER})
+  XLBUFFER=$LBUFFER"x"
+  xlbuflines=(${(f)XLBUFFER})
+
+  if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xlbuflines -ne 1 ]]; then
+    zle up-line-or-history
+    return true
+  fi
+
+  false
+}
+
+function _history-substring-search-down-buffer() {
+  #
+  # Check if the DOWN arrow was pressed to move the cursor within a multi-line
+  # buffer. This amounts to three tests:
+  #
+  # 1. $#buflines -gt 1.
+  #
+  # 2. $CURSOR -ne $#BUFFER.
+  #
+  # 3. Check if we are on the last line of the current multi-line buffer.
+  #    If so, pressing DOWN would amount to leaving the multi-line buffer.
+  #
+  #    We check this by adding an extra "x" to $RBUFFER, which makes
+  #    sure that xrbuflines is always equal to the number of lines
+  #    from $CURSOR (including the line with the cursor on it).
+  #
+  local buflines XRBUFFER xrbuflines
+  buflines=(${(f)BUFFER})
+  XRBUFFER="x"$RBUFFER
+  xrbuflines=(${(f)XRBUFFER})
+
+  if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xrbuflines -ne 1 ]]; then
+    zle down-line-or-history
+    return true
+  fi
+
+  false
+}
+
+function _history-substring-search-up-history() {
+  #
+  # Behave like up in ZSH, except clear the $BUFFER
+  # when beginning of history is reached like in Fish.
+  #
+  if [[ -z $_history_substring_search_query ]]; then
+
+    # we have reached the absolute top of history
+    if [[ $HISTNO -eq 1 ]]; then
+      BUFFER=
+
+    # going up from somewhere below the top of history
+    else
+      zle up-history
+    fi
+
+    return true
+  fi
+
+  false
+}
+
+function _history-substring-search-down-history() {
+  #
+  # Behave like down-history in ZSH, except clear the
+  # $BUFFER when end of history is reached like in Fish.
+  #
+  if [[ -z $_history_substring_search_query ]]; then
+
+    # going down from the absolute top of history
+    if [[ $HISTNO -eq 1 && -z $BUFFER ]]; then
+      BUFFER=${history[1]}
+      _history_substring_search_move_cursor_eol=true
+
+    # going down from somewhere above the bottom of history
+    else
+      zle down-history
+    fi
+
+    return true
+  fi
+
+  false
+}
+
+function _history-substring-search-up-search() {
+  _history_substring_search_move_cursor_eol=true
+
+  #
+  # Highlight matches during history-substring-up-search:
+  #
+  # The following constants have been initialized in
+  # _history-substring-search-up/down-search():
+  #
+  # $_history_substring_search_matches is the current list of matches
+  # $_history_substring_search_matches_count is the current number of matches
+  # $_history_substring_search_matches_count_plus is the current number of matches + 1
+  # $_history_substring_search_matches_count_sans is the current number of matches - 1
+  # $_history_substring_search_match_index is the index of the current match
+  #
+  # The range of values that $_history_substring_search_match_index can take
+  # is: [0, $_history_substring_search_matches_count_plus].  A value of 0
+  # indicates that we are beyond the end of
+  # $_history_substring_search_matches. A value of
+  # $_history_substring_search_matches_count_plus indicates that we are beyond
+  # the beginning of $_history_substring_search_matches.
+  #
+  # In _history-substring-search-up-search() the initial value of
+  # $_history_substring_search_match_index is
+  # $_history_substring_search_matches_count_plus.  This value is set in
+  # _history-substring-search-begin().  _history-substring-search-up-search()
+  # will initially decrease it to $_history_substring_search_matches_count.
+  #
+  if [[ $_history_substring_search_match_index -ge 2 ]]; then
+    #
+    # Highlight the next match:
+    #
+    # 1. Decrease the value of $_history_substring_search_match_index.
+    #
+    # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+    #    to highlight the current buffer.
+    #
+    (( _history_substring_search_match_index-- ))
+    BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
+    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+
+  elif [[ $_history_substring_search_match_index -eq 1 ]]; then
+    #
+    # We will move beyond the end of $_history_substring_search_matches:
+    #
+    # 1. Decrease the value of $_history_substring_search_match_index.
+    #
+    # 2. Save the current buffer in $_history_substring_search_old_buffer,
+    #    so that it can be retrieved by
+    #    _history-substring-search-down-search() later.
+    #
+    # 3. Make $BUFFER equal to $_history_substring_search_query.
+    #
+    # 4. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+    #    to highlight the current buffer.
+    #
+    (( _history_substring_search_match_index-- ))
+    _history_substring_search_old_buffer=$BUFFER
+    BUFFER=$_history_substring_search_query
+    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+
+  elif [[ $_history_substring_search_match_index -eq $_history_substring_search_matches_count_plus ]]; then
+    #
+    # We were beyond the beginning of $_history_substring_search_matches but
+    # UP makes us move back to $_history_substring_search_matches:
+    #
+    # 1. Decrease the value of $_history_substring_search_match_index.
+    #
+    # 2. Restore $BUFFER from $_history_substring_search_old_buffer.
+    #
+    # 3. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+    #    to highlight the current buffer.
+    #
+    (( _history_substring_search_match_index-- ))
+    BUFFER=$_history_substring_search_old_buffer
+    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+  fi
+}
+
+function _history-substring-search-down-search() {
+  _history_substring_search_move_cursor_eol=true
+
+  #
+  # Highlight matches during history-substring-up-search:
+  #
+  # The following constants have been initialized in
+  # _history-substring-search-up/down-search():
+  #
+  # $_history_substring_search_matches is the current list of matches
+  # $_history_substring_search_matches_count is the current number of matches
+  # $_history_substring_search_matches_count_plus is the current number of matches + 1
+  # $_history_substring_search_matches_count_sans is the current number of matches - 1
+  # $_history_substring_search_match_index is the index of the current match
+  #
+  # The range of values that $_history_substring_search_match_index can take
+  # is: [0, $_history_substring_search_matches_count_plus].  A value of 0
+  # indicates that we are beyond the end of
+  # $_history_substring_search_matches. A value of
+  # $_history_substring_search_matches_count_plus indicates that we are beyond
+  # the beginning of $_history_substring_search_matches.
+  #
+  # In _history-substring-search-down-search() the initial value of
+  # $_history_substring_search_match_index is
+  # $_history_substring_search_matches_count.  This value is set in
+  # _history-substring-search-begin().
+  # _history-substring-search-down-search() will initially increase it to
+  # $_history_substring_search_matches_count_plus.
+  #
+  if [[ $_history_substring_search_match_index -le $_history_substring_search_matches_count_sans ]]; then
+    #
+    # Highlight the next match:
+    #
+    # 1. Increase $_history_substring_search_match_index by 1.
+    #
+    # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+    #    to highlight the current buffer.
+    #
+    (( _history_substring_search_match_index++ ))
+    BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
+    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+
+  elif [[ $_history_substring_search_match_index -eq $_history_substring_search_matches_count ]]; then
+    #
+    # We will move beyond the beginning of $_history_substring_search_matches:
+    #
+    # 1. Increase $_history_substring_search_match_index by 1.
+    #
+    # 2. Save the current buffer in $_history_substring_search_old_buffer, so
+    #    that it can be retrieved by _history-substring-search-up-search()
+    #    later.
+    #
+    # 3. Make $BUFFER equal to $_history_substring_search_query.
+    #
+    # 4. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+    #    to highlight the current buffer.
+    #
+    (( _history_substring_search_match_index++ ))
+    _history_substring_search_old_buffer=$BUFFER
+    BUFFER=$_history_substring_search_query
+    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+
+  elif [[ $_history_substring_search_match_index -eq 0 ]]; then
+    #
+    # We were beyond the end of $_history_substring_search_matches but DOWN
+    # makes us move back to the $_history_substring_search_matches:
+    #
+    # 1. Increase $_history_substring_search_match_index by 1.
+    #
+    # 2. Restore $BUFFER from $_history_substring_search_old_buffer.
+    #
+    # 3. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+    #    to highlight the current buffer.
+    #
+    (( _history_substring_search_match_index++ ))
+    BUFFER=$_history_substring_search_old_buffer
+    _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+  fi
+}
+
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et

From 1d17502aed5fc04cd1ca3eb35757b5ba2822414a Mon Sep 17 00:00:00 2001
From: meh <meh@paranoici.org>
Date: Sat, 16 Jul 2011 07:18:14 +0200
Subject: [PATCH 334/907] rsync: add rsync- prefixes and use aliases

---
 plugins/rsync/rsync.plugin.zsh | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/plugins/rsync/rsync.plugin.zsh b/plugins/rsync/rsync.plugin.zsh
index 5e28f346c..33a31a5c1 100644
--- a/plugins/rsync/rsync.plugin.zsh
+++ b/plugins/rsync/rsync.plugin.zsh
@@ -1,15 +1,4 @@
-function copy {
-    rsync -av --progress -h "$1" "$2"
-}
-
-function move {
-    rsync -av --progress -h --remove-source-files "$1" "$2"
-}
-
-function update {
-    rsync -avu --progress -h "$1" "$2"
-}
-
-function synchronize {
-    rsync -avu --delete --progress -h "$1" "$2"
-}
+alias rsync-copy="rsync -av --progress -h"
+alias rsync-move="rsync -av --progress -h --remove-source-files"
+alias rsync-update="rsync -avu --progress -h"
+alias rsync-synchronize="rsync -avu --delete --progress -h"

From 66c6260c10422bf50c474c9654a7928ce99e7ceb Mon Sep 17 00:00:00 2001
From: Paul Serby <paul.serby@clock.co.uk>
Date: Sat, 16 Jul 2011 16:15:15 +0100
Subject: [PATCH 335/907] Completion for cake the coffee-script build tool

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

diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
new file mode 100644
index 000000000..75997521a
--- /dev/null
+++ b/plugins/cake/cake.plugin.zsh
@@ -0,0 +1,32 @@
+# Set this to 1 if you want to cache the tasks
+cacheTaskList=1
+
+# Cache filename
+cacheFile='.cake-task-cache'
+
+_cake_does_target_list_need_generating () {
+
+	if [ $cacheTaskList -eq 0 ]; then
+		return 1;
+	fi
+
+	if [ ! -f $cacheFile ]; then return 0;
+	else
+		accurate=$(stat -f%m $cacheFile)
+		changed=$(stat -f%m Cakefile)
+		return $(expr $accurate '>=' $changed)
+	fi
+}
+
+_cake () {
+	if [ -f Cakefile ]; then
+		if _cake_does_target_list_need_generating; then
+			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cacheFile
+			compadd `cat $cacheFile`
+		else
+			compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
+		fi
+	fi
+}
+
+compdef _cake cake

From e7e9e5bbe608fd7572a810f36e7f1b3321c25136 Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <dreurmail@gmail.com>
Date: Sat, 16 Jul 2011 18:42:09 -0400
Subject: [PATCH 336/907] Added archlinux plugin

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

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
new file mode 100644
index 000000000..acb8df057
--- /dev/null
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -0,0 +1,67 @@
+# Archlinux zsh aliases and functions for zsh
+
+# Aliases ###################################################################
+
+# Look for yaourt, and add some useful functions if we have it.
+if [[ -x `which yaourt` ]]; then
+  upgrade () {
+    yaourt -Syu -C
+  }
+  # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
+  alias yaupg='sudo yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+  alias yain='sudo yaourt -S'           # Install specific package(s) from the repositories
+  alias yains='sudo yaourt -U'          # Install specific package not from the repositories but from a file 
+  alias yare='sudo yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
+  alias yarem='sudo yaourt -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
+  alias yarep='yaourt -Si'              # Display information about a given package in the repositories
+  alias yareps='yaourt -Ss'             # Search for package(s) in the repositories
+  alias yaloc='yaourt -Qi'              # Display information about a given package in the local database
+  alias yalocs='yaourt -Qs'             # Search for package(s) in the local database
+  # Additional yaourt alias examples
+  alias yaupd='sudo yaourt -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+  alias yainsd='sudo yaourt -S --asdeps'        # Install given package(s) as dependencies of another package
+  alias yamir='sudo yaourt -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+else
+ upgrade() {
+   sudo pacman -Syu
+ }
+fi
+
+# Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
+alias pacupg='sudo pacman -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+alias pacin='sudo pacman -S'           # Install specific package(s) from the repositories
+alias pacins='sudo pacman -U'          # Install specific package not from the repositories but from a file 
+alias pacre='sudo pacman -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
+alias pacrem='sudo pacman -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
+alias pacrep='pacman -Si'              # Display information about a given package in the repositories
+alias pacreps='pacman -Ss'             # Search for package(s) in the repositories
+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
+alias pacupd='sudo pacman -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+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
+
+# https://bbs.archlinux.org/viewtopic.php?id=93683
+paclist() {
+  sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
+}
+alias paclsorhpans='sudo pacman -Qdt'
+alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+
+pacdisowned() {
+  tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
+  db=$tmp/db
+  fs=$tmp/fs
+
+  mkdir "$tmp"
+  trap  'rm -rf "$tmp"' EXIT
+
+  pacman -Qlq | sort -u > "$db"
+
+  find /bin /etc /lib /sbin /usr \
+      ! -name lost+found \
+        \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
+
+  comm -23 "$fs" "$db"
+}

From edcd4f7eea357cefee37a25a371e1dd5d1a6b598 Mon Sep 17 00:00:00 2001
From: Jake Bell <jake@theunraveler.com>
Date: Sun, 17 Jul 2011 13:01:48 -0500
Subject: [PATCH 337/907] Adding quotes to deal with paths that have spaces.

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

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e30488822..2b75e5541 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -9,4 +9,4 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
 echo "\033[0;32m"'                        /____/                       '"\033[0m"
 echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
 echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
-cd $current_path
+cd "$current_path"

From 127d2ae57b01ae13dd6017c3c104a45a0086e88e Mon Sep 17 00:00:00 2001
From: alexandru totolici <alex@hackd.net>
Date: Sun, 17 Jul 2011 21:01:06 -0700
Subject: [PATCH 338/907] Fixed typo for one of the subcommands (linset ->
 linsert)

---
 plugins/redis-cli/_redis-cli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/redis-cli/_redis-cli b/plugins/redis-cli/_redis-cli
index 3789add18..1569f2916 100644
--- a/plugins/redis-cli/_redis-cli
+++ b/plugins/redis-cli/_redis-cli
@@ -51,7 +51,7 @@ _1st_arguments=(
   'keys:find all keys matching the given pattern'
   'lastsave:get the UNIX timestamp of the last successful save to disk'
   'lindex:get an element from a list by its index'
-  'linset:insert an element before or after another element in a list'
+  'linsert:insert an element before or after another element in a list'
   'llen:get the length of a list'
   'lpop:remove and get the first element in a list'
   'lpush:prepend a value to a list'

From a38774c98d1c08f82b1325a40b2de1a76586e02a Mon Sep 17 00:00:00 2001
From: Christopher Sexton <csexton@gmail.com>
Date: Tue, 17 May 2011 14:13:07 -0400
Subject: [PATCH 339/907] C-x C-e to edit current command in EDITOR

The command C-x C-e opens the current command line for editing
in the editor defined by the $EDITOR environment variable.

Thanks to Craig Bosma and his blog post about this:
http://distrustsimplicity.net/articles/zsh-command-editing
---
 lib/edit-command-line.zsh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lib/edit-command-line.zsh

diff --git a/lib/edit-command-line.zsh b/lib/edit-command-line.zsh
new file mode 100644
index 000000000..db2000325
--- /dev/null
+++ b/lib/edit-command-line.zsh
@@ -0,0 +1,3 @@
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line

From c09e2f2986aafbf2a67004f8df6b5dd10abb8d61 Mon Sep 17 00:00:00 2001
From: Paul Serby <paul.serby@clock.co.uk>
Date: Mon, 18 Jul 2011 16:05:05 +0100
Subject: [PATCH 340/907] Bringing inline with oh-my-zsh coding convensions

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

diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
index 75997521a..f968c71d5 100644
--- a/plugins/cake/cake.plugin.zsh
+++ b/plugins/cake/cake.plugin.zsh
@@ -1,18 +1,18 @@
 # Set this to 1 if you want to cache the tasks
-cacheTaskList=1
+cache_task_list=1
 
 # Cache filename
-cacheFile='.cake-task-cache'
+cache_file='.cake_task_cache'
 
 _cake_does_target_list_need_generating () {
 
-	if [ $cacheTaskList -eq 0 ]; then
+	if [ $cache_task_list -eq 0 ]; then
 		return 1;
 	fi
 
-	if [ ! -f $cacheFile ]; then return 0;
+	if [ ! -f $cache_file ]; then return 0;
 	else
-		accurate=$(stat -f%m $cacheFile)
+		accurate=$(stat -f%m $cache_file)
 		changed=$(stat -f%m Cakefile)
 		return $(expr $accurate '>=' $changed)
 	fi
@@ -21,8 +21,8 @@ _cake_does_target_list_need_generating () {
 _cake () {
 	if [ -f Cakefile ]; then
 		if _cake_does_target_list_need_generating; then
-			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cacheFile
-			compadd `cat $cacheFile`
+			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cache_file
+			compadd `cat $cache_file`
 		else
 			compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
 		fi

From fea4e54b1053764df10f507c233286281133fe90 Mon Sep 17 00:00:00 2001
From: fox <fox91@anche.no>
Date: Tue, 19 Jul 2011 21:47:26 +0200
Subject: [PATCH 341/907] added theme chooser

---
 tools/theme_chooser.sh | 47 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 tools/theme_chooser.sh

diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
new file mode 100755
index 000000000..2413bfee8
--- /dev/null
+++ b/tools/theme_chooser.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# Zsh Theme Chooser by fox (fox91 at anche dot no)
+# This program is free software. It comes without any warranty, to
+# the extent permitted by applicable law. You can redistribute it
+# and/or modify it under the terms of the Do What The Fuck You Want
+# To Public License, Version 2, as published by Sam Hocevar. See
+# http://sam.zoy.org/wtfpl/COPYING for more details.
+
+THEMES_DIR="$ZSH/themes"
+FAVLIST="~/.zsh_favlist"
+
+function noyes() {
+    read -p "$1 [y/N]" a
+    if [[ $a == "N" || $a == "n" || $a = "" ]]; then
+        return 0
+    fi
+    return 1
+}
+
+function theme_preview() {
+    THEME=$1
+    export ZDOTDIR="$(mktemp -d)"
+
+cat <<-EOF >"$ZDOTDIR/.zshrc"
+    source ~/.zshrc
+    source "$THEMES_DIR/$THEME"
+EOF
+    zsh
+    rm -rf "$ZDOTDIR"
+
+    echo
+    noyes "Do you want to add it to your favourite list?" && \
+          echo $THEME >> $FAVLIST
+    echo
+}
+
+echo
+echo "╺━┓┏━┓╻ ╻   ╺┳╸╻ ╻┏━╸┏┳┓┏━╸   ┏━╸╻ ╻┏━┓┏━┓┏━┓┏━╸┏━┓"
+echo "┏━┛┗━┓┣━┫    ┃ ┣━┫┣╸ ┃┃┃┣╸    ┃  ┣━┫┃ ┃┃ ┃┗━┓┣╸ ┣┳┛"
+echo "┗━╸┗━┛╹ ╹    ╹ ╹ ╹┗━╸╹ ╹┗━╸   ┗━╸╹ ╹┗━┛┗━┛┗━┛┗━╸╹┗╸"
+echo
+
+for i in $(ls $THEMES_DIR); do
+    echo "Now showing theme $i"
+    theme_preview $i
+done

From 5d5d2f94be7a13c3a5069bed6bfc2070fa7f014c Mon Sep 17 00:00:00 2001
From: fox <fox91@anche.no>
Date: Tue, 19 Jul 2011 22:02:34 +0200
Subject: [PATCH 342/907] fox's theme + theme chooser fixes

---
 themes/fox.zsh-theme   | 8 ++++++++
 tools/theme_chooser.sh | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 themes/fox.zsh-theme

diff --git a/themes/fox.zsh-theme b/themes/fox.zsh-theme
new file mode 100644
index 000000000..1959853cf
--- /dev/null
+++ b/themes/fox.zsh-theme
@@ -0,0 +1,8 @@
+#fox theme
+PROMPT='%{$fg[cyan]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[cyan]%}☮%{$fg_bold[white]%}%M%{$reset_color%}%{$fg[cyan]%}]%{$fg[white]%}-%{$fg[cyan]%}(%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[cyan]%})$(git_prompt_info)
+└> % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="-[%{$reset_color%}%{$fg[white]%}git://%{$fg_bold[white]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg[cyan]%}]-"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}"
diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index 2413bfee8..50f80f092 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -8,10 +8,10 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 THEMES_DIR="$ZSH/themes"
-FAVLIST="~/.zsh_favlist"
+FAVLIST="${HOME}/.zsh_favlist"
 
 function noyes() {
-    read -p "$1 [y/N]" a
+    read -p "$1 [y/N] " a
     if [[ $a == "N" || $a == "n" || $a = "" ]]; then
         return 0
     fi
@@ -30,7 +30,7 @@ EOF
     rm -rf "$ZDOTDIR"
 
     echo
-    noyes "Do you want to add it to your favourite list?" && \
+    noyes "Do you want to add it to your favourite list ($FAVLIST)?" || \
           echo $THEME >> $FAVLIST
     echo
 }

From 8e77ad468dd22f25c461a0f69f9c03cbb2fb2d05 Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <dreurmail@gmail.com>
Date: Tue, 19 Jul 2011 19:38:29 -0700
Subject: [PATCH 343/907] Fix typo

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

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index acb8df057..8ed291fcf 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -46,7 +46,8 @@ alias pacmir='sudo pacman -Syy'                # Force refresh of all package li
 paclist() {
   sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}'
 }
-alias paclsorhpans='sudo pacman -Qdt'
+
+alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
 
 pacdisowned() {

From cbaa97d8c38bf7bc1a92480ae83e323e1e0cac02 Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <dreurmail@gmail.com>
Date: Sat, 23 Jul 2011 10:42:43 -0400
Subject: [PATCH 344/907] Add utility method to spectrum

---
 lib/spectrum.zsh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index 4006a7fe1..2fdf537ef 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -18,3 +18,11 @@ for color in {000..255}; do
     FG[$color]="%{[38;5;${color}m%}"
     BG[$color]="%{[48;5;${color}m%}"
 done
+
+# Show all 256 colors with color number
+function spectrum_ls() {
+  for code in {000..255}; do
+    print -P -- "$code: %F{$code}Test%f"
+  done
+}
+

From 512f3678c07accd6d121e9c0d6d50f008c99708a Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <dreurmail@gmail.com>
Date: Sat, 23 Jul 2011 11:22:39 -0400
Subject: [PATCH 345/907] Remove sudo when using yaourt + do not rely on abs
 when not in path - In archlinux plugin

---
 plugins/archlinux/archlinux.plugin.zsh | 42 +++++++++++++++-----------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 8ed291fcf..b5e519036 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,26 +1,30 @@
-# Archlinux zsh aliases and functions for zsh
-
-# Aliases ###################################################################
+# Archlinux zsh aliases and functions
+# Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins
 
 # Look for yaourt, and add some useful functions if we have it.
 if [[ -x `which yaourt` ]]; then
   upgrade () {
-    yaourt -Syu -C
+    yaourt -Syu
   }
+  alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff
   # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
-  alias yaupg='sudo yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
-  alias yain='sudo yaourt -S'           # Install specific package(s) from the repositories
-  alias yains='sudo yaourt -U'          # Install specific package not from the repositories but from a file 
-  alias yare='sudo yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
-  alias yarem='sudo yaourt -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
-  alias yarep='yaourt -Si'              # Display information about a given package in the repositories
-  alias yareps='yaourt -Ss'             # Search for package(s) in the repositories
-  alias yaloc='yaourt -Qi'              # Display information about a given package in the local database
-  alias yalocs='yaourt -Qs'             # Search for package(s) in the local database
+  alias yaupg='yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+  alias yain='yaourt -S'           # Install specific package(s) from the repositories
+  alias yains='yaourt -U'          # Install specific package not from the repositories but from a file 
+  alias yare='yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
+  alias yarem='yaourt -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
+  alias yarep='yaourt -Si'         # Display information about a given package in the repositories
+  alias yareps='yaourt -Ss'        # Search for package(s) in the repositories
+  alias yaloc='yaourt -Qi'         # Display information about a given package in the local database
+  alias yalocs='yaourt -Qs'        # Search for package(s) in the local database
   # Additional yaourt alias examples
-  alias yaupd='sudo yaourt -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
-  alias yainsd='sudo yaourt -S --asdeps'        # Install given package(s) as dependencies of another package
-  alias yamir='sudo yaourt -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+  if [[ -x `which abs` ]]; then
+    alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories
+  else
+    alias yaupd='yaourt -Sy'               # Update and refresh the local package and ABS databases 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
 else
  upgrade() {
    sudo pacman -Syu
@@ -38,7 +42,11 @@ alias pacreps='pacman -Ss'             # Search for package(s) in the repositori
 alias pacloc='pacman -Qi'              # Display information about a given package in the local database
 alias paclocs='pacman -Qs'             # Search for package(s) in the local database
 # Additional pacman alias examples
-alias pacupd='sudo pacman -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+if [[ -x `which abs` ]]; then
+  alias pacupd='sudo pacman -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
+else
+  alias pacupd='sudo pacman -Sy'     # Update and refresh the local package and ABS databases 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 34f00f385ce1b322ee7de48f30d175746bba94fc Mon Sep 17 00:00:00 2001
From: hobbestigrou <hobbestigrou@erakis.im>
Date: Mon, 11 Oct 2010 21:19:23 +0200
Subject: [PATCH 346/907] More generic.

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

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 4c1743657..88732e664 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -10,4 +10,4 @@ setopt long_list_jobs
 
 ## pager
 export PAGER=less
-export LC_CTYPE=en_US.UTF-8
+export LC_CTYPE=$LANG

From eb63ddf6bb119e3d0e62f012b2f9b5fe95e0d647 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Tue, 12 Oct 2010 20:02:04 +0100
Subject: [PATCH 347/907] added mac keybinding for backward-delete-char

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

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9f28d5761..9c2dda35a 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -21,6 +21,7 @@ bindkey ' ' magic-space    # also do history expansion on space
 bindkey '^[[Z' reverse-menu-complete
 
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~
+bindkey '^?' backward-delete-char
 bindkey "^[[3~" delete-char
 bindkey "^[3;5~" delete-char
 bindkey "\e[3~" delete-char

From 6bb0c1c9269025867e886b76bcbf737e5a54400d Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Mon, 11 Oct 2010 02:43:51 +0100
Subject: [PATCH 348/907] added git log with graph

---
 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 bc340e86b..0c94cc99e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -27,6 +27,8 @@ alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
+alias glgg='git log --graph --max-count=5'
+compdef _git glgg=git-log
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From 96b0af68242ec6235e4162f5e7e1f4d470cb2b22 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 23:09:42 +0100
Subject: [PATCH 349/907] adding git svn aliases

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 0c94cc99e..3721d3343 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -34,6 +34,8 @@ compdef _git glgg=git-log
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
 
+alias gsr='git svn rebase'
+alias gsd='git svn dcommit'
 #
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)
@@ -47,6 +49,10 @@ function current_branch() {
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
+<<<<<<< HEAD
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
+=======
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+>>>>>>> e5e032f... adding git svn aliases

From 9e783c0a8e276e89d9d81951a4c32ea61dadccf1 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sat, 23 Jul 2011 09:14:44 -0700
Subject: [PATCH 350/907] fixing issue with last commit merge. missed a
 conflict

---
 plugins/git/git.plugin.zsh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3721d3343..5132b639a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -49,10 +49,6 @@ function current_branch() {
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
-<<<<<<< HEAD
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
-=======
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
->>>>>>> e5e032f... adding git svn aliases

From 428f18cf428fd86bd6e99c4363e5f25d0e392506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= <loic.yhuel@gmail.com>
Date: Sat, 23 Jul 2011 23:09:03 +0200
Subject: [PATCH 351/907] Add key bindings for gnome-terminal on Fedora

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

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 9c2dda35a..5c1b90bfa 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -14,10 +14,15 @@ bindkey '^[[B' down-line-or-search
 
 bindkey "^[[H" beginning-of-line
 bindkey "^[[1~" beginning-of-line
+bindkey "^[OH" beginning-of-line
 bindkey "^[[F"  end-of-line
 bindkey "^[[4~" end-of-line
+bindkey "^[OF" end-of-line
 bindkey ' ' magic-space    # also do history expansion on space
 
+bindkey "^[[1;5C" forward-word
+bindkey "^[[1;5D" backward-word
+
 bindkey '^[[Z' reverse-menu-complete
 
 # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~

From 76dd2d8b05cb1b8d34653732e8b3939f68e8a67a Mon Sep 17 00:00:00 2001
From: fox <fox91@anche.no>
Date: Sun, 24 Jul 2011 11:58:41 +0200
Subject: [PATCH 352/907] mac os fix

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

diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index 50f80f092..af861a15b 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -20,7 +20,7 @@ function noyes() {
 
 function theme_preview() {
     THEME=$1
-    export ZDOTDIR="$(mktemp -d)"
+    export ZDOTDIR="$(mktemp -d tmp.zshXXXX)"
 
 cat <<-EOF >"$ZDOTDIR/.zshrc"
     source ~/.zshrc

From d15d3a5b01a527d8642cc0b173a2f8d1b92332c0 Mon Sep 17 00:00:00 2001
From: fox <fox91@anche.no>
Date: Sun, 24 Jul 2011 20:51:27 +0200
Subject: [PATCH 353/907] global zsh config

---
 tools/theme_chooser.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index af861a15b..ea5191afe 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -20,18 +20,19 @@ function noyes() {
 
 function theme_preview() {
     THEME=$1
+    THEME_NAME=`echo $THEME | sed s/\.zsh-theme//`
     export ZDOTDIR="$(mktemp -d tmp.zshXXXX)"
 
 cat <<-EOF >"$ZDOTDIR/.zshrc"
-    source ~/.zshrc
-    source "$THEMES_DIR/$THEME"
+    ZSH_THEME="$THEME_NAME"
+    source $ZSH/oh-my-zsh.sh
 EOF
     zsh
     rm -rf "$ZDOTDIR"
 
     echo
     noyes "Do you want to add it to your favourite list ($FAVLIST)?" || \
-          echo $THEME >> $FAVLIST
+          echo $THEME_NAME >> $FAVLIST
     echo
 }
 

From 0848acfb25b6601adcabc406089b6c7788df5749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= <loic.yhuel@gmail.com>
Date: Sat, 23 Jul 2011 23:34:02 +0200
Subject: [PATCH 354/907] Display red dots during completion process (disabled
 by default)

---
 lib/completion.zsh           | 9 +++++++++
 templates/zshrc.zsh-template | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index fdd0a8536..b3cc91822 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -59,3 +59,12 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
+if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then
+  expand-or-complete-with-dots() {
+    echo -n "\e[31m......\e[0m"
+    zle expand-or-complete
+    zle redisplay
+  }
+  zle -N expand-or-complete-with-dots
+  bindkey "^I" expand-or-complete-with-dots
+fi
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 77f866d52..1ab40aba6 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -19,6 +19,9 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git)

From 3cb33fc254290a848a602af634cfa26179d630e5 Mon Sep 17 00:00:00 2001
From: Andrew Smith <asmith@bcm.com.au>
Date: Mon, 25 Jul 2011 09:46:17 +1000
Subject: [PATCH 355/907] Replace a duplicated test to see if we're in an SVN
 folder with a call to the 'in_svn' function.

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 86050227d..77de27481 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,5 +1,5 @@
 function svn_prompt_info {
-    if [[ -d .svn ]]; then
+    if [ in_svn ]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
     fi

From 7b25a3fca90e31f2c272fd8d2ef1dfa3e61dc9e4 Mon Sep 17 00:00:00 2001
From: Andrew Smith <asmith@bcm.com.au>
Date: Mon, 25 Jul 2011 09:50:54 +1000
Subject: [PATCH 356/907] The original SVN pluging would mark a folder as dirty
 if there was an svn:external set and the output of 'svn status' returned the
 check for the external. E.g.

$ svn st
X       Application

Performing status on external item at 'Application'

Shouldn't be marked as being dirty. By grepping for only the valid
output for what should be class as dirty, it won't return false
positives.
---
 plugins/svn/svn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 77de27481..53a8a513a 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -28,7 +28,7 @@ function svn_get_rev_nr {
 
 function svn_dirty_choose {
     if [ in_svn ]; then
-        s=$(svn status 2>/dev/null)
+        s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
         if [ $s ]; then 
             echo $1
         else 

From 6bf468f92c9302f84d3b21358202c3a956cad02b Mon Sep 17 00:00:00 2001
From: Shane Emmons <semmons99@gmail.com>
Date: Mon, 25 Jul 2011 08:02:25 -0700
Subject: [PATCH 357/907] add alias for `bundle package` to the bundler plugin

---
 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 e98bb4b46..f005700ff 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -2,6 +2,7 @@ alias be="bundle exec"
 alias bi="bundle install"
 alias bl="bundle list"
 alias bu="bundle update"
+alias bp="bundle package"
 
 # The following is based on https://github.com/gma/bundler-exec
 

From fd732eb3ff4984ddc9109e950cf7ceb472cb9824 Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Wed, 27 Jul 2011 10:28:55 -0700
Subject: [PATCH 358/907] move history-substring-search* files into plugins/

---
 README => plugins/history-substring-search/README                 | 0
 .../history-substring-search/history-substring-search.plugin.zsh  | 0
 .../history-substring-search/history-substring-search.zsh         | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename README => plugins/history-substring-search/README (100%)
 rename history-substring-search.plugin.zsh => plugins/history-substring-search/history-substring-search.plugin.zsh (100%)
 rename history-substring-search.zsh => plugins/history-substring-search/history-substring-search.zsh (100%)

diff --git a/README b/plugins/history-substring-search/README
similarity index 100%
rename from README
rename to plugins/history-substring-search/README
diff --git a/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
similarity index 100%
rename from history-substring-search.plugin.zsh
rename to plugins/history-substring-search/history-substring-search.plugin.zsh
diff --git a/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
similarity index 100%
rename from history-substring-search.zsh
rename to plugins/history-substring-search/history-substring-search.zsh

From fc49b4a4ded376cd82b813dcb6d72fdc050b7bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= <loic.yhuel@gmail.com>
Date: Thu, 28 Jul 2011 19:52:35 +0200
Subject: [PATCH 359/907] Enable red dots during completion by default

---
 lib/completion.zsh           | 2 +-
 templates/zshrc.zsh-template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index b3cc91822..2a457402a 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -59,7 +59,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then
+if [ "$DISABLE_COMPLETION_WAITING_DOTS" != "true" ]; then
   expand-or-complete-with-dots() {
     echo -n "\e[31m......\e[0m"
     zle expand-or-complete
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1ab40aba6..4de1fa4e9 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -19,8 +19,8 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment following line if you want red dots to be displayed while waiting for completion
-# COMPLETION_WAITING_DOTS="true"
+# Uncomment following line if you want disable red dots displayed while waiting for completion
+# DISABLE_COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)

From f35bfd9c4b2a3924975b936d2ca946dbca48c51f Mon Sep 17 00:00:00 2001
From: Max Masnick <max@masnick.me>
Date: Fri, 29 Jul 2011 15:17:22 -0400
Subject: [PATCH 360/907] Add fino.zsh-theme

Add my brand new oh-my-zsh theme called Fino. It borrows from some other
themes (see comments at the beginning). I only have/can tested on OS X
10.7, so there might be some compatibility problems with other
platforms.
---
 themes/fino.zsh-theme | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 themes/fino.zsh-theme

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

From d866662c4af4c6e6e661c59d2da8f60eabbfba1d Mon Sep 17 00:00:00 2001
From: Fredrik Wallgren <fredrik.wallgren@gmail.com>
Date: Sat, 30 Jul 2011 04:38:57 +0200
Subject: [PATCH 361/907] Add autocomplete for gas. Based on the rvm plugin.

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

diff --git a/plugins/gas/_gas b/plugins/gas/_gas
new file mode 100644
index 000000000..069713fc6
--- /dev/null
+++ b/plugins/gas/_gas
@@ -0,0 +1,34 @@
+#compdef gas
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+	'(- 1 *)'{-v,--version}'[display version information]' \
+	'(-h|--help)'{-h,--help}'[show help information]' \
+	'1: :->cmds' \
+	'*: :->args' && ret=0
+
+case $state in
+	cmds)
+		cmds=(
+            "version:Prints Gas's version"
+            "use:Uses author"
+            "show:Shows your current user"
+            "list:Lists your authors"
+            "import:Imports current user to gasconfig"
+            "help:Describe available tasks or one specific task"
+            "delete:Deletes author"
+            "add:Adds author to gasconfig"
+        )
+		_describe -t commands 'gas command' cmds && ret=0
+		;;
+	args)
+		case $line[1] in
+			(use|delete)
+				_values -S , 'rubies' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
+				;;
+		esac
+		;;
+esac
+
+return ret

From c3412ca57d313a0a1419d26b5529f28de49285d0 Mon Sep 17 00:00:00 2001
From: Fredrik Wallgren <fredrik.wallgren@gmail.com>
Date: Sat, 30 Jul 2011 04:57:25 +0200
Subject: [PATCH 362/907] Replace forgotten rubies with authors

---
 plugins/gas/_gas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gas/_gas b/plugins/gas/_gas
index 069713fc6..befdc9459 100644
--- a/plugins/gas/_gas
+++ b/plugins/gas/_gas
@@ -25,7 +25,7 @@ case $state in
 	args)
 		case $line[1] in
 			(use|delete)
-				_values -S , 'rubies' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
+				_values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
 				;;
 		esac
 		;;

From b160ee6512f58a3a7f2c18f12feab3e32884003b Mon Sep 17 00:00:00 2001
From: Ilya Chesnokov <chesnokov.ilya@gmail.com>
Date: Mon, 1 Aug 2011 10:58:05 +0400
Subject: [PATCH 363/907] 'echo' did not show colors without -e in upgrade.sh

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

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 2b75e5541..52a8cc4da 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,12 +1,12 @@
 current_path=`pwd`
-echo "\033[0;34mUpgrading Oh My Zsh\033[0m"
+echo -e "\033[0;34mUpgrading Oh My Zsh\033[0m"
 ( cd $ZSH && git pull origin master )
-echo "\033[0;32m"'         __                                     __   '"\033[0m"
-echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
-echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
-echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
-echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
-echo "\033[0;32m"'                        /____/                       '"\033[0m"
-echo "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
-echo "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
+echo -e "\033[0;32m"'         __                                     __   '"\033[0m"
+echo -e "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
+echo -e "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
+echo -e "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
+echo -e "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
+echo -e "\033[0;32m"'                        /____/                       '"\033[0m"
+echo -e "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
+echo -e "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
 cd "$current_path"

From 68b5ef2aabddc1049738a80f6cbfa470fd538e95 Mon Sep 17 00:00:00 2001
From: Rahul Trikha <rahul.trikha@gmail.com>
Date: Tue, 2 Aug 2011 11:24:09 +0930
Subject: [PATCH 364/907] Added auto complete plugin for powder gem
 https://github.com/Rodreegez/powder

---
 plugins/powder/_powder | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 plugins/powder/_powder

diff --git a/plugins/powder/_powder b/plugins/powder/_powder
new file mode 100644
index 000000000..84e260a15
--- /dev/null
+++ b/plugins/powder/_powder
@@ -0,0 +1,4 @@
+#compdef powder
+#autoload
+
+compadd `powder help | grep powder | cut -d " " -f 4`

From 3bc32eef6dbad942fd137a7c7d04050d9b87fed4 Mon Sep 17 00:00:00 2001
From: Adolfo Benedetti <adolfo.benedetti@gmail.com>
Date: Tue, 2 Aug 2011 09:42:23 +0200
Subject: [PATCH 365/907] add theme with command-line tips support

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

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
new file mode 100644
index 000000000..9f777e847
--- /dev/null
+++ b/themes/adben.zsh-theme
@@ -0,0 +1,26 @@
+#!/usr/bin/env zsh
+local USER_HOST='%{$terminfo[bold]$fg[yellow]%}%n@%m%{$reset_color%}'
+local RETURN_CODE="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+local GIT_BRANCH='%{$terminfo[bold]$fg[red]%}$(git_prompt_info)%{$reset_color%}'
+local CURRENT_DIR='%{$terminfo[bold]$fg[green]%} %~%{$reset_color%}'
+local RUBY_RVM='%{$fg[gray]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+local COMMAND_TIP='%{$terminfo[bold]$fg[blue]%}$(wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d' | sed 's/^/║/g')%{$reset_color%}'
+######### PROMPT #########
+PROMPT="%{$terminfo[bold]$fg[blue]%}╔═ %{$reset_color%}${USER_HOST} ${CURRENT_DIR} ${RUBY_RVM} ${GIT_BRANCH}
+${COMMAND_TIP}
+%{$terminfo[bold]$fg[blue]%}╚═ %{$reset_color%}%B%{$terminfo[bold]$fg[white]%}$%b%{$reset_color%} "
+RPS1='${RETURN_CODE}'
+RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
+######### PROMPT #########
+########## GIT ###########
+ZSH_THEME_GIT_PROMPT_PREFIX="‹"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%}›"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
+########## GIT ###########

From cbf662744ffcf998829cabbd7b2550861c13d1d8 Mon Sep 17 00:00:00 2001
From: fox <fox91@anche.no>
Date: Wed, 3 Aug 2011 09:42:16 +0200
Subject: [PATCH 366/907] fixed theme chooser + options + list available themes
 + show all themes

---
 tools/theme_chooser.sh | 90 ++++++++++++++++++++++++++++++++----------
 1 file changed, 69 insertions(+), 21 deletions(-)

diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index ea5191afe..4d7047444 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 
 # Zsh Theme Chooser by fox (fox91 at anche dot no)
 # This program is free software. It comes without any warranty, to
@@ -9,9 +9,10 @@
 
 THEMES_DIR="$ZSH/themes"
 FAVLIST="${HOME}/.zsh_favlist"
+source $ZSH/oh-my-zsh.sh
 
 function noyes() {
-    read -p "$1 [y/N] " a
+    read "a?$1 [y/N] "
     if [[ $a == "N" || $a == "n" || $a = "" ]]; then
         return 0
     fi
@@ -20,29 +21,76 @@ function noyes() {
 
 function theme_preview() {
     THEME=$1
-    THEME_NAME=`echo $THEME | sed s/\.zsh-theme//`
-    export ZDOTDIR="$(mktemp -d tmp.zshXXXX)"
-
-cat <<-EOF >"$ZDOTDIR/.zshrc"
-    ZSH_THEME="$THEME_NAME"
-    source $ZSH/oh-my-zsh.sh
-EOF
-    zsh
-    rm -rf "$ZDOTDIR"
+    THEME_NAME=`echo $THEME | sed s/\.zsh-theme$//`
+    print "$fg[blue]${(l.((${COLUMNS}-${#THEME_NAME}-5))..─.)}$reset_color $THEME_NAME $fg[blue]───$reset_color"
+    source "$THEMES_DIR/$THEME"
+    print -P $PROMPT
+}
 
+function banner() {
     echo
-    noyes "Do you want to add it to your favourite list ($FAVLIST)?" || \
-          echo $THEME_NAME >> $FAVLIST
+    echo "╺━┓┏━┓╻ ╻   ╺┳╸╻ ╻┏━╸┏┳┓┏━╸   ┏━╸╻ ╻┏━┓┏━┓┏━┓┏━╸┏━┓"
+    echo "┏━┛┗━┓┣━┫    ┃ ┣━┫┣╸ ┃┃┃┣╸    ┃  ┣━┫┃ ┃┃ ┃┗━┓┣╸ ┣┳┛"
+    echo "┗━╸┗━┛╹ ╹    ╹ ╹ ╹┗━╸╹ ╹┗━╸   ┗━╸╹ ╹┗━┛┗━┛┗━┛┗━╸╹┗╸"
     echo
 }
 
-echo
-echo "╺━┓┏━┓╻ ╻   ╺┳╸╻ ╻┏━╸┏┳┓┏━╸   ┏━╸╻ ╻┏━┓┏━┓┏━┓┏━╸┏━┓"
-echo "┏━┛┗━┓┣━┫    ┃ ┣━┫┣╸ ┃┃┃┣╸    ┃  ┣━┫┃ ┃┃ ┃┗━┓┣╸ ┣┳┛"
-echo "┗━╸┗━┛╹ ╹    ╹ ╹ ╹┗━╸╹ ╹┗━╸   ┗━╸╹ ╹┗━┛┗━┛┗━┛┗━╸╹┗╸"
-echo
+function usage() {
+    echo "Usage: $0 [options] [theme]"
+    echo
+    echo "Options"
+    echo "  -l   List available themes"
+    echo "  -s   Show all themes"
+    echo "  -h   Get this help message"
+    exit 1
+}
 
-for i in $(ls $THEMES_DIR); do
-    echo "Now showing theme $i"
-    theme_preview $i
+function list_themes() {
+    for THEME in $(ls $THEMES_DIR); do
+        THEME_NAME=`echo $THEME | sed s/\.zsh-theme$//`
+        echo $THEME_NAME
+    done
+}
+
+function insert_favlist() {
+    if grep -q "$THEME_NAME" $FAVLIST 2> /dev/null ; then
+        echo "Already in favlist"
+    else
+        echo $THEME_NAME >> $FAVLIST
+        echo "Saved to favlist"
+    fi
+
+}
+
+function theme_chooser() {
+    for THEME in $(ls $THEMES_DIR); do
+        echo
+        theme_preview $THEME
+        echo
+        if [[ -z $1 ]]; then
+            noyes "Do you want to add it to your favourite list ($FAVLIST)?" || \
+                  insert_favlist $THEME_NAME
+            echo
+        fi
+    done
+}
+
+while getopts ":lhs" Option
+do
+  case $Option in
+    l ) list_themes ;;
+    s ) theme_chooser 0 ;;
+    h ) usage ;;
+    * ) usage ;; # Default.
+  esac
 done
+
+if [[ -z $Option ]]; then
+    if [[ -z $1 ]]; then
+        banner
+        echo
+        theme_chooser
+    else
+        theme_preview $1".zsh-theme"
+    fi
+fi

From 3780247f633d99b6870e39ea77c540ebb5125095 Mon Sep 17 00:00:00 2001
From: Sune Kibsgaard Pedersen <sune@kibs.dk>
Date: Thu, 4 Aug 2011 12:37:33 +0200
Subject: [PATCH 367/907] added option of setting another path to custom
 plugins and files

just set ZSH_CUSTOM in your .zshrc, if not set oh-my-zsh.sh will
use the default custom dir in the repository
---
 oh-my-zsh.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c4522491b..3865abe17 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -21,17 +21,24 @@ for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 autoload -U compinit
 compinit -i
 
+# Set ZSH_CUSTOM to the path where your custom config files
+# and plugins exists, or else we will use the default custom/
+if [ "$ZSH_CUSTOM" = ""  ]
+then
+    ZSH_CUSTOM="$ZSH/custom"
+fi
+
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH/custom/plugins/$plugin/$plugin.plugin.zsh
+  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+    source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
   elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
     source $ZSH/plugins/$plugin/$plugin.plugin.zsh
   fi
 done
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH/custom/*.zsh) source $config_file
+for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]

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

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

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

From 749feb2720948a4ac9a981286654962e699d8d94 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sat, 6 Aug 2011 15:22:55 -0400
Subject: [PATCH 369/907] Merge "deb" and "debian" plugins.

---
 plugins/deb/deb.plugin.zsh       | 13 -------------
 plugins/debian/debian.plugin.zsh | 30 +++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 plugins/deb/deb.plugin.zsh

diff --git a/plugins/deb/deb.plugin.zsh b/plugins/deb/deb.plugin.zsh
deleted file mode 100644
index 1b35a0646..000000000
--- a/plugins/deb/deb.plugin.zsh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Aliases
-alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
-		--no-gui --disable-columns search"	# search package
-alias ad="sudo apt-get update"				# update packages lists
-alias au="sudo apt-get update && \
-		sudo apt-get dselect-upgrade"		# upgrade packages
-alias ai="sudo apt-get install"				# install package
-alias ar="sudo apt-get remove --purge && \
-		sudo apt-get autoremove --purge"	# remove package
-alias ap="apt-cache policy"				# apt policy
-alias av="apt-cache show"				# show package info
-alias acs="apt-cache search"                            # search package
-alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index f8865a412..6feb6973d 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,4 +1,4 @@
-# https://github.com/dbbolton/
+# https://github.com/dbb/
 #
 # Debian-related zsh aliases and functions for zsh
 
@@ -6,14 +6,29 @@
 # Aliases ###################################################################
 
 # Some self-explanatory aliases
+alias acs="apt-cache search"
 alias afs='apt-file search --regexp'
 alias aps='aptitude search'
+alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
+		--no-gui --disable-columns search"	# search package
 alias apsrc='apt-get source'
 alias apv='apt-cache policy'
 
+# aliases that use su -c ##############
 alias apdg='su -c "aptitude update && aptitude safe-upgrade"'
 alias apud='su -c "aptitude update"'
 alias apug='su -c "aptitude safe-upgrade"'
+# end aliases that use su -c ##########
+
+# aliases that use sudo ###############
+alias ad="sudo apt-get update"				# update packages lists
+alias au="sudo apt-get update && \
+		sudo apt-get dselect-upgrade"		# upgrade packages
+alias ai="sudo apt-get install"				# install package
+alias ar="sudo apt-get remove --purge && \
+		sudo apt-get autoremove --purge"	# remove package
+alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
+# end aliases that use sudo ###########
 
 # print all installed packages
 alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
@@ -33,6 +48,13 @@ alias kclean='su -c '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`unam
 
 # Functions #################################################################
 
+# install packages without sudo
+apin() {
+    cmd="su -lc 'aptitude -P install $@' root"
+    print "$cmd"
+    eval "$cmd"
+}
+
 # create a simple script that can be used to 'duplicate' a system
 apt-copy() {
 	print '#!/bin/sh'"\n" > apt-copy.sh
@@ -46,8 +68,10 @@ apt-copy() {
 
 
 # Kernel-package building shortcut
-dbb-build () {
-	MAKEFLAGS=''		# temporarily unset MAKEFLAGS ( '-j3' will fail )
+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
 

From fd55d53eb22856883953bb6efc89bb2d643ef296 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sat, 6 Aug 2011 15:41:52 -0400
Subject: [PATCH 370/907] Fix su commands

---
 plugins/debian/debian.plugin.zsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 6feb6973d..0c487cf70 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -15,9 +15,9 @@ alias apsrc='apt-get source'
 alias apv='apt-cache policy'
 
 # aliases that use su -c ##############
-alias apdg='su -c "aptitude update && aptitude safe-upgrade"'
-alias apud='su -c "aptitude update"'
-alias apug='su -c "aptitude safe-upgrade"'
+alias apdg='su -lc "aptitude update && aptitude safe-upgrade" root'
+alias apud='su -lc "aptitude update" root'
+alias apug='su -lc "aptitude safe-upgrade" root'
 # end aliases that use su -c ##########
 
 # aliases that use sudo ###############
@@ -36,13 +36,13 @@ alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
 # Install all .deb files in the current directory.
 # Warning: you will need to put the glob in single quotes if you use:
 # glob_subst
-alias di='su -c "dpkg -i ./*.deb"'
+alias di='su -lc "dpkg -i ./*.deb" root'
 
 # Create a basic .deb package
 alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 
 # Remove ALL kernel images and headers EXCEPT the one in use
-alias kclean='su -c '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
+alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
 
 
 
@@ -81,4 +81,3 @@ kerndeb () {
         "$revision" kernel_image kernel_headers
 }
 
-

From 8ed6dd5fc4c5e9b28d0f8a87f72c0bbe5f628580 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sat, 6 Aug 2011 15:58:40 -0400
Subject: [PATCH 371/907] Add functions for new GH repos.

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

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 1eb338113..e5f59097d 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -4,3 +4,44 @@ if [ "$commands[(I)hub]" ]; then
     # eval `hub alias -s zsh`
     function git(){hub "$@"}
 fi
+
+# Functions #################################################################
+
+# https://github.com/dbb 
+
+# These are taken directly from the instructions you see after you create a new
+# repo. As the names imply, new_gh() assumes you're starting from scratch in a
+# directory named after the repo (this name is the only argument it takes), and
+# exist_gh() assumes that you've already initialized git in the given directory
+# (again, the only argument).
+# set up a new repo
+
+new_gh() { # [NAME_OF_REPO]
+    repo = $1
+
+    name=$(  igit config user.name )
+    email=$( git config user.email )
+    user=$(  git config github.user )
+
+    mkdir "$repo"
+    cd "$repo"
+    git init
+    touch README
+    git add README
+    git commit -m 'Initial commit.'
+    git remote add origin git@github.com:${user}/${name}.git
+    git push -u origin master
+}
+
+exist_gh() { # [DIRECTORY]
+    cd "$1"
+    name=$( git config user.name )
+    email=$( git config user.email )
+    user=$( git config github.user )
+
+    git remote add origin git@github.com:${user}/${name}.git
+    git push -u origin master
+}
+
+# End Functions #############################################################
+

From 8c48f10a04ce8e6c789cead457e062602cc89931 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sat, 6 Aug 2011 16:15:09 -0400
Subject: [PATCH 372/907] Add functions for new GH repos.

---
 plugins/github/github.plugin.zsh | 44 +++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index e5f59097d..fc51b173c 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -9,19 +9,13 @@ fi
 
 # https://github.com/dbb 
 
-# These are taken directly from the instructions you see after you create a new
-# repo. As the names imply, new_gh() assumes you're starting from scratch in a
-# directory named after the repo (this name is the only argument it takes), and
-# exist_gh() assumes that you've already initialized git in the given directory
-# (again, the only argument).
-# set up a new repo
 
-new_gh() { # [NAME_OF_REPO]
+# empty_gh [NAME_OF_REPO]
+#
+# Use this when creating a new repo from scratch.
+empty_gh() { # [NAME_OF_REPO]
     repo = $1
-
-    name=$(  igit config user.name )
-    email=$( git config user.email )
-    user=$(  git config github.user )
+    ghuser=$(  git config github.user )
 
     mkdir "$repo"
     cd "$repo"
@@ -29,17 +23,37 @@ new_gh() { # [NAME_OF_REPO]
     touch README
     git add README
     git commit -m 'Initial commit.'
-    git remote add origin git@github.com:${user}/${name}.git
+    git remote add origin git@github.com:${ghuser}/${repo}.git
     git push -u origin master
 }
 
+# new_gh [DIRECTORY]
+#
+# Use this when you have a directory that is not yet set up for git.
+# This function will add all non-hidden files to git.
+new_gh() { # [DIRECTORY]
+    cd "$1"
+    ghuser=$( git config github.user )
+
+    git init
+    # add all non-dot files
+    print '.*'"\n"'*~' >> .gitignore
+    git add ^.*
+    git commit -m 'Initial commit.'
+    git remote add origin git@github.com:${ghuser}/${repo}.git
+    git push -u origin master
+}
+
+# exist_gh [DIRECTORY]
+#
+# Use this when you have a git repo that's ready to go and you want to add it
+# to your GitHub.
 exist_gh() { # [DIRECTORY]
     cd "$1"
     name=$( git config user.name )
-    email=$( git config user.email )
-    user=$( git config github.user )
+    ghuser=$( git config github.user )
 
-    git remote add origin git@github.com:${user}/${name}.git
+    git remote add origin git@github.com:${ghuser}/${repo}.git
     git push -u origin master
 }
 

From fac74012f81fc99eb2ba7a85e94a2cd74c352271 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sun, 7 Aug 2011 15:30:55 -0400
Subject: [PATCH 373/907] Add options for su(do) and apt(itude|-get)

---
 plugins/debian/debian.plugin.zsh | 76 ++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 0c487cf70..1df91dc4a 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,48 +1,76 @@
-# https://github.com/dbb/
+# Authors:
+# https://github.com/AlexBio
+# https://github.com/dbb
 #
 # Debian-related zsh aliases and functions for zsh
 
+# Set to 'apt-get' or 'aptitude'
+apt_pref='aptitude'
+
+# Use sudo by default if it's installed
+if [[ -e $( which sudo ) ]]; then
+    use_sudo=1
+fi
 
 # Aliases ###################################################################
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"
-alias afs='apt-file search --regexp'
 alias aps='aptitude search'
 alias as="aptitude -F \"* %p -> %d \n(%v/%V)\" \
 		--no-gui --disable-columns search"	# search package
-alias apsrc='apt-get source'
-alias apv='apt-cache policy'
 
-# aliases that use su -c ##############
-alias apdg='su -lc "aptitude update && aptitude safe-upgrade" root'
-alias apud='su -lc "aptitude update" root'
-alias apug='su -lc "aptitude safe-upgrade" root'
-# end aliases that use su -c ##########
+# apt-file
+alias afs='apt-file search --regexp'
+
+
+# These are apt-get only
+alias asrc='apt-get source'
+alias ap='apt-cache policy'
+
+# superuser operations ################
+if [[ $use_sudo -eq 1 ]]; then
+    alias ai="sudo $apt_pref install"
+    alias ad="sudo $apt_pref update"
+    alias afu='sudo apt-file update'
+    alias ag="sudo $apt_pref upgrade"
+    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
+    alias ap="sudo $apt_pref purge"
+    alias ar="sudo $apt_pref remove"
+
+    if [[ $apt_pref -eq 'apt-get' ]]; then
+        alias ads="sudo $apt_pref dselect-upgrade"
+    fi
+    
+    # Install all .deb files in the current directory.
+    # Warning: you will need to put the glob in single quotes if you use:
+    # glob_subst
+    alias di='sudo dpkg -i ./*.deb'
+
+    # 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`))'
+else
+    alias ai='apin' 
+    alias ad='su -lc "'"$apt_pref"' update" root'
+    alias afu='su -lc "apt-file update"'
+    alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
+    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
+    alias di='su -lc "dpkg -i ./*.deb" root'
+    # Remove ALL kernel images and headers EXCEPT the one in use
+    alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
+fi
+# end superuser operations ##########
 
-# aliases that use sudo ###############
-alias ad="sudo apt-get update"				# update packages lists
-alias au="sudo apt-get update && \
-		sudo apt-get dselect-upgrade"		# upgrade packages
-alias ai="sudo apt-get install"				# install package
-alias ar="sudo apt-get remove --purge && \
-		sudo apt-get autoremove --purge"	# remove package
-alias ac="sudo apt-get clean && sudo apt-get autoclean" # clean apt cache
-# end aliases that use sudo ###########
 
 # print all installed packages
 alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
 
-# Install all .deb files in the current directory.
-# Warning: you will need to put the glob in single quotes if you use:
-# glob_subst
-alias di='su -lc "dpkg -i ./*.deb" root'
+
 
 # Create a basic .deb package
 alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 
-# Remove ALL kernel images and headers EXCEPT the one in use
-alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
+
 
 
 

From 65393b4bb10de841edbe2026dba29b73625b33d7 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sun, 7 Aug 2011 16:51:14 -0400
Subject: [PATCH 374/907] Extend root ops, switch apt-copy to plain zsh

---
 plugins/debian/debian.plugin.zsh | 92 ++++++++++++++++++++++----------
 1 file changed, 65 insertions(+), 27 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 1df91dc4a..23cb98f93 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -4,8 +4,13 @@
 #
 # Debian-related zsh aliases and functions for zsh
 
-# Set to 'apt-get' or 'aptitude'
-apt_pref='aptitude'
+# Use aptitude if installed, or apt-get if not.
+# You can just set apt_pref='apt-get' to override it.
+if [[ -e $( which aptitude ) ]]; then
+    apt_pref='aptitude'
+else
+    apt_pref='apt-get'
+fi
 
 # Use sudo by default if it's installed
 if [[ -e $( which sudo ) ]]; then
@@ -13,6 +18,10 @@ if [[ -e $( which sudo ) ]]; then
 fi
 
 # Aliases ###################################################################
+# These are for more obscure uses of apt-get and aptitude that aren't covered
+# below.
+alias ag='apt-get'
+alias at='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"
@@ -28,19 +37,23 @@ alias afs='apt-file search --regexp'
 alias asrc='apt-get source'
 alias ap='apt-cache policy'
 
-# superuser operations ################
+# superuser operations ######################################################
 if [[ $use_sudo -eq 1 ]]; then
-    alias ai="sudo $apt_pref install"
+# commands using sudo #######
+    alias aac="sudo $apt_pref autoclean"
+    alias abd="sudo $apt_pref build-dep"
+    alias ac="sudo $apt_pref clean"
     alias ad="sudo $apt_pref update"
+    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
+    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
     alias afu='sudo apt-file update'
     alias ag="sudo $apt_pref upgrade"
-    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
+    alias ai="sudo $apt_pref install"
     alias ap="sudo $apt_pref purge"
     alias ar="sudo $apt_pref remove"
 
-    if [[ $apt_pref -eq 'apt-get' ]]; then
-        alias ads="sudo $apt_pref dselect-upgrade"
-    fi
+    # apt-get only
+    alias ads="sudo $apt_pref dselect-upgrade"
     
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
@@ -48,25 +61,54 @@ if [[ $use_sudo -eq 1 ]]; then
     alias di='sudo dpkg -i ./*.deb'
 
     # 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`))'
+    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
+        ?not(~n`uname -r`))'
+
+
+# commands using su #########
 else
-    alias ai='apin' 
+    alias aac='su -ls "'"$apt_pref"' autoclean" root'
+    abd() {
+        cmd="su -lc '$apt_pref build-dep $@' root"
+        print "$cmd"
+        eval "$cmd"
+    }
+    alias ac='su -ls "'"$apt_pref"' clean" root'
     alias ad='su -lc "'"$apt_pref"' update" root'
+    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
+    alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
     alias afu='su -lc "apt-file update"'
     alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
-    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
+    ai() {
+        cmd="su -lc 'aptitude -P install $@' root"
+        print "$cmd"
+        eval "$cmd"
+    }
+    ap() {
+        cmd="su -lc '$apt_pref -P purge $@' root"
+        print "$cmd"
+        eval "$cmd"
+    }
+    ar() {
+        cmd="su -lc '$apt_pref -P remove $@' root"
+        print "$cmd"
+        eval "$cmd"
+    }
+
+    # Install all .deb files in the current directory
+    # Assumes glob_subst is off
     alias di='su -lc "dpkg -i ./*.deb" root'
+
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))'\'' root'
+    alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) \
+        ?not(~n`uname -r`))'\'' root'
 fi
-# end superuser operations ##########
 
 
+# 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'
 
@@ -75,23 +117,19 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 
 
 # Functions #################################################################
-
-# install packages without sudo
-apin() {
-    cmd="su -lc 'aptitude -P install $@' root"
-    print "$cmd"
-    eval "$cmd"
-}
-
 # create a simple script that can be used to 'duplicate' a system
 apt-copy() {
-	print '#!/bin/sh'"\n" > apt-copy.sh
+    print '#!/bin/sh'"\n" > apt-copy.sh
 
-	list=$(perl -m'AptPkg::Cache' -e '$c=AptPkg::Cache->new; for (keys %$c){ push @a, $_ if $c->{$_}->{'CurrentState'} eq 'Installed';} print "$_ " for sort @a;')
+    cmd="$apt_pref install -s "
 
-	print 'aptitude install '"$list\n" >> apt-copy.sh
+    for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
+        cmd="${cmd} ${p}"
+    }
 
-	chmod +x apt-copy.sh
+    print $cmd "\n" >> apt-copy.sh
+
+    chmod +x apt-copy.sh
 }
 
 

From d5333e8efc0f6669d64bba1b2aa6e80bc2e7c8e8 Mon Sep 17 00:00:00 2001
From: Ali B <dmondark@gmail.com>
Date: Fri, 12 Aug 2011 00:40:35 +1000
Subject: [PATCH 375/907] Heroku completion plugin

---
 plugins/heroku/_heroku | 158 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 plugins/heroku/_heroku

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
new file mode 100644
index 000000000..dc899e2b2
--- /dev/null
+++ b/plugins/heroku/_heroku
@@ -0,0 +1,158 @@
+#compdef heroku
+
+# Heroku Autocomplete plugin for Oh-My-Zsh
+# Requires: The Heroku client gem (https://github.com/heroku/heroku)
+# Author: Ali B. (http://awhitebox.com)
+
+local -a _1st_arguments
+_1st_arguments=(
+  "account\:confirm_billing":"Confirm that your account can be billed at the end of the month"
+  "addons":"list installed addons"
+  "addons\:list":"list all available addons"
+  "addons\:add":"install an addon"
+  "addons\:upgrade":"upgrade an existing addon"
+  "addons\:downgrade":"downgrade an existing addon"
+  "addons\:remove":"uninstall an addon"
+  "addons\:open":"open an addon's dashboard in your browser"
+  "apps":"list your apps"
+  "apps\:info":"show detailed app information"
+  "apps\:create":"create a new app"
+  "apps\:rename":"rename the app"
+  "apps\:open":"open the app in a web browser"
+  "apps\:destroy":"permanently destroy an app"
+  "auth\:login":"log in with your heroku credentials"
+  "auth\:logout":"clear local authentication credentials"
+  "config":"display the config vars for an app"
+  "config\:add":"add one or more config vars"
+  "config\:remove":"remove a config var"
+  "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"
+  "domains\:clear":"remove all custom domains from an app"
+  "help":"list available commands or display help for a specific command"
+  "keys":"display keys for the current user"
+  "keys\:add":"add a key for the current user"
+  "keys\:remove":"remove a key from the current user"
+  "keys\:clear":"remove all authentication keys from the current user"
+  "logs":"display recent log output"
+  "logs\:cron":"DEPRECATED: display cron logs from legacy logging"
+  "logs\:drains":"manage syslog drains"
+  "maintenance\:on":"put the app into maintenance mode"
+  "maintenance\:off":"take the app out of maintenance mode"
+  "pg\:info":"display database information"
+  "pg\:ingress":"allow direct connections to the database from this IP for one minute"
+  "pg\:promote":"sets DATABASE as your DATABASE_URL"
+  "pg\:psql":"open a psql shell to the database"
+  "pg\:reset":"delete all data in DATABASE"
+  "pg\:unfollow":"stop a replica from following and make it a read/write database"
+  "pg\:wait":"monitor database creation, exit when complete"
+  "pgbackups":"list captured backups"
+  "pgbackups\:url":"get a temporary URL for a backup"
+  "pgbackups\:capture":"capture a backup from a database id"
+  "pgbackups\:restore":"restore a backup to a database"
+  "pgbackups\:destroy":"destroys a backup"
+  "plugins":"list installed plugins"
+  "plugins\:install":"install a plugin"
+  "plugins\:uninstall":"uninstall a plugin"
+  "ps\:dynos":"scale to QTY web processes"
+  "ps\:workers":"scale to QTY background processes"
+  "ps":"list processes for an app"
+  "ps\:restart":"restart an app process"
+  "ps\:scale":"scale processes by the given amount"
+  "releases":"list releases"
+  "releases\:info":"view detailed information for a release"
+  "rollback":"roll back to an older release"
+  "run":"run an attached process"
+  "run\:rake":"remotely execute a rake command"
+  "run\:console":"open a remote console session"
+  "sharing":"list collaborators on an app"
+  "sharing\:add":"add a collaborator to an app"
+  "sharing\:remove":"remove a collaborator from an app"
+  "sharing\:transfer":"transfer an app to a new owner"
+  "ssl":"list certificates for an app"
+  "ssl\:add":"add an ssl certificate to an app"
+  "ssl\:remove":"remove an ssl certificate from an app"
+  "ssl\:clear":"remove all ssl certificates from an app"
+  "stack":"show the list of available stacks"
+  "stack\:migrate":"prepare migration of this app to a new stack"
+  "version":"show heroku client version"
+)
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "heroku command" _1st_arguments
+  return
+fi
+
+local -a _command_args
+case "$words[1]" in
+  apps:info)
+    _command_args=(
+      '(-r|--raw)'{-r,--raw}'[output info as raw key/value pairs]' \
+    )
+    ;;
+  apps:create)
+    _command_args=(
+      '(-a|--addons)'{-a,--addons}'[a list of addons to install]' \
+      '(-r|--remote)'{-r,--remote}'[the git remote to create, default "heroku"]' \
+      '(-s|--stack)'{-s,--stack}'[the stack on which to create the app]' \
+    )
+    ;;
+  config)
+    _command_args=(
+      '(-s|--shell)'{-s,--shell}'[output config vars in shell format]' \
+    )
+    ;;
+  db:push)
+    _command_args=(
+      '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+      '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+      '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the push]' \
+      '(-f|--filter)'{-f,--filter}'[only push certain tables]' \
+      '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+      '(-t|--tables)'{-t,--tables}'[only push the specified tables]' \
+    )
+    ;;
+  db:pull)
+    _command_args=(
+      '(-c|--chunksize)'{-c,--chunksize}'[specify the number of rows to send in each batch]' \
+      '(-d|--debug)'{-d,--debug}'[enable debugging output]' \
+      '(-e|--exclude)'{-e,--exclude}'[exclude the specified tables from the pull]' \
+      '(-f|--filter)'{-f,--filter}'[only pull certain tables]' \
+      '(-r|--resume)'{-r,--resume}'[resume transfer described by a .dat file]' \
+      '(-t|--tables)'{-t,--tables}'[only pull the specified tables]' \
+    )
+    ;;
+  keys)
+    _command_args=(
+      '(-l|--long)'{-l,--long}'[display extended information for each key]' \
+    )
+    ;;
+  logs)
+    _command_args=(
+      '(-n|--num)'{-n,--num}'[the number of lines to display]' \
+      '(-p|--ps)'{-p,--ps}'[only display logs from the given process]' \
+      '(-s|--source)'{-s,--source}'[only display logs from the given source]' \
+      '(-t|--tail)'{-t,--tail}'[continually stream logs]' \
+    )
+    ;;
+  pgbackups:capture)
+    _command_args=(
+      '(-e|--expire)'{-e,--expire}'[if no slots are available to capture, delete the oldest backup to make room]' \
+    )
+    ;;
+  stack)
+    _command_args=(
+      '(-a|--all)'{-a,--all}'[include deprecated stacks]' \
+    )
+    ;;
+  esac
+
+_arguments \
+  $_command_args \
+  '(--app)--app[the app name]' \
+  &&  return 0
+

From c2a95b796b79b4ce4e36b8cb879cb9b0162bc438 Mon Sep 17 00:00:00 2001
From: Matthew Git McCullough <matthewm@ambientideas.com>
Date: Tue, 14 Jun 2011 15:01:28 -0600
Subject: [PATCH 376/907] Added a gradle build tool plugin

* Enhanced gradle plugin to parse tasks from a quick execution of the tool
* Added a duplicated function for gradlew completion that uses gradlew internally. Builds like Gradle itself (built with Gradle) are sensitive to being run with a matching gradlew version.
* Fixed broken caching of gradle task names. Added - and -- argument completions.
---
 plugins/gradle/gradle.plugin.zsh | 119 +++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 plugins/gradle/gradle.plugin.zsh

diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
new file mode 100644
index 000000000..fc4c78c50
--- /dev/null
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -0,0 +1,119 @@
+#!zsh
+##############################################################################
+# A descriptive listing of core Gradle commands 
+############################################################################
+function _gradle_core_commands() {
+    local ret=1 state
+    _arguments ':subcommand:->subcommand' && ret=0
+
+    case $state in
+      subcommand)
+        subcommands=(
+          "properties:Display all project properties"
+          "tasks:Calculate and display all tasks"
+          "dependencies:Calculate and display all dependencies"
+          "projects:Discover and display all sub-projects"
+          "build:Build the project"
+          "help:Display help"
+        )
+        _describe -t subcommands 'gradle subcommands' subcommands && ret=0
+    esac
+
+    return ret
+}
+
+function _gradle_arguments() {
+    _arguments -C \
+    '-a[Do not rebuild project dependencies]' \
+    '-h[Help]' \
+    '-D[System property]' \
+    '-d[Log at the debug level]' \
+    '--gui[Launches the Gradle GUI app]' \
+    '--stop[Stop the Gradle daemon]' \
+    '--daemon[Use the Gradle daemon]' \
+    '--no-daemon[Do not use the Gradle daemon]' \
+    '--no-opt[Do not perform any task optimization]' \
+    '-i[Log at the info level]' \
+    '-m[Dry run]' \
+    '-P[Set a project property]' \
+    '--profile[Profile the build time]' \
+    '-q[Log at the quiet level (only show errors)]' \
+    '-v[Print the Gradle version info]' \
+    '-x[Specify a task to be excluded]' \
+    '*::command:->command' \
+    && return 0
+}
+
+
+##############################################################################
+# Are we in a directory containing a build.gradle file?
+############################################################################
+function in_gradle() {
+    if [[ -f build.gradle ]]; then
+        echo 1
+    fi
+}
+
+############################################################################
+# Define the stat_cmd command based on platform behavior
+##########################################################################
+stat -f%m . > /dev/null 2>&1
+if [ "$?" = 0 ]; then
+	stat_cmd=(stat -f%m)
+else
+	stat_cmd=(stat -L --format=%Y)
+fi
+
+############################################################################## Examine the build.gradle file to see if its
+# timestamp has changed, and if so, regen
+# the .gradle_tasks cache file
+############################################################################
+_gradle_does_task_list_need_generating () {
+  if [ ! -f .gradletasknamecache ]; then return 0;
+  else
+    accurate=$($stat_cmd .gradletasknamecache)
+    changed=$($stat_cmd build.gradle)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+
+##############################################################################
+# Discover the gradle tasks by running "gradle tasks --all"
+############################################################################
+_gradle_tasks () {
+  if [ in_gradle ]; then
+    _gradle_arguments
+    if _gradle_does_task_list_need_generating; then
+     gradle tasks --all | grep "^[ ]*[a-zA-Z0-9]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+    fi
+    compadd -X "==== Gradle Tasks ====" `cat .gradletasknamecache`
+  fi
+}
+
+_gradlew_tasks () {
+  if [ in_gradle ]; then
+    _gradle_arguments
+    if _gradle_does_task_list_need_generating; then
+     gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+    fi
+    compadd -X "==== Gradlew Tasks ====" `cat .gradletasknamecache`
+  fi
+}
+
+
+##############################################################################
+# Register the completions against the gradle and gradlew commands
+############################################################################
+compdef _gradle_tasks gradle
+compdef _gradlew_tasks gradlew
+
+
+##############################################################################
+# Open questions for future improvements:
+# 1) Should 'gradle tasks' use --all or just the regular set?
+# 2) Should gradlew use the same approach as gradle?
+# 3) Should only the " - " be replaced with a colon so it can work
+#     with the richer descriptive method of _arguments?
+#     gradle tasks | grep "^[a-zA-Z0-9]*\ -\ " | sed "s/ - /\:/"
+#############################################################################

From 11fcdb844d67492080befd8dcd1f995deb26b8ee Mon Sep 17 00:00:00 2001
From: Ches Martin <ches.martin@gmail.com>
Date: Sat, 13 Aug 2011 04:53:23 +0700
Subject: [PATCH 377/907] Add guard to bundler plugin's wrapped commands

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

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index f005700ff..a6c116407 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bp="bundle package"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(cap capify cucumber heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+bundled_commands=(cap capify cucumber guard heroku rackup rails rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
 
 ## Functions
 

From 4dc11fee35f21b295deb1a61503031c8e17f83a1 Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Sat, 13 Aug 2011 13:29:13 +0300
Subject: [PATCH 378/907] detect rvm or rbenv and show ruby version

---
 themes/gnzh.zsh-theme | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 357798cf6..7765efbf2 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -1,4 +1,4 @@
-# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
+# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 # Based on bira theme
 
 # load some modules
@@ -35,9 +35,17 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
-local rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+local rvm_ruby=''
+if which rvm-prompt &> /dev/null; then
+  rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
+  fi
+fi
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 
+#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
 ╰─$PR_PROMPT "
 RPS1="${return_code}"

From 7a89786139bcfd83e0e9caa9974f66a423c6ed48 Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Sat, 13 Aug 2011 13:32:37 +0300
Subject: [PATCH 379/907] oops, restore broken theme preview

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

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 7765efbf2..3c6b8a409 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -1,4 +1,4 @@
-# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
+# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
 # Based on bira theme
 
 # load some modules

From d3116d4f0b499bb76e371f7d60eed48b81068932 Mon Sep 17 00:00:00 2001
From: Daniel Bolton <dbb@9y.com>
Date: Sat, 13 Aug 2011 10:53:24 -0400
Subject: [PATCH 380/907] Remove -s switch from apt-copy

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

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 23cb98f93..09771881d 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -121,7 +121,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 apt-copy() {
     print '#!/bin/sh'"\n" > apt-copy.sh
 
-    cmd="$apt_pref install -s "
+    cmd="$apt_pref install "
 
     for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
         cmd="${cmd} ${p}"

From 85f388fabf657360960c3fcf55b52f2fb3c4e142 Mon Sep 17 00:00:00 2001
From: David Aaron Fendley <tricon@me.com>
Date: Tue, 16 Aug 2011 11:18:23 -0500
Subject: [PATCH 381/907] Added nifty purple Apple theme.

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

diff --git a/themes/apple.zsh-theme b/themes/apple.zsh-theme
new file mode 100644
index 000000000..350548e36
--- /dev/null
+++ b/themes/apple.zsh-theme
@@ -0,0 +1,5 @@
+function toon {
+  echo -n ""
+}
+
+PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}'

From bf2c55ac5a789d8874e6d8e06360608b4234e872 Mon Sep 17 00:00:00 2001
From: Ben Lumley <ben@benlumley.co.uk>
Date: Tue, 16 Aug 2011 17:23:33 +0100
Subject: [PATCH 382/907] Gallois theme - made the git branch/status show for
 those of us without rvm

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

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index 259640ba4..f9406dd96 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -14,6 +14,8 @@ git_custom_status() {
 #RVM and git settings
 if [[ -s ~/.rvm/scripts/rvm ]] ; then 
   RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
+else
+  RPS1='$(git_custom_status) $EPS1'
 fi
 
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '

From efa5593f88e552fbd3fde850b283fa43d36f481c Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Tue, 16 Aug 2011 13:54:47 -0700
Subject: [PATCH 383/907] Rename to _capistrano (completion only)

---
 plugins/capistrano/_capistrano           | 19 +++++++++++++++++++
 plugins/capistrano/capistrano.plugin.zsh | 20 --------------------
 2 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 plugins/capistrano/_capistrano
 delete mode 100644 plugins/capistrano/capistrano.plugin.zsh

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
new file mode 100644
index 000000000..2ae977fcd
--- /dev/null
+++ b/plugins/capistrano/_capistrano
@@ -0,0 +1,19 @@
+#compdef cap
+#autoload
+
+_cap_does_task_list_need_generating () {
+  if [ ! -f .cap_tasks~ ]; then return 0;
+  else
+    accurate=$(stat -f%m .cap_tasks~)
+    changed=$(stat -f%m config/deploy.rb)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+if [ -f config/deploy.rb ]; then
+  if _cap_does_task_list_need_generating; then
+    echo "\nGenerating .cap_tasks~..." > /dev/stderr
+    cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
+  fi
+  compadd `cat .cap_tasks~`
+fi
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
deleted file mode 100644
index a9db4381b..000000000
--- a/plugins/capistrano/capistrano.plugin.zsh
+++ /dev/null
@@ -1,20 +0,0 @@
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-function _cap () {
-  if [ -f config/deploy.rb ]; then
-    if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
-    fi
-    compadd `cat .cap_tasks~`
-  fi
-}
-
-compdef _cap cap

From c113e88c454cf759078f06c95f4b35db90acb9d7 Mon Sep 17 00:00:00 2001
From: Tim Taylor <tim@tool-man.org>
Date: Wed, 17 Aug 2011 00:17:21 -0400
Subject: [PATCH 384/907] Fix auto upgrade failure from non-exported ZSH env
 var

Fixes #549. Specify ZSH=$ZSH explicitly when invoking
the auto update scripts.
---
 oh-my-zsh.sh               | 2 +-
 tools/check_for_upgrade.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c4522491b..f77762815 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,7 +1,7 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH zsh $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 e1e4eb99f..aeaa0e415 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -24,7 +24,7 @@ then
     read line
     if [ "$line" = Y ] || [ "$line" = y ]
     then
-      /bin/sh $ZSH/tools/upgrade.sh
+      /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
       # update the zsh file
       _update_zsh_update
     fi

From 1fb141cfb51f753fe997d17c12ac810ad321f36f Mon Sep 17 00:00:00 2001
From: Mark Szymanski <mrman208@me.com>
Date: Sat, 27 Aug 2011 16:16:51 -0500
Subject: [PATCH 385/907] Add gss alias for git status -s

---
 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 5132b639a..37bfd383a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -29,6 +29,8 @@ alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
 alias glgg='git log --graph --max-count=5'
 compdef _git glgg=git-log
+alias gss='git status -s'
+compdef _git gss=git-status
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From bd6aba9c68db06758593e9ef707839c2f0271235 Mon Sep 17 00:00:00 2001
From: Mark Szymanski <mrman208@me.com>
Date: Sat, 27 Aug 2011 16:23:49 -0500
Subject: [PATCH 386/907] Add an alias for ga --> git add, too

---
 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 37bfd383a..4fcf9425d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -31,6 +31,8 @@ alias glgg='git log --graph --max-count=5'
 compdef _git glgg=git-log
 alias gss='git status -s'
 compdef _git gss=git-status
+alias ga='git add'
+compdef _git ga=git-add
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From 9d67d75b0ad62242e60db1bd6d22ae7ea252c7bc Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 30 Aug 2011 20:56:13 -0700
Subject: [PATCH 387/907] Revert "Enable red dots during completion by
 default".

After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.

This reverts commit fc49b4a4ded376cd82b813dcb6d72fdc050b7bed.
---
 lib/completion.zsh           | 2 +-
 templates/zshrc.zsh-template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 2a457402a..b3cc91822 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -59,7 +59,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [ "$DISABLE_COMPLETION_WAITING_DOTS" != "true" ]; then
+if [ "x$COMPLETION_WAITING_DOTS" = "xtrue" ]; then
   expand-or-complete-with-dots() {
     echo -n "\e[31m......\e[0m"
     zle expand-or-complete
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 4de1fa4e9..1ab40aba6 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -19,8 +19,8 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want to disable autosetting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment following line if you want disable red dots displayed while waiting for completion
-# DISABLE_COMPLETION_WAITING_DOTS="true"
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 9c5c70dc0a2531b621ba825c2599189717694d56 Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 31 Aug 2011 12:51:10 +0100
Subject: [PATCH 388/907] order aliases alphabetically

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

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index a6c116407..17e17efd9 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,8 +1,8 @@
 alias be="bundle exec"
 alias bi="bundle install"
 alias bl="bundle list"
-alias bu="bundle update"
 alias bp="bundle package"
+alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 

From ee507c90461beb06590af1c5e30bd78a62d8c4be Mon Sep 17 00:00:00 2001
From: Hakan Ensari <hakan.ensari@papercavalier.com>
Date: Wed, 31 Aug 2011 12:53:02 +0100
Subject: [PATCH 389/907] add foreman, nanoc, and rainbows to list of bundled
 commands

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

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

From fe175661fddd04691cc03012f84490e729cf2bae Mon Sep 17 00:00:00 2001
From: Max Gonzih <gonzih@gmail.com>
Date: Fri, 2 Sep 2011 16:06:32 +0300
Subject: [PATCH 390/907] vundle call fixed for new vundle version

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

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 39c36ac59..d7ab4858d 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -12,11 +12,11 @@ function vundle-init () {
 
 function vundle () {
   vundle-init
-  vim -c "execute \"BundleInstall\" | q"
+  vim -c "execute \"BundleInstall\" | q | q"
 }
 
 
 function vundle-update () {
   vundle-init
-  vim -c "execute \"BundleInstall!\" | q"
+  vim -c "execute \"BundleInstall!\" | q | q"
 }

From 965e1cfefa41bd0419126d9321eecec4fcbbb0e3 Mon Sep 17 00:00:00 2001
From: Mario Fernandez <mario.fernandez@hceris.com>
Date: Sat, 10 Sep 2011 11:35:08 +0200
Subject: [PATCH 391/907] fix completion for commands wrapped with bundler

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

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index a6c116407..bd77b0781 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -33,5 +33,10 @@ _run-with-bundler() {
 
 ## Main program
 for cmd in $bundled_commands; do
-  alias $cmd="_run-with-bundler $cmd"
+  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
+  alias $cmd=bundled_$cmd
+
+  if which _$cmd > /dev/null 2>&1; then
+        compdef _$cmd bundled_$cmd
+  fi
 done

From c6e8c856cb59e24362fe50fd93de097f30205420 Mon Sep 17 00:00:00 2001
From: Zach Riggle <zach@riggle.me>
Date: Sat, 10 Sep 2011 06:48:40 -0400
Subject: [PATCH 392/907] [plugins/grails] Added grails plugin

---
 plugins/grails/grails.plugin.zsh | 62 ++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100755 plugins/grails/grails.plugin.zsh

diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
new file mode 100755
index 000000000..95b1324e7
--- /dev/null
+++ b/plugins/grails/grails.plugin.zsh
@@ -0,0 +1,62 @@
+
+if [[ ! -d $GRAILS_HOME/scripts ]];
+then
+    echo "$0:"
+    echo "Please set \$GRAILS_HOME to use the 'grails' plugin, and ensure that \$GRAILS_HOME/scripts exists"
+fi
+
+_enumerateGrailsScripts() {
+    # Default directoryies
+    directories=($GRAILS_HOME/scripts ~/.grails/scripts ./scripts)
+
+    # Check all of the plugins directories, if they exist
+    if [ -d plugins ]
+    then
+        directories+=(plugins/*/scripts)
+    fi
+    
+    # Enumerate all of the Groovy files
+    files=()
+    for dir in $directories;
+    do
+        if [ -d $dir ]
+        then
+            files+=($dir/*.groovy)
+        fi
+    done
+    
+    # Don't try to basename ()
+    if [ ${#files} -eq 0 ];
+    then
+        return
+    fi
+    
+    # - Strip the path
+    # - Remove all scripts with a leading '_'
+    # - PackagePlugin_.groovy -> PackagePlugin
+    # - PackagePlugin         -> Package-Plugin
+    # - Package-Plugin        -> package-plugin
+    basename $files                             \
+        | grep -vE -e '^_'                      \
+        | sed -E  -e 's/^_?([^_]+)_?.groovy/\1/'\
+                  -e 's/([a-z])([A-Z])/\1-\2/g' \
+        | tr "[:upper:]" "[:lower:]"            \
+        | sort                                  \
+        | uniq
+}
+ 
+_grails() {
+    if (( CURRENT == 2 )); then
+        scripts=( $(_enumerateGrailsScripts) )
+        
+        if [ ${#scripts} -ne 0 ];
+        then
+            _multi_parts / scripts
+            return
+        fi
+    fi
+    
+    _files
+}
+ 
+compdef _grails grails

From 51736343595eb83f9d2364b50cf0b62227a4fab4 Mon Sep 17 00:00:00 2001
From: Zach Riggle <zach@riggle.me>
Date: Sat, 10 Sep 2011 07:00:31 -0400
Subject: [PATCH 393/907] [plugins/grails] Use globbing instead of grep

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

diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
index 95b1324e7..88e8b9008 100755
--- a/plugins/grails/grails.plugin.zsh
+++ b/plugins/grails/grails.plugin.zsh
@@ -21,7 +21,7 @@ _enumerateGrailsScripts() {
     do
         if [ -d $dir ]
         then
-            files+=($dir/*.groovy)
+            files+=($dir/[^_]*.groovy)
         fi
     done
     
@@ -37,7 +37,6 @@ _enumerateGrailsScripts() {
     # - PackagePlugin         -> Package-Plugin
     # - Package-Plugin        -> package-plugin
     basename $files                             \
-        | grep -vE -e '^_'                      \
         | sed -E  -e 's/^_?([^_]+)_?.groovy/\1/'\
                   -e 's/([a-z])([A-Z])/\1-\2/g' \
         | tr "[:upper:]" "[:lower:]"            \

From f9c143b69c30396f79e2cb75d11e70e4b983c1bd Mon Sep 17 00:00:00 2001
From: Zach Riggle <zach@riggle.me>
Date: Sat, 10 Sep 2011 07:06:26 -0400
Subject: [PATCH 394/907] [plugins/grails] Remove warning message; it's always
 displayed

---
 plugins/grails/grails.plugin.zsh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
index 88e8b9008..cc6f9c53b 100755
--- a/plugins/grails/grails.plugin.zsh
+++ b/plugins/grails/grails.plugin.zsh
@@ -1,10 +1,3 @@
-
-if [[ ! -d $GRAILS_HOME/scripts ]];
-then
-    echo "$0:"
-    echo "Please set \$GRAILS_HOME to use the 'grails' plugin, and ensure that \$GRAILS_HOME/scripts exists"
-fi
-
 _enumerateGrailsScripts() {
     # Default directoryies
     directories=($GRAILS_HOME/scripts ~/.grails/scripts ./scripts)

From ecfac1cd74cada9594531d6c0217e511914a14f6 Mon Sep 17 00:00:00 2001
From: David Aaron Fendley <tricon@me.com>
Date: Sun, 11 Sep 2011 15:19:49 -0500
Subject: [PATCH 395/907] Added VCS prompt to Apple theme.

---
 themes/apple.zsh-theme | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/themes/apple.zsh-theme b/themes/apple.zsh-theme
index 350548e36..92f1df941 100644
--- a/themes/apple.zsh-theme
+++ b/themes/apple.zsh-theme
@@ -2,4 +2,25 @@ function toon {
   echo -n ""
 }
 
-PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}'
+get_git_dirty() { 
+  git diff --quiet || echo '*'
+}
+
+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
+zstyle ':vcs_info:*' actionformats \
+    '%F{5}%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
+zstyle ':vcs_info:*' formats       \
+    '%F{5}%F{5}[%F{2}%b%c%u%F{5}]%f '
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git cvs svn
+
+precmd () {
+    vcs_info
+}
+
+setopt prompt_subst
+PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}'

From 701f775c18f1f8a1acdd3282cc3f68f1075904ad Mon Sep 17 00:00:00 2001
From: Gil Vandendriesssche <vdd.gil@gmail.com>
Date: Wed, 14 Sep 2011 10:13:01 +0300
Subject: [PATCH 396/907] Textmate plugin update to take Gemfile and cucumber
 features in account

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

diff --git a/plugins/textmate/textmate.plugin.zsh b/plugins/textmate/textmate.plugin.zsh
index aa2f75f4f..a11a097f5 100644
--- a/plugins/textmate/textmate.plugin.zsh
+++ b/plugins/textmate/textmate.plugin.zsh
@@ -1,5 +1,5 @@
 alias et='mate .'
-alias ett='mate app config lib db public spec test Rakefile Capfile Todo'
+alias ett='mate Gemfile app config features lib db public spec test Rakefile Capfile Todo'
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo'
 

From 1ad8fde027ea3e66c0ed8f1498dfcfb07e0aefe6 Mon Sep 17 00:00:00 2001
From: Philipp Bosch <hello@pb.io>
Date: Thu, 15 Sep 2011 15:00:47 +0200
Subject: [PATCH 397/907] Add basic autocompletion for terminitor
 (https://github.com/achiu/terminitor).

---
 plugins/terminitor/_terminitor | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/terminitor/_terminitor

diff --git a/plugins/terminitor/_terminitor b/plugins/terminitor/_terminitor
new file mode 100644
index 000000000..7d267643b
--- /dev/null
+++ b/plugins/terminitor/_terminitor
@@ -0,0 +1,26 @@
+#compdef terminitor
+#autoload
+
+# terminitor zsh completion
+
+local -a _1st_arguments
+_1st_arguments=(
+    'create:create a Termfile in directory'
+    'delete:delete terminitor script'
+    'edit:open termitor script'
+    'fetch:clone the designated repo and run setup'
+    'help:Describe available tasks or one specific task'
+    'init:create initial root terminitor folder'
+    'list:lists all terminitor scripts'
+    'setup:execute setup in the terminitor script'
+    'start:runs the terminitor script'
+    'update:update Terminitor to new global path(.config/.terminitor)'
+)
+
+_arguments \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "terminitor task" _1st_arguments
+  return
+fi

From 47d0735b5fb5e9e82d8fb5d71f4f4c814e977b68 Mon Sep 17 00:00:00 2001
From: Philipp Bosch <hello@pb.io>
Date: Thu, 15 Sep 2011 15:18:15 +0200
Subject: [PATCH 398/907] terminitor plugin: add autocompletion for start
 subcommand.

---
 plugins/terminitor/_terminitor | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/terminitor/_terminitor b/plugins/terminitor/_terminitor
index 7d267643b..0326506eb 100644
--- a/plugins/terminitor/_terminitor
+++ b/plugins/terminitor/_terminitor
@@ -3,6 +3,10 @@
 
 # terminitor zsh completion
 
+_terminitor_available_scripts() {
+  scripts=(`for SCRIPT in ~/.config/terminitor/*.term ; do basename $SCRIPT .term ; done`)
+}
+
 local -a _1st_arguments
 _1st_arguments=(
     'create:create a Termfile in directory'
@@ -17,6 +21,8 @@ _1st_arguments=(
     'update:update Terminitor to new global path(.config/.terminitor)'
 )
 
+local expl
+
 _arguments \
   '*:: :->subcmds' && return 0
 
@@ -24,3 +30,9 @@ if (( CURRENT == 1 )); then
   _describe -t commands "terminitor task" _1st_arguments
   return
 fi
+
+case "$words[1]" in
+  start)
+    _terminitor_available_scripts
+    _wanted scripts expl 'installed scripts' compadd -a scripts ;;
+esac

From 0d285e3a0f12b8bf9f0ac63d5ef7930ab9455bff Mon Sep 17 00:00:00 2001
From: Philipp Bosch <hello@pb.io>
Date: Thu, 15 Sep 2011 15:22:05 +0200
Subject: [PATCH 399/907] terminitor plugin: add autocompletion also for edit,
 delete and setup subcommands.

---
 plugins/terminitor/_terminitor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/terminitor/_terminitor b/plugins/terminitor/_terminitor
index 0326506eb..1ce87c3ad 100644
--- a/plugins/terminitor/_terminitor
+++ b/plugins/terminitor/_terminitor
@@ -32,7 +32,7 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  start)
+  start|edit|delete|setup)
     _terminitor_available_scripts
     _wanted scripts expl 'installed scripts' compadd -a scripts ;;
 esac

From 14411cb904b7682fe2a5c69861bfffa96f124707 Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Mon, 19 Sep 2011 12:40:29 +0100
Subject: [PATCH 400/907] Tweaks to the wakeonlan plugin

These were suggested by sorin-ionescu in pull request #343.
---
 plugins/wakeonlan/wakeonlan.plugin.zsh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/wakeonlan/wakeonlan.plugin.zsh b/plugins/wakeonlan/wakeonlan.plugin.zsh
index 08db1bdea..752bfc600 100644
--- a/plugins/wakeonlan/wakeonlan.plugin.zsh
+++ b/plugins/wakeonlan/wakeonlan.plugin.zsh
@@ -1,15 +1,18 @@
 function wake() {
-  local config_file=~/.wakeonlan/$1
-  if [[ ! -f $config_file ]]; then
+  local config_file="$HOME/.wakeonlan/$1"
+  if [[ ! -f "$config_file" ]]; then
     echo "ERROR: There is no configuration file at \"$config_file\"."
-    return
+    return 1
   fi
 
-  which wakeonlan > /dev/null
-  if [[ ! $? == 0 ]]; then
+  if (( ! $+commands[wakeonlan] )); then
     echo "ERROR: Can't find \"wakeonlan\".  Are you sure it's installed?"
-    return
+    return 1
   fi
 
   wakeonlan -f $config_file
 }
+
+if (( $+functions[compdef] )); then
+  compdef "_arguments '1:device to wake:_files -W '\''$HOME/.wakeonlan'\'''" wake
+fi

From aa7ddd51cc4bd6afca23760ba3e3cc777305b1da Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Mon, 19 Sep 2011 12:45:34 +0100
Subject: [PATCH 401/907] Forgot to quote the path parameter to wakeonlan

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

diff --git a/plugins/wakeonlan/wakeonlan.plugin.zsh b/plugins/wakeonlan/wakeonlan.plugin.zsh
index 752bfc600..8406b8f7d 100644
--- a/plugins/wakeonlan/wakeonlan.plugin.zsh
+++ b/plugins/wakeonlan/wakeonlan.plugin.zsh
@@ -10,7 +10,7 @@ function wake() {
     return 1
   fi
 
-  wakeonlan -f $config_file
+  wakeonlan -f "$config_file"
 }
 
 if (( $+functions[compdef] )); then

From e94039d62b04e61507cbaa57c5fa955d97c8eca9 Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Mon, 19 Sep 2011 15:42:58 +0100
Subject: [PATCH 402/907] Splitting wakeonlan plugin completion into separate
 file

---
 plugins/wakeonlan/_wake                | 4 ++++
 plugins/wakeonlan/wakeonlan.plugin.zsh | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 plugins/wakeonlan/_wake

diff --git a/plugins/wakeonlan/_wake b/plugins/wakeonlan/_wake
new file mode 100644
index 000000000..4ab10d374
--- /dev/null
+++ b/plugins/wakeonlan/_wake
@@ -0,0 +1,4 @@
+#compdef wake
+#autoload
+
+_arguments "1:device to wake:_files -W '$HOME/.wakeonlan'" && return 0
diff --git a/plugins/wakeonlan/wakeonlan.plugin.zsh b/plugins/wakeonlan/wakeonlan.plugin.zsh
index 8406b8f7d..6cef7d44a 100644
--- a/plugins/wakeonlan/wakeonlan.plugin.zsh
+++ b/plugins/wakeonlan/wakeonlan.plugin.zsh
@@ -12,7 +12,3 @@ function wake() {
 
   wakeonlan -f "$config_file"
 }
-
-if (( $+functions[compdef] )); then
-  compdef "_arguments '1:device to wake:_files -W '\''$HOME/.wakeonlan'\'''" wake
-fi

From d22b253ce2bd69d908f0c2fce75c5d9ab09edda3 Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Tue, 20 Sep 2011 10:16:51 +0200
Subject: [PATCH 403/907] split rkj into two themes.

---
 themes/rkj-repos.zsh-theme | 29 +++++++++++++++++++++++++++++
 themes/rkj.zsh-theme       | 25 +------------------------
 2 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 themes/rkj-repos.zsh-theme

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
new file mode 100644
index 000000000..318c315bb
--- /dev/null
+++ b/themes/rkj-repos.zsh-theme
@@ -0,0 +1,29 @@
+# user, host, full path, and time/date
+# on two lines for easier vgrepping
+# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
+
+function hg_prompt_info {
+    hg prompt --angle-brackets "\
+<hg:%{$fg[magenta]%}<branch>%{$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
+}
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"
+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]%}✈"
+
+function mygit() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+# alternate prompt with git & hg
+PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
+PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
+
diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index 4b49a2a09..81b701e07 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -2,30 +2,7 @@
 # on two lines for easier vgrepping
 # entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 
-function hg_prompt_info {
-    hg prompt --angle-brackets "\
-<hg:%{$fg[magenta]%}<branch>%{$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
-}
-
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+"
-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]%}✈"
-
-function mygit() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
-}
-
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
 %{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b '
-#PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-#%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
-PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
-#RPROMPT='$(mygit)'
+
 

From 7ba54d197dac8d5ae380271259ba4d8843f01b4f Mon Sep 17 00:00:00 2001
From: Paul Gideon Dann <pdgiddie@gmail.com>
Date: Tue, 20 Sep 2011 09:26:32 +0100
Subject: [PATCH 404/907] Adding README file for the wakeonlan plugin

---
 plugins/wakeonlan/README | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 plugins/wakeonlan/README

diff --git a/plugins/wakeonlan/README b/plugins/wakeonlan/README
new file mode 100644
index 000000000..16fdd4587
--- /dev/null
+++ b/plugins/wakeonlan/README
@@ -0,0 +1,29 @@
+This plugin provides a wrapper around the "wakeonlan" tool available from most
+distributions' package repositories, or from the following website:
+
+http://gsd.di.uminho.pt/jpo/software/wakeonlan/
+
+In order to use this wrapper, create the ~/.wakeonlan directory, and place in
+that directory one file for each device you would like to be able to wake. Give
+the file a name that describes the device, such as its hostname. Each file
+should contain a line with the mac address of the target device and the network
+broadcast address.
+
+For instance, there might be a file ~/.wakeonlan/leto with the following
+contents:
+
+00:11:22:33:44:55:66 192.168.0.255
+
+To wake that device, use the following command:
+
+# wake leto
+
+The available device names will be autocompleted, so:
+
+# wake <tab>
+
+...will suggest "leto", along with any other configuration files that were
+placed in the ~/.wakeonlan directory.
+
+For more information regarding the configuration file format, check the
+wakeonlan man page.

From 2ca2ad3fc5b8635b22d33fd0f1c1511f44e9fff8 Mon Sep 17 00:00:00 2001
From: fceccon <francesco@ceccon.me>
Date: Tue, 20 Sep 2011 12:04:06 +0200
Subject: [PATCH 405/907] First search in the custom folder for the theme

---
 oh-my-zsh.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c4522491b..6ab2ba35f 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -45,7 +45,12 @@ then
 else
   if [ ! "$ZSH_THEME" = ""  ]
   then
-    source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
+    then
+      source "$ZSH/custom/$ZSH_THEME.zsh-theme"
+    else
+      source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+    fi
   fi
 fi
 

From c2d0cdd5330ae072468ca801d0b5750bf4fae7c3 Mon Sep 17 00:00:00 2001
From: James Moore <james@panic.com>
Date: Fri, 23 Sep 2011 10:18:09 -0700
Subject: [PATCH 406/907] This needs to explicitly check the return value

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 53a8a513a..b1f873be5 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,5 +1,5 @@
 function svn_prompt_info {
-    if [ in_svn ]; then
+    if [[ in_svn == 1 ]]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
     fi

From b2703a3c8a6c860eeea8a36bc693a1508372d8c1 Mon Sep 17 00:00:00 2001
From: James Moore <james@panic.com>
Date: Fri, 23 Sep 2011 10:51:20 -0700
Subject: [PATCH 407/907] This is the correct way to check the return value

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index b1f873be5..e2cf96ca3 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,5 +1,5 @@
 function svn_prompt_info {
-    if [[ in_svn == 1 ]]; then
+    if [ $(in_svn) ]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
     fi
@@ -13,7 +13,7 @@ function in_svn() {
 }
 
 function svn_get_repo_name {
-    if [ in_svn ]; then
+    if [ $(in_svn) ]; then
         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
     
         svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
@@ -21,13 +21,13 @@ function svn_get_repo_name {
 }
 
 function svn_get_rev_nr {
-    if [ in_svn ]; then
+    if [ $(in_svn) ]; then
         svn info 2> /dev/null | sed -n s/Revision:\ //p
     fi
 }
 
 function svn_dirty_choose {
-    if [ in_svn ]; then
+    if [ $(in_svn) ]; then
         s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
         if [ $s ]; then 
             echo $1

From 8287cc177e993aebc8ee0a9f5ee5a1cee6893253 Mon Sep 17 00:00:00 2001
From: Nick Stenning <nick@whiteink.com>
Date: Sat, 24 Sep 2011 17:09:57 +0100
Subject: [PATCH 408/907] Better cake completion: don't barf on options, and
 don't clobber user's namespace

---
 plugins/cake/cake.plugin.zsh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/plugins/cake/cake.plugin.zsh b/plugins/cake/cake.plugin.zsh
index f968c71d5..1d0d196ee 100644
--- a/plugins/cake/cake.plugin.zsh
+++ b/plugins/cake/cake.plugin.zsh
@@ -1,18 +1,22 @@
 # Set this to 1 if you want to cache the tasks
-cache_task_list=1
+_cake_cache_task_list=1
 
 # Cache filename
-cache_file='.cake_task_cache'
+_cake_task_cache_file='.cake_task_cache'
+
+_cake_get_target_list () {
+	cake | grep '^cake ' | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'
+}
 
 _cake_does_target_list_need_generating () {
 
-	if [ $cache_task_list -eq 0 ]; then
+	if [ ${_cake_cache_task_list} -eq 0 ]; then
 		return 1;
 	fi
 
-	if [ ! -f $cache_file ]; then return 0;
+	if [ ! -f ${_cake_task_cache_file} ]; then return 0;
 	else
-		accurate=$(stat -f%m $cache_file)
+		accurate=$(stat -f%m $_cake_task_cache_file)
 		changed=$(stat -f%m Cakefile)
 		return $(expr $accurate '>=' $changed)
 	fi
@@ -21,12 +25,12 @@ _cake_does_target_list_need_generating () {
 _cake () {
 	if [ -f Cakefile ]; then
 		if _cake_does_target_list_need_generating; then
-			cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$' > $cache_file
-			compadd `cat $cache_file`
+			_cake_get_target_list > ${_cake_task_cache_file}
+			compadd `cat ${_cake_task_cache_file}`
 		else
-			compadd `cake | sed -e "s/cake \([^ ]*\) .*/\1/" | grep -v '^$'`
+			compadd `_cake_get_target_list`
 		fi
 	fi
 }
 
-compdef _cake cake
+compdef _cake cake
\ No newline at end of file

From c1c7b0e4af8a33c25118679f075f63a3b67b14f4 Mon Sep 17 00:00:00 2001
From: Dan Shearmur <dan.shearmur@semantico.com>
Date: Mon, 26 Sep 2011 14:44:42 +0100
Subject: [PATCH 409/907] added git merge as gm

---
 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 4fcf9425d..183c56c1c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -33,6 +33,8 @@ alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'
 compdef _git ga=git-add
+alias gm='git merge'
+compdef _git gm=git-merge
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From 40cc4dabfb7cd91e09e70a3dd11f73b20d303303 Mon Sep 17 00:00:00 2001
From: Mark Szymanski <mrman208@me.com>
Date: Tue, 4 Oct 2011 21:27:36 -0500
Subject: [PATCH 410/907] Add new theme: wuffers

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

diff --git a/themes/wuffers.zsh-theme b/themes/wuffers.zsh-theme
new file mode 100644
index 000000000..004b5ebc4
--- /dev/null
+++ b/themes/wuffers.zsh-theme
@@ -0,0 +1,5 @@
+ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[blue]["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]$reset_color "
+ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[red] x$fg_bold[blue]"
+
+PROMPT='$(git_prompt_info)$fg_bold[green]{$(rvm current)}$reset_color $fg[cyan]%c$reset_color '

From c373c7153be77a91d30a9c6d5ea96b18e911823c Mon Sep 17 00:00:00 2001
From: Mark Szymanski <mrman208@me.com>
Date: Tue, 4 Oct 2011 21:30:32 -0500
Subject: [PATCH 411/907] Fix up some wonkiness

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

diff --git a/themes/wuffers.zsh-theme b/themes/wuffers.zsh-theme
index 004b5ebc4..182d8a34f 100644
--- a/themes/wuffers.zsh-theme
+++ b/themes/wuffers.zsh-theme
@@ -1,5 +1,5 @@
-ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[blue]["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]$reset_color "
-ZSH_THEME_GIT_PROMPT_DIRTY="$fg_bold[red] x$fg_bold[blue]"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} x%{$fg_bold[blue]%}"
 
-PROMPT='$(git_prompt_info)$fg_bold[green]{$(rvm current)}$reset_color $fg[cyan]%c$reset_color '
+PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '

From 878d569c6845198005dacc4e9a56b6610e46ffd9 Mon Sep 17 00:00:00 2001
From: Aslam Najeebdeen <aslamnajeem@gmail.com>
Date: Mon, 4 Jul 2011 15:37:11 +0530
Subject: [PATCH 412/907] FrontCube theme with git status

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

diff --git a/themes/frontcube.zsh-theme b/themes/frontcube.zsh-theme
new file mode 100644
index 000000000..081fa2f29
--- /dev/null
+++ b/themes/frontcube.zsh-theme
@@ -0,0 +1,10 @@
+PROMPT='
+%{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%}
+%{$fg[green]%}➞  %{$reset_color%'
+
+RPROMPT='$(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[git:"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}] %{$fg[red]%}✖ %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}] %{$fg[green]%}✔%{$reset_color%}"

From ebbead82abe59663cedd9f0ade4627e01548b4c1 Mon Sep 17 00:00:00 2001
From: Aslam Najeebdeen <aslamnajeem@gmail.com>
Date: Sat, 16 Jul 2011 17:31:57 +0530
Subject: [PATCH 413/907] RVM info

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

diff --git a/themes/frontcube.zsh-theme b/themes/frontcube.zsh-theme
index 081fa2f29..d9f5b6d9c 100644
--- a/themes/frontcube.zsh-theme
+++ b/themes/frontcube.zsh-theme
@@ -1,8 +1,10 @@
+local rvm="%{$fg[green]%}[$(rvm-prompt i v g)]%{$reset_color%}"
+
 PROMPT='
 %{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%}
 %{$fg[green]%}➞  %{$reset_color%'
 
-RPROMPT='$(git_prompt_info)'
+RPROMPT='$(git_prompt_info) $(rvm)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[git:"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From 7553d0171f7d1fe070a70af2c863fdadf6d7d5ac Mon Sep 17 00:00:00 2001
From: Gavin Huang <gravof@gmail.com>
Date: Tue, 18 Oct 2011 11:46:45 +0800
Subject: [PATCH 414/907] Replace "git-diff" with "git diff" in the git plugin

---
 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 183c56c1c..89b3259fe 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -9,7 +9,7 @@ alias gup='git fetch && git rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
-gdv() { git-diff -w "$@" | view - }
+gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
 compdef _git gc=git-commit

From 81d94e6c9e3ebe5f0cb094474b1b2f96d2cf567b Mon Sep 17 00:00:00 2001
From: Godwin Ko <godwin.ko@athenabest.com>
Date: Wed, 12 Oct 2011 12:16:23 +0800
Subject: [PATCH 415/907] add rails runner alias

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

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index ac8119e83..4aa7a05d6 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -2,6 +2,7 @@ alias ss='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
 alias sp='ruby script/plugin'
+alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
 alias sc='ruby script/console'
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index f4ee637e6..a817b483f 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -14,6 +14,7 @@ alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
 alias rp='_rails_command plugin'
+alias rr='_rails_command runner'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'

From 6095fe4f7157ba444addaf436f9f44e3d491a784 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <p.hoeg@northwind.sg>
Date: Thu, 20 Oct 2011 14:12:13 +0800
Subject: [PATCH 416/907] add: battery plugin

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

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
new file mode 100644
index 000000000..bc75c5cf9
--- /dev/null
+++ b/plugins/battery/battery.plugin.zsh
@@ -0,0 +1,20 @@
+if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
+  function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
+  function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
+  function battery_pct_prompt() {
+    b=$(battery_pct_remaining)
+    if [ $b -gt 50 ] ; then
+      color='green'
+    elif [ $b -gt 20 ] ; then
+      color='yellow'
+    else
+      color='red'
+    fi
+    echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+  }
+else
+  error_msg='no battery'
+  function battery_pct_remaining() { echo $error_msg }
+  function battery_time_remaining() { echo $error_msg }
+  function battery_pct_prompt() { echo '' }
+fi

From a5545bd31c76a4f34339dc4e7b87f74fa0174015 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <p.hoeg@northwind.sg>
Date: Thu, 20 Oct 2011 14:12:56 +0800
Subject: [PATCH 417/907] add: rbenv plugin

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

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
new file mode 100644
index 000000000..136ea75e0
--- /dev/null
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -0,0 +1,44 @@
+FOUND_RBENV=0
+for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
+  if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
+    FOUND_RBENV=1
+    export RBENV_ROOT=$rbenvdir
+    export PATH=${rbenvdir}/bin:$PATH
+    eval "$(rbenv init -)"
+
+    alias rubies="rbenv versions"
+    alias gemsets="rbenv gemset list"
+
+    function current_ruby() {
+      echo "$(rbenv version-name)"
+    }
+
+    function current_gemset() {
+      echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a') | head -n1"
+    }
+
+    function gems {
+      local rbenv_path=$(rbenv prefix)
+      gem list $@ | sed \
+        -Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+        -Ee "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
+        -Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+        -Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+    }
+
+    function rbenv_prompt_info() {
+      if [[ -n $(current_gemset) ]] ; then
+        echo "$(current_ruby)@$(current_gemset)"
+      else
+        echo "$(current_ruby)"
+      fi
+    }
+  fi
+done
+unset rbenvdir
+
+if [ $FOUND_RBENV -eq 0 ] ; then
+  alias rubies='ruby -v'
+  function gemsets() { echo 'not supported' }
+  function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }
+fi

From 31cddcd32427a5f5d3daa0da168d39aba5b510b4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <p.hoeg@northwind.sg>
Date: Thu, 20 Oct 2011 15:27:49 +0800
Subject: [PATCH 418/907] fix: rbenv: I need to find a proper way to test
 changes...

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

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 136ea75e0..ae37404cd 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -14,7 +14,7 @@ for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
     }
 
     function current_gemset() {
-      echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a') | head -n1"
+      echo "$(rbenv gemset active 2&>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"
     }
 
     function gems {

From a2afccae194470e71dd256b594964ddfe0e5c221 Mon Sep 17 00:00:00 2001
From: ornicar <thibault.duplessis@gmail.com>
Date: Tue, 25 Oct 2011 09:53:59 +0200
Subject: [PATCH 419/907] Add yaourt --sucre alias in archlinux plugin

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

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index b5e519036..294dc5354 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -9,6 +9,7 @@ if [[ -x `which yaourt` ]]; then
   alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff
   # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
   alias yaupg='yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+  alias yasu='yaourt --sucre'      # Same as yaupg, but without confirmation
   alias yain='yaourt -S'           # Install specific package(s) from the repositories
   alias yains='yaourt -U'          # Install specific package not from the repositories but from a file 
   alias yare='yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies

From 0f13387b074aa20b035251ea85e4f8a82eddbfa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lache=CC=80ze=20Alexandre?= <alexandre.lacheze@gmail.com>
Date: Wed, 2 Nov 2011 03:55:26 +0100
Subject: [PATCH 420/907] Added completion plugin for jake

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

diff --git a/plugins/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
new file mode 100644
index 000000000..d629fa4bc
--- /dev/null
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -0,0 +1,28 @@
+##-----Autocomplete for Jake tool----
+# Jake : https://github.com/mde/jake
+# Warning : Jakefile should have the right cas : Jakefile
+# Add a .jake_tasks file to your working directory
+# Author : Alexandre Lacheze (@al3xstrat)
+# Inspiration : http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh 
+
+function _jake_does_task_list_need_generating () {
+  if [ ! -f .jake_tasks ]; then
+    return 0;
+  else
+    accurate=$(stat -f%m .jake_tasks)
+    changed=$(stat -f%m Jakefile)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+function _jake () {
+  if [ -f Jakefile ]; then
+    if _jake_does_task_list_need_generating; then
+      echo "\nGenerating .jake_tasks..." > /dev/stderr
+      jake -T | cut -d " " -f 2 | sed -E "s/.\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" > .jake_tasks
+    fi
+    reply=( `cat .jake_tasks` )
+  fi
+}
+
+compctl -K _jake jake
\ No newline at end of file

From a78387cb5d46c98336a8fa0abd72d682f1c00c8b Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.lacheze@gmail.com>
Date: Wed, 2 Nov 2011 13:29:28 +0100
Subject: [PATCH 421/907] Minor modifications in comment-header

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

diff --git a/plugins/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
index d629fa4bc..d365aee9b 100644
--- a/plugins/jake-node/jake-node.plugin.zsh
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -1,7 +1,7 @@
-##-----Autocomplete for Jake tool----
+#---oh-my-zsh plugin : take Autocomplete for Jake tool---
 # Jake : https://github.com/mde/jake
-# Warning : Jakefile should have the right cas : Jakefile
-# Add a .jake_tasks file to your working directory
+# Warning : Jakefile should have the right case : Jakefile
+# Warnign : Add a .jake_tasks file to your working directory
 # Author : Alexandre Lacheze (@al3xstrat)
 # Inspiration : http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh 
 

From 456993e03be3193056b9a18a809a18414cf9df00 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.lacheze@gmail.com>
Date: Wed, 2 Nov 2011 13:31:06 +0100
Subject: [PATCH 422/907] minor modifications in comment header (the revenge)

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

diff --git a/plugins/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
index d365aee9b..ff9f6b5cf 100644
--- a/plugins/jake-node/jake-node.plugin.zsh
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -1,4 +1,4 @@
-#---oh-my-zsh plugin : take Autocomplete for Jake tool---
+#---oh-my-zsh plugin : task Autocomplete for Jake tool---
 # Jake : https://github.com/mde/jake
 # Warning : Jakefile should have the right case : Jakefile
 # Warnign : Add a .jake_tasks file to your working directory

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

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

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

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

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

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

From 452f1213018551f6a388224bbfd1c84ef73b3770 Mon Sep 17 00:00:00 2001
From: Benjamin Boudreau <boudreau.benjamin@gmail.com>
Date: Mon, 7 Nov 2011 13:42:16 -0500
Subject: [PATCH 425/907] Add apt-history to debian plugin

---
 plugins/debian/debian.plugin.zsh | 42 ++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 09771881d..16a5d54ca 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -54,7 +54,7 @@ if [[ $use_sudo -eq 1 ]]; then
 
     # apt-get only
     alias ads="sudo $apt_pref dselect-upgrade"
-    
+
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
     # glob_subst
@@ -113,9 +113,6 @@ alias allpkgs='aptitude search -F "%p" --disable-columns ~i'
 alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 
 
-
-
-
 # Functions #################################################################
 # create a simple script that can be used to 'duplicate' a system
 apt-copy() {
@@ -132,11 +129,46 @@ apt-copy() {
     chmod +x apt-copy.sh
 }
 
+# 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' )		
+    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

From 419ffdc48d218156b578d46d7fb5c64adcccb3de Mon Sep 17 00:00:00 2001
From: Kir Shatrov <razor.psp@gmail.com>
Date: Wed, 9 Nov 2011 14:46:38 +0400
Subject: [PATCH 426/907] Rails Migrations support

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

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index f4ee637e6..792cde2bd 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -17,3 +17,5 @@ alias rp='_rails_command plugin'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
+alias rdm='rake db:migrate'
+alias rdr='rake db:rollback'

From 444145b495338ca3fbc86f0956003a1074f845df Mon Sep 17 00:00:00 2001
From: Mario Fernandez <mario.fernandez@hceris.com>
Date: Wed, 9 Nov 2011 23:01:45 +0100
Subject: [PATCH 427/907] FIX: commands like ruby and rake where not being
 completed

---
 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 3c96b8da9..89f62232b 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -41,6 +41,6 @@ for cmd in $bundled_commands; do
   alias $cmd=bundled_$cmd
 
   if which _$cmd > /dev/null 2>&1; then
-        compdef _$cmd bundled_$cmd
+        compdef _$cmd bundled_$cmd=$cmd
   fi
 done

From 40c47a737571468b759bbc30e4b4dc4b5f77470f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Tue, 15 Nov 2011 01:14:03 -0500
Subject: [PATCH 428/907] lib/termsupport now uses add-zsh-hook

This is needed to play nice with plugins that need various hooks.
---
 lib/termsupport.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 22e7f372f..221989502 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -4,7 +4,7 @@
 #Limited support for Apple Terminal (Terminal can't set window or tab separately)
 function title {
   [ "$DISABLE_AUTO_TITLE" != "true" ] || return
-  if [[ "$TERM" == screen* ]]; then 
+  if [[ "$TERM" == screen* ]]; then
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
     print -Pn "\e]2;$2:q\a" #set window name
@@ -16,14 +16,18 @@ 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
-function precmd {
+function omz_termsupport_precmd {
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 }
 
 #Appears at the beginning of (and during) of command execution
-function preexec {
+function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
   title "$CMD" "%100>...>$2%<<"
 }
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd  omz_termsupport_precmd
+add-zsh-hook preexec omz_termsupport_preexec

From 5277a0ffaacbc2e23c8753fefdf1c4fe6d1e7685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Tue, 15 Nov 2011 01:20:29 -0500
Subject: [PATCH 429/907] Added add-zsh-hook support to themes

I added add-zsh-hook support to the themes that didn't have it already.
This allows the themes to co-exist with plugins and lib/termsupport.
---
 themes/apple.zsh-theme    |  7 +++++--
 themes/jonathan.zsh-theme | 28 ++++++++++++++++------------
 themes/kolo.zsh-theme     |  5 ++++-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/themes/apple.zsh-theme b/themes/apple.zsh-theme
index 92f1df941..275341dc6 100644
--- a/themes/apple.zsh-theme
+++ b/themes/apple.zsh-theme
@@ -2,7 +2,7 @@ function toon {
   echo -n ""
 }
 
-get_git_dirty() { 
+get_git_dirty() {
   git diff --quiet || echo '*'
 }
 
@@ -18,9 +18,12 @@ zstyle ':vcs_info:*' formats       \
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git cvs svn
 
-precmd () {
+theme_precmd () {
     vcs_info
 }
 
 setopt prompt_subst
 PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}'
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd theme_precmd
\ No newline at end of file
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index add485279..a170a13d0 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,19 +1,19 @@
-function precmd {
+function theme_precmd {
     local TERMWIDTH
     (( TERMWIDTH = ${COLUMNS} - 1 ))
 
 
     ###
     # Truncate the path if it's too long.
-    
+
     PR_FILLBAR=""
     PR_PWDLEN=""
-    
+
     local promptsize=${#${(%):---(%n@%m:%l)---()--}}
     local rubyprompt=`rvm_prompt_info`
     local rubypromptsize=${#${rubyprompt}}
     local pwdsize=${#${(%):-%~}}
-    
+
     if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then
       ((PR_PWDLEN=$TERMWIDTH - $promptsize))
     else
@@ -24,7 +24,7 @@ function precmd {
 
 
 setopt extended_glob
-preexec () {
+theme_preexec () {
     if [[ "$TERM" == "screen" ]]; then
 	local CMD=${1[(wr)^(*=*|sudo|-*)]}
 	echo -n "\ek$CMD\e\\"
@@ -69,7 +69,7 @@ setprompt () {
 
     ###
     # See if we can use extended characters to look nicer.
-    
+
     typeset -A altchar
     set -A altchar ${(s..)terminfo[acsc]}
     PR_SET_CHARSET="%{$terminfo[enacs]%}"
@@ -81,10 +81,10 @@ setprompt () {
     PR_LRCORNER=${altchar[j]:--}
     PR_URCORNER=${altchar[k]:--}
 
-    
+
     ###
     # Decide if we need to set titlebar text.
-    
+
     case $TERM in
 	xterm*)
 	    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
@@ -96,8 +96,8 @@ setprompt () {
 	    PR_TITLEBAR=''
 	    ;;
     esac
-    
-    
+
+
     ###
     # Decide whether to set a screen title
     if [[ "$TERM" == "screen" ]]; then
@@ -105,8 +105,8 @@ setprompt () {
     else
 	PR_STITLE=''
     fi
-    
-    
+
+
     ###
     # Finally, the prompt.
 
@@ -135,3 +135,7 @@ $PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT$PR_NO_COLOUR '
 }
 
 setprompt
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd  theme_precmd
+add-zsh-hook preexec theme_preexec
\ No newline at end of file
diff --git a/themes/kolo.zsh-theme b/themes/kolo.zsh-theme
index 6e04e1595..e743289c3 100644
--- a/themes/kolo.zsh-theme
+++ b/themes/kolo.zsh-theme
@@ -7,7 +7,7 @@ zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
 zstyle ':vcs_info:*' enable git svn
-precmd () {
+theme_precmd () {
     if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
         zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
     } else {
@@ -19,3 +19,6 @@ precmd () {
 
 setopt prompt_subst
 PROMPT='%B%F{magenta}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}%% '
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd  theme_precmd

From 4173ba1e95403f3d2cd28b0ad5d5f2c0691f86b7 Mon Sep 17 00:00:00 2001
From: Graham McMillan <mcmgraham@gmail.com>
Date: Tue, 15 Nov 2011 13:46:14 -0500
Subject: [PATCH 430/907] Added option to disable the update prompt. Set
 DISABLE_UPDATE_PROMPT to true to enable.

---
 tools/check_for_upgrade.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index aeaa0e415..524aa509d 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -8,6 +8,12 @@ function _update_zsh_update() {
   echo "LAST_EPOCH=$(_current_epoch)" > ~/.zsh-update
 }
 
+function _upgrade_zsh() {
+  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
+  # update the zsh file
+  _update_zsh_update
+}
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
@@ -19,17 +25,21 @@ then
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
   if [ $epoch_diff -gt 6 ]
   then
-    echo "[Oh My Zsh] Would you like to check for updates?"
-    echo "Type Y to update oh-my-zsh: \c"
-    read line
-    if [ "$line" = Y ] || [ "$line" = y ]
+    if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then
-      /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
-      # update the zsh file
-      _update_zsh_update
+      _upgrade_zsh
+    else
+      echo "[Oh My Zsh] Would you like to check for updates?"
+      echo "Type Y to update oh-my-zsh: \c"
+      read line
+      if [ "$line" = Y ] || [ "$line" = y ]
+      then
+        _upgrade_zsh
+      fi
     fi
   fi
 else
   # create the zsh file
   _update_zsh_update
 fi
+

From 7ec2dd984a7605b28fcaed411f33403802bc876a Mon Sep 17 00:00:00 2001
From: Russell Harmon <russ@eatnumber1.com>
Date: Wed, 16 Nov 2011 04:32:05 -0500
Subject: [PATCH 431/907] Use printf rather than echo -e in update.sh

update.sh is an "sh" script, not a zsh or bash script. On platforms
which have real sh, echo does not have the -e option.
---
 tools/upgrade.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 52a8cc4da..6ffe56f4c 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,12 +1,12 @@
 current_path=`pwd`
-echo -e "\033[0;34mUpgrading Oh My Zsh\033[0m"
+printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 ( cd $ZSH && git pull origin master )
-echo -e "\033[0;32m"'         __                                     __   '"\033[0m"
-echo -e "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
-echo -e "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
-echo -e "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
-echo -e "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
-echo -e "\033[0;32m"'                        /____/                       '"\033[0m"
-echo -e "\033[0;34mHooray! Oh My Zsh has been updated and/or is at the current version.\033[0m"
-echo -e "\033[0;34mTo keep up on the latest, be sure to follow Oh My Zsh on twitter: \033[1mhttp://twitter.com/ohmyzsh\033[0m"
+printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
+printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
+printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
+printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
+printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh'
 cd "$current_path"

From 3512eca2cefee9b89b08230021c25f6e30525e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Wed, 16 Nov 2011 09:25:45 -0500
Subject: [PATCH 432/907] set fpath correctly for custom plugins

Custom plugins weren't being added to the fpath correctly.
---
 oh-my-zsh.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 891e8d467..8f5e2472d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,9 +13,16 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
-# Add all defined plugins to fpath
+# Add all defined plugins to fpath. This must be done
+# before running compinit.
 plugin=${plugin:=()}
-for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
+for plugin ($plugins); do
+  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
+  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+    fpath=($ZSH/plugins/$plugin $fpath)
+  fi
+done
 
 # Load and run compinit
 autoload -U compinit

From 258457ea4fe0b8fcb1f6d0242071edb82cab449a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= <docwhat@gerf.org>
Date: Wed, 16 Nov 2011 09:46:05 -0500
Subject: [PATCH 433/907] Moved ZSH_CUSTOM declaration before fpath is set

* also normalized style to match the guide.
---
 oh-my-zsh.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 8f5e2472d..7ae41c33e 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -13,6 +13,12 @@ fpath=($ZSH/functions $ZSH/completions $fpath)
 # TIP: Add files you don't want in git to .gitignore
 for config_file ($ZSH/lib/*.zsh) source $config_file
 
+# 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
+
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
 plugin=${plugin:=()}
@@ -28,12 +34,6 @@ done
 autoload -U compinit
 compinit -i
 
-# Set ZSH_CUSTOM to the path where your custom config files
-# and plugins exists, or else we will use the default custom/
-if [ "$ZSH_CUSTOM" = ""  ]
-then
-    ZSH_CUSTOM="$ZSH/custom"
-fi
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do

From 10618f323f2915c2a7281e258a42d05faf1cc1af Mon Sep 17 00:00:00 2001
From: Matt Outten <moutten@squaremouth.com>
Date: Wed, 16 Nov 2011 11:14:26 -0500
Subject: [PATCH 434/907] Add the --format tag to knife list commands

This commit adds the --format tag to all of the autocompletion functions. The default format changed from json to a "human readable" format as of version 0.10.  This change should be backward compatible.  Alternatively, these commands could be simplified by using the new default human readable format.
---
 plugins/knife/_knife | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index 7f8c95ee5..f336380a1 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -138,27 +138,27 @@ _knife_options3() {
 
 # The chef_x_remote functions use knife to get a list of objects of type x on the server
 _chef_roles_remote() {
- (knife role list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+ (knife role list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
 _chef_clients_remote() {
- (knife client list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+ (knife client list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
 _chef_nodes_remote() {
- (knife node list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+ (knife node list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
 _chef_cookbooks_remote() {
- (knife cookbook list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+ (knife cookbook list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
 _chef_sitecookbooks_remote() {
- (knife cookbook site list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+ (knife cookbook site list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
 _chef_data_bags_remote() {
- (knife data bag list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+ (knife data bag list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
 # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server

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

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

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

From 2c660c16ad818d4e1f001e392f7e82c7c02cbbc6 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Thu, 24 Nov 2011 13:51:55 +0100
Subject: [PATCH 436/907] Only alias git=hub if `hub --version` works.

`hub` is crashing for me on a old CentOS setup with
"undefined method `shelljoin'".

On first use of the `git` function it is now checked if
`hub --version` returns successfully.
---
 plugins/github/github.plugin.zsh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 9b0d54602..197e86a48 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,7 +1,17 @@
 # Setup hub function for git, if it is available; http://github.com/defunkt/hub
 if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then
     # eval `hub alias -s zsh`
-    function git(){hub "$@"}
+    function git(){
+        if ! (( $+_has_working_hub  )); then
+            hub --version &> /dev/null
+            _has_working_hub=$(($? == 0))
+        fi
+        if (( $_has_working_hub )) ; then
+            hub "$@"
+        else
+            command git "$@"
+        fi
+    }
 fi
 
 # Functions #################################################################

From 5260bfd4eba3787d5d32086b55ed728f3f3ab7f8 Mon Sep 17 00:00:00 2001
From: Gael Pasgrimaud <gael@gawel.org>
Date: Sun, 27 Nov 2011 15:07:31 +0100
Subject: [PATCH 437/907] allow django-manage completion.
 http://pypi.python.org/pypi/DjangoDevKit

---
 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 1d72a2f2c..0bbd031fe 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -220,3 +220,4 @@ _managepy() {
 
 compdef _managepy manage.py
 compdef _managepy django
+compdef _managepy django-manage

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

A utility to automate tmux session creation

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

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

From 31badac2ea2ecdc77cf4c339fcef9472940cb261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lache=CC=80ze=20Alexandre?= <alexandre.lacheze@gmail.com>
Date: Fri, 2 Dec 2011 12:54:04 +0100
Subject: [PATCH 439/907] Jake-node plugin : update - remove the need to write
 a `jake_tasks` in the directory - use most recent usage of completion with
 zsh - tested for MacOSX and Ubuntu

---
 plugins/jake-node/jake-node.plugin.zsh | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/plugins/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
index ff9f6b5cf..a9eef4029 100644
--- a/plugins/jake-node/jake-node.plugin.zsh
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -1,28 +1,14 @@
 #---oh-my-zsh plugin : task Autocomplete for Jake tool---
 # Jake : https://github.com/mde/jake
-# Warning : Jakefile should have the right case : Jakefile
-# Warnign : Add a .jake_tasks file to your working directory
+# Warning : Jakefile should have the right case : Jakefile or jakefile
+# Tested on : MacOSX 10.7 (Lion), Ubuntu 11.10
 # Author : Alexandre Lacheze (@al3xstrat)
 # Inspiration : http://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh 
 
-function _jake_does_task_list_need_generating () {
-  if [ ! -f .jake_tasks ]; then
-    return 0;
-  else
-    accurate=$(stat -f%m .jake_tasks)
-    changed=$(stat -f%m Jakefile)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
 function _jake () {
-  if [ -f Jakefile ]; then
-    if _jake_does_task_list_need_generating; then
-      echo "\nGenerating .jake_tasks..." > /dev/stderr
-      jake -T | cut -d " " -f 2 | sed -E "s/.\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" > .jake_tasks
-    fi
-    reply=( `cat .jake_tasks` )
+  if [ -f Jakefile ]||[ -f jakefile ]; then
+    compadd `jake -T | cut -d " " -f 2 | sed -E "s/.\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`
   fi
 }
 
-compctl -K _jake jake
\ No newline at end of file
+compdef _jake jake
\ No newline at end of file

From 3fc812afc9af75e49a8f99bad3ada41672547503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20Gustafsson?= <gustafsson.g@gmail.com>
Date: Sat, 3 Dec 2011 13:18:37 +0100
Subject: [PATCH 440/907] Removed duplicate setting and sorted the remaining

---
 lib/history.zsh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index ca6f57079..876936b87 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -3,14 +3,11 @@ HISTFILE=$HOME/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
 
-setopt hist_ignore_dups # ignore duplication command history list
-setopt share_history # share command history data
-
-setopt hist_verify
-setopt inc_append_history
+setopt append_history
 setopt extended_history
 setopt hist_expire_dups_first
+setopt hist_ignore_dups # ignore duplication command history list
 setopt hist_ignore_space
-
-setopt SHARE_HISTORY
-setopt APPEND_HISTORY
+setopt hist_verify
+setopt inc_append_history
+setopt share_history # share command history data

From b16099f3cb9855affa14d0f03adf6563f8df4cbe Mon Sep 17 00:00:00 2001
From: Steven De Coeyer <steven@platipi.be>
Date: Tue, 6 Dec 2011 15:18:29 +0100
Subject: [PATCH 441/907] Added Zhann theme. Based on Robbyrussel theme, but
 shows the current ruby version and has some color variations.

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

diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
new file mode 100644
index 000000000..6c056dfbe
--- /dev/null
+++ b/themes/zhann.zsh-theme
@@ -0,0 +1,7 @@
+PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v) %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From 7c36ef7faa65441f8eec27589f24ba9f18f8d66c Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 6 Dec 2011 13:51:31 -0800
Subject: [PATCH 442/907] Adding critical security patch to let you all know
 I'm on top of this shit. add 'nyan' to your plugins... then run  for security
 upgrade.

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

diff --git a/plugins/nyan/nyan.plugin.zsh b/plugins/nyan/nyan.plugin.zsh
new file mode 100644
index 000000000..6321e5f5a
--- /dev/null
+++ b/plugins/nyan/nyan.plugin.zsh
@@ -0,0 +1,5 @@
+if [[ -x `which nc` ]]; then
+  alias nyan='nc -v miku.acm.uiuc.edu 23' # nyan cat
+fi
+
+

From 42b0123427d2bdee0e3221d930bb48038c601932 Mon Sep 17 00:00:00 2001
From: Max Persson <max@maxpersson.com>
Date: Wed, 7 Dec 2011 11:08:42 +0100
Subject: [PATCH 443/907] Added brute force package completin on install
 subcommand

---
 plugins/pip/_pip | 60 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index b58010173..8c03d8519 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -3,30 +3,39 @@
 
 # pip zsh completion, based on homebrew completion
 
+_pip_all() {
+  all_pkgs=(`pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'`)
+}
+
 _pip_installed() {
-  installed_pkgs=(`pip freeze`)
+  installed_pkgs=(`pip freeze | cut -d '=' -f 1`)
 }
 
 local -a _1st_arguments
 _1st_arguments=(
-  'bundle:Create pybundles (archives containing multiple packages)'
-  'freeze:Output all currently installed packages (exact versions) to stdout'
-  'help:Show available commands'
-  'install:Install packages'
-  'search:Search PyPI'
-  'uninstall:Uninstall packages'
-  'unzip:Unzip individual packages'
-  'zip:Zip individual packages'
+  'bundle:create pybundles (archives containing multiple packages)'
+  'freeze:output all currently installed packages (exact versions) to stdout'
+  'help:show available commands'
+  'install:install packages'
+  'search:search PyPI'
+  'uninstall:uninstall packages'
+  'unzip:unzip individual packages'
+  'zip:zip individual packages'
 )
 
 local expl
-local -a pkgs installed_pkgs
+local -a all_pkgs installed_pkgs
 
 _arguments \
-  '(--version)--version[Show version number of program and exit]' \
-  '(-v --verbose)'{-v,--verbose}'[Give more output]' \
-  '(-q --quiet)'{-q,--quiet}'[Give less output]' \
-  '(-h --help)'{-h,--help}'[Show help]' \
+  '(--version)--version[show version number of program and exit]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '(-E --environment)'{-E,--environment}'[virtualenv environment to run pip in]' \
+  '(-s --enable-site-packages)'{-s,--enable-site-packages}'[include site-packages in virtualenv]' \
+  '(-v --verbose)'{-v,--verbose}'[give more output]' \
+  '(-q --quiet)'{-q,--quiet}'[give less output]' \
+  '(--log)--log[log file location]' \
+  '(--proxy)--proxy[proxy in form user:passwd@proxy.server:port]' \
+  '(--timeout)--timeout[socket timeout (default 15s)]' \
   '*:: :->subcmds' && return 0
 
 if (( CURRENT == 1 )); then
@@ -35,10 +44,25 @@ if (( CURRENT == 1 )); then
 fi
 
 case "$words[1]" in
-  list)
-      if [[ "$state" == forms ]]; then
-        _pip_installed
-        _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs
+  search)
+    _arguments \
+      '(--index)--index[base URL of Python Package Index]' ;;
+  freeze)
+    _arguments \
+      '(-l --local)'{-l,--local}'[report only virtualenv packages]' ;;
+  install)
+  	_arguments \
+      '(-U --upgrade)'{-U,--upgrade}'[upgrade all packages to the newest available version]' \
+      '(-f --find-links)'{-f,--find-links}'[URL for finding packages]' \
+      '(--no-deps --no-dependencies)'{--no-deps,--no-dependencies}'[iIgnore package dependencies]' \
+      '(--no-install)--no-install[only download packages]' \
+      '(--no-download)--no-download[only install downloaded packages]' \
+      '(--install-option)--install-option[extra arguments to be supplied to the setup.py]' \
+      '1: :->packages' &&  return 0
+     
+      if [[ "$state" == packages ]]; then
+        _pip_all
+        _wanted all_pkgs expl 'packages' compadd -a all_pkgs
       fi ;;
   uninstall)
     _pip_installed

From 1c4997f5cada6f1ff1f205b20cf321cfc6b6d347 Mon Sep 17 00:00:00 2001
From: Max Persson <max@maxpersson.com>
Date: Wed, 7 Dec 2011 13:32:58 +0100
Subject: [PATCH 444/907] Added caching of packages

---
 plugins/pip/_pip | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 8c03d8519..07d37c80e 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -4,7 +4,10 @@
 # pip zsh completion, based on homebrew completion
 
 _pip_all() {
-  all_pkgs=(`pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'`)
+  # we cache the list of packages (originally from the macports plugin)
+  if (( ! $+piplist )); then
+	piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
+  fi
 }
 
 _pip_installed() {
@@ -62,7 +65,7 @@ case "$words[1]" in
      
       if [[ "$state" == packages ]]; then
         _pip_all
-        _wanted all_pkgs expl 'packages' compadd -a all_pkgs
+        _wanted piplist expl 'packages' compadd -a piplist
       fi ;;
   uninstall)
     _pip_installed

From 5eae9421883d71b954d4abaa6056b28874ad47ec Mon Sep 17 00:00:00 2001
From: Max Persson <max@maxpersson.com>
Date: Wed, 7 Dec 2011 14:09:43 +0100
Subject: [PATCH 445/907] Added message when caching packages

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

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index 07d37c80e..df53ba5ce 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -6,6 +6,7 @@
 _pip_all() {
   # we cache the list of packages (originally from the macports plugin)
   if (( ! $+piplist )); then
+    echo -n " (caching package index...)"
 	piplist=($(pip search * | cut -d ' ' -f 1 | tr '[A-Z]' '[a-z]'))
   fi
 }

From d25fb095a9d1f814fe2b4d0f42ffe827780d4a59 Mon Sep 17 00:00:00 2001
From: Dominick LoBraico <dj@lobraico.com>
Date: Fri, 9 Dec 2011 12:18:54 -0600
Subject: [PATCH 446/907] forks miloshadzic theme to add more directory info as
 well as user and host info

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

diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
new file mode 100644
index 000000000..cf3bb908f
--- /dev/null
+++ b/themes/pygmalion.zsh-theme
@@ -0,0 +1,9 @@
+# Yay! High voltage and arrows!
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+PROMPT='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%}  '
+

From 8ca019f02a4dc718fe5fc8b1186108eb376360c9 Mon Sep 17 00:00:00 2001
From: Suvash Thapaliya <suvash@gmail.com>
Date: Mon, 12 Dec 2011 23:55:07 +0100
Subject: [PATCH 447/907] Added my own theme file : suvash

Since I store my dotfiles on github
and plan to submodule oh-my-zsh
i supposed it was a good idea to
submit my theme as well.
---
 themes/suvash.zsh-theme | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 themes/suvash.zsh-theme

diff --git a/themes/suvash.zsh-theme b/themes/suvash.zsh-theme
new file mode 100644
index 000000000..f50657db2
--- /dev/null
+++ b/themes/suvash.zsh-theme
@@ -0,0 +1,23 @@
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    hg root >/dev/null 2>/dev/null && echo 'Hg' && return
+    echo '○'
+}
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+
+function collapse_pwd {
+    echo $(pwd | sed -e "s,^$HOME,~,")
+}
+
+PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) using %{$reset_color%}%{$fg[red]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
+$(virtualenv_info)$(prompt_char) '
+
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From 3e7e52a25fbfdb57f291ee9575a606f845dbff57 Mon Sep 17 00:00:00 2001
From: Christoph Neuroth <cnr@lusini.com>
Date: Wed, 14 Dec 2011 11:47:24 +0100
Subject: [PATCH 448/907] add support for autojump installed via macports

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index da0a12765..6f9b80bff 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,3 +1,5 @@
-if [ -f `brew --prefix`/etc/autojump ]; then
+if [ -f /opt/local/etc/profile.d/autojump.sh ]; then
+  . /opt/local/etc/profile.d/autojump.sh
+elif [ -f `brew --prefix`/etc/autojump ]; then
   . `brew --prefix`/etc/autojump
 fi

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

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

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

From 1a49f6443c0230b8e182294546ed9ef2a5110bf2 Mon Sep 17 00:00:00 2001
From: Matt Parnell <parwok@gmail.com>
Date: Sat, 12 Nov 2011 21:09:27 -0800
Subject: [PATCH 450/907] add sprunge.us pastebin uploader - uses files, or
 pipes

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

diff --git a/plugins/sprunge/sprunge.plugin.zsh b/plugins/sprunge/sprunge.plugin.zsh
new file mode 100644
index 000000000..9f9432ac8
--- /dev/null
+++ b/plugins/sprunge/sprunge.plugin.zsh
@@ -0,0 +1,64 @@
+# Contributed and SLIGHTLY modded by Matt Parnell/ilikenwf <parwok -at- gmail>
+# Created by the blogger at the URL below...I don't know where to find his/her name
+# Original found at http://www.shellperson.net/sprunge-pastebin-script/
+ 
+usage() {
+description | fmt -s >&2
+}
+ 
+description() {
+cat << HERE
+ 
+DESCRIPTION
+  Upload data and fetch URL from the pastebin http://sprunge.us
+ 
+USAGE
+  $0 filename.txt
+  $0 text string
+  $0 < filename.txt
+  piped_data | $0
+ 
+NOTES
+--------------------------------------------------------------------------
+* INPUT METHODS *
+$0 can accept piped data, STDIN redirection [<filename.txt], text strings following the command as arguments, or filenames as arguments.  Only one of these methods can be used at a time, so please see the note on precedence.  Also, note that using a pipe or STDIN redirection will treat tabs as spaces, or disregard them entirely (if they appear at the beginning of a line).  So I suggest using a filename as an argument if tabs are important either to the function or readability of the code.
+ 
+* PRECEDENCE *
+STDIN redirection has precedence, then piped input, then a filename as an argument, and finally text strings as an arguments.
+ 
+  EXAMPLE:
+  echo piped | "$0" arguments.txt < stdin_redirection.txt
+ 
+In this example, the contents of file_as_stdin_redirection.txt would be uploaded. Both the piped_text and the file_as_argument.txt are ignored. If there is piped input and arguments, the arguments will be ignored, and the piped input uploaded.
+ 
+* FILENAMES *
+If a filename is misspelled or doesn't have the necessary path description, it will NOT generate an error, but will instead treat it as a text string and upload it.
+--------------------------------------------------------------------------
+ 
+HERE
+exit
+}
+
+sprunge() {
+	if [ -t 0 ]; then
+	  echo Running interactively, checking for arguments... >&2
+	  if [ "$*" ]; then
+		echo Arguments present... >&2
+		if [ -f "$*" ]; then
+		  echo Uploading the contents of "$*"... >&2
+		  cat "$*"
+		else
+		  echo Uploading the text: \""$*"\"... >&2
+		  echo "$*"
+		fi | curl -F 'sprunge=<-' http://sprunge.us
+	  else
+		echo No arguments found, printing USAGE and exiting. >&2
+		usage
+	  fi
+	else
+	  echo Using input from a pipe or STDIN redirection... >&2
+	  while read -r line ; do
+		echo $line
+	  done | curl -F 'sprunge=<-' http://sprunge.us
+	fi
+}

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

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

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

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

From 03424fdadba13fea2297a94144e989926cabdcb3 Mon Sep 17 00:00:00 2001
From: Andrew Tch <andrew@noop.lv>
Date: Sun, 18 Dec 2011 00:23:31 +0200
Subject: [PATCH 452/907] Symfony 2 completion

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

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
new file mode 100644
index 000000000..644266841
--- /dev/null
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -0,0 +1,13 @@
+# Symfony2 basic command completion
+
+_symfony2_get_command_list () {
+	app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+}
+
+_symfony2 () {
+  if [ -f app/console ]; then
+    compadd `_symfony2_get_command_list`
+  fi
+}
+
+compdef _symfony2 app/console
\ No newline at end of file

From 1ced49b85a859b399728ce32ef77399874f5172b Mon Sep 17 00:00:00 2001
From: Cameron Johnston <cwjohnston@gmail.com>
Date: Sun, 18 Dec 2011 22:15:00 -0700
Subject: [PATCH 453/907] adding support for chef environments in knife plugin

---
 plugins/knife/_knife | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index 7f8c95ee5..32ff9fc99 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -26,7 +26,7 @@ _knife() {
   
   case $state in
   knifecmd)
-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec index node recipe role search ssh status windows $cloudproviders
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec environment index node recipe role search ssh status windows $cloudproviders
   ;;
   knifesubcmd)
     case $words[2] in
@@ -42,6 +42,9 @@ _knife() {
     cookbook)
       compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
     ;;
+  environment)
+      compadd -Q "$@" list create delete edit show "from file"
+      ;;
     node)
      compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
     ;;
@@ -161,6 +164,10 @@ _chef_data_bags_remote() {
  (knife data bag list | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
 }
 
+_chef_environments_remote() {
+  (knife environment list | awk '{print $1}')
+}
+
 # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server
 _chef_cookbooks_local() {
  (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done)

From a62d22726be1c3a02405bf327449e605be8fc5b2 Mon Sep 17 00:00:00 2001
From: Steven De Coeyer <steven@platipi.be>
Date: Mon, 19 Dec 2011 15:26:37 +0100
Subject: [PATCH 454/907] show gemset next to ruby version

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

diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 6c056dfbe..3dff29c9c 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -1,5 +1,5 @@
 PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v) %{$reset_color%}'
+RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From a21dc477c26ce29c839ca3aa36af91efcad179ea Mon Sep 17 00:00:00 2001
From: Trevor Wennblom <trevor@well.com>
Date: Tue, 20 Dec 2011 16:16:02 -0600
Subject: [PATCH 455/907] add note about custom plugins

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

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1ab40aba6..64b1ece69 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,6 +23,7 @@ ZSH_THEME="robbyrussell"
 # COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git)
 

From dd14e075b7dd39906e2075ac6dd8f5bcc66b6129 Mon Sep 17 00:00:00 2001
From: "julien@macbook" <julien.stechele@gmail.com>
Date: Wed, 21 Dec 2011 15:03:55 +0100
Subject: [PATCH 456/907] Ignore submodules dirty in prompt info

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

diff --git a/lib/git.zsh b/lib/git.zsh
index f04343650..defa062c6 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -6,7 +6,7 @@ function git_prompt_info() {
 
 # Checks if working tree is dirty
 parse_git_dirty() {
-  if [[ -n $(git status -s 2> /dev/null) ]]; then
+  if [[ -n $(git status -s --ignore-submodules=dirty 2> /dev/null) ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"

From d8521693f4e2c140391065e7b721d7452134259f Mon Sep 17 00:00:00 2001
From: Kyle Smith <askreet@gmail.com>
Date: Thu, 22 Dec 2011 14:02:01 -0500
Subject: [PATCH 457/907] Added support for entries in
 /etc/ssh/ssh_known_hosts.

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

diff --git a/lib/completion.zsh b/lib/completion.zsh
index b3cc91822..0e5d480ff 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -32,9 +32,11 @@ zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-dir
 cdpath=(.)
 
 # use /etc/hosts and known_hosts for hostname completion
+[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
 hosts=(
+  "$_global_ssh_hosts[@]"
   "$_ssh_hosts[@]"
   "$_etc_hosts[@]"
   `hostname`

From 12a04571bbe5551cff6c8095ede74e4c8d7cc5aa Mon Sep 17 00:00:00 2001
From: Alexander Balashov <divineforest@gmail.com>
Date: Fri, 23 Dec 2011 11:14:22 +0400
Subject: [PATCH 458/907] Added alias gcm='git checkout master

---
 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 183c56c1c..c1b382b2c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -17,6 +17,7 @@ alias gca='git commit -v -a'
 compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
+alias gcm='git checkout master'
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'

From 0b583638ae7bc58928b77669919600e27f4738b0 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sun, 11 Dec 2011 20:27:35 +0530
Subject: [PATCH 459/907] Fix upgrade and uninstall functions to pick up $ZSH
 value

---
 lib/functions.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index ef7cc6383..d2dcadd0c 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -3,11 +3,11 @@ function zsh_stats() {
 }
 
 function uninstall_oh_my_zsh() {
-  /bin/sh $ZSH/tools/uninstall.sh
+  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
 }
 
 function upgrade_oh_my_zsh() {
-  /bin/sh $ZSH/tools/upgrade.sh
+  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
 }
 
 function take() {

From 59baf390e96751fc51299ecefe921ba8718ba3aa Mon Sep 17 00:00:00 2001
From: Tate Johnson <tate@tatey.com>
Date: Mon, 26 Dec 2011 13:16:26 +1000
Subject: [PATCH 460/907] Black on white theme inspired by Sam Stephenson's
 terminal screenshot on https://github.com/sstephenson/rbenv

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

diff --git a/themes/sammy.zsh-theme b/themes/sammy.zsh-theme
new file mode 100644
index 000000000..52e6e4bb6
--- /dev/null
+++ b/themes/sammy.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg[white]%}%c$(git_prompt_info)$ % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="*)"
+ZSH_THEME_GIT_PROMPT_CLEAN=")"

From f999fd8e121c1fd4d097c25be59c6020e1aed830 Mon Sep 17 00:00:00 2001
From: Michael Holachek <michael.holachek@gmail.com>
Date: Mon, 26 Dec 2011 12:20:02 -0500
Subject: [PATCH 461/907] Added example aliases in ZSH template. Added a new
 theme.

Example aliases allow for an easier way to open ZSH config file/folder
in Textmate. New theme is mh.zsh-theme.
---
 templates/zshrc.zsh-template |  4 ++++
 themes/mh.zsh-theme          | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 themes/mh.zsh-theme

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1ab40aba6..25cf4f233 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -7,6 +7,10 @@ ZSH=$HOME/.oh-my-zsh
 # time that oh-my-zsh is loaded.
 ZSH_THEME="robbyrussell"
 
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
diff --git a/themes/mh.zsh-theme b/themes/mh.zsh-theme
new file mode 100644
index 000000000..34a3765b1
--- /dev/null
+++ b/themes/mh.zsh-theme
@@ -0,0 +1,24 @@
+# mh theme
+# preview: http://cl.ly/1y2x0W0E3t2C0F29043z
+
+# features:
+# path is autoshortened to ~30 characters
+# displays git status (if applicable in current folder)
+# turns username green if superuser, otherwise it is white
+
+# if superuser make the username green
+if [ $UID -eq 0 ]; then NCOLOR="green"; else NCOLOR="white"; fi
+
+# prompt
+PROMPT='[%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[red]%}%30<...<%~%<<%{$reset_color%}]%(!.#.$) '
+RPROMPT='$(git_prompt_info)'
+
+# git theming
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[gray]%}(%{$fg_no_bold[yellow]%}%B"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[gray]%})%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✱"
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'

From 480d1247b89ae089564eb0ca7d66aef989b9f5e5 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 26 Dec 2011 10:15:35 -0800
Subject: [PATCH 462/907] Updating installation documentation to show a curl
 example as well for those who don't have wget installed.

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

diff --git a/README.textile b/README.textile
index 2dbfbe5a6..eca968089 100644
--- a/README.textile
+++ b/README.textile
@@ -8,6 +8,14 @@ h2. Setup
 
 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://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+
+h4. via `wget`
+
 @wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way

From 4a813cf1a2ccddc58059271065a8abc8f9079019 Mon Sep 17 00:00:00 2001
From: Ryan Schmukler <rschmukler@gmail.com>
Date: Tue, 27 Dec 2011 21:02:31 -0600
Subject: [PATCH 463/907] Added vsplit_tab and split_tab for iTerm. Create new
 session within a vertical/horizontal split of the tab respectively.

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

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 682bb2667..f278d4f8d 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -2,10 +2,9 @@
 #          FILE:  osx.plugin.zsh
 #   DESCRIPTION:  oh-my-zsh plugin file.
 #        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.1
+#       VERSION:  1.1.0
 # ------------------------------------------------------------------------------
 
-
 function tab() {
   local command="cd \\\"$PWD\\\""
   (( $# > 0 )) && command="${command}; $*"
@@ -35,7 +34,7 @@ EOF
           launch session "Default Session"
           set current_session to current session
           tell current_session
-            write text "${command}"
+            write text "${command}; clear;"
           end tell
         end tell
       end tell
@@ -43,6 +42,64 @@ EOF
   }
 }
 
+function vsplit_tab() {
+  local command="cd \\\"$PWD\\\""
+  (( $# > 0 )) && command="${command}; $*"
+
+  the_app=$(
+    osascript 2>/dev/null <<EOF
+      tell application "System Events"
+        name of first item of (every process whose frontmost is true)
+      end tell
+EOF
+  )
+
+  [[ "$the_app" == 'iTerm' ]] && {
+    osascript 2>/dev/null <<EOF
+      tell application "iTerm" to activate
+
+      tell application "System Events"
+        tell process "iTerm"
+          tell menu item "Split Vertically With Current Profile" of menu "Shell" of menu bar item "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        keystroke "${command}; clear;"
+        keystroke return
+      end tell
+EOF
+  }
+}
+
+function split_tab() {
+  local command="cd \\\"$PWD\\\""
+  (( $# > 0 )) && command="${command}; $*"
+
+  the_app=$(
+    osascript 2>/dev/null <<EOF
+      tell application "System Events"
+        name of first item of (every process whose frontmost is true)
+      end tell
+EOF
+  )
+
+  [[ "$the_app" == 'iTerm' ]] && {
+    osascript 2>/dev/null <<EOF
+      tell application "iTerm" to activate
+
+      tell application "System Events"
+        tell process "iTerm"
+          tell menu item "Split Horizontally With Current Profile" of menu "Shell" of menu bar item "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        keystroke "${command}; clear;"
+        keystroke return
+      end tell
+EOF
+  }
+}
+
 function pfd() {
   osascript 2>/dev/null <<EOF
     tell application "Finder"

From e43dd05a6a731462c6124598ce2e4d1a9d3a5160 Mon Sep 17 00:00:00 2001
From: Michael Andersen <michael.andersen.85@gmail.com>
Date: Thu, 29 Dec 2011 01:30:43 +0100
Subject: [PATCH 464/907] Mortal Scumbag Theme

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

diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme
new file mode 100644
index 000000000..7e25b149f
--- /dev/null
+++ b/themes/mortalscumbag.zsh-theme
@@ -0,0 +1,58 @@
+function my_git_prompt() {
+  tester=$(git rev-parse --git-dir 2> /dev/null) || return
+  
+  INDEX=$(git status --porcelain 2> /dev/null)
+  STATUS=""
+
+  # is branch ahead?
+  if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
+    STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
+  fi
+
+  # is anything staged?
+  if $(echo "$INDEX" | 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
+    STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
+  fi
+
+  # is anything untracked?
+  if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
+    STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+  fi
+
+  # is anything unmerged?
+  if $(echo "$INDEX" | grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then
+    STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+  fi
+
+  if [[ -n $STATUS ]]; then
+    STATUS=" $STATUS"
+  fi
+
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(my_current_branch)$STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+function my_current_branch() {
+  echo $(current_branch || echo "(no branch)")
+}
+
+function ssh_connection() {
+  if [[ -n $SSH_CONNECTION ]]; then
+    echo "%{$fg_bold[red]%}(ssh) "
+  fi
+}
+
+PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n%# '
+
+ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[magenta]%}↑"
+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●"
+ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[red]%}●"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}●"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}✕"
+ZSH_THEME_GIT_PROMPT_SUFFIX=" $fg_bold[white]›%{$reset_color%}"

From 967e84ebaa180ad2ab1eebc9a512f94d93e84aea Mon Sep 17 00:00:00 2001
From: Andreas Steinel <A.Steinel@gmail.com>
Date: Thu, 29 Dec 2011 02:22:40 +0100
Subject: [PATCH 465/907] multiple versions could occur and should also be
 highlighted

---
 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 24621fe0b..604c00713 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -37,7 +37,7 @@ function gems {
 	local current_gemset=`rvm-prompt g`
 
 	gem list $@ | sed \
-		-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+		-Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
 		-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
 		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
 		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"

From 2176cf37fb1eed028c53a2095098d585489b1cce Mon Sep 17 00:00:00 2001
From: Simon Jefford <simon.jefford@gmail.com>
Date: Thu, 29 Dec 2011 21:54:19 +0000
Subject: [PATCH 466/907] bundler plugin - don't "bundle exec rails"

As per http://blog.wyeworks.com/2011/12/27/bundle-exec-rails-executes-bundler-setup-3-times
---
 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 89f62232b..7b73c8fed 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -10,7 +10,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rails rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
 
 ## Functions
 

From cb501645d70ad1e50b6b3d3553618e585074533f Mon Sep 17 00:00:00 2001
From: Gustavo Barron <cicloid@42fu.com>
Date: Fri, 30 Dec 2011 12:11:41 -0600
Subject: [PATCH 467/907] Get the Hostname

Main library should use ZSH native hostname function
---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 0e5d480ff..b964595ed 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -39,7 +39,7 @@ hosts=(
   "$_global_ssh_hosts[@]"
   "$_ssh_hosts[@]"
   "$_etc_hosts[@]"
-  `hostname`
+  "$HOST"
   localhost
 )
 zstyle ':completion:*:hosts' hosts $hosts

From e3c34b4f9aee666ea5446a975b4a70cdbab3239c Mon Sep 17 00:00:00 2001
From: Mark Drago <markdrago@gmail.com>
Date: Sat, 31 Dec 2011 12:13:31 -0500
Subject: [PATCH 468/907] add ability to set custom prefix for cloud theme

---
 themes/cloud.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/cloud.zsh-theme b/themes/cloud.zsh-theme
index ad5e2834b..4efbf9776 100644
--- a/themes/cloud.zsh-theme
+++ b/themes/cloud.zsh-theme
@@ -1,4 +1,8 @@
-PROMPT='%{$fg_bold[cyan]%}☁ %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+if [[ -z $ZSH_THEME_CLOUD_PREFIX ]]; then
+    ZSH_THEME_CLOUD_PREFIX='☁'
+fi
+
+PROMPT='%{$fg_bold[cyan]%}$ZSH_THEME_CLOUD_PREFIX %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From a49fcea9f5d281cccce2ad421db253455a248109 Mon Sep 17 00:00:00 2001
From: Patrick Lindborg <lindborg@gmail.com>
Date: Mon, 2 Jan 2012 21:48:19 +0100
Subject: [PATCH 469/907] Fixed the rfind command in the  ruby plugin

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

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 08ca9c601..38e4d7cd0 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -3,4 +3,4 @@
 alias sgem='sudo gem'
 
 # Find ruby file
-alias rfind='find . -name *.rb | xargs grep -n'
+alias rfind='find . -name "*.rb" | xargs grep -n'

From 955825b1e9e484e4b6811a6ba8895924c1834493 Mon Sep 17 00:00:00 2001
From: Calogero Lo Leggio <kalos@nerdrug.org>
Date: Tue, 3 Jan 2012 18:03:53 +0100
Subject: [PATCH 470/907] autojump plugin enhanced

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 6f9b80bff..72c416a17 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,5 +1,9 @@
-if [ -f /opt/local/etc/profile.d/autojump.sh ]; then
-  . /opt/local/etc/profile.d/autojump.sh
-elif [ -f `brew --prefix`/etc/autojump ]; then
-  . `brew --prefix`/etc/autojump
+if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+  . /usr/share/autojump/autojump.zsh
+elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
+  . /etc/profile.d/autojump.zsh
+elif (`command -v brew >/dev/null`); then # mac os x with brew
+  if [ -f `brew --prefix`/etc/autojump ]; then
+    . `brew --prefix`/etc/autojump
+  fi
 fi

From a28b8889ee80856b65dd792dedd7735a1b94443c Mon Sep 17 00:00:00 2001
From: Alexander Madyankin <alexander@madyankin.name>
Date: Thu, 5 Jan 2012 11:16:17 +0600
Subject: [PATCH 471/907] Apple Terminal.app resume directory plugin

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

diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
new file mode 100644
index 000000000..4695ad055
--- /dev/null
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
@@ -0,0 +1,11 @@
+# Set Apple Terminal.app resume directory
+# based on this answer: http://superuser.com/a/315029
+
+function chpwd {
+  local SEARCH=' '
+  local REPLACE='%20'
+  local PWD_URL="file://$HOSTNAME${PWD//$SEARCH/$REPLACE}"
+  printf '\e]7;%s\a' "$PWD_URL"
+}
+
+chpwd
\ No newline at end of file

From 9ac98f6ceb77df71c98558a122bc06f8adadf989 Mon Sep 17 00:00:00 2001
From: Chad Seeger <chad@manilla.com>
Date: Thu, 5 Jan 2012 13:41:27 -0800
Subject: [PATCH 472/907] Git Plugin: adds 'grhh' alias for 'git reset HEAD
 --hard'

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c1b382b2c..ec98d4ad5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -36,6 +36,8 @@ alias ga='git add'
 compdef _git ga=git-add
 alias gm='git merge'
 compdef _git gm=git-merge
+alias grhh='git reset HEAD --hard'
+compdef _git grhh=git-reset-head-hard
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From 804c18ca53e832f20869a7681143464382e8a2df Mon Sep 17 00:00:00 2001
From: Mark Drago <markdrago@gmail.com>
Date: Thu, 5 Jan 2012 17:39:13 -0500
Subject: [PATCH 473/907] remove the -v flag from a few mercurial aliases

The -v flag for these commands really isn't very useful.  It will
output some information about the hooks it is running, but that is
generally not useful and just noisy.  The desire to add -v to these
commands is exceptional and IMHO it's better to make the common
case of not seeing those messages the supported behavior.
---
 plugins/mercurial/mercurial.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 2988f0a46..caf0d9efc 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -1,14 +1,14 @@
 
 # Mercurial
-alias hgc='hg commit -v'
-alias hgb='hg branch -v'
+alias hgc='hg commit'
+alias hgb='hg branch'
 alias hgba='hg branches'
 alias hgco='hg checkout'
 alias hgd='hg diff'
 alias hged='hg diffmerge'
 # pull and update
-alias hgl='hg pull -u -v'
-alias hgp='hg push -v'
-alias hgs='hg status -v'
+alias hgl='hg pull -u'
+alias hgp='hg push'
+alias hgs='hg status'
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'

From 7a361870a97d9d34158542503f942fb0c67accfc Mon Sep 17 00:00:00 2001
From: lucapette <lucapette@gmail.com>
Date: Fri, 6 Jan 2012 22:10:57 +0100
Subject: [PATCH 474/907] add annotate

---
 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 7b73c8fed..55564a252 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -10,7 +10,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
 
 ## Functions
 

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

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

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

From ae735335e186447b370d299376970a7ea949b474 Mon Sep 17 00:00:00 2001
From: Chad Seeger <chad@manilla.com>
Date: Mon, 9 Jan 2012 15:19:19 -0800
Subject: [PATCH 476/907] Kill the compdef; Introduce 'grh' alias for 'git
 reset HEAD'

---
 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 ec98d4ad5..ae080662f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -36,8 +36,8 @@ alias ga='git add'
 compdef _git ga=git-add
 alias gm='git merge'
 compdef _git gm=git-merge
+alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
-compdef _git grhh=git-reset-head-hard
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From 5809a4721dd1b575c1f4cbc3cc361520e97cd8b9 Mon Sep 17 00:00:00 2001
From: Calogero Lo Leggio <kalos@nerdrug.org>
Date: Tue, 10 Jan 2012 10:01:16 +0100
Subject: [PATCH 477/907] check if autojump is installed

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 72c416a17..6f0edb062 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,9 +1,9 @@
-if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
-  . /usr/share/autojump/autojump.zsh
-elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
-  . /etc/profile.d/autojump.zsh
-elif (`command -v brew >/dev/null`); then # mac os x with brew
-  if [ -f `brew --prefix`/etc/autojump ]; then
+if [ $commands[autojump] ]; then # check if autojump is installed
+  if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
+    . /usr/share/autojump/autojump.zsh
+  elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
+    . /etc/profile.d/autojump.zsh
+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
     . `brew --prefix`/etc/autojump
   fi
 fi

From c04b4abe91b69c058bde8e5968abb759b9168b88 Mon Sep 17 00:00:00 2001
From: Daniel Bye <dan@slightlystrange.org>
Date: Fri, 13 Jan 2012 12:40:59 +0000
Subject: [PATCH 478/907] Removed calls to compinit in the extract and the
 bundler plugins. compinit should only be called once, after all modules,
 libs, etc are imported.

---
 plugins/bundler/bundler.plugin.zsh | 2 --
 plugins/extract/extract.plugin.zsh | 2 --
 2 files changed, 4 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 55564a252..e120331ff 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,6 +1,4 @@
 fpath=($ZSH/plugins/bundler $fpath)
-autoload -U compinit
-compinit -i
 
 alias be="bundle exec"
 alias bi="bundle install"
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 8cc17f7d4..383331ccf 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -80,6 +80,4 @@ alias x=extract
 
 # add extract completion function to path
 fpath=($ZSH/plugins/extract $fpath)
-autoload -U compinit
-compinit -i
 

From 0d99759cc371d7b8f70cde950f42cc3558559533 Mon Sep 17 00:00:00 2001
From: backspace <b@chromatin.ca>
Date: Sun, 15 Jan 2012 08:49:52 +0200
Subject: [PATCH 479/907] =?UTF-8?q?Don=E2=80=99t=20report=20that=20Oh=20My?=
 =?UTF-8?q?=20Zsh=20has=20been=20updated=20when=20it=20hasn=E2=80=99t.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/upgrade.sh | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6ffe56f4c..b2a1c06c4 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,12 +1,19 @@
 current_path=`pwd`
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
-( cd $ZSH && git pull origin master )
-printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
-printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
-printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
-printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
-printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
-printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
-printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
-printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh'
-cd "$current_path"
+cd $ZSH
+
+if git pull origin master
+then
+  printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
+  printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '
+  printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '
+  printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '
+  printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '
+  printf '\033[0;32m%s\033[0m\n' '                        /____/                       '
+  printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
+  printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh'
+else
+  printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
+fi
+
+cd "$current_path"
\ No newline at end of file

From 6040d72e2a438529f5850b68d1a87d54a3c96f45 Mon Sep 17 00:00:00 2001
From: "Thomas (nezza-_-) Roth" <thomas.roth@leveldown.de>
Date: Mon, 16 Jan 2012 12:20:06 +0100
Subject: [PATCH 480/907] Fix the behaviour of the sprunge plugin so that is
 preserves whitespaces and tabs.

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

diff --git a/plugins/sprunge/sprunge.plugin.zsh b/plugins/sprunge/sprunge.plugin.zsh
index 9f9432ac8..e542b437f 100644
--- a/plugins/sprunge/sprunge.plugin.zsh
+++ b/plugins/sprunge/sprunge.plugin.zsh
@@ -57,7 +57,7 @@ sprunge() {
 	  fi
 	else
 	  echo Using input from a pipe or STDIN redirection... >&2
-	  while read -r line ; do
+	  while IFS= read -r line ; do
 		echo $line
 	  done | curl -F 'sprunge=<-' http://sprunge.us
 	fi

From 54a30c470145be2d7aa055bc7a05815ce051d540 Mon Sep 17 00:00:00 2001
From: "Thomas (nezza-_-) Roth" <thomas.roth@leveldown.de>
Date: Mon, 16 Jan 2012 13:26:08 +0100
Subject: [PATCH 481/907] sprunge-plugin: Remove the unnecessary while loop.

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

diff --git a/plugins/sprunge/sprunge.plugin.zsh b/plugins/sprunge/sprunge.plugin.zsh
index e542b437f..fcc9004f8 100644
--- a/plugins/sprunge/sprunge.plugin.zsh
+++ b/plugins/sprunge/sprunge.plugin.zsh
@@ -57,8 +57,6 @@ sprunge() {
 	  fi
 	else
 	  echo Using input from a pipe or STDIN redirection... >&2
-	  while IFS= read -r line ; do
-		echo $line
-	  done | curl -F 'sprunge=<-' http://sprunge.us
+	  curl -F 'sprunge=<-' http://sprunge.us
 	fi
 }

From b73f95ab260f49bf6baa484faa40591c51629c02 Mon Sep 17 00:00:00 2001
From: Daniel Bye <dan@slightlystrange.org>
Date: Mon, 16 Jan 2012 13:34:07 +0000
Subject: [PATCH 482/907] Removed the assignments to fpath as well, since
 that's all handled in the .oh-my-zsh/oh-my-zsh.sh boot script.

---
 plugins/bundler/bundler.plugin.zsh | 2 --
 plugins/extract/extract.plugin.zsh | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index e120331ff..b473d203c 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,5 +1,3 @@
-fpath=($ZSH/plugins/bundler $fpath)
-
 alias be="bundle exec"
 alias bi="bundle install"
 alias bl="bundle list"
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 383331ccf..5c125e98b 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -78,6 +78,3 @@ function extract() {
 
 alias x=extract
 
-# add extract completion function to path
-fpath=($ZSH/plugins/extract $fpath)
-

From 73c2c8adc77568abdf2c7be1761c5cac6f06ad06 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nico@bounga.org>
Date: Mon, 16 Jan 2012 15:19:36 +0100
Subject: [PATCH 483/907] Add Thor to bundled commands

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

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

From 4b3429d765f1f14f7dbf2cc451e3047388978bf6 Mon Sep 17 00:00:00 2001
From: Arbo von Monkiewitsch <arbo@soundcloud.com>
Date: Mon, 16 Jan 2012 18:21:27 +0100
Subject: [PATCH 484/907] fixing #812: adding plugins w/o plugin.zsh file to
 fpath.

---
 oh-my-zsh.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index aeeaa3daf..732a403b7 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -19,13 +19,19 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
+
+is_plugin() {
+  local base_dir=$1
+  local name=$2
+  test -f $base_dir/plugins/$name/$name.plugin.zsh \
+    || test -f $base_dir/plugins/$name/_$name
+}
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
-plugin=${plugin:=()}
 for plugin ($plugins); do
-  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
+  if is_plugin $ZSH_CUSTOM $plugin; then
     fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
-  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
+  elif is_plugin $ZSH $plugin; then
     fpath=($ZSH/plugins/$plugin $fpath)
   fi
 done

From 96265d26454868b8b654e4a5271939748e1dd148 Mon Sep 17 00:00:00 2001
From: Jeff Wallace <jwallace@partnerpedia.com>
Date: Tue, 17 Jan 2012 10:00:12 -0800
Subject: [PATCH 485/907] fix bundler plugin for root level folders

this fix allows _within-bundled-project() to properly pickup a Gemfile
within a root level folder (ie. /my_project)
---
 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 033f9cedf..b8f8ed3da 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -20,7 +20,7 @@ _bundler-installed() {
 
 _within-bundled-project() {
   local check_dir=$PWD
-  while [ "$(dirname $check_dir)" != "/" ]; do
+  while [ $check_dir != "/" ]; do
     [ -f "$check_dir/Gemfile" ] && return
     check_dir="$(dirname $check_dir)"
   done

From 8f1a5d3f1581c80510728143e146143deecaa61e Mon Sep 17 00:00:00 2001
From: max sharples <maxsharples@gmail.com>
Date: Tue, 17 Jan 2012 13:11:01 +1100
Subject: [PATCH 486/907] added a rake plugin to disable zsh file globbing when
 calling rake tasks with square brackets

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

diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
new file mode 100644
index 000000000..16b933c14
--- /dev/null
+++ b/plugins/rake/rake.plugin.zsh
@@ -0,0 +1,6 @@
+alias rake="noglob rake" # allows square brackts for rake task invocation
+alias brake='noglob bundle exec rake' # execute the bundled rake gem
+alias srake='noglob sudo rake' # noglob must come before sudo
+alias sbrake='noglob sudo bundle exec rake' # altogether now ... 
+
+

From 741f6747e418229deec62ae2d19c776f6494e219 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 12:52:27 -0500
Subject: [PATCH 487/907] fix for pow plugin to default to current dir

---
 plugins/pow/pow.plugin.zsh | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 6b2a6f2be..da94b657b 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -1,10 +1,25 @@
-# Thanks to Christopher Sexton
+# Restart a rack app running under pow
+# http://pow.cx/
+#
+# Adds a kapow command that will restart an app
+#
+#   $ kapow myapp
+#   $ kapow # defaults to current directory
+#
+# Supports command completion.
+#
+# If you are not already using completion you might need to enable it with
+# 
+#    autoload -U compinit compinit
+#
+# Thanks also to Christopher Sexton
 # https://gist.github.com/965032
+#
 function kapow {
-	touch ~/.pow/$1/tmp/restart.txt
-	if [ $? -eq 0 ]; then
-		echo "$fg[yellow]Pow restarting $1...$reset_color"
-	fi
+	FOLDERNAME=$1
+	if [ -z "$FOLDERNAME" ]; then; FOLDERNAME=${PWD##*/}; fi
+	touch ~/.pow/$FOLDERNAME/tmp/restart.txt;
+	if [ $? -eq 0 ]; then; echo "pow: restarting $FOLDERNAME" ; fi
 }
 
 compctl -W ~/.pow -/ kapow

From c1a04eb61fcdd740bef52cd9da75fd72aeac3cf4 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 12:58:13 -0500
Subject: [PATCH 488/907] take in csexton's changes

https://gist.github.com/1019777/70dbb46db9bd5b346faf543a9dd4edac4782adda
---
 plugins/pow/pow.plugin.zsh | 45 +++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index da94b657b..08e5cf62f 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -4,7 +4,6 @@
 # Adds a kapow command that will restart an app
 #
 #   $ kapow myapp
-#   $ kapow # defaults to current directory
 #
 # Supports command completion.
 #
@@ -12,14 +11,40 @@
 # 
 #    autoload -U compinit compinit
 #
-# Thanks also to Christopher Sexton
-# https://gist.github.com/965032
+# Changes:
 #
-function kapow {
-	FOLDERNAME=$1
-	if [ -z "$FOLDERNAME" ]; then; FOLDERNAME=${PWD##*/}; fi
-	touch ~/.pow/$FOLDERNAME/tmp/restart.txt;
-	if [ $? -eq 0 ]; then; echo "pow: restarting $FOLDERNAME" ; fi
-}
+# Defaults to the current application, and will walk up the tree to find 
+# a config.ru file and restart the corresponding app
+#
+# Will Detect if a app does not exist in pow and print a (slightly) helpful 
+# error message
 
-compctl -W ~/.pow -/ kapow
+rack_root_detect(){
+  setopt chaselinks
+  local orgdir=$(pwd)
+  local basedir=$(pwd)
+
+  while [[ $basedir != '/' ]]; do
+    test -e "$basedir/config.ru" && break
+    builtin cd ".." 2>/dev/null
+    basedir="$(pwd)"
+  done
+
+  builtin cd $orgdir 2>/dev/null
+  [[ ${basedir} == "/" ]] && return 1
+  echo `basename $basedir | sed -E "s/.(com|net|org)//"`
+}
+kapow(){
+  local vhost=$1
+  [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
+  if [ ! -h ~/.pow/$vhost ]
+  then
+    echo "pow: This domain isn’t set up yet. Symlink your application to ${vhost} first."
+    return 1
+  fi
+
+  [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
+  touch ~/.pow/$vhost/tmp/restart.txt;
+  [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
+}
+compctl -W ~/.pow -/ kapow
\ No newline at end of file

From 36cd5ed1a59394827d6e9d38eca33b614790ded3 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 14:18:09 -0500
Subject: [PATCH 489/907] add alias to view the standard out (puts) from any
 pow app

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

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 08e5cf62f..5ab55ff1f 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -47,4 +47,7 @@ kapow(){
   touch ~/.pow/$vhost/tmp/restart.txt;
   [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
 }
-compctl -W ~/.pow -/ kapow
\ No newline at end of file
+compctl -W ~/.pow -/ kapow
+
+# View the standard out (puts) from any pow app
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file

From 3841da15d02e6d36310b9cc1ebd62502d0bf2135 Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 18:07:31 -0500
Subject: [PATCH 490/907] don't check for tmp dir

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

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 5ab55ff1f..0fbcf8c7b 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -43,7 +43,7 @@ kapow(){
     return 1
   fi
 
-  [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
+  # [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
   touch ~/.pow/$vhost/tmp/restart.txt;
   [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
 }

From f9b4356e0ed9e95890ce79c982dd5481ba7803aa Mon Sep 17 00:00:00 2001
From: John Antoni Griffiths <john@johnantoni.com>
Date: Wed, 18 Jan 2012 18:36:11 -0500
Subject: [PATCH 491/907] bug : stop creating those ~ directories add powit
 command to symlink an app if it hasn't been already

---
 plugins/pow/pow.plugin.zsh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
index 0fbcf8c7b..399a54cb0 100644
--- a/plugins/pow/pow.plugin.zsh
+++ b/plugins/pow/pow.plugin.zsh
@@ -34,6 +34,7 @@ rack_root_detect(){
   [[ ${basedir} == "/" ]] && return 1
   echo `basename $basedir | sed -E "s/.(com|net|org)//"`
 }
+
 kapow(){
   local vhost=$1
   [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
@@ -43,11 +44,23 @@ kapow(){
     return 1
   fi
 
-  # [ ! -d "~/.pow/${vhost}/tmp" ] &&  mkdir -p "~/.pow/$vhost/tmp"
+  [ ! -d ~/.pow/${vhost}/tmp ] && mkdir -p ~/.pow/$vhost/tmp
   touch ~/.pow/$vhost/tmp/restart.txt;
   [ $? -eq 0 ] &&  echo "pow: restarting $vhost.dev"
 }
 compctl -W ~/.pow -/ kapow
 
+powit(){
+	local basedir=$(pwd)
+  local vhost=$1
+  [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
+  if [ ! -h ~/.pow/$vhost ]
+	then
+		echo "pow: Symlinking your app with pow. ${vhost}"
+	  [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
+    return 1
+  fi
+}
+
 # View the standard out (puts) from any pow app
-alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
\ No newline at end of file
+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"

From 5f95d018e89e886615c82bc180e7e70457188c9b Mon Sep 17 00:00:00 2001
From: lepht <pete.clark@gmail.com>
Date: Wed, 18 Jan 2012 20:29:31 -0500
Subject: [PATCH 492/907] Updated to latest version of taskwarrior completions
 (using Taskwarrior 2.0b4)

---
 plugins/taskwarrior/_task | 160 +++++++++++++++-----------------------
 1 file changed, 64 insertions(+), 96 deletions(-)

diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
index 5bffa9119..0bda738bb 100644
--- a/plugins/taskwarrior/_task
+++ b/plugins/taskwarrior/_task
@@ -1,37 +1,37 @@
 #compdef task
-#
 # zsh completion for taskwarrior
 #
+# taskwarrior - a command line task list manager.
+#
 # Copyright 2010 - 2011 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
-# All rights reserved.
 #
-# This script is part of the taskwarrior project.
+# 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:
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
+# 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.
 #
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the
-#
-#     Free Software Foundation, Inc.,
-#     51 Franklin Street, Fifth Floor,
-#     Boston, MA
-#     02110-1301
-#     USA
+# http://www.opensource.org/licenses/mit-license.php
 #
 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
 _task_projects=($(task _projects))
 _task_tags=($(task _tags))
 _task_ids=($(task _ids))
 _task_config=($(task _config))
+_task_columns=($(task _columns))
 _task_modifiers=(
 	'before' \
 	'after' \
@@ -46,39 +46,19 @@ _task_modifiers=(
 	'word' \
 	'noword'
 )
+_task_conjunctions=(
+   'and' \
+   'or' \
+	'xor' \
+	'\)'
+	'\('
+)
 _task_cmds=($(task _commands))
 _task_zshcmds=( ${(f)"$(task _zshcommands)"} )
 
-
-_task_idCmds=(
-	'append' \
-	'prepend' \
-	'annotate' \
-	'denotate' \
-	'edit' \
-	'duplicate' \
-	'info' \
-	'start' \
-	'stop' \
-	'done'
-)
-
-_task_idCmdsDesc=(
-	'append:Appends more description to an existing task.' \
-	'prepend:Prepends more description to an existing task.' \
-	'annotate:Adds an annotation to an existing task.' \
-	'denotate:Deletes an annotation of an existing task.' \
-	'edit:Launches an editor to let you modify a task directly.' \
-	'duplicate:Duplicates the specified task, and allows modifications.' \
-	'info:Shows all data, metadata for specified task.' \
-	'start:Marks specified task as started.' \
-	'stop:Removes the start time from a task.' \
-	'done:Marks the specified task as completed.'
-)
-
 _task() {
     _arguments -s -S \
-        "*::task command:_task_commands"
+        "*::task default:_task_default"
     return 0
 }
 
@@ -148,6 +128,7 @@ _regex_words values 'task frequencies' \
 	'weekly:Every week' \
 	'biweekly:Every two weeks' \
 	'fortnight:Every two weeks' \
++ 'monthly:Every month' \
 	'quarterly:Every three months' \
 	'semiannual:Every six months' \
 	'annual:Every year' \
@@ -196,22 +177,13 @@ _regex_arguments _task_attributes "${args[@]}"
 
 ## task commands
 
-# default completion
-(( $+functions[_task_default] )) ||
-_task_default() {
+# filter completion
+(( $+functions[_task_filter] )) ||
+_task_filter() {
 	_task_attributes "$@"
-}
 
-# commands expecting an ID
-(( $+functions[_task_id] )) ||
-_task_id() {
-	if (( CURRENT < 3 )); then
-		# update IDs
-		_task_zshids=( ${(f)"$(task _zshids)"} )
-		_describe -t values 'task IDs' _task_zshids
-	else
-		_task_attributes "$@"
-	fi
+	# TODO complete conjunctions only if the previous word is a filter expression, i.e. attribute, ID, any non-command
+	_describe -t default 'task conjunctions' _task_conjunctions
 }
 
 # merge completion
@@ -235,46 +207,42 @@ _task_pull() {
 	_files
 }
 
+# execute completion
+(( $+functions[_task_execute] )) ||
+_task_execute() {
+	_files
+}
 
-# modify (task [0-9]* ...) completion
-(( $+functions[_task_modify] )) ||
-_task_modify() {
-	_describe -t commands 'task command' _task_idCmdsDesc
-	_task_attributes "$@"
+# id-only completion
+(( $+functions[_task_id] )) ||
+_task_id() {
+	_describe -t values 'task IDs' _task_zshids
 }
 
 ## first level completion => task sub-command completion
-(( $+functions[_task_commands] )) ||
-_task_commands() {
+(( $+functions[_task_default] )) ||
+_task_default() {
     local cmd ret=1
-	if (( CURRENT == 1 )); then
-		# update IDs
-		_task_zshids=( ${(f)"$(task _zshids)"} )
 
-		_describe -t commands 'task command' _task_zshcmds
-		_describe -t values 'task IDs' _task_zshids
-		# TODO match more than one ID
-	elif [[ $words[1] =~ ^[0-9]*$ ]] then
-		 _call_function ret _task_modify
-		 return ret
-	else
-#        local curcontext="${curcontext}"
-#        cmd="${_task_cmds[(r)$words[1]:*]%%:*}"
-		  cmd="${_task_cmds[(r)$words[1]]}"
-		  idCmd="${(M)_task_idCmds[@]:#$words[1]}"
-        if (( $#cmd )); then
-#            curcontext="${curcontext%:*:*}:task-${cmd}"
+	integer i=1
+	while (( i < $#words ))
+	do
+		cmd="${_task_cmds[(r)$words[$i]]}"
+		if (( $#cmd )); then
+			_call_function ret _task_${cmd} ||
+				_call_function ret _task_filter ||
+					_message "No command remaining."
+			return ret
+		fi
+		(( i++ ))
+	done
 
-				if (( $#idCmd )); then
-					_call_function ret _task_id
-				else
-					_call_function ret _task_${cmd} ||
-						_call_function ret _task_default ||
-							_message "No command remaining."
-				fi
-        else
-            _message "Unknown subcommand ${cmd}"
-        fi
-        return ret
-    fi
+	# update IDs
+	_task_zshids=( ${(f)"$(task _zshids)"} )
+
+	_describe -t commands 'task command' _task_zshcmds
+	_describe -t values 'task IDs' _task_zshids
+	_call_function ret _task_filter
+
+	return ret
 }

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

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

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

From 62a3ef643328a05c11a62cd42de12cf271ca1e69 Mon Sep 17 00:00:00 2001
From: "Steven G. Harms" <github@sgharms.oib.com>
Date: Sat, 21 Jan 2012 13:24:07 -0800
Subject: [PATCH 494/907] Grammar update

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

diff --git a/README.textile b/README.textile
index eca968089..bf6776665 100644
--- a/README.textile
+++ b/README.textile
@@ -56,7 +56,7 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
 h3. Customization
 
 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
-If you have many functions which go good together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
+If you have many functions which go well together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
 If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
 
 

From e0b235608032256f5b725676f7c6217480a52722 Mon Sep 17 00:00:00 2001
From: Tate Johnson <tate@tatey.com>
Date: Sun, 22 Jan 2012 21:34:25 +1000
Subject: [PATCH 495/907] Add middleman to bundled commands

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

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

From 6496acf58bf8531809490b52e34811f74a27cc7c Mon Sep 17 00:00:00 2001
From: Brent Faulkner <brent.faulkner@mosaic.com>
Date: Mon, 23 Jan 2012 20:42:54 -0500
Subject: [PATCH 496/907] adding rbenv support to all the rvm themes

---
 themes/alanpeabody.zsh-theme   | 10 ++++++++--
 themes/bira.zsh-theme          |  9 ++++++++-
 themes/crunch.zsh-theme        |  8 +++++++-
 themes/dallas.zsh-theme        |  8 +++++++-
 themes/eastwood.zsh-theme      |  4 ++++
 themes/fino.zsh-theme          |  9 ++++++++-
 themes/gallois.zsh-theme       |  6 +++++-
 themes/jonathan.zsh-theme      |  4 ++--
 themes/josh.zsh-theme          |  4 ++--
 themes/macovsky-ruby.zsh-theme |  9 ++++++++-
 themes/macovsky.zsh-theme      |  8 +++++++-
 themes/murilasso.zsh-theme     |  2 +-
 themes/nebirhos.zsh-theme      |  4 ++++
 themes/superjarin.zsh-theme    |  8 +++++++-
 themes/suvash.zsh-theme        |  9 ++++++++-
 themes/wuffers.zsh-theme       |  2 +-
 themes/zhann.zsh-theme         | 10 +++++++++-
 17 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody.zsh-theme
index 1f66f1ec3..4a1b1b386 100644
--- a/themes/alanpeabody.zsh-theme
+++ b/themes/alanpeabody.zsh-theme
@@ -1,7 +1,14 @@
 
 local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
 local pwd='%{$fg[blue]%}%~%{$reset_color%}'
-local rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+local rvm=''
+if which rvm-prompt &> /dev/null; then
+  rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm='%{$fg[green]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
+  fi
+fi
 local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
 local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
 
@@ -19,4 +26,3 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
 
 PROMPT="${user} ${pwd}$ "
 RPROMPT="${return_code} ${git_branch} ${rvm}"
-
diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index 5642eaeb8..215720477 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -3,7 +3,14 @@ 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='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$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 git_branch='$(git_prompt_info)%{$reset_color%}'
 
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
index 2473cd230..b2759a1b0 100644
--- a/themes/crunch.zsh-theme
+++ b/themes/crunch.zsh-theme
@@ -29,7 +29,13 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
 
 # Our elements:
 CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
-CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
+if which rvm-prompt &> /dev/null; then
+  CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
+else
+  if which rbenv &> /dev/null; then
+    CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(rbenv version | sed -e 's/ (set.*$//' -e 's/^ruby-//')}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
+  fi
+fi
 CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
 CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
 
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
index eef32e998..e9b4f852a 100644
--- a/themes/dallas.zsh-theme
+++ b/themes/dallas.zsh-theme
@@ -3,7 +3,13 @@
 # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
 DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
-DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
+if which rvm-prompt &> /dev/null; then
+  DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
+else
+  if which rbenv &> /dev/null; then
+    DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}"
+  fi
+fi
 # Grab the current machine name: muscato
 DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
 # Grab the current filepath, use shortcuts: ~/Desktop
diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
index 83664515a..db2529990 100644
--- a/themes/eastwood.zsh-theme
+++ b/themes/eastwood.zsh-theme
@@ -1,6 +1,10 @@
 #RVM settings
 if [[ -s ~/.rvm/scripts/rvm ]] ; then 
   RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
+else
+  if which rbenv &> /dev/null; then
+    RPS1="%{$fg[yellow]%}rbenv:%{$reset_color%}%{$fg[red]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$reset_color%} $EPS1"
+  fi
 fi
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 17cf59708..26e547176 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -25,7 +25,14 @@ function box_name {
 }
 
 
-local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+local rvm_ruby=''
+if which rvm-prompt &> /dev/null; then
+  rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm_ruby='‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
+  fi
+fi
 local current_dir='${PWD/#$HOME/~}'
 local git_info='$(git_prompt_info)'
 
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index f9406dd96..3eac14867 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -15,7 +15,11 @@ git_custom_status() {
 if [[ -s ~/.rvm/scripts/rvm ]] ; then 
   RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
 else
-  RPS1='$(git_custom_status) $EPS1'
+  if which rbenv &> /dev/null; then
+    RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
+  else
+    RPS1='$(git_custom_status) $EPS1'
+  fi
 fi
 
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index a170a13d0..2f0c4b917 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -10,7 +10,7 @@ function theme_precmd {
     PR_PWDLEN=""
 
     local promptsize=${#${(%):---(%n@%m:%l)---()--}}
-    local rubyprompt=`rvm_prompt_info`
+    local rubyprompt=`rvm_prompt_info || rbenv_prompt_info`
     local rubypromptsize=${#${rubyprompt}}
     local pwdsize=${#${(%):-%~}}
 
@@ -113,7 +113,7 @@ setprompt () {
     PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
 $PR_GREEN%$PR_PWDLEN<...<%~%<<\
-$PR_GREY)`rvm_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
+$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
 $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
 $PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
 
diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index 6bed1a70e..142e76838 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -10,7 +10,7 @@ function josh_prompt {
   prompt=" "
 
   branch=$(current_branch)
-  ruby_version=$(rvm_prompt_info)
+  ruby_version=$(rvm_prompt_info || rbenv_prompt_info)
   path_size=${#PWD}
   branch_size=${#branch}
   ruby_size=${#ruby_version}
@@ -31,7 +31,7 @@ function josh_prompt {
     prompt=" $prompt"
   done
   
-  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_prompt_info)"
   
   echo $prompt
 }
diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby.zsh-theme
index 4eb410233..045376761 100644
--- a/themes/macovsky-ruby.zsh-theme
+++ b/themes/macovsky-ruby.zsh-theme
@@ -1,7 +1,14 @@
 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+if which rvm-prompt &> /dev/null; then
+  PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+else
+  if which rbenv &> /dev/null; then
+    PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+  fi
+fi
+
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme
index 4eb410233..b6978b929 100644
--- a/themes/macovsky.zsh-theme
+++ b/themes/macovsky.zsh-theme
@@ -1,7 +1,13 @@
 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+if which rvm-prompt &> /dev/null; then
+  PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+else
+  if which rbenv &> /dev/null; then
+    PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
+  fi
+fi
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
diff --git a/themes/murilasso.zsh-theme b/themes/murilasso.zsh-theme
index 310357b45..bc2b9b224 100644
--- a/themes/murilasso.zsh-theme
+++ b/themes/murilasso.zsh-theme
@@ -1,7 +1,7 @@
 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='%{$fg[red]%}$(rvm_prompt_info)%{$reset_color%}'
+local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}'
 local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
 
 PROMPT="${user_host}:${current_dir} ${rvm_ruby}
diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme
index c49df972e..c5864d9b8 100644
--- a/themes/nebirhos.zsh-theme
+++ b/themes/nebirhos.zsh-theme
@@ -4,6 +4,10 @@
 # Get the current ruby version in use with RVM:
 if [ -e ~/.rvm/bin/rvm-prompt ]; then
     RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} "
+else
+  if which rbenv &> /dev/null; then
+    RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
+  fi
 fi
 
 # Get the host name (first 4 chars)
diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
index 16eeb5316..0be816de0 100644
--- a/themes/superjarin.zsh-theme
+++ b/themes/superjarin.zsh-theme
@@ -1,5 +1,11 @@
 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
-JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
+if which rvm-prompt &> /dev/null; 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 filepath, use shortcuts: ~/Desktop
 # Append the current git branch, if in a git repository
diff --git a/themes/suvash.zsh-theme b/themes/suvash.zsh-theme
index f50657db2..c87f64558 100644
--- a/themes/suvash.zsh-theme
+++ b/themes/suvash.zsh-theme
@@ -12,8 +12,15 @@ function collapse_pwd {
     echo $(pwd | sed -e "s,^$HOME,~,")
 }
 
-PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) using %{$reset_color%}%{$fg[red]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
+if which rvm-prompt &> /dev/null; then
+  PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) using %{$reset_color%}%{$fg[red]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} 
 $(virtualenv_info)$(prompt_char) '
+else
+  if which rbenv &> /dev/null; then
+    PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) using %{$reset_color%}%{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%} 
+$(virtualenv_info)$(prompt_char) '
+  fi
+fi
 
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
diff --git a/themes/wuffers.zsh-theme b/themes/wuffers.zsh-theme
index 182d8a34f..4019d0a51 100644
--- a/themes/wuffers.zsh-theme
+++ b/themes/wuffers.zsh-theme
@@ -2,4 +2,4 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} x%{$fg_bold[blue]%}"
 
-PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '
+PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current 2>/dev/null || rbenv version-name 2>/dev/null)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '
diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 3dff29c9c..574e0cec3 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -1,5 +1,13 @@
 PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
+
+if which rvm-prompt &> /dev/null; then
+  RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
+else
+  if which rbenv &> /dev/null; then
+    RPROMPT='%{$reset_color%} %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//") %{$reset_color%}'
+  fi
+fi
+
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From a26f9b9948405a10d3c04280a0ad2e49e69ba6f8 Mon Sep 17 00:00:00 2001
From: Alexander Greim <alexxx@iltempo.de>
Date: Wed, 25 Jan 2012 06:56:09 +0100
Subject: [PATCH 497/907] adding engine yard command (ey) to bundler binstubs

---
 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 96c649664..5e9b82336 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber ey foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
 
 ## Functions
 

From 0da18650c6d8f63c230c36e92786855361f42ef3 Mon Sep 17 00:00:00 2001
From: Wim Griffioen <wgriffioen@gmail.com>
Date: Thu, 26 Jan 2012 19:31:45 +0100
Subject: [PATCH 498/907] added rails to bundled_commands

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

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

From 52733cb3bb0b1c85230c5c69e6c7231fb41c67fe Mon Sep 17 00:00:00 2001
From: Tadaya Tsuyukubo <ttsuyukubo@adconion.com>
Date: Thu, 26 Jan 2012 15:20:08 -0800
Subject: [PATCH 499/907] prompt git-remove as deleted

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

diff --git a/lib/git.zsh b/lib/git.zsh
index defa062c6..9c89c3664 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -54,6 +54,8 @@ git_prompt_status() {
   fi
   if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi

From 35d89ab85991e9a6dc055d0fd790b50c1aaa0cce Mon Sep 17 00:00:00 2001
From: szetobo <szetobo@gmail.com>
Date: Fri, 27 Jan 2012 08:50:28 +0800
Subject: [PATCH 500/907] update rails runner alias to ru

- avoid rr as it is mostly used for restart rails server
---
 plugins/rails3/rails3.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index a817b483f..52fdf43e9 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -14,7 +14,7 @@ alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
 alias rp='_rails_command plugin'
-alias rr='_rails_command runner'
+alias ru='_rails_command runner'
 alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'

From 8769e5f8c959f3d3fc9e5b62ab48fc0f73aedb1f Mon Sep 17 00:00:00 2001
From: Carlos Rodriguez <carlos@eddorre.com>
Date: Thu, 26 Jan 2012 23:19:50 -0800
Subject: [PATCH 501/907] Removed trailing spaces in Git files. Fixes #867

---
 lib/git.zsh                | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index defa062c6..4d1634e8b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -61,4 +61,4 @@ git_prompt_status() {
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   echo $STATUS
-}
+}
\ No newline at end of file
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 94af31202..e1d682508 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -60,4 +60,4 @@ compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
+compdef ggpnp=git
\ No newline at end of file

From 8f89d4d5a5d584bae288d8111d83a6489a1369dc Mon Sep 17 00:00:00 2001
From: Darren Clark <djcdude@gmail.com>
Date: Fri, 27 Jan 2012 01:20:06 -0700
Subject: [PATCH 502/907] Fixed Mac OS X Terminal.app related issue with extra
 newlines being printed out sometimes

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

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 221989502..6601cbcb8 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -6,6 +6,8 @@ function title {
   [ "$DISABLE_AUTO_TITLE" != "true" ] || return
   if [[ "$TERM" == screen* ]]; then
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
+  elif [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+    print -Pn "\e]1;$1:q\a" #set icon (=tab) name (will override window name on broken terminal)
   elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$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)

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

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

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

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

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

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

From dc4d7a92c1a56509ed116a3ea44345f556c4f91b Mon Sep 17 00:00:00 2001
From: Aleksey Orekhov <ao2391@columbia.edu>
Date: Wed, 8 Feb 2012 15:19:12 -0500
Subject: [PATCH 505/907] fixed asterisk display for modified repos in git
 prior to 1.7.2

---
 lib/git.zsh | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 4d1634e8b..c46aa608d 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -4,15 +4,21 @@ function git_prompt_info() {
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
+
 # Checks if working tree is dirty
 parse_git_dirty() {
-  if [[ -n $(git status -s --ignore-submodules=dirty 2> /dev/null) ]]; then
+  local SUBMODULE_SYNTAX=''
+  if [[ PRE_1_7_2_GIT -gt 0 ]]; then
+        SUBMODULE_SYNTAX="--ignore-submodules=dirty"
+  fi
+  if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi
 }
 
+
 # Checks if there are commits ahead from remote
 function git_prompt_ahead() {
   if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
@@ -61,4 +67,30 @@ git_prompt_status() {
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   echo $STATUS
-}
\ No newline at end of file
+}
+
+#this is unlikely to change so make it all statically assigned
+PRE_1_7_2_GIT=$(git_compare_version "1.7.2")
+#clean up the namespace slightly by removing the checker function
+unset -f git_compare_version()
+
+#compare the provided version of git to the version installed and on path
+#prints 1 if input version <= installed version
+#prints -1 otherwise 
+function git_compare_version() {
+  local INPUT_GIT_VERSION=$1;
+  local INSTALLED_GIT_VERSION
+  INPUT_GIT_VERSION=(${(s/./)INPUT_GIT_VERSION});
+  INSTALLED_GIT_VERSION=($(git --version));
+  INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]});
+
+  for i in {1..3}; do
+    if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then
+      echo -1
+      return 0
+    fi
+  done
+  echo 1
+}
+
+

From 7ea758834baa2694c2e9301fed1a71faa9f12166 Mon Sep 17 00:00:00 2001
From: Aleksey Orekhov <ao2391@columbia.edu>
Date: Wed, 8 Feb 2012 15:25:12 -0500
Subject: [PATCH 506/907] changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to
 make it more accurate

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

diff --git a/lib/git.zsh b/lib/git.zsh
index c46aa608d..efaa943ff 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -8,7 +8,7 @@ function git_prompt_info() {
 # Checks if working tree is dirty
 parse_git_dirty() {
   local SUBMODULE_SYNTAX=''
-  if [[ PRE_1_7_2_GIT -gt 0 ]]; then
+  if [[ POST_1_7_2_GIT -gt 0 ]]; then
         SUBMODULE_SYNTAX="--ignore-submodules=dirty"
   fi
   if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then
@@ -70,7 +70,7 @@ git_prompt_status() {
 }
 
 #this is unlikely to change so make it all statically assigned
-PRE_1_7_2_GIT=$(git_compare_version "1.7.2")
+POST_1_7_2_GIT=$(git_compare_version "1.7.2")
 #clean up the namespace slightly by removing the checker function
 unset -f git_compare_version()
 

From a9f6aed307f128a58176b151bc36854c9d3899f7 Mon Sep 17 00:00:00 2001
From: Aleksey Orekhov <ao2391@columbia.edu>
Date: Wed, 8 Feb 2012 15:30:58 -0500
Subject: [PATCH 507/907] fixed introduced to parse_git_dirty

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

diff --git a/lib/git.zsh b/lib/git.zsh
index efaa943ff..d90f0f315 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -8,7 +8,7 @@ function git_prompt_info() {
 # Checks if working tree is dirty
 parse_git_dirty() {
   local SUBMODULE_SYNTAX=''
-  if [[ POST_1_7_2_GIT -gt 0 ]]; then
+  if [[ $POST_1_7_2_GIT -gt 0 ]]; then
         SUBMODULE_SYNTAX="--ignore-submodules=dirty"
   fi
   if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then

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

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

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

From 8f8767a566b24ba62cfa73a7aa4b12a95a1af285 Mon Sep 17 00:00:00 2001
From: Douglas Creager <douglas.creager@redjack.com>
Date: Fri, 17 Feb 2012 16:56:09 -0500
Subject: [PATCH 509/907] blinks theme works with light and dark Solarized

The blinks theme now looks good if you're using the light version of the
Solarized color scheme, too.  It still defaults to the dark version, so
it should work as before if you don't override things.  If you're using
the light version, just set SOLARIZED_THEME to "light" before sourcing
oh-my-zsh.
---
 themes/blinks.zsh-theme | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/themes/blinks.zsh-theme b/themes/blinks.zsh-theme
index 3db7012f4..ddb32f7c3 100644
--- a/themes/blinks.zsh-theme
+++ b/themes/blinks.zsh-theme
@@ -8,13 +8,23 @@ function _prompt_char() {
   fi
 }
 
+# This theme works with both the "dark" and "light" variants of the
+# Solarized color schema.  Set the SOLARIZED_THEME variable to one of
+# these two values to choose.  If you don't specify, we'll assume you're
+# using the "dark" variant.
+
+case ${SOLARIZED_THEME:-dark} in
+    light) bkg=white;;
+    *)     bkg=black;;
+esac
+
 ZSH_THEME_GIT_PROMPT_PREFIX=" [%{%B%F{blue}%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{%f%k%b%K{black}%B%F{green}%}]"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{%f%k%b%K{${bkg}}%B%F{green}%}]"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{%F{red}%}*%{%f%k%b%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 PROMPT='%{%f%k%b%}
-%{%K{black}%B%F{green}%}%n%{%B%F{blue}%}@%{%B%F{cyan}%}%m%{%B%F{green}%} %{%b%F{yellow}%K{black}%}%~%{%B%F{green}%}$(git_prompt_info)%E%{%f%k%b%}
-%{%K{black}%}$(_prompt_char)%{%K{black}%} %#%{%f%k%b%} '
+%{%K{${bkg}}%B%F{green}%}%n%{%B%F{blue}%}@%{%B%F{cyan}%}%m%{%B%F{green}%} %{%b%F{yellow}%K{${bkg}}%}%~%{%B%F{green}%}$(git_prompt_info)%E%{%f%k%b%}
+%{%K{${bkg}}%}$(_prompt_char)%{%K{${bkg}}%} %#%{%f%k%b%} '
 
 RPROMPT='!%{%B%F{cyan}%}%!%{%f%k%b%}'

From 5a5c93b33493b47d34dd470eb851aaf24fa87536 Mon Sep 17 00:00:00 2001
From: cruser42 <ao2391@columbia.edu>
Date: Tue, 21 Feb 2012 10:47:05 -0500
Subject: [PATCH 510/907] Fixed bug introduced when fixing issue 896

---
 lib/git.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index d90f0f315..fb4ad8ca6 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -69,11 +69,6 @@ git_prompt_status() {
   echo $STATUS
 }
 
-#this is unlikely to change so make it all statically assigned
-POST_1_7_2_GIT=$(git_compare_version "1.7.2")
-#clean up the namespace slightly by removing the checker function
-unset -f git_compare_version()
-
 #compare the provided version of git to the version installed and on path
 #prints 1 if input version <= installed version
 #prints -1 otherwise 
@@ -93,4 +88,9 @@ function git_compare_version() {
   echo 1
 }
 
+#this is unlikely to change so make it all statically assigned
+POST_1_7_2_GIT=$(git_compare_version "1.7.2")
+#clean up the namespace slightly by removing the checker function
+unset -f git_compare_version
+
 

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

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

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

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

From d693711f1419c4c4da1da8eca35c1d983bb42ab0 Mon Sep 17 00:00:00 2001
From: Alex Light <scialexlight@gmail.com>
Date: Tue, 28 Feb 2012 13:52:57 -0500
Subject: [PATCH 512/907] made the 'd' alias only show the directories that can
 be cd'ed to using the number aliases

---
 lib/directories.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index bb114f615..a787db9eb 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -36,9 +36,9 @@ cd () {
 
 alias md='mkdir -p'
 alias rd=rmdir
-alias d='dirs -v'
+alias d='dirs -v | head -10'
 
 # mkdir & cd to it
 function mcd() { 
   mkdir -p "$1" && cd "$1"; 
-}
\ No newline at end of file
+}

From f8802bd61216b7636b9065efe5441479d3e4f7fd Mon Sep 17 00:00:00 2001
From: Rotem Yaari <vmalloc@gmail.com>
Date: Thu, 26 Jan 2012 22:25:51 +0200
Subject: [PATCH 513/907] Add dircycle plugin: enables cycling through the
 directory stack

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

diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
new file mode 100644
index 000000000..46a0ab268
--- /dev/null
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -0,0 +1,10 @@
+##
+# dircycle plugin: enables cycling through the directory
+# stack using Ctrl+Shift+Left/Right
+
+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 }"
+zle -N insert-cycledright
+bindkey "\e[1;6C" insert-cycledright

From 19bf83e17d90d64b9bb40f8fd4c36e660e4b17e3 Mon Sep 17 00:00:00 2001
From: Rotem Yaari <vmalloc@gmail.com>
Date: Sun, 29 Jan 2012 16:41:40 +0200
Subject: [PATCH 514/907] Pager is 'less -R' to support colored outputs

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

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 88732e664..0f7e7e925 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -9,5 +9,5 @@ bindkey "^[m" copy-prev-shell-word
 setopt long_list_jobs
 
 ## pager
-export PAGER=less
+export PAGER="less -R"
 export LC_CTYPE=$LANG

From b1e4ef17543d4a236ad35417ac36560917e6cadc Mon Sep 17 00:00:00 2001
From: pomaxa <pomaxa@ambergames.com>
Date: Thu, 1 Mar 2012 16:57:00 +0200
Subject: [PATCH 515/907] current repository action

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e1d682508..d3d3f702a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -54,10 +54,16 @@ function current_branch() {
   echo ${ref#refs/heads/}
 }
 
+function current_repository() {
+
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo $(git remote -v | cut -d':' -f 2)
+}
+
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
\ No newline at end of file
+compdef ggpnp=git

From 09c5996cd0528eb03a93dd464f3cbd755eafd624 Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Mon, 5 Mar 2012 21:36:50 +0800
Subject: [PATCH 516/907] Added kafeitu theme it modified by robbyrussell

---
 kafeitu.zsh-theme | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 kafeitu.zsh-theme

diff --git a/kafeitu.zsh-theme b/kafeitu.zsh-theme
new file mode 100644
index 000000000..60c0303b9
--- /dev/null
+++ b/kafeitu.zsh-theme
@@ -0,0 +1,6 @@
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n %{$fg[blue]%}%D{[%I:%M:%S]} %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

From c1e9d9226c106aaf973712b1a700dd045aeff9bc Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Mon, 5 Mar 2012 21:39:09 +0800
Subject: [PATCH 517/907] move kafeitu.zsh-theme to themes folder

---
 kafeitu.zsh-theme => themes/kafeitu.zsh-theme | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename kafeitu.zsh-theme => themes/kafeitu.zsh-theme (100%)

diff --git a/kafeitu.zsh-theme b/themes/kafeitu.zsh-theme
similarity index 100%
rename from kafeitu.zsh-theme
rename to themes/kafeitu.zsh-theme

From bd4f1eeca2d1430029153f7be0aa432ef5d2fce9 Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Tue, 6 Mar 2012 14:09:11 +0800
Subject: [PATCH 518/907] =?UTF-8?q?add=20hostname=20behind=20username,=20e?=
 =?UTF-8?q?xample:=20henryyan=20[02:07:20]=20=20~/.oh-my-zsh=20git:(master?=
 =?UTF-8?q?)=20=E2=9C=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/themes/kafeitu.zsh-theme b/themes/kafeitu.zsh-theme
index 60c0303b9..18e941601 100644
--- a/themes/kafeitu.zsh-theme
+++ b/themes/kafeitu.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n %{$fg[blue]%}%D{[%I:%M:%S]} %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[blue]%}@%{$fg_bold[green]%}%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From 7ffc3e745fa7ab020ec45e4ffe7a069c823e386a Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Tue, 6 Mar 2012 14:14:17 +0800
Subject: [PATCH 519/907] change color of @ to cyan

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

diff --git a/themes/kafeitu.zsh-theme b/themes/kafeitu.zsh-theme
index 18e941601..a89a899aa 100644
--- a/themes/kafeitu.zsh-theme
+++ b/themes/kafeitu.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[blue]%}@%{$fg_bold[green]%}%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From c7105a53416866e8315c503546dc5bfe2b9da83f Mon Sep 17 00:00:00 2001
From: Jeffrey Dileo <jtdileo@gmail.com>
Date: Wed, 7 Mar 2012 07:47:34 -0500
Subject: [PATCH 520/907] Disabled title function for emacs term mode

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

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 221989502..e26fef6d3 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -3,7 +3,9 @@
 #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 {
-  [ "$DISABLE_AUTO_TITLE" != "true" ] || return
+  if [[ "$DISABLE_AUTO_TITLE" == "true" ]] || [[ "$EMACS" == *term* ]]; then
+    return
+  fi
   if [[ "$TERM" == screen* ]]; then
     print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars
   elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then

From 814ecfc60daffc1eac250d41643d05fb1f43bd4c Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Wed, 7 Mar 2012 23:52:51 +0800
Subject: [PATCH 521/907] delete time filed

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

diff --git a/themes/kafeitu.zsh-theme b/themes/kafeitu.zsh-theme
index a89a899aa..c4720b24d 100644
--- a/themes/kafeitu.zsh-theme
+++ b/themes/kafeitu.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

From db27635d8b4cb60f4d3594893e53777179d00d43 Mon Sep 17 00:00:00 2001
From: Vitaliy Yanchuk <fuksito@gmail.com>
Date: Fri, 16 Mar 2012 14:10:37 +0200
Subject: [PATCH 522/907] Plugin for encoding strings into base64 and decoding
 them

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

diff --git a/plugins/encode64/encode64.plugin.zsh b/plugins/encode64/encode64.plugin.zsh
new file mode 100644
index 000000000..cfb7c6a18
--- /dev/null
+++ b/plugins/encode64/encode64.plugin.zsh
@@ -0,0 +1,2 @@
+encode64(){ echo -n $1 | base64 }
+decode64(){ echo -n $1 | base64 -D }
\ No newline at end of file

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

Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
---
 lib/key-bindings.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 5c1b90bfa..5f499f3e8 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -3,7 +3,6 @@
 bindkey -e
 bindkey '\ew' kill-region
 bindkey -s '\el' "ls\n"
-bindkey -s '\e.' "..\n"
 bindkey '^r' history-incremental-search-backward
 bindkey "^[[5~" up-line-or-history
 bindkey "^[[6~" down-line-or-history

From 605ad8725b06cc15f8523404f59060b6a71bb7a2 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Tue, 20 Mar 2012 02:25:21 +0100
Subject: [PATCH 524/907] Add a cat smilie as alias for cat

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

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index e455527e7..e53688763 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -5,6 +5,7 @@ alias wtf='dmesg'
 alias onoz='cat /var/log/errors.log'
 alias rtfm='man'
 
+alias :3='echo'
 alias visible='echo'
 alias invisible='cat'
 alias moar='more'

From 60c3fa937120f38b1215a57889c8207989c9a7f1 Mon Sep 17 00:00:00 2001
From: dir01 <dir01@dir01.org>
Date: Thu, 22 Mar 2012 04:34:19 +0700
Subject: [PATCH 525/907] Python plugin: added pygrep command, simplified
 pyclean

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

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 3ea34d718..8be3cd863 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -2,4 +2,7 @@
 alias pyfind='find . -name "*.py"'
 
 # Remove python compiled byte-code
-alias pyclean='find . -type f -name "*.py[co]" -exec rm -f \{\} \;'
+alias pyclean='find . -type f -name "*.py[co]" -delete'
+
+# Grep among .py files
+alias pygrep='grep --include="*.py"'

From e9feccf6a94f9f5238ff0b3501f62575d14ae148 Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Thu, 22 Mar 2012 09:33:55 +0800
Subject: [PATCH 526/907] add maven plugin

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

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
new file mode 100644
index 000000000..8c87d3afe
--- /dev/null
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -0,0 +1,6 @@
+function listMavenCompletions {
+reply=(
+cli:execute cli:execute-phase archetype:generate generate-sources compile clean install test test-compile deploy package cobertura:cobertura jetty:run gwt:run gwt:debug -DskipTests -Dmaven.test.skip=true -Dtest= `if [ -d ./src ] ; then find ./src -type f | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`);
+}
+
+compctl -K listMavenCompletions mvn

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

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

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

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

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

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

From dc3074309555965e47b604499ca64a1489f639ed Mon Sep 17 00:00:00 2001
From: Peter Tillemans <pti@snamellit.com>
Date: Wed, 4 Apr 2012 19:52:14 +0200
Subject: [PATCH 529/907] Added subcommands for leiningen 1.7.0

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

diff --git a/plugins/lein/lein.plugin.zsh b/plugins/lein/lein.plugin.zsh
index 19af3556a..11c92979b 100644
--- a/plugins/lein/lein.plugin.zsh
+++ b/plugins/lein/lein.plugin.zsh
@@ -5,15 +5,29 @@ function _lein_commands() {
     case $state in
       subcommand)
         subcommands=(
+          "classpath:print the classpath of the current project"
           "clean:remove compiled files and dependencies from project"
           "compile:ahead-of-time compile the project"
+          "deploy:build jar and deploy to remote repository"
           "deps:download and install all dependencies"
           "help:display a list of tasks or help for a given task"
           "install:install the project and its dependencies in your local repository"
+          "int:enter an interactive task shell"
+          "interactive:enter an interactive task shell"
+          "jack-in:jack in to a clojure slime session from emacs."
           "jar:create a jar file containing the compiled .class files"
+          "javac:compile java source files"
           "new:create a new project skeleton"
+          "plugin:manage user-level plugins"
           "pom:write a pom.xml file to disk for maven interop"
+          "repl:start a repl session either with the current project or standalone"
+          "retest:run only the test namespaces which failed last time around"
+          "run:run the project's -main function"
+          "search:search remote maven repositories for matching jars"
+          "swank:launch swank server for Emacs to connect"
           "test:run the project's tests"
+          "test!:run a project's tests after cleaning and fetching dependencies"
+          "trampoline:run a task without nesting the project's JVM inside Leiningen's."
           "uberjar:Create a jar including the contents of each of deps"
           "upgrade:upgrade leiningen to the latest stable release"
           "version:print leiningen's version"

From 12e181c6f6167adabb688f63418037c8c1949335 Mon Sep 17 00:00:00 2001
From: Daniel Lockard <danielhlockard@gmail.com>
Date: Wed, 4 Apr 2012 13:04:00 -0500
Subject: [PATCH 530/907] Added an if-statement to see if git is installed

---
 tools/install.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index aedb706da..8ca427d2c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -5,7 +5,13 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+which git > /dev/null
+if [[ $? -eq 0 ]]; then
+  /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+else
+  echo "git not installed"
+  exit
+fi
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]

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

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

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

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

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

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

From e429a880e68982ce9ab0f35921174493fa3e4c03 Mon Sep 17 00:00:00 2001
From: ntpeters <ntpeters@mtu.edu>
Date: Thu, 12 Apr 2012 06:04:24 -0300
Subject: [PATCH 533/907] Added yum aliases for: makecache, grouplist,
 groupinstall, and groupremove.

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

diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
index d6ba7ed62..c9966f1b1 100644
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@@ -3,10 +3,14 @@
 alias ys="yum search"                       # search package
 alias yp="yum info"                         # show package info
 alias yl="yum list"                         # list packages
+alias ygl="yum grouplist"                   # list package groups
 alias yli="yum list installed"              # print all installed packages
+alias ymc="yum makecache                    # rebuilds the yum package list
 
 alias yu="sudo yum update"                  # upgrate packages
 alias yi="sudo yum install"                 # install package
+alias ygi="sudo yum groupinstall"           # install package group
 alias yr="sudo yum remove"                  # remove package
+alias ygr="sudo yum groupremove"            # remove pagage group
 alias yrl="sudo yum remove --remove-leaves" # remove package and leaves
-alias yc="sudo yum clean all"               # clean cache
+alias yc="sudo yum clean all"               # clean cache
\ No newline at end of file

From 8ce35df2c5aa333dd394f6e7e2700538c10d9a90 Mon Sep 17 00:00:00 2001
From: Martin Meredith <martinmeredith@protecinnovations.co.uk>
Date: Wed, 18 Apr 2012 11:45:22 +0100
Subject: [PATCH 534/907] Add option to disable status notification

For certain git repositories, this slows down usage
of the shell horifically.

This option can be set with

    git config --add oh-my-zsh.hide-status 1

which will disable checking/showing the status notification
---
 lib/git.zsh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index fb4ad8ca6..6c878afff 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -8,13 +8,15 @@ function git_prompt_info() {
 # Checks if working tree is dirty
 parse_git_dirty() {
   local SUBMODULE_SYNTAX=''
-  if [[ $POST_1_7_2_GIT -gt 0 ]]; then
-        SUBMODULE_SYNTAX="--ignore-submodules=dirty"
-  fi
-  if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then
-    echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
-  else
-    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
+  if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then
+    if [[ $POST_1_7_2_GIT -gt 0 ]]; then
+          SUBMODULE_SYNTAX="--ignore-submodules=dirty"
+    fi
+    if [[ -n $(git status -s ${SUBMODULE_SYNTAX}  2> /dev/null) ]]; then
+      echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
+    else
+      echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
+    fi
   fi
 }
 

From 5eb466a7886e1220584322a10964343a101ed1dc Mon Sep 17 00:00:00 2001
From: Dylan Hudson <dylan.w.hudson@gmail.com>
Date: Thu, 19 Apr 2012 00:14:55 -0700
Subject: [PATCH 535/907] added aliases for sublime text

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

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
new file mode 100644
index 000000000..e0f6e052c
--- /dev/null
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -0,0 +1,3 @@
+# Sublime Text 2 Aliases
+alias st='open -a "/Applications/Sublime Text 2.app"'
+alias stt='st .'

From 99a3c3c5c85b7a72037022607f41d682b77db7d7 Mon Sep 17 00:00:00 2001
From: Dylan Hudson <dylan.w.hudson@gmail.com>
Date: Sun, 22 Apr 2012 08:36:37 -0700
Subject: [PATCH 536/907] changed the alias to use to cli provided by sublime
 text

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

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index e0f6e052c..c42c68df1 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,3 +1,3 @@
 # Sublime Text 2 Aliases
-alias st='open -a "/Applications/Sublime Text 2.app"'
+alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
 alias stt='st .'

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

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

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

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

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

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

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

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

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

From e2f7623534054645e849db42a0030a1642e5ba97 Mon Sep 17 00:00:00 2001
From: Mat Gadd <mgadd@names.co.uk>
Date: Thu, 3 May 2012 13:03:23 +0100
Subject: [PATCH 540/907] Don't drop everything after a trailing slash, as this
 breaks standard svn branches: ^/branches/featurename ^/releases/Release-vx.y
 ^/trunk

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e2cf96ca3..4d5bfb8dd 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -16,7 +16,7 @@ function svn_get_repo_name {
     if [ $(in_svn) ]; then
         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
     
-        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
+        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
     fi
 }
 

From 51c55ad17e23db89e72424add0c34fa20654cd8f Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 6 May 2012 11:08:34 +0100
Subject: [PATCH 541/907] Suppress "zsh: no matches found" error when
 $ZSH_CUSTOM has no files

The addition of `(.N)` enables the `NULL_GLOB` option which suppresses
the error output in question.

Reference: http://www.zsh.org/mla/users/2004/msg00621.html
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 732a403b7..e360344b0 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -51,7 +51,7 @@ for plugin ($plugins); do
 done
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
+for config_file ($ZSH_CUSTOM/*.zsh(.N)) source $config_file
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]

From f9018c5efbb6cf164139009eff1863837d72b412 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 6 May 2012 11:10:16 +0100
Subject: [PATCH 542/907] Load themes from `$ZSH_CUSTOM` instead of
 `$ZSH/custom`

This seems like a simple oversight, everything else uses `$ZSH_CUSTOM`
rather than `$ZSH/custom`.
---
 oh-my-zsh.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index e360344b0..c2b6049cb 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -65,12 +65,11 @@ then
 else
   if [ ! "$ZSH_THEME" = ""  ]
   then
-    if [ -f "$ZSH/custom/$ZSH_THEME.zsh-theme" ]
+    if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]
     then
-      source "$ZSH/custom/$ZSH_THEME.zsh-theme"
+      source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
     else
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"
     fi
   fi
 fi
-

From adab18f1616956beb10419dc52b8d713d6b6c9e0 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey@linux-8ud6.(none)>
Date: Sun, 25 Mar 2012 00:00:05 +0200
Subject: [PATCH 543/907] Added suse plugins

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

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
new file mode 100644
index 000000000..d79308caf
--- /dev/null
+++ b/plugins/suse/suse.plugin.zsh
@@ -0,0 +1,5 @@
+alias zi='sudo zypper install'
+alias zrf='sudo zypper refresh'
+alias zs='zypper search'
+alias zup='sudo zypper dist-upgrade'
+alias zrm='sudo zypper remove'

From b4380aacb0a0a89618430b2bbb1221c602d43d62 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Thu, 19 Apr 2012 13:49:15 +0300
Subject: [PATCH 544/907] Added zp and zps aliases for the SUSE plugin

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

diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index d79308caf..d46286948 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -3,3 +3,5 @@ alias zrf='sudo zypper refresh'
 alias zs='zypper search'
 alias zup='sudo zypper dist-upgrade'
 alias zrm='sudo zypper remove'
+alias zp='sudo zypper patch'
+alias zps='sudo zypper ps'

From 6f859c5837753a87544b2672678e36bcf167cc82 Mon Sep 17 00:00:00 2001
From: Varun Vijayaraghavan <varun.vijayaraghavan@visualrevenue.com>
Date: Mon, 21 May 2012 10:42:12 -0400
Subject: [PATCH 545/907] Add Sublime Text 2 alias for Linux.

Detects the platform using "uname", and sets the alias accordingly.
If you are using Linux, this assumes that you have created a
symbolic link to /usr/bin/sublime_text.
---
 plugins/sublime/sublime.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index c42c68df1..6825d6c08 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,3 +1,8 @@
 # Sublime Text 2 Aliases
-alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+#unamestr = 'uname'
+if [[ uname == 'Linux' ]]; then
+	alias st='open -a /usr/bin/sublime_text'
+elif  [[ uname == 'Darwin' ]]; then
+	alias st='open -a "/Applications/Sublime Text 2.app'
+fi
 alias stt='st .'

From 61c39b50390a7869f22001a6cd65b7e8cd977e88 Mon Sep 17 00:00:00 2001
From: natsumesou <natsumesouxx@gmail.com>
Date: Wed, 23 May 2012 13:49:21 +0900
Subject: [PATCH 546/907] Load symlink custom files

    `(.)` search only real files.
    The deletion of it enables searching symlink *.zsh files
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c2b6049cb..ddef1ad6c 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -51,7 +51,7 @@ for plugin ($plugins); do
 done
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(.N)) source $config_file
+for config_file ($ZSH_CUSTOM/*.zsh(N)) source $config_file
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]

From 0f9fff8aecb154627b42a57cede37f7bd7b6c3ba Mon Sep 17 00:00:00 2001
From: Alexander Berezovsky <ab@plumdistrict.com>
Date: Wed, 23 May 2012 16:47:06 -0700
Subject: [PATCH 547/907] add fasd plugin

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

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
new file mode 100644
index 000000000..d42584f1a
--- /dev/null
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -0,0 +1,6 @@
+if [ $commands[fasd] ]; then # check if fasd is installed
+  eval "$(fasd --init auto)"
+  alias v='f -e vim'
+  alias o='a -e open'
+fi
+

From 548f68d7f028acc70f4a9026a28161a604edc405 Mon Sep 17 00:00:00 2001
From: Alexander Berezovsky <ab@plumdistrict.com>
Date: Wed, 23 May 2012 17:03:18 -0700
Subject: [PATCH 548/907] fino-time theme

---
 themes/fino-time.zsh-theme | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 themes/fino-time.zsh-theme

diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
new file mode 100644
index 000000000..22c7a0981
--- /dev/null
+++ b/themes/fino-time.zsh-theme
@@ -0,0 +1,39 @@
+# Fino-time theme by Aexander Berezovsky (http://berezovsky.me) based on Fino by Max Masnick (http://max.masnick.me)
+
+# Use with a dark background and 256-color terminal!
+# Meant for people with RVM and git. Tested only on OS X 10.7.
+
+# You can set your computer name in the ~/.box-name file if you want.
+
+# Borrowing shamelessly from these oh-my-zsh themes:
+#   bira
+#   robbyrussell
+#
+# Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    echo '○'
+}
+
+function box_name {
+    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+}
+
+
+local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
+local current_dir='${PWD/#$HOME/~}'
+local git_info='$(git_prompt_info)'
+
+
+PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby} %D - %*
+╰─$(virtualenv_info)$(prompt_char) "
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"

From 8923694fb42393d063487203e803199b394bbb47 Mon Sep 17 00:00:00 2001
From: Varun Vijayaraghavan <varun.vijayaraghavan@visualrevenue.com>
Date: Thu, 24 May 2012 11:33:19 -0400
Subject: [PATCH 549/907] Fixed a bug in checking the platform

---
 plugins/sublime/sublime.plugin.zsh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 plugins/sublime/sublime.plugin.zsh

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
old mode 100644
new mode 100755
index 6825d6c08..0035b1b26
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,8 +1,9 @@
 # Sublime Text 2 Aliases
 #unamestr = 'uname'
-if [[ uname == 'Linux' ]]; then
-	alias st='open -a /usr/bin/sublime_text'
-elif  [[ uname == 'Darwin' ]]; then
-	alias st='open -a "/Applications/Sublime Text 2.app'
+
+if [[ $('uname') == 'Linux' ]]; then
+	alias st='/usr/bin/sublime_text&'
+elif  [[ $('uname') == 'Darwin' ]]; then
+	alias st='open -a /Applications/Sublime Text 2.app'
 fi
 alias stt='st .'

From 8de877d63222ed4effad7d52d68fccca2c01b6dd Mon Sep 17 00:00:00 2001
From: Amar Raja <amarsuperstar@gmail.com>
Date: Tue, 29 May 2012 10:20:49 +0200
Subject: [PATCH 550/907] Prevent the heroku command from being automatically
 bundle-exec'ed The heroku command should not be executed via bundler, see:
 https://github.com/heroku/heroku/issues/173

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

From 3dd3c1f4158365b98e0754de9f0c1cbcb33d026c Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Tue, 29 May 2012 01:07:36 +0200
Subject: [PATCH 551/907] Add aliases for git-remote: gr...

---
 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 e1d682508..11808f8e0 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -18,6 +18,18 @@ compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gcm='git checkout master'
+alias gr='git remote'
+compdef _git gr=git-remote
+alias grv='git remote -v'
+compdef _git grv=git-remote
+alias grmv='git remote rename'
+compdef _git grmv=git-remote
+alias grrm='git remote remove'
+compdef _git grrm=git-remote
+alias grset='git remote set-url'
+compdef _git grset=git-remote
+alias grup='git remote update'
+compdef _git grset=git-remote
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'

From 1876f1d5581e7b6907ead46a8371826db5eded49 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Mon, 28 May 2012 23:14:51 +0200
Subject: [PATCH 552/907] Make the $apt_pref variable evaluatet at alias
 expansion by using single-quotes instad of double quotes

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

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 16a5d54ca..5b6e5cfd4 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -40,20 +40,20 @@ alias ap='apt-cache policy'
 # superuser operations ######################################################
 if [[ $use_sudo -eq 1 ]]; then
 # commands using sudo #######
-    alias aac="sudo $apt_pref autoclean"
-    alias abd="sudo $apt_pref build-dep"
-    alias ac="sudo $apt_pref clean"
-    alias ad="sudo $apt_pref update"
-    alias adg="sudo $apt_pref update && sudo $apt_pref upgrade"
-    alias adu="sudo $apt_pref update && sudo $apt_pref dist-upgrade"
+    alias aac='sudo $apt_pref autoclean'
+    alias abd='sudo $apt_pref build-dep'
+    alias ac='sudo $apt_pref clean'
+    alias ad='sudo $apt_pref update'
+    alias adg='sudo $apt_pref update && sudo $apt_pref upgrade'
+    alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade'
     alias afu='sudo apt-file update'
-    alias ag="sudo $apt_pref upgrade"
-    alias ai="sudo $apt_pref install"
-    alias ap="sudo $apt_pref purge"
-    alias ar="sudo $apt_pref remove"
+    alias ag='sudo $apt_pref upgrade'
+    alias ai='sudo $apt_pref install'
+    alias ap='sudo $apt_pref purge'
+    alias ar='sudo $apt_pref remove'
 
     # apt-get only
-    alias ads="sudo $apt_pref dselect-upgrade"
+    alias ads='sudo $apt_pref dselect-upgrade'
 
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
@@ -67,18 +67,18 @@ if [[ $use_sudo -eq 1 ]]; then
 
 # commands using su #########
 else
-    alias aac='su -ls "'"$apt_pref"' autoclean" root'
+    alias aac='su -ls \'$apt_pref autoclean\' root'
     abd() {
         cmd="su -lc '$apt_pref build-dep $@' root"
         print "$cmd"
         eval "$cmd"
     }
-    alias ac='su -ls "'"$apt_pref"' clean" root'
-    alias ad='su -lc "'"$apt_pref"' update" root'
-    alias adg='su -lc "'"$apt_pref"' update && aptitude safe-upgrade" root'
-    alias adu='su -lc "'"$apt_pref"' update && aptitude dist-upgrade" root'
+    alias ac='su -ls \'$apt_pref clean\' root'
+    alias ad='su -lc \'$apt_pref update\' root'
+    alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root'
+    alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root'
     alias afu='su -lc "apt-file update"'
-    alias ag='su -lc "'"$apt_pref"' safe-upgrade" root'
+    alias ag='su -lc \'$apt_pref safe-upgrade\' root'
     ai() {
         cmd="su -lc 'aptitude -P install $@' root"
         print "$cmd"
@@ -118,7 +118,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 apt-copy() {
     print '#!/bin/sh'"\n" > apt-copy.sh
 
-    cmd="$apt_pref install "
+    cmd='$apt_pref install'
 
     for p in ${(f)"$(aptitude search -F "%p" --disable-columns \~i)"}; {
         cmd="${cmd} ${p}"

From 0673425331fe997224bab9f90579c40cd14934f1 Mon Sep 17 00:00:00 2001
From: mapc <musikmichael@web.de>
Date: Mon, 28 May 2012 23:17:38 +0200
Subject: [PATCH 553/907] Add command to directly install the output of acs

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

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 5b6e5cfd4..39d3ef36a 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -49,6 +49,9 @@ if [[ $use_sudo -eq 1 ]]; then
     alias afu='sudo apt-file update'
     alias ag='sudo $apt_pref upgrade'
     alias ai='sudo $apt_pref install'
+    # Install all packages given on the command line while using only the first word of each line:
+    # acs ... | ail
+    alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | "' xargs sudo $apt_pref install'
     alias ap='sudo $apt_pref purge'
     alias ar='sudo $apt_pref remove'
 

From 91b4758d8f5a910a60de783f15acb66acda68d7f Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 31 May 2012 09:52:53 -0700
Subject: [PATCH 554/907] Now with 50% less auto-updates.

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

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 524aa509d..bbd705a1e 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -23,7 +23,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt 6 ]
+  if [ $epoch_diff -gt 13 ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then

From c4608ba281147af564fc0979b63bc8b23f1e55fb Mon Sep 17 00:00:00 2001
From: Tim Littlemore <tim@tjl2.com>
Date: Fri, 1 Jun 2012 15:26:22 +0100
Subject: [PATCH 555/907] Removing ey command from bundled_commands. It is not
 usually bundled.

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

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

From a04484e546e330a9cd2130ee160a53ec4580a844 Mon Sep 17 00:00:00 2001
From: Weston Platter <westonplatter@gmail.com>
Date: Fri, 1 Jun 2012 19:11:53 -0400
Subject: [PATCH 556/907] rails3, added rgm = 'rails generate migration'

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

diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index d4c7df654..237d0594b 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -13,6 +13,7 @@ alias rd='_rails_command destroy'
 alias rdb='_rails_command dbconsole'
 alias rdbm='rake db:migrate db:test:clone'
 alias rg='_rails_command generate'
+alias rgm='_rails_command generate migration'
 alias rp='_rails_command plugin'
 alias ru='_rails_command runner'
 alias rs='_rails_command server'

From df30eae4121802f8ac800cb3e92c7d08356217a6 Mon Sep 17 00:00:00 2001
From: Erich Menge <erich.menge@me.com>
Date: Sun, 3 Jun 2012 12:44:14 -0500
Subject: [PATCH 557/907] Add a couple of options for git-flow.

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

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 270bcbe38..71b343884 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -110,6 +110,8 @@ __git-flow-release ()
 						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
 						-m'[Use the given tag message]'\
 						-p'[Push to $ORIGIN after performing finish]'\
+						-k'[Keep branch after performing finish]'\
+						-n"[Don't tag this release]"\
 						':version:__git_flow_version_list'
 				;;
 
@@ -162,6 +164,8 @@ __git-flow-hotfix ()
 						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
 						-m'[Use the given tag message]'\
 						-p'[Push to $ORIGIN after performing finish]'\
+						-k'[Keep branch after performing finish]'\
+						-n"[Don't tag this release]"\
 						':hotfix:__git_flow_hotfix_list'
 				;;
 

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

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

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

From 083cff4a577f8889db4ec201d2309b126a65e894 Mon Sep 17 00:00:00 2001
From: westonplatter <westonplatter@gmail.com>
Date: Fri, 8 Jun 2012 12:18:26 -0400
Subject: [PATCH 559/907] checking if airport allows git protocol

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

diff --git a/README.textile b/README.textile
index bf6776665..875d02f86 100644
--- a/README.textile
+++ b/README.textile
@@ -1,5 +1,6 @@
 A handful of functions, auto-complete helpers, and stuff that makes you shout...
 
+
 bq. "OH MY ZSHELL!"
 
 h2. Setup

From 61ceec528533bdc2865cf3d04a9214dda6f0f173 Mon Sep 17 00:00:00 2001
From: Jaiden Mispy <^_^@mispy.me>
Date: Sat, 9 Jun 2012 11:04:58 +1000
Subject: [PATCH 560/907] Plugin which loads Python virtualenvwrapper and
 activates virtualenvs on cd into git repos

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

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
new file mode 100644
index 000000000..afdad1bea
--- /dev/null
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -0,0 +1,47 @@
+WRAPPER_FOUND=0
+for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
+  if [[ -e $wrapsource ]] ; then
+    WRAPPER_FOUND=1
+    source $wrapsource
+
+    if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
+      # Automatically activate Git projects' virtual environments based on the
+      # directory name of the project. Virtual environment name can be overridden
+      # by placing a .venv file in the project root with a virtualenv name in it
+      function workon_cwd {
+          # Check that this is a Git repo
+          GIT_DIR=`git rev-parse --git-dir 2> /dev/null`
+          if (( $? == 0 )); then
+              # Find the repo root and check for virtualenv name override
+              GIT_DIR=`readlink -f $GIT_DIR`
+              PROJECT_ROOT=`dirname "$GIT_DIR"`
+              ENV_NAME=`basename "$PROJECT_ROOT"`
+              if [[ -f "$PROJECT_ROOT/.venv" ]]; then
+                  ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+              fi
+              # Activate the environment only if it is not already active
+              if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+                  if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+                      workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+                  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
+      }
+
+      # New cd function that does the virtualenv magic
+      function cd {
+          builtin cd "$@" && workon_cwd
+      }
+    fi
+
+    break
+  fi
+done
+
+if [ $WRAPPER_FOUND -eq 0 ] ; then
+  print "zsh virtualenvwrapper plugin: Couldn't activate virtualenvwrapper. Please run \`pip install virtualenvwrapper\`."
+fi

From 1bb715965c1dde1ed6f4456b462ae59e1b3769da Mon Sep 17 00:00:00 2001
From: s3 <s3+dev@sdfeu.org>
Date: Tue, 12 Jun 2012 10:18:02 +0200
Subject: [PATCH 561/907] Change hardcoded ~/.oh-my-zsh to $ZSH.

---
 lib/completion.zsh                       | 2 +-
 plugins/dirpersist/dirpersist.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index b964595ed..f31e101d5 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -46,7 +46,7 @@ zstyle ':completion:*:hosts' hosts $hosts
 
 # Use caching so that commands like apt and dpkg complete are useable
 zstyle ':completion::complete:*' use-cache 1
-zstyle ':completion::complete:*' cache-path ~/.oh-my-zsh/cache/
+zstyle ':completion::complete:*' cache-path $ZSH/cache/
 
 # Don't complete uninteresting users
 zstyle ':completion:*:*:*:users' ignored-patterns \
diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh
index 6a2b289a2..0f6d9f435 100644
--- a/plugins/dirpersist/dirpersist.plugin.zsh
+++ b/plugins/dirpersist/dirpersist.plugin.zsh
@@ -12,7 +12,7 @@ dirpersistinstall () {
     if grep 'dirpersiststore' ~/.zlogout > /dev/null; then
     else
         if read -q \?"Would you like to set up your .zlogout file for use with dirspersist? (y/n) "; then
-            echo "# Store dirs stack\n# See ~/.oh-my-zsh/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
+            echo "# Store dirs stack\n# See $ZSH/plugins/dirspersist.plugin.zsh\ndirpersiststore" >> ~/.zlogout
         else
             echo "If you don't want this message to appear, remove dirspersist from \$plugins"
         fi

From 37bce2b51a528c6be5dc4605c81aab70c949a3a3 Mon Sep 17 00:00:00 2001
From: thackoun <thackoun@gmail.com>
Date: Tue, 12 Jun 2012 15:48:00 +0300
Subject: [PATCH 562/907] fix a very minor bug with colors of parenthesis in
 the terminalparty theme

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

diff --git a/themes/terminalparty.zsh-theme b/themes/terminalparty.zsh-theme
index 73653aca8..216ce37eb 100644
--- a/themes/terminalparty.zsh-theme
+++ b/themes/terminalparty.zsh-theme
@@ -2,7 +2,7 @@ PROMPT='%{$fg[green]%} %% '
 # RPS1='%{$fg[blue]%}%~%{$reset_color%} '
 RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}'
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[yellow]%}"
+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 dee54a2477d2a5be5d6cced7497f539ecfc2e05f Mon Sep 17 00:00:00 2001
From: Kristi <kristi.dev@gmail.com>
Date: Wed, 13 Jun 2012 12:57:15 -0700
Subject: [PATCH 563/907] Use grep to detect if untracked files exist instead
 of storing all the output of ls-files.

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index a2583b028..f22ce2719 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -81,7 +81,7 @@ add-zsh-hook chpwd steeef_chpwd
 function steeef_precmd {
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
         # check for untracked files or updated submodules, since vcs_info doesn't
-        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+        if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
             PR_GIT_UPDATE=1
             FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
         else

From 4199c1a6f77f1605157b1cfa6baa47c14c68a6c9 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Wed, 13 Jun 2012 13:14:23 -0700
Subject: [PATCH 564/907] Updating README to ask people to stop sending themes
 for now

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

diff --git a/README.textile b/README.textile
index 875d02f86..a38e2d7cf 100644
--- a/README.textile
+++ b/README.textile
@@ -69,9 +69,13 @@ 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!
 
-h3. Send us your theme!
+h3. (Don't) Send us your theme! (for now)
+
+-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.-
+
+We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there. 
+
 
-I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.
 
 h2. Contributors
 

From 4d6b532248fce0e71d762eb1ec3ef2ec8fcd5289 Mon Sep 17 00:00:00 2001
From: Kristi <kristi.dev@gmail.com>
Date: Wed, 13 Jun 2012 13:14:31 -0700
Subject: [PATCH 565/907] add --directory flag

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

diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme
index f22ce2719..312229e9f 100644
--- a/themes/steeef.zsh-theme
+++ b/themes/steeef.zsh-theme
@@ -81,7 +81,7 @@ add-zsh-hook chpwd steeef_chpwd
 function steeef_precmd {
     if [[ -n "$PR_GIT_UPDATE" ]] ; then
         # check for untracked files or updated submodules, since vcs_info doesn't
-        if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
+        if git ls-files --other --exclude-standard --directory 2> /dev/null | grep -q "."; then
             PR_GIT_UPDATE=1
             FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
         else

From 43c09216939d3936a3a3887a975c4b16e8664806 Mon Sep 17 00:00:00 2001
From: Vitaliy Yanchuk <fuksito@gmail.com>
Date: Thu, 14 Jun 2012 13:31:00 +0300
Subject: [PATCH 566/907] More usable and shorter aliases

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

diff --git a/plugins/encode64/encode64.plugin.zsh b/plugins/encode64/encode64.plugin.zsh
index cfb7c6a18..3b59447c5 100644
--- a/plugins/encode64/encode64.plugin.zsh
+++ b/plugins/encode64/encode64.plugin.zsh
@@ -1,2 +1,4 @@
 encode64(){ echo -n $1 | base64 }
-decode64(){ echo -n $1 | base64 -D }
\ No newline at end of file
+decode64(){ echo -n $1 | base64 -D }
+alias e64=encode64
+alias d64=decode64

From c65a53df811953b9f4117ff0b8014d869565bf9d Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Fri, 15 Jun 2012 10:07:22 +0300
Subject: [PATCH 567/907] Fixed unmached " in yum plugin

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

diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
index c9966f1b1..69abfc4ce 100644
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@@ -5,7 +5,7 @@ alias yp="yum info"                         # show package info
 alias yl="yum list"                         # list packages
 alias ygl="yum grouplist"                   # list package groups
 alias yli="yum list installed"              # print all installed packages
-alias ymc="yum makecache                    # rebuilds the yum package list
+alias ymc="yum makecache"                   # rebuilds the yum package list
 
 alias yu="sudo yum update"                  # upgrate packages
 alias yi="sudo yum install"                 # install package

From 823cc9180c21c0520713b39fe3e3590645c76ad2 Mon Sep 17 00:00:00 2001
From: Thomas Dippel <thomas@dippel.dk>
Date: Sat, 16 Jun 2012 12:41:44 +0200
Subject: [PATCH 568/907] Explicitly tell rbenv to use zsh

According to @graywh's comment on:
https://github.com/sstephenson/rbenv/issues/185
---
 plugins/rbenv/rbenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index ae37404cd..4c4647b32 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -4,7 +4,7 @@ for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
     FOUND_RBENV=1
     export RBENV_ROOT=$rbenvdir
     export PATH=${rbenvdir}/bin:$PATH
-    eval "$(rbenv init -)"
+    eval "$(rbenv init - zsh)"
 
     alias rubies="rbenv versions"
     alias gemsets="rbenv gemset list"

From 82f785bc6751dc7c199b5d1ea068567120b92511 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 18 Jun 2012 10:41:19 -0400
Subject: [PATCH 569/907] remove readlink call and clean up

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index afdad1bea..a93c8e863 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -10,11 +10,9 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
       # by placing a .venv file in the project root with a virtualenv name in it
       function workon_cwd {
           # Check that this is a Git repo
-          GIT_DIR=`git rev-parse --git-dir 2> /dev/null`
+          PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
           if (( $? == 0 )); then
-              # Find the repo root and check for virtualenv name override
-              GIT_DIR=`readlink -f $GIT_DIR`
-              PROJECT_ROOT=`dirname "$GIT_DIR"`
+              # Check for virtualenv name override
               ENV_NAME=`basename "$PROJECT_ROOT"`
               if [[ -f "$PROJECT_ROOT/.venv" ]]; then
                   ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
@@ -30,6 +28,7 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
               # Note: this only happens if the virtualenv was activated automatically
               deactivate && unset CD_VIRTUAL_ENV
           fi
+          unset PROJECT_ROOT
       }
 
       # New cd function that does the virtualenv magic

From e9a9deacb09196a48a39adc827d861e1896f4c59 Mon Sep 17 00:00:00 2001
From: Tima Maslyuchenko <dudapip3@gmail.com>
Date: Mon, 18 Jun 2012 20:15:57 +0300
Subject: [PATCH 570/907] rbenv plugin now uses 'brew --prefix rbenv' command
 to find rbenv folder

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

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index ae37404cd..a0a64c7e4 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -1,5 +1,18 @@
+function is_homebrew_installed() {
+  type brew &> /dev/null
+}
+
+function is_rbenv_installed() {
+  brew --prefix rbenv &> /dev/null
+}
+
 FOUND_RBENV=0
-for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
+rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
+if is_homebrew_installed && is_rbenv_installed ; then
+    rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
+fi
+
+for rbenvdir in "${rbenvdirs[@]}" ; do
   if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
     FOUND_RBENV=1
     export RBENV_ROOT=$rbenvdir

From 5931f64308cbf4b0a8ef740a6b4eda5834479bd7 Mon Sep 17 00:00:00 2001
From: Tima Maslyuchenko <dudapip3@gmail.com>
Date: Mon, 18 Jun 2012 21:29:24 +0300
Subject: [PATCH 571/907] sanitized code according to coding style

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

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index a0a64c7e4..a62dd5602 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -1,14 +1,14 @@
-function is_homebrew_installed() {
+_homebrew-installed() {
   type brew &> /dev/null
 }
 
-function is_rbenv_installed() {
+_rbenv-from-homebrew-installed() {
   brew --prefix rbenv &> /dev/null
 }
 
 FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
-if is_homebrew_installed && is_rbenv_installed ; then
+if _homebrew-installed && _rbenv-from-homebrew-installed ; then
     rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
 fi
 

From b97cc939ec50cbd424beb4d9d5d61625b209ccac Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@variableaction.com>
Date: Wed, 20 Jun 2012 13:17:41 -0700
Subject: [PATCH 572/907] added first version of my theme af-magic

---
 themes/af-magic.zsh-theme | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 themes/af-magic.zsh-theme

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
new file mode 100644
index 000000000..241393f1e
--- /dev/null
+++ b/themes/af-magic.zsh-theme
@@ -0,0 +1,39 @@
+# af-magic.zsh-theme
+#
+# Author: Andy Fleming
+# URL: http://andyfleming.com/
+#
+# Created on:		June 19, 2012
+# Last modified on:	June 20, 2012
+
+
+
+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+
+PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%}
+$FG[032]%~\
+$(git_prompt_info) \
+$FG[105]%(!.#.»)%{$reset_color%} '
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
+RPS1='${return_code}'
+
+
+
+eval my_gray='$FG[237]'
+eval my_orange='$FG[214]'
+RPROMPT='$my_gray%n@%m%{$reset_color%}%'
+
+
+ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
+
+
+
+# LS colors, made with http://geoff.greer.fm/lscolors/
+#export LSCOLORS="exfxcxdxbxegedabagacad"
+#export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
+

From 98d7a010994cd39758e4a1599cefe9e130a346db Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@variableaction.com>
Date: Wed, 20 Jun 2012 13:26:05 -0700
Subject: [PATCH 573/907] theme cleanup

---
 themes/af-magic.zsh-theme | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 241393f1e..c1b00c62b 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -2,6 +2,8 @@
 #
 # Author: Andy Fleming
 # URL: http://andyfleming.com/
+# Repo: https://github.com/andyfleming/oh-my-zsh
+# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
 #
 # Created on:		June 19, 2012
 # Last modified on:	June 20, 2012
@@ -11,7 +13,7 @@
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-
+# primary prompt
 PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%}
 $FG[032]%~\
 $(git_prompt_info) \
@@ -20,20 +22,15 @@ PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
 RPS1='${return_code}'
 
 
-
+# color vars
 eval my_gray='$FG[237]'
 eval my_orange='$FG[214]'
+
+# right prompt
 RPROMPT='$my_gray%n@%m%{$reset_color%}%'
 
-
+# git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
-
-
-
-# LS colors, made with http://geoff.greer.fm/lscolors/
-#export LSCOLORS="exfxcxdxbxegedabagacad"
-#export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
-

From 8088e8ac7935e9289d049278e117befd87f48809 Mon Sep 17 00:00:00 2001
From: Paul McKellar <paul.mckellar@gmail.com>
Date: Mon, 18 Jun 2012 01:01:05 -0700
Subject: [PATCH 574/907] add git remote branch autocomplete

---
 .../git-remote-branch.plugin.zsh               | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 plugins/git-remote-branch/git-remote-branch.plugin.zsh

diff --git a/plugins/git-remote-branch/git-remote-branch.plugin.zsh b/plugins/git-remote-branch/git-remote-branch.plugin.zsh
new file mode 100644
index 000000000..ff98cbf87
--- /dev/null
+++ b/plugins/git-remote-branch/git-remote-branch.plugin.zsh
@@ -0,0 +1,18 @@
+_git_remote_branch() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null)
+  if [[ -n $ref ]]; then
+    if (( CURRENT == 2 )); then
+      # first arg: operation
+      compadd create publish rename delete track
+    elif (( CURRENT == 3 )); then
+      # second arg: remote branch name
+      compadd `git branch -r | grep -v HEAD | sed "s/.*\///" | sed "s/ //g"`
+    elif (( CURRENT == 4 )); then
+      # third arg: remote name
+      compadd `git remote`
+    fi
+  else;
+    _files
+  fi
+}
+compdef _git_remote_branch grb

From 7e1da28d27f42e4d873cdfc28ef362d59d8c2b07 Mon Sep 17 00:00:00 2001
From: jugyo <jugyo.org@gmail.com>
Date: Thu, 21 Jun 2012 07:41:50 +0900
Subject: [PATCH 575/907] correct the ruby version label for rbenv

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

diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme
index c5864d9b8..a5a226b69 100644
--- a/themes/nebirhos.zsh-theme
+++ b/themes/nebirhos.zsh-theme
@@ -6,7 +6,7 @@ if [ -e ~/.rvm/bin/rvm-prompt ]; then
     RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} "
 else
   if which rbenv &> /dev/null; then
-    RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
+    RUBY_PROMPT_="%{$fg_bold[blue]%}rbenv:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
   fi
 fi
 

From 8ba97c36443d8551a28de194a3da4b7c4d6c7949 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Fri, 22 Jun 2012 15:30:51 +0300
Subject: [PATCH 576/907] Added history plugin

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

diff --git a/plugins/history/history.plugin.zsh b/plugins/history/history.plugin.zsh
new file mode 100644
index 000000000..0f4aa4b10
--- /dev/null
+++ b/plugins/history/history.plugin.zsh
@@ -0,0 +1,8 @@
+alias h='history'
+
+function hs
+{
+    history | grep $*
+}
+
+alias hsi='hs -i'

From 62a436bb95144b00f0ef8ba8906a4044b4be4d9c Mon Sep 17 00:00:00 2001
From: Peter Mounce <pete@neverrunwithscissors.com>
Date: Fri, 22 Jun 2012 17:12:44 +0100
Subject: [PATCH 577/907] Fix mismatched quote in yum plugin

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

diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
index c9966f1b1..69abfc4ce 100644
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@@ -5,7 +5,7 @@ alias yp="yum info"                         # show package info
 alias yl="yum list"                         # list packages
 alias ygl="yum grouplist"                   # list package groups
 alias yli="yum list installed"              # print all installed packages
-alias ymc="yum makecache                    # rebuilds the yum package list
+alias ymc="yum makecache"                   # rebuilds the yum package list
 
 alias yu="sudo yum update"                  # upgrate packages
 alias yi="sudo yum install"                 # install package

From 3aa0cb74d0a19a8053889a976404a7915585466e Mon Sep 17 00:00:00 2001
From: Volker Pacher <volker.pacher@gmail.com>
Date: Fri, 22 Jun 2012 18:27:21 +0100
Subject: [PATCH 578/907] added plugin for jruby

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

diff --git a/plugins/jruby/jruby.plugin.zsh b/plugins/jruby/jruby.plugin.zsh
new file mode 100755
index 000000000..58781fc72
--- /dev/null
+++ b/plugins/jruby/jruby.plugin.zsh
@@ -0,0 +1,3 @@
+# Aliases
+alias jrspec='jruby --debug -S rspec --debug'
+alias jprofile='jruby --profile.api -S rspec'

From 5c37c85fb49a377b59115efc2aa132665982ac06 Mon Sep 17 00:00:00 2001
From: Volker Pacher <volker.pacher@gmail.com>
Date: Fri, 22 Jun 2012 18:33:11 +0100
Subject: [PATCH 579/907] added jexec

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

diff --git a/plugins/jruby/jruby.plugin.zsh b/plugins/jruby/jruby.plugin.zsh
index 58781fc72..bb7975b10 100755
--- a/plugins/jruby/jruby.plugin.zsh
+++ b/plugins/jruby/jruby.plugin.zsh
@@ -1,3 +1,4 @@
 # Aliases
 alias jrspec='jruby --debug -S rspec --debug'
 alias jprofile='jruby --profile.api -S rspec'
+alias jexec='jruby -S'

From 5e9a16b88a5cffe015101f992e29fa0d50027f5d Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Fri, 22 Jun 2012 20:25:44 +0300
Subject: [PATCH 580/907] Added themes plugin

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

diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh
new file mode 100644
index 000000000..8bab257ea
--- /dev/null
+++ b/plugins/themes/themes.plugin.zsh
@@ -0,0 +1,24 @@
+function theme
+{
+    if [ "$1" = "random" ]; then
+	themes=($ZSH/themes/*zsh-theme)
+	N=${#themes[@]}
+	((N=(RANDOM%N)+1))
+	RANDOM_THEME=${themes[$N]}
+	source "$RANDOM_THEME"
+	echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
+    else
+	if [ -f "$ZSH_CUSTOM/$1.zsh-theme" ]
+	then
+	    source "$ZSH_CUSTOM/$1.zsh-theme"
+	else
+	    source "$ZSH/themes/$1.zsh-theme"
+	fi
+    fi
+}
+
+function lstheme
+{
+    cd $ZSH/themes
+    ls *zsh-theme | sed 's,\.zsh-theme$,,'
+}

From f7b1615b7cd6cd2088050a29f43650098eaba514 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Fri, 22 Jun 2012 20:42:59 +0300
Subject: [PATCH 581/907] Added completion to the theme selection plugin

---
 plugins/themes/_theme | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 plugins/themes/_theme

diff --git a/plugins/themes/_theme b/plugins/themes/_theme
new file mode 100644
index 000000000..8214ddb0d
--- /dev/null
+++ b/plugins/themes/_theme
@@ -0,0 +1,3 @@
+#compdef theme
+
+_arguments "1: :($(lstheme | tr "\n" " "))"

From a39c9ffe5b7236b6e4dc78efa80b478cc411af7f Mon Sep 17 00:00:00 2001
From: Renan Cakirerk <renan@cakirerk.org>
Date: Sat, 23 Jun 2012 14:53:40 +0300
Subject: [PATCH 582/907] Fix finding git issue.
 http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script

---
 tools/install.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 8ca427d2c..b080be3a1 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -5,13 +5,10 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-which git > /dev/null
-if [[ $? -eq 0 ]]; then
-  /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
-else
+hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
   echo "git not installed"
   exit
-fi
+}
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]

From d15ec4bf248cf091fb31dd10da066c040abcd744 Mon Sep 17 00:00:00 2001
From: David Barragan <david.barragan@kaleidos.net>
Date: Mon, 25 Jun 2012 10:55:23 +0200
Subject: [PATCH 583/907] Added another path

---
 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 a93c8e863..5d0860400 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,5 +1,5 @@
 WRAPPER_FOUND=0
-for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
+for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
   if [[ -e $wrapsource ]] ; then
     WRAPPER_FOUND=1
     source $wrapsource

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

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

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

From e2ddf1ef8c1147586a11c25007b201e9cbcfe278 Mon Sep 17 00:00:00 2001
From: Eustachy Kapusta <Eustachy.kapusta@gmail.com>
Date: Sun, 1 Jul 2012 19:57:32 +0200
Subject: [PATCH 585/907] Remove bogus "-" from nomz="ps -aux" alias.

Info from http://procps.sourceforge.net/faq.html .
---
 plugins/lol/lol.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
index e455527e7..697f98d66 100644
--- a/plugins/lol/lol.plugin.zsh
+++ b/plugins/lol/lol.plugin.zsh
@@ -29,7 +29,7 @@ alias iminurbase='finger'
 alias btw='nice'
 alias obtw='nohup'
 
-alias nomz='ps -aux'
+alias nomz='ps aux'
 alias nomnom='killall'
 
 alias byes='exit'

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

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

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

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

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

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

From e3ff4b58c6b0012c616ea7a1dc44cde7a2ecfb57 Mon Sep 17 00:00:00 2001
From: lukas <lukas.westermann@gmail.com>
Date: Tue, 3 Jul 2012 09:59:42 +0200
Subject: [PATCH 588/907] provide plugin for rbfu the ruby version switcher

Evaluates $(rbfu --init --auto) if rbfu is installed on the system,
also has a custom rbfu-rubies method which lists the installed
rubies which are available to rbfu.

For compatibility with themes, also creates the rvm_prompt_info
function, so existing themes should work out of the box.
---
 plugins/rbfu/rbfu.plugin.zsh | 42 ++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 plugins/rbfu/rbfu.plugin.zsh

diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
new file mode 100644
index 000000000..008485205
--- /dev/null
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -0,0 +1,42 @@
+# Enables rbfu with --auto option, if available.
+#
+# Also provides a command to list all installed/available
+# rubies. To ensure compatibility with themes, creates the
+# rvm_prompt_info function to return the $RBFU_RUBY_VERSION
+# version.
+
+command -v rbfu &>/dev/null
+
+if [[ $? -eq 0 ]]; then
+  eval "$(rbfu --init --auto)"
+
+  # Internal: Print ruby version details, if it's currently
+  # active etc.
+  function _rbfu_rubies_print() {
+    local rb rb_out
+    rb=$(basename $1)
+    rb_out="$rb"
+    [[ -h $1 ]] && rb_out="$rb_out${fg[green]}@${reset_color}"
+    [[ "x$rb" == "x$2" ]] && rb_out="${fg[red]}$rb_out ${fg[red]}*${reset_color}"
+    echo $rb_out
+  }
+
+  # Public: Provide a list with all available rubies, this basically depends
+  # on `ls -1` and .rfbu/rubies. Highlights the currently active ruby version
+  # and aliases.
+  function rbfu-rubies() {
+    local rbfu_dir active_rb
+    rbfu_dir=$RBFU_RUBIES
+    active_rb=$RBFU_RUBY_VERSION
+    [[ -z "$rbfu_dir" ]] && rbfu_dir="${HOME}/.rbfu/rubies"
+    [[ -z "$active_rb" ]] && active_rb="system"
+    _rbfu_rubies_print "${rbfu_dir}/system" $active_rb
+    for rb in $(ls -1 $rbfu_dir); do
+      _rbfu_rubies_print "${rbfu_dir}/${rb}" $active_rb
+    done
+  }
+
+  # Public: Create rvm_prompt_info command for themes compatibility, unless
+  # it has already been defined.
+  [ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
+fi

From 92b6cae02638f644e6359e3f553805e2c3eba957 Mon Sep 17 00:00:00 2001
From: Josh Vermaire <joshvermaire@gmail.com>
Date: Sun, 8 Jul 2012 23:34:27 -0700
Subject: [PATCH 589/907] escape whitespace

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

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 0035b1b26..781c8f83f 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -4,6 +4,6 @@
 if [[ $('uname') == 'Linux' ]]; then
 	alias st='/usr/bin/sublime_text&'
 elif  [[ $('uname') == 'Darwin' ]]; then
-	alias st='open -a /Applications/Sublime Text 2.app'
+	alias st='open -a /Applications/Sublime\ Text\ 2.app'
 fi
 alias stt='st .'

From a15bcd6461b5b8237844c4e2968df0518dab5e9a Mon Sep 17 00:00:00 2001
From: Josh Vermaire <joshvermaire@gmail.com>
Date: Mon, 9 Jul 2012 00:11:07 -0700
Subject: [PATCH 590/907] utilize sublime's embedded command line binary

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

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 781c8f83f..91b0279c5 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -4,6 +4,6 @@
 if [[ $('uname') == 'Linux' ]]; then
 	alias st='/usr/bin/sublime_text&'
 elif  [[ $('uname') == 'Darwin' ]]; then
-	alias st='open -a /Applications/Sublime\ Text\ 2.app'
+	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
 fi
 alias stt='st .'

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

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

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

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

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

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

From 87ab8771dac655272895e5904fcf93217ea4a64b Mon Sep 17 00:00:00 2001
From: Sebastian Nowak <sebastian.nowak@gmail.com>
Date: Sun, 15 Jul 2012 21:26:30 +0200
Subject: [PATCH 593/907] 'rails' command should not be run with bundle exec

http://blog.wyeworks.com/2011/12/27/bundle-exec-rails-executes-bundler-setup-3-times
http://yehudakatz.com/2011/05/30/gem-versioning-and-bundler-doing-it-right/
---
 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 1ca48089e..39b76ecdf 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
 
 ## Functions
 

From 6a2e04fefbd794f050d45e7a717d009e39204431 Mon Sep 17 00:00:00 2001
From: clutton <clutton0@gmail.com>
Date: Mon, 16 Jul 2012 02:59:30 +0300
Subject: [PATCH 594/907] =?UTF-8?q?modify=20themes/jnrowe.zsh-theme,=20add?=
 =?UTF-8?q?=20host=20directive=20"=CE=9E=20(mbsd)=20~=20=E2=86=92"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/jnrowe.zsh-theme | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index 7c8a7082e..0ade9cc60 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -1,3 +1,4 @@
+autoload -U colors && colors
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
@@ -8,9 +9,10 @@ zstyle ':vcs_info:*' formats \
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
-add-zsh-hook precmd prompt_jnrowe_precmd
+add-zsh-hook precmd prompt_vcs
+add-zsh-hook precmd prompt_host
 
-prompt_jnrowe_precmd () {
+prompt_vcs () {
     vcs_info
 
     if [ "${vcs_info_msg_0_}" = "" ]; then
@@ -24,8 +26,17 @@ prompt_jnrowe_precmd () {
     fi
 }
 
+prompt_host () {
+    if [[ -n "$SSH_CLIENT" ]]; then
+        host=" ($HOST)"
+    else
+        host=''
+    fi
+}
+
+
 local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)"
 
-PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
+PROMPT='${ret_status}%{$fg[blue]%}${host}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
 
 #  vim: set ft=zsh ts=4 sw=4 et:

From bb34abd5186c0d87126b13af8643614d0aa50367 Mon Sep 17 00:00:00 2001
From: Mugen Kenichi <mugen.kenichi@uninets.eu>
Date: Wed, 18 Jul 2012 12:07:16 +0200
Subject: [PATCH 595/907] check for knife.rb in cwd

this is useful when managing multiple chef servers
---
 plugins/knife/_knife | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

From 3fe1e5c78760b81335eef501ef7f89875ae7753a Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Wed, 18 Jul 2012 23:37:21 +0800
Subject: [PATCH 596/907] add maven zsh autocomplete plugin, copy from
 juvenxu's bash maven autocomplete plugin

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

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
new file mode 100644
index 000000000..7131893c9
--- /dev/null
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -0,0 +1,117 @@
+function listMavenCompletions { 
+     reply=(
+        # common lifecycle
+        clean process-resources compile process-test-resources test-compile 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
+       
+        # deploy
+        deploy:deploy-file
+        # failsafe
+        failsafe:integration-test failsafe:verify
+        # install
+        install:install-file
+        # site
+        site:site site:deploy site:run site:stage site:stage-deploy
+        # surefire
+        surefire:test
+            
+        # checkstyle
+        checkstyle:checkstyle checkstyle:check
+        # javadoc
+        javadoc:javadoc javadoc:jar javadoc:aggregate
+        # jxr
+        jxr:jxr
+        # pmd
+        pmd:pmd pmd:cpd pmd:check pmd:cpd-check
+
+        # ant
+        ant:ant ant:clean
+        # antrun
+        antrun:run
+        # archetype
+        archetype:generate archetype:create-from-project archetype:crawl
+        # assembly
+        assembly:single assembly:assembly
+        # dependency
+        dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:get dependency:go-offline dependency:list dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
+        # enforcer
+        enforcer:enforce
+        # gpg
+        gpg:sign gpg:sign-and-deploy-file
+        # help
+        help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
+        # release
+        release:clean release:prepare release:rollback release:perform release:stage release:branch release:update-versions
+        # repository
+        repository:bundle-create repository:bundle-pack
+        # source
+        source:aggregate source:jar source:jar-no-fork
+            
+        # eclipse
+        eclipse:clean eclipse:eclipse
+        # idea
+        idea:clean idea:idea
+            
+        # jetty
+        jetty:run jetty:run-exploded
+        # cargo
+        cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
+        # jboss
+        jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
+        # tomcat
+        tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:undeploy
+        # tomcat6
+        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
+        # exec
+        exec:exec exec:java
+        # versions
+        versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
+        # scm
+        scm:add scm:checkin scm:checkout scm:update scm:status
+        # buildnumber
+        buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
+
+        # war
+        war:war war:exploded war:inplace war:manifest
+        # ear
+        ear:ear ear:generate-application-xml
+        # ejb
+        ejb:ejb
+        # android
+        android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
+        # nexus
+        nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
+        # repository
+        repository:bundle-create repository:bundle-pack repository:help
+
+        # sonar
+        sonar:sonar
+        # license
+        license:format license:check
+        # hibernate3
+        hibernate3:hbm2ddl hibernate3:help
+        # liquibase
+        liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
+        # flyway
+        flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
+        # gwt
+        gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
+
+        # options
+        -Dmaven.test.skip=true -DskipTests -Dmaven.surefire.debug -DenableCiProfile -Dpmd.skip=true -Dcheckstyle.skip=true -Dtycho.mode=maven
+
+        # arguments
+        -am -amd -B -C -c -cpu -D -e -emp -ep -f -fae -ff -fn -gs -h -l -N -npr -npu -nsu -o -P -pl -q -rf -s -T -t -U -up -V -v -X
+
+        cli:execute cli:execute-phase 
+        archetype:generate generate-sources 
+        cobertura:cobertura
+        -Dtest= `if [ -d ./src ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`
+    ); 
+}
+
+compctl -K listMavenCompletions mvn

From 98ecfa4c7769226432075edec8f2f3de275a81ff Mon Sep 17 00:00:00 2001
From: Andrew Vit <andrew@avit.ca>
Date: Sun, 6 Nov 2011 04:24:33 -0800
Subject: [PATCH 597/907] Bwana plugin for reading man pages in Safari

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

diff --git a/plugins/bwana/bwana.plugin.zsh b/plugins/bwana/bwana.plugin.zsh
new file mode 100644
index 000000000..455da8621
--- /dev/null
+++ b/plugins/bwana/bwana.plugin.zsh
@@ -0,0 +1,13 @@
+#
+# Requires http://www.bruji.com/bwana/
+#
+if [[ -e /Applications/Bwana.app ]] ||
+    ( system_profiler -detailLevel mini SPApplicationsDataType | grep -q Bwana )
+then
+  function man() {
+    open "man:$1"
+  }
+else
+  echo "Bwana lets you read man files in Safari through a man: URI scheme" 
+  echo "To use it within Zsh, install it from http://www.bruji.com/bwana/"
+fi

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

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

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

From 0b757825a2c23af6fcf17f540cbfacd390321fa8 Mon Sep 17 00:00:00 2001
From: Alexis GRIMALDI <alexis.grimaldi@gmail.com>
Date: Thu, 19 Jul 2012 12:50:53 +0200
Subject: [PATCH 599/907] Added git-extras completion

---
 plugins/git-extras/git-extras.plugin.zsh | 265 +++++++++++++++++++++++
 1 file changed, 265 insertions(+)
 create mode 100644 plugins/git-extras/git-extras.plugin.zsh

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
new file mode 100644
index 000000000..6adad124e
--- /dev/null
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -0,0 +1,265 @@
+#compdef git
+
+
+__git_command_successful () {
+    if (( ${#pipestatus:#0} > 0 )); then
+        _message 'not a git repository'
+        return 1
+    fi
+    return 0
+}
+
+
+__git_tag_names() {
+    local expl
+    declare -a tag_names
+    tag_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
+    __git_command_successful || return
+    _wanted tag-names expl tag-name compadd $* - $tag_names
+}
+
+
+__git_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_feature_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/feature 2>/dev/null)"}#refs/heads/feature/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_refactor_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/refactor 2>/dev/null)"}#refs/heads/refactor/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_bug_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/bug 2>/dev/null)"}#refs/heads/bug/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_submodule_names() {
+    local expl
+    declare -a submodule_names
+    submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})
+    __git_command_successful || return
+    _wanted submodule-names expl submodule-name compadd $* - $submodule_names
+}
+
+
+__git_author_names() {
+    local expl
+    declare -a author_names
+    author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' | sort -u)"})
+    __git_command_successful || return
+    _wanted author-names expl author-name compadd $* - $author_names
+}
+
+
+_git-changelog() {
+    _arguments \
+        '(-l --list)'{-l, --list}'[list commits]' \
+}
+
+
+_git-effort() {
+    _arguments \
+        '--above[ignore file with less than x commits]' \
+}
+
+
+_git-contrib() {
+    _arguments \
+        ':author:__git_author_names'
+}
+
+
+_git-count() {
+    _arguments \
+        '--all[detailed commit count]'
+}
+
+
+_git-delete-branch() {
+    _arguments \
+        ':branch-name:__git_branch_names'
+}
+
+
+_git-delete-submodule() {
+    _arguments \
+        ':submodule-name:__git_submodule_names'
+}
+
+
+_git-delete-tag() {
+    _arguments \
+        ':tag-name:__git_tag_names'
+}
+
+
+_git-extras() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'update:update git-extras'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+    esac
+
+    _arguments \
+        '(-v --version)'{-v,--version}'[show current version]' \
+}
+
+
+_git-graft() {
+    _arguments \
+        ':src-branch-name:__git_branch_names' \
+        ':dest-branch-name:__git_branch_names'
+}
+
+
+_git-squash() {
+    _arguments \
+        ':branch-name:__git_branch_names'
+}
+
+
+_git-feature() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge feature into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_feature_branch_names'
+                    ;;
+            esac
+    esac
+}
+
+
+_git-refactor() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge refactor into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_refactor_branch_names'
+                    ;;
+            esac
+    esac
+}
+
+
+_git-bug() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge bug into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_bug_branch_names'
+                    ;;
+            esac
+    esac
+}
+
+
+zstyle ':completion:*:*:git:*' user-commands \
+    changelog:'populate changelog file with commits since the previous tag' \
+    contrib:'display author contributions' \
+    count:'count commits' \
+    delete-branch:'delete local and remote branch' \
+    delete-submodule:'delete submodule' \
+    delete-tag:'delete local and remote tag' \
+    extras:'git-extras' \
+    graft:'merge commits from source branch to destination branch' \
+    squash:'merge commits from source branch into the current one as a single commit' \
+    feature:'create a feature branch' \
+    refactor:'create a refactor branch' \
+    bug:'create a bug branch' \
+    summary:'repository summary' \
+    effort:'display effort statistics' \
+    repl:'read-eval-print-loop' \
+    commits-since:'list commits since a given date' \
+    release:'release commit with the given tag' \
+    alias:'define, search and show aliases' \
+    ignore:'add patterns to .gitignore' \
+    info:'show info about the repository' \
+    create-branch:'create local and remote branch' \
+    fresh-branch:'create empty local branch' \
+    undo:'remove the latest commit' \
+    setup:'setup a git repository' \
+    touch:'one step creation of new files' \
+    obliterate:'Completely remove a file from the repository, including past commits and tags' \
+    local-commits:'list unpushed commits on the local branch' \

From 46b88b6a5a48f555c89a02d30e039758f4e3bfe7 Mon Sep 17 00:00:00 2001
From: Alexis GRIMALDI <alexis.grimaldi@gmail.com>
Date: Thu, 19 Jul 2012 13:01:32 +0200
Subject: [PATCH 600/907] Added credits

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

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index 6adad124e..0d7c2db7d 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -1,4 +1,24 @@
 #compdef git
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for git-extras (http://github.com/visionmedia/git-extras).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Alexis GRIMALDI (https://github.com/agrimaldi)
+#
+# ------------------------------------------------------------------------------
+# Inspirations
+# -----------
+#
+#  * git-extras (http://github.com/visionmedia/git-extras)
+#  * git-flow-completion (http://github.com/bobthecow/git-flow-completion)
+#
+# ------------------------------------------------------------------------------
 
 
 __git_command_successful () {

From 1e1e0fa44d8e97567f7a3ecd7f922c7ecca6e76f Mon Sep 17 00:00:00 2001
From: Alexis GRIMALDI <alexis.grimaldi@gmail.com>
Date: Fri, 20 Jul 2012 16:46:30 +0200
Subject: [PATCH 601/907] Fix changelog --list completion bug

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

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
index 0d7c2db7d..8419166ab 100644
--- a/plugins/git-extras/git-extras.plugin.zsh
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -95,7 +95,7 @@ __git_author_names() {
 
 _git-changelog() {
     _arguments \
-        '(-l --list)'{-l, --list}'[list commits]' \
+        '(-l --list)'{-l,--list}'[list commits]' \
 }
 
 

From 1c23a52f5744ef419e83733d18a6a698ddd14d1e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 20 Jul 2012 15:07:51 -0700
Subject: [PATCH 602/907] auto-upadate feature will now reset the epoch so that
 if a user doesn't say yes, it won't ask them again for a while. fixes #1240

---
 tools/check_for_upgrade.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index bbd705a1e..612901cbe 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -32,9 +32,10 @@ then
       echo "[Oh My Zsh] Would you like to check for updates?"
       echo "Type Y to update oh-my-zsh: \c"
       read line
-      if [ "$line" = Y ] || [ "$line" = y ]
-      then
+      if [ "$line" = Y ] || [ "$line" = y ]; then
         _upgrade_zsh
+      else
+        _update_zsh_update
       fi
     fi
   fi

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

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

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

From d5bfbf05d16634fa3c2834c7097edb1cf2487d96 Mon Sep 17 00:00:00 2001
From: clutton <clutton0@gmail.com>
Date: Tue, 24 Jul 2012 05:36:18 +0300
Subject: [PATCH 604/907] improvement: define PROMPT_HOST once on startup

---
 themes/jnrowe.zsh-theme | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index 0ade9cc60..a1478be31 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -1,16 +1,14 @@
-autoload -U colors && colors
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
+zstyle ':vcs_info:*' disable-patterns "/usr/(ports|src)(|/*)"
 zstyle ':vcs_info:*' actionformats \
-    '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
-zstyle ':vcs_info:*' formats \
-    '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f '
+       '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+zstyle ':vcs_info:*' formats '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f '
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_vcs
-add-zsh-hook precmd prompt_host
 
 prompt_vcs () {
     vcs_info
@@ -26,17 +24,16 @@ prompt_vcs () {
     fi
 }
 
-prompt_host () {
+function {
     if [[ -n "$SSH_CLIENT" ]]; then
-        host=" ($HOST)"
+        PROMPT_HOST=" ($HOST)"
     else
-        host=''
+        PROMPT_HOST=''
     fi
 }
 
-
 local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)"
 
-PROMPT='${ret_status}%{$fg[blue]%}${host}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
+PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
 
 #  vim: set ft=zsh ts=4 sw=4 et:

From 61e708f91f36420e1c5ebe68c23d94738989c9d1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <gchristensen@nationalfield.org>
Date: Mon, 23 Jul 2012 23:33:14 -0400
Subject: [PATCH 605/907] Adding a symfony plugin, for symfony 1

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

diff --git a/plugins/symfony/symfony.plugin.zsh b/plugins/symfony/symfony.plugin.zsh
new file mode 100644
index 000000000..9de767548
--- /dev/null
+++ b/plugins/symfony/symfony.plugin.zsh
@@ -0,0 +1,13 @@
+# symfony basic command completion
+
+_symfony_get_command_list () {
+    ./symfony | sed "1,/Available tasks/d" | awk 'BEGIN { cat=null; } /^[A-Za-z]+$/ { cat = $1; } /^  :[a-z]+/ { print cat $1; }'
+}
+
+_symfony () {
+  if [ -f symfony ]; then
+    compadd `_symfony_get_command_list`
+  fi
+}
+
+compdef _symfony symfony

From decb9c82b5392d66e157ceef9c3b41466bdcbafd Mon Sep 17 00:00:00 2001
From: clutton <clutton0@gmail.com>
Date: Tue, 24 Jul 2012 14:16:03 +0300
Subject: [PATCH 606/907] delete os specific disable-patterns

---
 themes/jnrowe.zsh-theme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index a1478be31..bae88f7ab 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -1,7 +1,6 @@
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
-zstyle ':vcs_info:*' disable-patterns "/usr/(ports|src)(|/*)"
 zstyle ':vcs_info:*' actionformats \
        '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
 zstyle ':vcs_info:*' formats '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f '

From a8d795872989ddce5bbda0926f5ebca1d769ff6b Mon Sep 17 00:00:00 2001
From: apm <korjavin@gmail.com>
Date: Wed, 25 Jul 2012 10:55:28 +0600
Subject: [PATCH 607/907] alias at=aptitude broke /usr/bin/at scheduler. Just
 an idea: change it to ap

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

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 39d3ef36a..67e38bdf9 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -21,7 +21,7 @@ fi
 # These are for more obscure uses of apt-get and aptitude that aren't covered
 # below.
 alias ag='apt-get'
-alias at='aptitude'
+alias ap='aptitude'
 
 # Some self-explanatory aliases
 alias acs="apt-cache search"
@@ -35,7 +35,7 @@ alias afs='apt-file search --regexp'
 
 # These are apt-get only
 alias asrc='apt-get source'
-alias ap='apt-cache policy'
+alias app='apt-cache policy'
 
 # superuser operations ######################################################
 if [[ $use_sudo -eq 1 ]]; then

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

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

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

From e709642f6f9e9e89cd95177b2867794b3183a43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Thu, 26 Jul 2012 17:50:56 +0000
Subject: [PATCH 609/907] Merge branch 'master', remote-tracking branch
 'rr/master'


From 75029cda2a52b656543ae5477328150654de8ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Thu, 26 Jul 2012 17:54:15 +0000
Subject: [PATCH 610/907] Added a "please" alias for sudo

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

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 0555be264..2eae3835a 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -8,6 +8,7 @@ alias -- -='cd -'
 
 # Super user
 alias _='sudo'
+alias please='sudo'
 
 #alias g='grep -in'
 

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

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

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

From aaf705c5faf3ebe27604277809ca1260705430c9 Mon Sep 17 00:00:00 2001
From: bwl <benlundquist@gmail.com>
Date: Sun, 29 Jul 2012 00:53:20 -0400
Subject: [PATCH 612/907] Adding logic for ~/Applications folder installs of
 Sublime Text 2

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

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 91b0279c5..e43bf76f5 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,9 +1,16 @@
 # Sublime Text 2 Aliases
 #unamestr = 'uname'
 
+local _sublime_darwin_subl=/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl
+
 if [[ $('uname') == 'Linux' ]]; then
 	alias st='/usr/bin/sublime_text&'
 elif  [[ $('uname') == 'Darwin' ]]; then
-	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
+	# Check if Sublime is installed in user's home application directory
+	if [[ -a $HOME/${_sublime_darwin_subl} ]]; then
+		alias st='$HOME/${_sublime_darwin_subl}'
+	else
+		alias st='${_sublime_darwin_subl}'
+	fi
 fi
 alias stt='st .'

From a3c2a2f6e8ff9db508070a905de056346386ef4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caio=20Rom=C3=A3o?= <caioromao@gmail.com>
Date: Sun, 29 Jul 2012 20:18:26 +0200
Subject: [PATCH 613/907] Add branch status support to git_prompt_status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch makes git_prompt_status support three new status variables:

 - ZSH_THEME_GIT_PROMPT_AHEAD
 - ZSH_THEME_GIT_PROMPT_BEHIND
 - ZSH_THEME_GIT_PROMPT_DIVERGED

With these extra variables it's easy to see (1) if you have commits in
your local branch that weren't pushed to the remote (AHEAD), (2) if
there are commits in the remote that you haven't merged/rebased yet
(BEHIND) or (3) if you have local unpushed commits AND the remote has
some commits you haven't merged yet (DIVERGED).

Refer to the first line displayed on `git status -b --porcelain`.

An example setup in a .zsh-theme file would be:

ZSH_THEME_GIT_PROMPT_AHEAD="↑"
ZSH_THEME_GIT_PROMPT_BEHIND="↓"
ZSH_THEME_GIT_PROMPT_DIVERGED="↕"
---
 lib/git.zsh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index fb4ad8ca6..bca8bdc96 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -38,7 +38,7 @@ function git_prompt_long_sha() {
 
 # Get the status of the working tree
 git_prompt_status() {
-  INDEX=$(git status --porcelain 2> /dev/null)
+  INDEX=$(git status --porcelain -b 2> /dev/null)
   STATUS=""
   if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
@@ -66,6 +66,15 @@ git_prompt_status() {
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
+  if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
+  fi
+  if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
+  fi
   echo $STATUS
 }
 

From 027fcccc9256aaf63e0d1b812069a1a0880f46fa Mon Sep 17 00:00:00 2001
From: Ted Vessenes <tvessene@akamai.com>
Date: Tue, 31 Jul 2012 13:27:40 -0400
Subject: [PATCH 614/907] Make git use sha when branch name is missing.

---
 lib/git.zsh                | 3 ++-
 plugins/git/git.plugin.zsh | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index fb4ad8ca6..af8b153d9 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,6 +1,7 @@
 # get the name of the branch we are on
 function git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
   echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d3d3f702a..14237cebe 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -50,13 +50,14 @@ alias gsd='git svn dcommit'
 # Usage example: git pull origin $(current_branch)
 #
 function current_branch() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  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() {
-
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  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 9af7f862999c458525d1a5c0f2470757ffe2f1dc Mon Sep 17 00:00:00 2001
From: Alexis Letessier <alexis.letessier@gmail.com>
Date: Wed, 1 Aug 2012 23:58:09 +0200
Subject: [PATCH 615/907] Correct variable used for global ssh known host
 completion

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

diff --git a/lib/completion.zsh b/lib/completion.zsh
index f31e101d5..ba839a067 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -32,7 +32,7 @@ zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-dir
 cdpath=(.)
 
 # use /etc/hosts and known_hosts for hostname completion
-[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
+[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
 hosts=(

From 9172b3a89fb77f79043d185d247a501b3b93fa6f Mon Sep 17 00:00:00 2001
From: Yannik Stein <yannikstein@gmail.com>
Date: Sun, 5 Aug 2012 22:51:11 +0300
Subject: [PATCH 616/907] fix typo in cd-wrapper

---
 lib/directories.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index a787db9eb..1b92df6b3 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -26,9 +26,9 @@ cd () {
   elif [[ "x$*" == "x...." ]]; then
     cd ../../..
   elif [[ "x$*" == "x....." ]]; then
-    cd ../../..
-  elif [[ "x$*" == "x......" ]]; then
     cd ../../../..
+  elif [[ "x$*" == "x......" ]]; then
+    cd ../../../../..
   else
     builtin cd "$@"
   fi

From 74faabbcabf6dc9a60737bfd54ba1b3a341c547d Mon Sep 17 00:00:00 2001
From: "Sean M. Collins" <sean@coreitpro.com>
Date: Tue, 7 Aug 2012 14:38:48 -0400
Subject: [PATCH 617/907] Add shortcut for showing log of all branches

---
 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 d3d3f702a..23c598169 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -30,6 +30,8 @@ alias glg='git log --stat --max-count=5'
 compdef _git glg=git-log
 alias glgg='git log --graph --max-count=5'
 compdef _git glgg=git-log
+alias glgga='git log --graph --decorate --all' 
+compdef _git glgga=git-log
 alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'

From 36b42017aeda6629d487c080ff6b5c7d3650687d Mon Sep 17 00:00:00 2001
From: Bodo Tasche <bodo@wannawork.de>
Date: Sun, 12 Aug 2012 09:13:02 +0200
Subject: [PATCH 618/907] new forklift plugin

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

diff --git a/plugins/forklift/forklift.plugin.zsh b/plugins/forklift/forklift.plugin.zsh
new file mode 100644
index 000000000..056069d36
--- /dev/null
+++ b/plugins/forklift/forklift.plugin.zsh
@@ -0,0 +1,44 @@
+# Open folder in ForkLift.app from console
+# Author: Adam Strzelecki nanoant.com, modified by Bodo Tasche bitboxer.de
+#
+# Usage:
+#   fl [<folder>]
+#
+# Opens specified directory or current working directory in ForkLift.app
+#
+# Notes:
+# It assumes Shift+Cmd+G launches go to folder panel and Cmd+N opens new
+# app window.
+#
+# https://gist.github.com/3313481
+function fl {
+  if [ ! -z "$1" ]; then
+    DIR=$1
+    if [ ! -d "$DIR" ]; then
+      DIR=$(dirname $DIR)
+    fi
+    if [ "$DIR" != "." ]; then
+      PWD=`cd "$DIR";pwd`
+    fi
+  fi
+  osascript 2>&1 1>/dev/null <<END
+    tell application "ForkLift"
+      activate
+    end tell
+    tell application "System Events"
+      tell application process "ForkLift"
+        try
+          set topWindow to window 1
+        on error
+          keystroke "n" using command down
+          set topWindow to window 1
+        end try
+        keystroke "g" using {command down, shift down}
+        tell sheet 1 of topWindow
+          set value of text field 1 to "$PWD"
+        	keystroke return
+        end tell
+      end tell
+    end tell
+END
+}

From 76f2429e8ec30afacd3a913018c8c573962e214c Mon Sep 17 00:00:00 2001
From: Marcelo Eden <edendroid@gmail.com>
Date: Tue, 14 Aug 2012 12:23:11 -0300
Subject: [PATCH 619/907] new 3den theme with RVM and GIT

---
 themes/3den.zsh-theme | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 themes/3den.zsh-theme

diff --git a/themes/3den.zsh-theme b/themes/3den.zsh-theme
new file mode 100644
index 000000000..1d2c7db7f
--- /dev/null
+++ b/themes/3den.zsh-theme
@@ -0,0 +1,7 @@
+PROMPT=$'%{$fg[white]%}$(~/.rvm/bin/rvm-prompt) %{$fg_bold[cyan]%}%~%{$reset_color%}$(git_prompt_info) %{$fg[cyan]%}%D{[%I:%M:%S]}\
+%{$fg_bold[green]%}%n$%{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="*"
+ZSH_THEME_GIT_PROMPT_CLEAN=""

From d3f6507a2e432efe48a3b8ac8f45c32e7d2ab656 Mon Sep 17 00:00:00 2001
From: Graeme Coupar <grambo@grambo.me.uk>
Date: Fri, 17 Aug 2012 16:58:35 +0100
Subject: [PATCH 620/907] Debian plugin now pipes which stderr to stdout

The debian plugin calls which to determine whether aptitude & sudo are
installed.  However, if these are not installed then the error output
from which will be output.  Since this isn't really an error condition,
this commit updates the which calls to pipe stderr to stdout, thus
hiding the error messages.
---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 39d3ef36a..da86b1711 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -6,14 +6,14 @@
 
 # Use aptitude if installed, or apt-get if not.
 # You can just set apt_pref='apt-get' to override it.
-if [[ -e $( which aptitude ) ]]; then
+if [[ -e $( which aptitude 2>&1 ) ]]; then
     apt_pref='aptitude'
 else
     apt_pref='apt-get'
 fi
 
 # Use sudo by default if it's installed
-if [[ -e $( which sudo ) ]]; then
+if [[ -e $( which sudo 2>&1 ) ]]; then
     use_sudo=1
 fi
 

From b2c1af91d3e70ea442ae5353cf7f140d89491c73 Mon Sep 17 00:00:00 2001
From: John Hamelink <john@johnhamelink.com>
Date: Sun, 19 Aug 2012 14:03:23 +0100
Subject: [PATCH 621/907] Added laravel plugin which gives aliases to artisan
 and bob, and provides autocompletion for artisan.

---
 plugins/laravel/_artisan           | 40 ++++++++++++++++++++++++++++++
 plugins/laravel/laravel.plugin.zsh |  3 +++
 2 files changed, 43 insertions(+)
 create mode 100644 plugins/laravel/_artisan
 create mode 100644 plugins/laravel/laravel.plugin.zsh

diff --git a/plugins/laravel/_artisan b/plugins/laravel/_artisan
new file mode 100644
index 000000000..8637514cf
--- /dev/null
+++ b/plugins/laravel/_artisan
@@ -0,0 +1,40 @@
+#compdef artisan
+
+# Laravel autocompletion
+# Author: John Hamelink <john@johnhamelink.com>
+#
+# This plugin does the following:
+#  - Adds aliases and autocompletion for artisan
+#  - Adds aliases and autocompletion for bob
+
+local curcontext="$curcontext" state line _opts _bundles ret=1
+_arguments -C \
+    '1: :->cmds' \
+    '*:: :->args' && ret=0
+
+case $state in
+    cmds)
+
+    _values "Artisan command" \
+        'session\:install[Create a session table]' \
+        'migrate[Manage Migrations]' \
+        'test[Run a test]' \
+        'route\:\:call[Call a route in the CLI]' \
+        'key\:\:generate[Generate a key]'
+        ret=0
+        ;;
+    args)
+        case $line[1] in
+            migrate)
+                _values \
+                    'install[Create the Laravel migration table' \
+                    'make[Create a migration]' \
+                    'rollback[Roll back to the last migration operation]' \
+                    'reset[Roll back all migrations that have ever run]'
+                ret=0
+                ;;
+        esac
+        ;;
+esac
+
+return ret
diff --git a/plugins/laravel/laravel.plugin.zsh b/plugins/laravel/laravel.plugin.zsh
new file mode 100644
index 000000000..ed932ee89
--- /dev/null
+++ b/plugins/laravel/laravel.plugin.zsh
@@ -0,0 +1,3 @@
+#!zsh
+alias artisan='php artisan'
+alias bob='php artisan bob::build'

From f995218d081ac66b86d40a0141db5d445147b50d Mon Sep 17 00:00:00 2001
From: "jamie sa (jsa)" <james.sa.2013@gmail.com>
Date: Fri, 10 Aug 2012 23:01:55 +0800
Subject: [PATCH 622/907] Add keep branch option.

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

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 71b343884..d9d288b8e 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -221,6 +221,7 @@ __git-flow-feature ()
 					_arguments \
 						-F'[Fetch from origin before performing finish]' \
 						-r'[Rebase instead of merge]'\
+						-k'[Keep branch after performing finish]'\
 						':feature:__git_flow_feature_list'
 				;;
 

From 6f92745761afc000b54bd782c7f3bcc0733302f7 Mon Sep 17 00:00:00 2001
From: Cenk Alti <cenkalti@gmail.com>
Date: Sat, 25 Aug 2012 09:51:58 +0300
Subject: [PATCH 623/907] Added another path for virtualenvwrapper plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When you install python via brew on OSX, pip is installed into /usr/local/share/python/ and all packages installed with this pip are installed here.
---
 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 5d0860400..8506624b5 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,5 +1,5 @@
 WRAPPER_FOUND=0
-for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
+for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/usr/local/share/python/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
   if [[ -e $wrapsource ]] ; then
     WRAPPER_FOUND=1
     source $wrapsource

From d5e5b7ee5adaf74afa96cae00260c50581d8f46f Mon Sep 17 00:00:00 2001
From: Cenk Alti <cenkalti@gmail.com>
Date: Sat, 25 Aug 2012 10:26:00 +0300
Subject: [PATCH 624/907] search virtualenvwrapper.sh in PATH

---
 .../virtualenvwrapper.plugin.zsh              | 76 +++++++++----------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 8506624b5..a5abb77c3 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,46 +1,40 @@
-WRAPPER_FOUND=0
-for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/usr/local/share/python/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
-  if [[ -e $wrapsource ]] ; then
-    WRAPPER_FOUND=1
-    source $wrapsource
+wrapsource=`which virtualenvwrapper.sh`
 
-    if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
-      # Automatically activate Git projects' virtual environments based on the
-      # directory name of the project. Virtual environment name can be overridden
-      # by placing a .venv file in the project root with a virtualenv name in it
-      function workon_cwd {
-          # Check that this is a Git repo
-          PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
-          if (( $? == 0 )); then
-              # Check for virtualenv name override
-              ENV_NAME=`basename "$PROJECT_ROOT"`
-              if [[ -f "$PROJECT_ROOT/.venv" ]]; then
-                  ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
-              fi
-              # Activate the environment only if it is not already active
-              if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
-                  if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
-                      workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
-                  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
-      }
+if [[ -f "$wrapsource" ]]; then
+  source $wrapsource
 
-      # New cd function that does the virtualenv magic
-      function cd {
-          builtin cd "$@" && workon_cwd
-      }
-    fi
+  if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
+    # Automatically activate Git projects' virtual environments based on the
+    # directory name of the project. Virtual environment name can be overridden
+    # by placing a .venv file in the project root with a virtualenv name in it
+    function workon_cwd {
+        # Check that this is a Git repo
+        PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
+        if (( $? == 0 )); then
+            # Check for virtualenv name override
+            ENV_NAME=`basename "$PROJECT_ROOT"`
+            if [[ -f "$PROJECT_ROOT/.venv" ]]; then
+                ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
+            fi
+            # Activate the environment only if it is not already active
+            if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+                if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+                    workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
+                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
+    }
 
-    break
+    # New cd function that does the virtualenv magic
+    function cd {
+        builtin cd "$@" && workon_cwd
+    }
   fi
-done
-
-if [ $WRAPPER_FOUND -eq 0 ] ; then
-  print "zsh virtualenvwrapper plugin: Couldn't activate virtualenvwrapper. Please run \`pip install virtualenvwrapper\`."
+else
+  print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh. Please install with \`pip install virtualenvwrapper\`."
 fi

From 28d3b80db1d5d976a809bc01da191be5b1768fcb Mon Sep 17 00:00:00 2001
From: Xavier Lacoste <xavier.lacoste@inria.fr>
Date: Thu, 30 Aug 2012 16:25:36 +0200
Subject: [PATCH 625/907] Add empty function rbenv_prompt_info() if doesn't
 exists

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

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2f0c4b917..9f0f30271 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,3 +1,5 @@
+functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){}
+
 function theme_precmd {
     local TERMWIDTH
     (( TERMWIDTH = ${COLUMNS} - 1 ))

From fbf82ae62fe03f69af0114011c0d6848a83d4fb3 Mon Sep 17 00:00:00 2001
From: everbird <stephen.zhuang@gmail.com>
Date: Sat, 1 Sep 2012 23:11:47 +0800
Subject: [PATCH 626/907] add new plugin to autocomplete supervisor commands

---
 plugins/supervisor/_supervisorctl        | 136 +++++++++++++++++++++++
 plugins/supervisor/_supervisord          |  32 ++++++
 plugins/supervisor/supervisor.plugin.zsh |   1 +
 3 files changed, 169 insertions(+)
 create mode 100644 plugins/supervisor/_supervisorctl
 create mode 100644 plugins/supervisor/_supervisord
 create mode 100644 plugins/supervisor/supervisor.plugin.zsh

diff --git a/plugins/supervisor/_supervisorctl b/plugins/supervisor/_supervisorctl
new file mode 100644
index 000000000..d159f20e0
--- /dev/null
+++ b/plugins/supervisor/_supervisorctl
@@ -0,0 +1,136 @@
+#compdef supervisorctl
+
+typeset -A opt_args
+local context state line
+
+_supervisorctl() {
+    _arguments -s -S \
+        {--configuration,-c}"[configuration file path (default /etc/supervisor.conf)]:FILENAME:_files" \
+        {--help,-h}"[print usage message and exit]:" \
+        {--interactive,-i}"[start an interactive shell after executing commands]" \
+        {--serverurl,-s}"[URL on which supervisord server is listening (default "http://localhost:9001").]" \
+        {--username,-u}"[username to use for authentication with server]:USERNAME:_users" \
+        {--password,-p}"[password to use for authentication with server]:PASSWORD:" \
+        {--history-file,-r}"[keep a readline history (if readline is available)]:FILENAME:_files" \
+        "*::supervisorctl commands:_supervisorctl_command"
+}
+
+(( $+functions[_supervisorctl_command] )) ||
+_supervisorctl_command() {
+    local cmd ret=1
+
+    (( $+supervisorctl_cmds )) || _supervisorctl_cmds=(
+        "add:Activates any updates in config for process/group" \
+        "avail:Display all configured processes" \
+        "clear:Clear process/multiple-process/all-process log files" \
+        "exit:Exit the supervisor shell." \
+        "fg:Connect to a process in foreground mode" \
+        "maintail:tail of supervisor main log file" \
+        "open:Connect to a remote supervisord process. (for UNIX domain socket, use unix:///socket/path)" \
+        "pid:Get the PID of supervisord." \
+        "quit:Exit the supervisor shell." \
+        "reload:Restart the remote supervisord." \
+        "remove:Removes process/group from active config" \
+        "reread:Reload the daemon's configuration files" \
+        "restart:Restart process or group." \
+        "shutdown:Shut the remote supervisord down." \
+        "start:Start process or groups." \
+        "status:Get process status info." \
+        "stop:Stop process or group." \
+        "tail:tail of process stdout" \
+        "update:Reload config and add/remove as necessary" \
+        "version:Show the version of the remote supervisord process" \
+        "help:Show help" \
+        )
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'supervisorctl subcommand' _supervisorctl_cmds \
+            || compadd "$@" - ${(s.:.)${(j.:.)_supervisorctl_syns}}
+    else
+        local curcontext="$curcontext"
+
+        cmd="${${_supervisorctl_cmds[(r)$words[1]:*]%%:*}:-${(k)_supervisorctl_syns[(r)(*:|)$words[1](:*|)]}}"
+        if (( $#cmd )); then
+            curcontext="${curcontext%:*:*}:supervisorctl-${cmd}:"
+            _call_function ret _supervisorctl_$cmd || _message 'no more arguments'
+        else
+            _message "unknown supervisorctl command: $words[1]"
+        fi
+        return ret
+    fi
+}
+
+# get supervisor contoroll processes
+(( $+functions[_get_supervisor_procs] )) ||
+_get_supervisor_procs() {
+    local cache_policy
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    if [[ -z "$cache_policy" ]]; then
+        zstyle ":completion:${curcontext}:" cache-policy _supervisor_procs_caching_policy
+    fi
+
+    if ( [[ ${+_supervisor_procs} -eq 0 ]] || _cache_invalid supervisor_procs ) \
+        && ! _retrieve_cache supervisor_procs; then
+
+        _supervisor_procs=(${${(f)"$(supervisorctl status >/dev/null 2>&1 | awk -F' ' '{print $1}')"}})
+        _store_cache supervisor_procs _supervisor_procs
+    fi
+
+    local expl
+    _wanted supervisor_procs expl 'supervisor processes' compadd -a _supervisor_procs
+}
+
+_supervisor_procs_caching_policy() {
+    local -a oldp
+    oldp=( "$1"(Nmw+1) )
+    (( $#oldp ))
+}
+
+(( $+functions[_supervisorctl_add] )) ||
+_supervisorctl_add() {
+    _arguments -s \
+        "--help[use help system]" \
+        "*::supervisorctl commands:_supervisorctl"
+}
+
+(( $+functions[_supervisorctl_help] )) ||
+_supervisorctl_help() {
+    _arguments -s \
+        "*:supervisorctl commands:_supervisorctl"
+}
+
+(( $+functions[_supervisorctl_maintail] )) ||
+_supervisorctl_maintail() {
+    _arguments -s \
+        '-f[Continuous tail of supervisor main log file (Ctrl-C to exit)]'
+}
+
+(( $+functions[_supervisorctl_start] )) ||
+_supervisorctl_start() {
+    # TODO: add 'all'
+    _arguments -s \
+        '*::supvervisor process:_get_supervisor_procs'
+}
+
+(( $+functions[_supervisorctl_status] )) ||
+_supervisorctl_status() {
+    _arguments \
+        '*::supvervisor process:_get_supervisor_procs'
+}
+
+(( $+functions[_supervisorctl_stop] )) ||
+_supervisorctl_stop() {
+    # TODO: add 'all'
+    _arguments -s \
+        '*::supvervisor process:_get_supervisor_procs'
+}
+
+(( $+functions[_supervisorctl_tail] )) ||
+_supervisorctl_tail() {
+    # TODO: add 'stderr'
+    _arguments -s \
+        '-f[Continuous tail of named process stdout Ctrl-C to exit.]' \
+        '*::supvervisor process:_get_supervisor_procs'
+}
+
+_supervisorctl "$@"
diff --git a/plugins/supervisor/_supervisord b/plugins/supervisor/_supervisord
new file mode 100644
index 000000000..34d27805d
--- /dev/null
+++ b/plugins/supervisor/_supervisord
@@ -0,0 +1,32 @@
+#compdef supervisord
+
+typeset -A opt_args
+local context state line
+
+_arguments \
+    {--configuration,-c}"[configuration file]:FILENAME:_files" \
+    {--nodaemon,-n}"[run in the foreground (same as 'nodaemon true' in config file)]" \
+    {--help,-h}"[print this usage message and exit]:" \
+    {--user,-u}"[run supervisord as this user]:USER:_users" \
+    {--umask,-m}"[use this umask for daemon subprocess (default is 022)]" \
+    {--directory,-d}"[directory to chdir to when daemonized]" \
+    {--logfile,-l}"[use FILENAME as logfile path]:FILENAME:_files" \
+    {--logfile_maxbytes,-y}"[use BYTES to limit the max size of logfile]" \
+    {--logfile_backups,-z}"[number of backups to keep when max bytes reached]" \
+    {--loglevel,-e}"[use LEVEL as log level (debug,info,warn,error,critical)]:level:->levels" \
+    {--pidfile,-j}"[write a pid file for the daemon process to FILENAME]:FILENAME:_files" \
+    {--identifier,-i}"[identifier used for this instance of supervisord]" \
+    {--childlogdir,-q}"[the log directory for child process logs]:child log directory:_files -/" \
+    {--nocleanup,-k}"[prevent the process from performing cleanup (removal of old automatic child log files) at startup.]" \
+    {--minfds,-a}"[the minimum number of file descriptors for start success]" \
+    {--strip_ansi,-t}"[strip ansi escape codes from process output]" \
+    "--minprocs[the minimum number of processes available for start success]" \
+    "--profile_options[run supervisord under profiler and output results based on OPTIONS, which is a comma-sep'd list of 'cumulative', 'calls', and/or 'callers', e.g. 'cumulative,callers')]" \
+    "*::args:_gnu_generic"
+
+case $state in
+levels)
+    levels=("debug" "info" "warn" "error" "critical")
+    _describe -t levels 'supervisord levels' levels && return 0
+    ;;
+esac
diff --git a/plugins/supervisor/supervisor.plugin.zsh b/plugins/supervisor/supervisor.plugin.zsh
new file mode 100644
index 000000000..cf1997c5b
--- /dev/null
+++ b/plugins/supervisor/supervisor.plugin.zsh
@@ -0,0 +1 @@
+# DECLARION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.

From 2643ac975bff9513753b6e3d99a34164e48955f7 Mon Sep 17 00:00:00 2001
From: Nicholas Hutchinson <nshutchinson@gmail.com>
Date: Sun, 2 Sep 2012 10:38:08 +1200
Subject: [PATCH 627/907] Update fishy theme to collapse working directory in
 PROMPT.

For non-trailing path components, we show only the first character. So, as in Fish proper, we convert ~/some/really/really/really/long/path/name to ~/s/r/r/r/l/p/name.
---
 themes/fishy.zsh-theme | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

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

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

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

From fa859f90d2ba91be36c77520b1a23442c55d9cfe Mon Sep 17 00:00:00 2001
From: Ben Cao <zcao@freewheel.tv>
Date: Mon, 3 Sep 2012 11:51:28 +0800
Subject: [PATCH 629/907] fix rvm auto complete, pointing to $rvm_path

---
 plugins/rvm/_rvm           | 147 -------------------------------------
 plugins/rvm/rvm.plugin.zsh |   7 +-
 2 files changed, 6 insertions(+), 148 deletions(-)
 delete mode 100644 plugins/rvm/_rvm

diff --git a/plugins/rvm/_rvm b/plugins/rvm/_rvm
deleted file mode 100644
index bba5304a0..000000000
--- a/plugins/rvm/_rvm
+++ /dev/null
@@ -1,147 +0,0 @@
-#compdef rvm
-
-local curcontext="$curcontext" state line cmds ret=1
-
-_arguments -C \
-	'(- 1 *)'{-v,--version}'[display version information]' \
-	'(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
-	'(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
-	'(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
-	'(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
-	'(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
-	'-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
-	'-e[Execute code from the command line]:code' \
-	'(-G)-G[root gem path to use]:path:_files' \
-	'(--gems)--gems[Used to set the gems_flag, use with remove to remove gems]' \
-	'(--archive)--archive[Used to set the archive_flag, use with remove to remove archive]' \
-	'(--patch)--patch[With MRI Rubies you may specify one or more full paths to patches]' \
-	'(-C|--configure)'{-C,--configure}'=[custom configure options]' \
-	'(--nice)--nice[process niceness (for slow computers, default 0)]:number' \
-	'(--ree)--ree-options[Options passed directly to ree ./installer on the command line]:options' \
-	'(--head)--head[with update, updates rvm to git head version]' \
-	'(--rubygems)--rubygems[with update, updates rubygems for selected ruby]' \
-	'(--default)--default[with ruby select, sets a default ruby for new shells]' \
-	'(--debug)--debug[Toggle debug mode on for very verbose output]' \
-	'(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
-	'(--force)--force[Force install, removes old install & source before install]' \
-	'(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
-	'(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
-	'(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
-	'(--docs)--docs[with install, attempt to generate ri after installation]' \
-	'(--reconfigure)--reconfigure[Force ./configure on install even if Makefile already exists]' \
-	'1: :->cmds' \
-	'*: :->args' && ret=0
-
-case $state in
-	cmds)
-		cmds=( 
-            "version:show the rvm version installed in rvm_path"
-            "use:setup current shell to use a specific ruby version"
-            "reload:reload rvm source itself (useful after changing rvm source)"
-            "implode:(seppuku) removes the rvm installation completely. This means everything in $rvm_path (~/.rvm)."
-            "update:upgrades rvm to the latest version."
-            "reset:remove current and stored default & system settings."
-            "info :show the *current* environment information for current ruby"
-            "current:print the *current* ruby version and the name of any gemset being used."
-            "debug:show info plus additional information for common issues"
-            "install:install one or many ruby versions"
-            "uninstall:uninstall one or many ruby versions, leaves their sources"
-            "remove:uninstall one or many ruby versions and remove their sources"
-            "migrate:Lets you migrate all gemsets from one ruby to another."
-            "upgrade:Lets you upgrade from one version of a ruby to another, including migrating your gemsets semi-automatically."
-            "wrapper:generates a set of wrapper executables for a given ruby with the specified ruby and gemset combination. Used under the hood for passenger support and the like."
-            "cleanup:Lets you remove stale source folders / archives and other miscellaneous data associated with rvm."
-            "repair:Lets you repair parts of your environment e.g. wrappers, env files and and similar files (e.g. general maintenance)."
-            "snapshot:Lets your backup / restore an rvm installation in a lightweight manner."
-            "disk-usage:Tells you how much disk space rvm install is using."
-            "tools:Provides general information about the ruby environment, primarily useful when scripting rvm."
-            "docs:Tools to make installing ri and rdoc documentation easier."
-            "rvmrc:Tools related to managing rvmrc trust and loading."
-            "exec:runs an arbitrary command as a set operation."
-            "ruby:runs a named ruby file against specified and/or all rubies"
-            "gem:runs a gem command using selected ruby's 'gem'"
-            "rake:runs a rake task against specified and/or all rubies"
-            "tests:runs 'rake test' across selected ruby versions"
-            "specs:runs 'rake spec' across selected ruby versions"
-            "monitor:Monitor cwd for testing, run rake {spec,test} on changes."
-            "gemset:gemsets: http://rvm.beginrescueend.com/gemsets/"
-            "rubygems:Switches the installed version of rubygems for the current ruby."
-            "gemdir:display the path to the current gem directory (GEM_HOME)."
-            "srcdir:display the path to rvm source directory (may be yanked)"
-            "fetch:Performs an archive / src fetch only of the selected ruby."
-            "list:show currently installed rubies, interactive output."
-            "package:Install a dependency package {readline,iconv,zlib,openssl}"
-            "notes:Display notes, with operating system specifics."
-            "export:Temporarily set an environment variable in the current shell."
-            "unexport:Undo changes made to the environment by 'rvm export'."
-        )
-		_describe -t commands 'rvm command' cmds && ret=0
-		;;
-	args)
-		case $line[1] in
-			(use|uninstall|remove|list)
-				_values -S , 'rubies' $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') default system && ret=0
-				;;
-			(install|fetch)
-				_values -S , 'rubies' $(rvm list known_strings) && ret=0
-				;;
-			gemset)
-				if (( CURRENT == 3 )); then
-					_values 'gemset_commands' \
-                        'import' \
-                        'export' \
-                        'create' \
-                        'copy' \
-                        'rename' \
-                        'empty' \
-                        'delete' \
-                        'name' \
-                        'dir' \
-                        'list' \
-                        'list_all' \
-                        'gemdir' \
-                        'install' \
-                        'pristine' \
-                        'clear' \
-                        'use' \
-                        'update' \
-                        'unpack' \
-                        'globalcache'
-				else
-					_values -S , 'gemsets' $(rvm gemset list | grep -v gemset 2>/dev/null)
-				fi
-				ret=0
-				;;
-			package)
-				if (( CURRENT == 3 )); then
-					_values 'package_commands' \
-                        'install' \
-                        'uninstall'  
-				else
-					_values 'packages' \
-                        'readline' \
-                        'iconv' \
-                        'curl' \
-                        'openssl' \
-                        'zlib' \
-                        'autoconf' \
-                        'ncurses' \
-                        'pkgconfig' \
-                        'gettext' \
-                        'glib' \
-                        'mono' \
-                        'llvm' \
-                        'libxml2' \
-                        'libxslt' \
-                        'libyaml'
-				fi
-				ret=0
-				;;
-			*)
-				(( ret )) && _message 'no more arguments'
-				;;
-		esac
-		;;
-esac
-
-return ret
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 604c00713..e0c58ebda 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -2,7 +2,7 @@ alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
 local ruby18='ruby-1.8.7-p334'
-local ruby19='ruby-1.9.2-p180'
+local ruby19='ruby-1.9.3-p194'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -42,3 +42,8 @@ function gems {
 		-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
 		-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 }
+
+function _rvm_completion {
+  source $rvm_path"/scripts/zsh/Completion/_rvm"
+}
+compdef _rvm_completion rvm

From cfeb57024d78d84521ea6676a49182dee9a98b52 Mon Sep 17 00:00:00 2001
From: Reza <reza@balatarin.com>
Date: Mon, 3 Sep 2012 21:20:45 +0430
Subject: [PATCH 630/907] Nuke _cap_does_task_list_need_generating

Thanks @docwhat
---
 plugins/capistrano/_capistrano | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index 2ae977fcd..cf6b50c7f 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -1,17 +1,8 @@
 #compdef cap
 #autoload
 
-_cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
 if [ -f config/deploy.rb ]; then
-  if _cap_does_task_list_need_generating; then
+  if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then
     echo "\nGenerating .cap_tasks~..." > /dev/stderr
     cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
   fi

From 061a4c006c83c9ddb2c8c693c2169d5be663763f Mon Sep 17 00:00:00 2001
From: Josh Parnham <joshparnham@gmail.com>
Date: Thu, 6 Sep 2012 19:59:18 +1000
Subject: [PATCH 631/907] Add new 'nanoc' plugin

---
 plugins/nanoc/_nanoc           | 44 ++++++++++++++++++++++++++++++++++
 plugins/nanoc/nanoc.plugin.zsh |  9 +++++++
 2 files changed, 53 insertions(+)
 create mode 100644 plugins/nanoc/_nanoc
 create mode 100644 plugins/nanoc/nanoc.plugin.zsh

diff --git a/plugins/nanoc/_nanoc b/plugins/nanoc/_nanoc
new file mode 100644
index 000000000..fde07c3fc
--- /dev/null
+++ b/plugins/nanoc/_nanoc
@@ -0,0 +1,44 @@
+#compdef nanoc
+#autoload
+
+# nanoc zsh completion - based on the homebrew zsh completion
+# requires the 'nanoc' gem to be installed
+
+local -a _1st_arguments
+_1st_arguments=(
+  'autocompile:start the autocompiler'
+  'compile:compile items of this site'
+  'create-item:create an item'
+  'create-layout:create a layout'
+  'create-site:create a site'
+  'deploy:deploy the compiled site'
+  'help:show help'
+  'prune:remove files not managed by nanoc from the output directory'
+  'show-data:show data in this site'
+  'show-plugins:show all available plugins'
+  'show-rules:describe the rules for each item'
+  'update:update the data stored by the data source to a newer version'
+  'validate-css:validate the site’s CSS'
+  'validate-html:validate the site’s HTML'
+  'validate-links:validate links in site'
+  'view:start the web server that serves static files'
+  'watch:start the watcher'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+  '(--color)--color[enable color]' \
+  '(--debug)--debug[enable debugging]' \
+  '(--help)--help[show the help message and quit]' \
+  '(--no-color)--no-color[disable color]' \
+  '(--verbose)--verbose[make nanoc output more detailed]' \
+  '(--version)--version[show version information and quit]' \
+  '(--warn)--warn[enable warnings]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "nanoc subcommand" _1st_arguments
+  return
+fi
diff --git a/plugins/nanoc/nanoc.plugin.zsh b/plugins/nanoc/nanoc.plugin.zsh
new file mode 100644
index 000000000..5a5064613
--- /dev/null
+++ b/plugins/nanoc/nanoc.plugin.zsh
@@ -0,0 +1,9 @@
+alias n='nanoc'
+alias na='nanoc autocompile'
+alias nco='nanoc compile'
+alias nci='nanoc create_item'
+alias ncl='nanoc create_layout'
+alias ncs='nanoc create_site'
+alias nd='nanoc deploy'
+alias nv='nanoc view'
+alias nw='nanoc watch'

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

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

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

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

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

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

From 8d60a0c80039048b836205475dfcf258bd776912 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Thu, 13 Sep 2012 11:38:58 +0200
Subject: [PATCH 634/907] updated cap plugin to use `cap -T` instead of `cap
 show_tasks` which didn't exist (sometimes?)

---
 plugins/cap/cap.plugin.zsh | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index 8336182d5..04479f46f 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -1,8 +1,30 @@
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
+stat -f%m . > /dev/null 2>&1
+if [ "$?" = 0 ]; then
+  stat_cmd=(stat -f%m)
+else
+  stat_cmd=(stat -L --format=%y)
+fi
+
+# Cache filename
+_cap_show_undescribed_tasks=0
+
+# Cache filename
+_cap_task_cache_file='.cap_task_cache'
+
+_cap_get_task_list () {
+  if [ ${_cap_show_undescribed_tasks} -eq 0 ]
+    cap -T | grep '^cap' | cut -d " " -f 2
   else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
+    cap -vT | grep '^cap' | cut -d " " -f 2
+  fi
+}
+
+_cap_does_task_list_need_generating () {
+
+  if [ ! -f ${_cap_task_cache_file} ]; then return 0;
+  else
+    accurate=$($stat_cmd $_cap_task_cache_file)
+    changed=$($stat_cmd config/deploy.rb)
     return $(expr $accurate '>=' $changed)
   fi
 }
@@ -10,12 +32,10 @@ function _cap_does_task_list_need_generating () {
 function _cap () {
   if [ -f config/deploy.rb ]; then
     if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
-> .cap_tasks~
+      _cap_get_task_list > ${_cap_task_cache_file}
     fi
-    compadd `cat .cap_tasks~`
+    compadd `cat ${_cap_task_cache_file}`
   fi
 }
 
-compctl -K _cap cap
+compdef _cap cap

From 9a4fac184ea1aa7a2e86e50111548a0a98652aaf Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Thu, 13 Sep 2012 12:20:44 +0200
Subject: [PATCH 635/907] fixed incorrect if/else

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

diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index 04479f46f..d22d10401 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -12,7 +12,7 @@ _cap_show_undescribed_tasks=0
 _cap_task_cache_file='.cap_task_cache'
 
 _cap_get_task_list () {
-  if [ ${_cap_show_undescribed_tasks} -eq 0 ]
+  if [ ${_cap_show_undescribed_tasks} -eq 0 ]; then
     cap -T | grep '^cap' | cut -d " " -f 2
   else
     cap -vT | grep '^cap' | cut -d " " -f 2

From b11e28914139fb585c0a4de4ddb6a55f19a5493d Mon Sep 17 00:00:00 2001
From: Isaac Wolkerstorfer <i@agnoster.net>
Date: Thu, 13 Sep 2012 14:02:09 +0200
Subject: [PATCH 636/907] Add agnoster.zsh-theme

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

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
new file mode 100644
index 000000000..15848979e
--- /dev/null
+++ b/themes/agnoster.zsh-theme
@@ -0,0 +1,28 @@
+# Theme by [agnoster](https://github.com/agnoster)
+# See https://gist.github.com/3712874
+
+ZSH_THEME_GIT_PROMPT_DIRTY='±'
+
+function _git_prompt_info() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+  echo "${ref/refs\/heads\//⭠ }$(parse_git_dirty)"
+}
+
+function _git_info() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    local BG_COLOR=green
+    if [[ -n $(parse_git_dirty) ]]; then
+      BG_COLOR=yellow
+    fi
+    echo "%{%K{$BG_COLOR}%}⮀%{%F{black}%} $(_git_prompt_info) %{%F{$BG_COLOR}%K{blue}%}⮀"
+  else
+    echo "%{%K{blue}%}⮀"
+  fi
+}
+
+PROMPT_HOST='%{%b%F{gray}%K{black}%} %(?.%{%F{green}%}✔.%{%F{red}%}✘)%{%F{gray}%} %m %{%F{black}%}'
+PROMPT_DIR='%{%F{white}%} %1~ '
+PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}⮀%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})⮀%{%f%k%b%}'
+
+PROMPT='%{%f%b%k%}
+$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU '

From 28d28ee6f6128b3194ac6e28839aabb9a9018c4e Mon Sep 17 00:00:00 2001
From: Alexander Surma <surma@surmair.de>
Date: Fri, 14 Sep 2012 13:57:13 +0200
Subject: [PATCH 637/907] git plugin: Add `gpoat` alias

---
 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 d3d3f702a..46a1419ba 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -38,6 +38,7 @@ alias gm='git merge'
 compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
+alias gpoat='git push origin --all && git push origin --tags'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From 11a4c67f340b400a3d9cc9913b4f49d708e01a57 Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Mon, 17 Sep 2012 10:19:37 -0600
Subject: [PATCH 638/907] Added junkfood theme

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
new file mode 100644
index 000000000..a265f29f1
--- /dev/null
+++ b/themes/junkfood.zsh-theme
@@ -0,0 +1,34 @@
+# ------------------------------------------------------------------------
+# Tyler Cipriani 
+# oh-my-zsh theme
+# Totally ripped off Dallas theme
+# ------------------------------------------------------------------------
+
+# Grab the current date (%W) and time (%t):
+JUNKFOOD_TIME_="%{$fg_bold[white]%}#%t%{$fg_bold[white]%} – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
+
+# Grab the current machine name 
+JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"
+
+# Grab the current username 
+JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}"
+
+# Grab the current filepath, use shortcuts: ~/Desktop
+# Append the current git branch, if in a git repository: ~aw@master
+JUNKFOOD_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
+
+# For the git prompt, use a white @ and blue text for the branch name
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg_bold[white]%}"
+
+# Close it all off by resetting the color and styles.
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+# Do nothing if the branch is clean (no changes).
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✔"
+
+# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗✗✗"
+
+# Put it all together!
+PROMPT="$JUNKFOOD_TIME_$JUNKFOOD_CURRENT_USER_@$JUNKFOOD_MACHINE_$JUNKFOOD_LOCA_
+  "

From 00e11991e0fec9e4db783550a1c849c48920f02a Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Mon, 17 Sep 2012 10:25:19 -0600
Subject: [PATCH 639/907] Added space to prompt

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index a265f29f1..bfe3913de 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,7 +5,7 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[white]%}#%t%{$fg_bold[white]%} – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[white]%}# %t%{$fg_bold[white]%} – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
 
 # Grab the current machine name 
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"

From bf4157514f8880ac04ba328f7f1b74c34f1b39d7 Mon Sep 17 00:00:00 2001
From: Isaac Wolkerstorfer <i@agnoster.net>
Date: Mon, 17 Sep 2012 11:44:25 -0500
Subject: [PATCH 640/907] Refactored theme

---
 themes/agnoster.zsh-theme | 96 +++++++++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 19 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 15848979e..9cfcff3d0 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -1,28 +1,86 @@
-# Theme by [agnoster](https://github.com/agnoster)
-# See https://gist.github.com/3712874
+### Segment drawing
+# A few utility functions to make it easy and re-usable to draw segmented prompts
 
-ZSH_THEME_GIT_PROMPT_DIRTY='±'
-
-function _git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
-  echo "${ref/refs\/heads\//⭠ }$(parse_git_dirty)"
+CURRENT_BG=''
+SEGMENT_SEPARATOR='⮀'
+function segment_start() {
+  local bg=$1
+  local fg=$2
+  if [[ -n $CURRENT_BG && $bg != $CURRENT_BG ]]; then
+    echo -n " %{%K{$bg}%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
+  else
+    echo -n "%{%K{$bg}%}"
+  fi
+  [[ -n $fg ]] && fg="%F{$fg}" || fg="%f"
+  echo -n "%{$fg%} "
+  CURRENT_BG=$bg
 }
 
-function _git_info() {
-  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
-    local BG_COLOR=green
-    if [[ -n $(parse_git_dirty) ]]; then
-      BG_COLOR=yellow
-    fi
-    echo "%{%K{$BG_COLOR}%}⮀%{%F{black}%} $(_git_prompt_info) %{%F{$BG_COLOR}%K{blue}%}⮀"
+function segment_stop() {
+  if [[ -n $CURRENT_BG ]]; then
+    echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
   else
-    echo "%{%K{blue}%}⮀"
+    echo -n "%{%k%}"
+  fi
+  echo -n "%{%f%}"
+  CURRENT_BG=''
+}
+
+### Prompt components
+# Each component will draw itself, and hide itself if no information needs to be shown
+
+function prompt_context() {
+  local user=`whoami`
+
+  if [[ ("$user" != "$DEFAULT_USER") || (-n "$SSH_CLIENT") ]]; then
+    segment_start black
+    #echo -n "%{%F{yellow}%}$user%{%F{gray}%}@%{%F{green}%}%m%{%f%}"
+    echo -n "%(!.%{%F{yellow}%}.)$user@%m"
   fi
 }
 
-PROMPT_HOST='%{%b%F{gray}%K{black}%} %(?.%{%F{green}%}✔.%{%F{red}%}✘)%{%F{gray}%} %m %{%F{black}%}'
-PROMPT_DIR='%{%F{white}%} %1~ '
-PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}⮀%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})⮀%{%f%k%b%}'
+function prompt_git() {
+  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    ZSH_THEME_GIT_PROMPT_DIRTY='±'
+    local dirty=$(parse_git_dirty)
+    local ref
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+    if [[ -n $dirty ]]; then
+      segment_start yellow black
+    else
+      segment_start green black
+    fi
+    echo -n "${ref/refs\/heads\//⭠ }$dirty"
+  fi
+}
+
+function prompt_dir() {
+  segment_start blue white
+  echo -n '%~'
+}
+
+function prompt_status() {
+  local symbols
+  symbols=()
+  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
+  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
+  jobs=$(jobs -l | wc -l)
+  [[ $jobs -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
+  if [[ -n "$symbols" ]]; then
+    segment_start black white
+    echo -n "${symbols}"
+  fi
+}
+
+## Main prompt
+function build_prompt() {
+  RETVAL=$?
+  prompt_status
+  prompt_context
+  prompt_dir
+  prompt_git
+  segment_stop
+}
 
 PROMPT='%{%f%b%k%}
-$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU '
+$(build_prompt) '

From b534b3806357492a19b25841c7c0ad6a416f33aa Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Mon, 17 Sep 2012 12:16:06 -0600
Subject: [PATCH 641/907] Added fat arrow the theme

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index bfe3913de..a3631a2b0 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,7 +5,7 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[white]%}# %t%{$fg_bold[white]%} – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜%{$fg_bold[white]%}%t – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
 
 # Grab the current machine name 
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"

From a8d426087bf5f79ee4c8c05e8debca01b4af5fd5 Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Mon, 17 Sep 2012 14:12:09 -0600
Subject: [PATCH 642/907] modified spacing on junkfood theme

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index a3631a2b0..bb250e19b 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -31,4 +31,4 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗✗✗"
 
 # Put it all together!
 PROMPT="$JUNKFOOD_TIME_$JUNKFOOD_CURRENT_USER_@$JUNKFOOD_MACHINE_$JUNKFOOD_LOCA_
-  "
+   "

From 8510ac002f1dec92f6e9e62809f3dc5493d4b842 Mon Sep 17 00:00:00 2001
From: Trae Robrock <trobrock@gmail.com>
Date: Mon, 17 Sep 2012 19:05:42 -0700
Subject: [PATCH 643/907] Bundle exec puma also http://puma.io

---
 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 39b76ecdf..2305c4979 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
+bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
 
 ## Functions
 

From 55c69017c501e30c8aa5a89104575f2863a26663 Mon Sep 17 00:00:00 2001
From: SK <lunaticman@gmail.com>
Date: Tue, 18 Sep 2012 22:10:11 +0700
Subject: [PATCH 644/907] Replace cp verbose with rsync

Rsync can help track progress while file is copying
---
 plugins/cp/cp.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 plugins/cp/cp.plugin.zsh

diff --git a/plugins/cp/cp.plugin.zsh b/plugins/cp/cp.plugin.zsh
new file mode 100644
index 000000000..7355a9990
--- /dev/null
+++ b/plugins/cp/cp.plugin.zsh
@@ -0,0 +1,14 @@
+#Show progress while file is copying
+
+# Rsync options are:
+#  -p - preserve permissions
+#  -o - preserve owner
+#  -g - preserve group
+#  -h - output in human-readable format
+#  --progress - display progress
+#  -b - instead of just overwriting an existing file, save the original
+#  --backup-dir=/tmp/rsync - move backup copies to "/tmp/rsync"
+#  -e /dev/null - only work on local files
+#  -- - everything after this is an argument, even if it looks like an option
+
+alias cpv="rsync -poghb --backup-dir=/tmp/rsync -e /dev/null --progress --"

From 9510eb0e5a2ae7526ac66bec8e01c39322a8b254 Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Tue, 18 Sep 2012 11:13:36 -0600
Subject: [PATCH 645/907] Modified spacing one last time

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index bb250e19b..5022a8d98 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,7 +5,7 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜%{$fg_bold[white]%}%t – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜ %{$fg_bold[white]%}%t – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
 
 # Grab the current machine name 
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"

From 8ecc252f0cfd21281be4e4549a8c86248e85a700 Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Wed, 19 Sep 2012 09:34:45 -0600
Subject: [PATCH 646/907] Last spacing adjustment...I swear

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index 5022a8d98..bb250e19b 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,7 +5,7 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜ %{$fg_bold[white]%}%t – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜%{$fg_bold[white]%}%t – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
 
 # Grab the current machine name 
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"

From b609aa0e6c981f2039d777687cb01a84587f6edc Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Thu, 20 Sep 2012 08:03:09 -0400
Subject: [PATCH 647/907] Fix to restore bindings after switching to vi-mode

the vi-mode plugin destroys any bindings made before it is sourced due to the
'bindkey -v' call to switch to using vi-mode.  This patch saves the bindings
before invoking 'bindkey -v' then rebinds them afterwards, this fixes a number
of outstanding issues due to people using vi-mode and having things in oh-my-zsh
break due to the bindings being destroyed
---
 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 c47ab7211..d29eb1dda 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -5,7 +5,12 @@ function zle-line-init zle-keymap-select {
 zle -N zle-line-init
 zle -N zle-keymap-select
 
+#changing mode clobbers the keybinds, so store the keybinds before and execute 
+#them after
+binds=`bindkey -L`
 bindkey -v
+for bind in ${(@f)binds}; do eval $bind; done
+unset binds
 
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then

From baa187e4b903f39422a84b580e6e617ec3738e09 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Thu, 20 Sep 2012 08:23:58 -0400
Subject: [PATCH 648/907] Per directory history plugin

   This is a implementation of per directory history for zsh, some
   implementations of which exist in bash[1,2].  It also implements
   a per-directory-history-toggle-history function to change from using the
   directory history to using the global history.  In both cases the history is
   always saved to both the global history and the directory history, so the
   toggle state will not effect the saved histories.  Being able to switch
   between global and directory histories on the fly is a novel feature as far
   as I am aware.

   [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
   [2]: http://dieter.plaetinck.be/per_directory_bash
---
 .../per-directory-history.plugin.zsh          | 149 ++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 plugins/per-directory-history/per-directory-history.plugin.zsh

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

From aeadd7371b244468aadf81a48e6009a4aa612f23 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Thu, 20 Sep 2012 08:29:05 -0400
Subject: [PATCH 649/907] Colemak plugin

  a plugin for useing the colemak[1] keyboard layout and vi-mode in zsh, rotates
  some keys around in vi command mode so that the physical hjkl keys are still
  used for movement, all the rotated keys are either in colemak's location or
  qwerty's location, so it is easy to pick up

  [1] www.colemak.com
---
 plugins/colemak/colemak-less       |  6 ++++++
 plugins/colemak/colemak.plugin.zsh | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 plugins/colemak/colemak-less
 create mode 100644 plugins/colemak/colemak.plugin.zsh

diff --git a/plugins/colemak/colemak-less b/plugins/colemak/colemak-less
new file mode 100644
index 000000000..e4ca4facd
--- /dev/null
+++ b/plugins/colemak/colemak-less
@@ -0,0 +1,6 @@
+n    forw-line
+e    back-line
+k    repeat-search
+\ek  repeat-search-all
+K    reverse-search
+\eK  reverse-search-all
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
new file mode 100644
index 000000000..34d42c280
--- /dev/null
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -0,0 +1,22 @@
+# ctrl-j newline
+bindkey '^n' accept-line
+bindkey -a '^n' accept-line
+
+# another rotation to match qwerty
+bindkey -a 'n' down-line-or-history
+bindkey -a 'e' up-line-or-history
+bindkey -a 'i' vi-forward-char
+
+# make qwerty
+bindkey -a 'k' vi-repeat-search
+bindkey -a 'K' vi-rev-repeat-search
+bindkey -a 'u' vi-insert
+bindkey -a 'U' vi-insert-bol
+bindkey -a 'l' vi-undo-change
+bindkey -a 'N' vi-join
+
+# spare
+bindkey -a 'j' vi-forward-word-end
+bindkey -a 'J' vi-forward-blank-word-end
+
+lesskey $ZSH_CUSTOM/plugins/colemak/colemak-less

From 00bff0a9963d4b36e6afc968449781c727bfef3b Mon Sep 17 00:00:00 2001
From: James Smith <james@loopj.com>
Date: Thu, 20 Sep 2012 19:35:09 -0700
Subject: [PATCH 650/907] Red prompt for remote hosts

---
 themes/intheloop.zsh-theme | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/themes/intheloop.zsh-theme b/themes/intheloop.zsh-theme
index c4736422d..85b4a4d95 100644
--- a/themes/intheloop.zsh-theme
+++ b/themes/intheloop.zsh-theme
@@ -3,10 +3,16 @@
 
 local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}"
 
+local host_color="green"
+if [ -n "$SSH_CLIENT" ]; then
+  local host_color="red"
+fi
+
 PROMPT='
-%{$fg_bold[grey]%}[%{$reset_color%}%{$fg_bold[green]%}%n@%m%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%} %{$fg_bold[blue]%}%10c%{$reset_color%} $(git_prompt_info) $(git_remote_status)
+%{$fg_bold[grey]%}[%{$reset_color%}%{$fg_bold[${host_color}]%}%n@%m%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%} %{$fg_bold[blue]%}%10c%{$reset_color%} $(git_prompt_info) $(git_remote_status)
 %{$fg_bold[cyan]%}❯%{$reset_color%} '
 
+
 RPROMPT='${return_status}%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[grey]%}(%{$fg[red]%}"

From 7284e6b397712dfff16a740ea12d1015b26f203d Mon Sep 17 00:00:00 2001
From: Aviad Reich <aviad.reich@intucellsystems.com>
Date: Fri, 21 Sep 2012 08:08:53 +0300
Subject: [PATCH 651/907] added autojump plugin support for mac os x + port

---
 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 6f0edb062..d367863b8 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -3,6 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
     . /etc/profile.d/autojump.zsh
+  elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
+    . /opt/local/etc/profile.d/autojump.zsh
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
     . `brew --prefix`/etc/autojump
   fi

From cc831508d7c2e839e1c4effe31ac2d92f2741f94 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Fri, 21 Sep 2012 10:19:39 -0400
Subject: [PATCH 652/907] Use HISTFILE evironment variable directly rather than
 copying it

Use the HISTFILE environment variable in place of copying it to
_per_directory_history_global so that users can change the environment variable
after sourcing per-directory-history and have the global variable set correctly
---
 .../per-directory-history.plugin.zsh                     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
index ce36db6af..22383b8b9 100644
--- a/plugins/per-directory-history/per-directory-history.plugin.zsh
+++ b/plugins/per-directory-history/per-directory-history.plugin.zsh
@@ -81,7 +81,6 @@ bindkey '^G' per-directory-history-toggle-history
 # implementation details
 #-------------------------------------------------------------------------------
 
-_per_directory_history_global=$HISTFILE
 _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history"
 
 function _per-directory-history-change-directory() {
@@ -89,7 +88,7 @@ function _per-directory-history-change-directory() {
   mkdir -p ${_per_directory_history_directory:h}
   if [[ $_per_directory_history_is_global == false ]]; then
     #save to the global history
-    fc -AI $_per_directory_history_global
+    fc -AI $HISTFILE
     #save history to previous file
     local prev="$HISTORY_BASE${OLDPWD:A}/history"
     mkdir -p ${prev:h}
@@ -115,7 +114,7 @@ function _per-directory-history-addhistory() {
 
 function _per-directory-history-set-directory-history() {
   if [[ $_per_directory_history_is_global == true ]]; then
-    fc -AI $_per_directory_history_global
+    fc -AI $HISTFILE
     local original_histsize=$HISTSIZE
     HISTSIZE=0
     HISTSIZE=$original_histsize
@@ -131,8 +130,8 @@ function _per-directory-history-set-global-history() {
     local original_histsize=$HISTSIZE
     HISTSIZE=0
     HISTSIZE=$original_histsize
-    if [[ -e "$_per_directory_history_global" ]]; then
-      fc -R "$_per_directory_history_global"
+    if [[ -e "$HISTFILE" ]]; then
+      fc -R "$HISTFILE"
     fi
   fi
   _per_directory_history_is_global=true

From 6e85ff5b44e81f5b9d743b6ba1df7ed7b62dc2df Mon Sep 17 00:00:00 2001
From: Isaac Wolkerstorfer <i@agnoster.net>
Date: Tue, 25 Sep 2012 18:35:08 -0500
Subject: [PATCH 653/907] Updated documentation for agnoster theme

---
 themes/agnoster.zsh-theme | 99 +++++++++++++++++++++++++--------------
 1 file changed, 64 insertions(+), 35 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 9cfcff3d0..71bc25fc2 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -1,22 +1,51 @@
+# vim:ft=zsh ts=2 sw=2 sts=2
+#
+# agnoster's Theme
+# A Powerline-inspired theme for ZSH
+#
+# # README
+#
+# In order for this theme to render correctly, you will need a
+# [Powerline-patched font](https://gist.github.com/1595572).
+#
+# In addition, I recommend the
+# [Solarized theme](https://github.com/altercation/solarized/) and, if you're
+# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app -
+# it has significantly better color fidelity.
+#
+# # Goals
+#
+# The aim of this theme is to only show you *relevant* information. Like most
+# prompts, it will only show git information when in a git working directory.
+# However, it goes a step further: everything from the current user and
+# hostname to whether the last call exited with an error to whether background
+# jobs are running in this shell will all be displayed automatically when
+# appropriate.
+
 ### Segment drawing
 # A few utility functions to make it easy and re-usable to draw segmented prompts
 
-CURRENT_BG=''
+CURRENT_BG='NONE'
 SEGMENT_SEPARATOR='⮀'
-function segment_start() {
-  local bg=$1
-  local fg=$2
-  if [[ -n $CURRENT_BG && $bg != $CURRENT_BG ]]; then
-    echo -n " %{%K{$bg}%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
+
+# Begin a segment
+# Takes two arguments, background and foreground. Both can be omitted,
+# rendering default background/foreground.
+prompt_segment() {
+  local bg fg
+  [[ -n $1 ]] && bg="%K{$1}" || bg="%k"
+  [[ -n $2 ]] && fg="%F{$2}" || fg="%f"
+  if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then
+    echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} "
   else
-    echo -n "%{%K{$bg}%}"
+    echo -n "%{$bg%}%{$fg%} "
   fi
-  [[ -n $fg ]] && fg="%F{$fg}" || fg="%f"
-  echo -n "%{$fg%} "
-  CURRENT_BG=$bg
+  CURRENT_BG=$1
+  [[ -n $3 ]] && echo -n $3
 }
 
-function segment_stop() {
+# End the prompt, closing any open segments
+prompt_end() {
   if [[ -n $CURRENT_BG ]]; then
     echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
   else
@@ -29,58 +58,58 @@ function segment_stop() {
 ### Prompt components
 # Each component will draw itself, and hide itself if no information needs to be shown
 
-function prompt_context() {
+# Context: user@hostname (who am I and where am I)
+prompt_context() {
   local user=`whoami`
 
-  if [[ ("$user" != "$DEFAULT_USER") || (-n "$SSH_CLIENT") ]]; then
-    segment_start black
-    #echo -n "%{%F{yellow}%}$user%{%F{gray}%}@%{%F{green}%}%m%{%f%}"
-    echo -n "%(!.%{%F{yellow}%}.)$user@%m"
+  if [[ "$user" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+    prompt_segment black default "%(!.%{%F{yellow}%}.)$user@%m"
   fi
 }
 
-function prompt_git() {
+# Git: branch/detached head, dirty status
+prompt_git() {
+  local ref dirty
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     ZSH_THEME_GIT_PROMPT_DIRTY='±'
-    local dirty=$(parse_git_dirty)
-    local ref
+    dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
     if [[ -n $dirty ]]; then
-      segment_start yellow black
+      prompt_segment yellow black
     else
-      segment_start green black
+      prompt_segment green black
     fi
     echo -n "${ref/refs\/heads\//⭠ }$dirty"
   fi
 }
 
-function prompt_dir() {
-  segment_start blue white
-  echo -n '%~'
+# Dir: current working directory
+prompt_dir() {
+  prompt_segment blue black '%~'
 }
 
-function prompt_status() {
+# Status:
+# - was there an error
+# - am I root
+# - are there background jobs?
+prompt_status() {
   local symbols
   symbols=()
   [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
-  jobs=$(jobs -l | wc -l)
-  [[ $jobs -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
-  if [[ -n "$symbols" ]]; then
-    segment_start black white
-    echo -n "${symbols}"
-  fi
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
+
+  [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
 }
 
 ## Main prompt
-function build_prompt() {
+build_prompt() {
   RETVAL=$?
   prompt_status
   prompt_context
   prompt_dir
   prompt_git
-  segment_stop
+  prompt_end
 }
 
-PROMPT='%{%f%b%k%}
-$(build_prompt) '
+PROMPT='%{%f%b%k%}$(build_prompt) '

From b207792f30f523e2fc82a70e75893bf1124bf7a8 Mon Sep 17 00:00:00 2001
From: Isaac Wolkerstorfer <i@agnoster.net>
Date: Tue, 25 Sep 2012 19:06:13 -0500
Subject: [PATCH 654/907] Add link to gist

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

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 71bc25fc2..c3107c06c 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -1,6 +1,6 @@
 # vim:ft=zsh ts=2 sw=2 sts=2
 #
-# agnoster's Theme
+# agnoster's Theme - https://gist.github.com/3712874
 # A Powerline-inspired theme for ZSH
 #
 # # README

From 5e0fd9bb9f8f11da1d7562f5e867a28706accb57 Mon Sep 17 00:00:00 2001
From: Martin Foot <martin@modeltwozero.com>
Date: Wed, 26 Sep 2012 14:16:15 +0100
Subject: [PATCH 655/907] Add user-local installation autojump zsh plugin
 source

If you manually install autojump as advised by the autojump README by running
the install.sh script, it will install by default to $HOME/.autojump.

Add an extra case in the zsh autojump plugin to find the new file and stop a
syntax error in the else clause every time a new zsh starts (running brew when
brew does not exist).
---
 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 d367863b8..ca0090560 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -3,6 +3,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
     . /etc/profile.d/autojump.zsh
+  elif [ -f $HOME/.autojump/etc/profile.d/autojump.zsh ]; then # manual user-local installation
+    . $HOME/.autojump/etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
   elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew

From 3d1b788d8ad3b4c407d3c752de15318cf57cf03e Mon Sep 17 00:00:00 2001
From: Trae Robrock <trobrock@gmail.com>
Date: Tue, 8 Nov 2011 12:24:14 -0800
Subject: [PATCH 656/907] Fixing the rvm_prompt_info command, now it will not
 show empty parens if no rvm is currently being used

---
 lib/rvm.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index 597be1b33..dbfaf8796 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,6 +1,10 @@
 # get the name of the branch we are on
 function rvm_prompt_info() {
   ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
+  if [ -z $ruby_version ]
+  then
+    return
+  fi
   echo "($ruby_version)"
 }
 

From a7fb6680789c0a45c23539f9cce623a920ae143e Mon Sep 17 00:00:00 2001
From: Trae Robrock <trobrock@gmail.com>
Date: Wed, 26 Sep 2012 13:57:38 -0700
Subject: [PATCH 657/907] Make rvm prompt function a bit cleaner

---
 lib/rvm.zsh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index dbfaf8796..cb870a9bb 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,11 +1,5 @@
 # get the name of the branch we are on
 function rvm_prompt_info() {
   ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
-  if [ -z $ruby_version ]
-  then
-    return
-  fi
-  echo "($ruby_version)"
+  [[ ! -z $ruby_version ]] && echo "($ruby_version)"
 }
-
-

From c7c647d8039987b802509519ffa631818cd1d194 Mon Sep 17 00:00:00 2001
From: Dominik Bamberger <dmayer@suse.de>
Date: Thu, 27 Sep 2012 11:51:16 +0200
Subject: [PATCH 658/907] Add zeus plugin

Includes aliases for zeus (https://github.com/burke/zeus)

Also there is a README.md that list all aliases, ready to copy
into the wiki.
---
 plugins/zeus/README.md       | 41 +++++++++++++++++++++++++
 plugins/zeus/zeus.plugin.zsh | 58 ++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 plugins/zeus/README.md
 create mode 100644 plugins/zeus/zeus.plugin.zsh

diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md
new file mode 100644
index 000000000..2cb85cec8
--- /dev/null
+++ b/plugins/zeus/README.md
@@ -0,0 +1,41 @@
+## zeus
+**Maintainer:** [b4mboo](https://github.com/b4mboo)
+
+* `zi` aliases `zeus init`
+* `zinit` aliases `zeus init`
+
+* `zs` aliases `zeus start`
+* `ztart` aliases `zeus start`
+
+* `zc` aliases `zeus console`
+* `zonsole` aliases `zeus console`
+
+* `zsr` aliases `zeus server`
+* `zerver` aliases `zeus server`
+
+* `zr` aliases `zeus rake`
+* `zake` aliases `zeus rake`
+
+* `zg` aliases `zeus generate`
+* `zenerate` aliases `zeus generate`
+
+* `zrn` aliases `zeus runner`
+* `zunner` aliases `zeus runner`
+
+* `zcu` aliases `zeus cucumber`
+* `zucumber` aliases `zeus cucumber`
+
+* `zt` aliases `zeus test`
+* `zest` aliases `zeus test`
+
+* `zu` aliases `zeus test/units/*`
+* `zunits` aliases `zeus test/units/*`
+
+* `zf` aliases `zeus test/functional/*`
+* `zunctional` aliases `zeus test/functional/*`
+
+* `za` aliases `zeus test test/units/*; zeus test test/functional/; zeus cucumber`
+* `zall` aliases `zeus test test/units/*; zeus test test/functional/; zeus cucumber`
+
+* `zsw` aliases `rm .zeus.sock`
+* `zweep` aliases `rm .zeus.sock`
diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
new file mode 100644
index 000000000..48392f541
--- /dev/null
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -0,0 +1,58 @@
+# Some aliases for zeus. (See: https://github.com/burke/zeus)
+# Zeus preloads your Rails environment and forks that process whenever
+# needed. This effectively speeds up Rails' boot process to under 1 sec.
+
+# Always use bundler.
+# Rails depends on bundler, so we can be pretty sure, that there are no
+# problems with this command. For all the other aliases I provided an 
+# alternative, in case people have conflicts with other plugins (e.g. suse).
+alias zeus='bundle exec zeus'
+
+# Init
+alias zi='zeus init'
+alias zinit='zeus init'
+
+# Start
+alias zs='zeus start'
+alias ztart='zeus start'
+
+# Console
+alias zc='zeus console'
+alias zonsole='zeus console'
+
+# Server
+alias zsr='zeus server'
+alias zerver='zeus server'
+
+# Rake
+alias zr='zeus rake'
+alias zake='zeus rake'
+
+# Generate
+alias zg='zeus generate'
+alias zenerate='zeus generate'
+
+# Runner
+alias zrn='zeus runner'
+alias zunner='zeus runner'
+
+# Cucumber
+alias zcu='zeus cucumber'
+alias zucumber='zeus cucumber'
+
+# Test
+alias zt='zeus test'
+alias zest='zeus test'
+
+alias zu='zeus test/units/*'
+alias zunits='zeus test/units/*'
+
+alias zf='zeus test/functional/*'
+alias zunctional='zeus test/functional/*'
+
+alias za='zeus test test/units/*; zeus test test/functional/; zeus cucumber'
+alias zall='zeus test test/units/*; zeus test test/functional/; zeus cucumber'
+
+# Clean up crashed zeus instances.
+alias zsw='rm .zeus.sock'
+alias zweep='rm .zeus.sock'

From 2bbe6aba8f90dabdb3f7e2caaf12b6a3ecaf5f1f Mon Sep 17 00:00:00 2001
From: Paul Redmond <paulrredmond@gmail.com>
Date: Fri, 28 Sep 2012 22:41:30 -0700
Subject: [PATCH 659/907] Jira ticket shortcut to browse existing issues or
 create a new issue.

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

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
new file mode 100644
index 000000000..c8b17d71f
--- /dev/null
+++ b/plugins/jira/jira.plugin.zsh
@@ -0,0 +1,22 @@
+# To use: add a .jira-url file containing your 
+# Jira project's base url in the root of your project.
+# Example: https://name.jira.com
+# Usage: jira           # opens a new issue
+#        jira ABC-123   # Opens an existing issue
+open_jira_issue () {
+  if [ ! -f .jira-url ]; then
+    echo "There is no .jira-url file in the current directory or your home folder..."
+    return 0;
+  else
+    jira_url=$(cat .jira-url);
+    if [ -z "$1" ]; then
+      echo "Opening new issue";
+      `open $jira_url/secure/CreateIssue!default.jspa`;
+    else
+      echo "Opening issue #$1";
+      `open $jira_url/issues/$1`;
+    fi
+  fi
+}
+
+alias jira='open_jira_issue'

From 2d660161027a5c6a6876520dd264df7fdab7c044 Mon Sep 17 00:00:00 2001
From: Paul Redmond <paulrredmond@gmail.com>
Date: Fri, 28 Sep 2012 22:48:18 -0700
Subject: [PATCH 660/907] Clean up doc

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

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index c8b17d71f..d19296cb6 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -1,6 +1,6 @@
-# To use: add a .jira-url file containing your 
-# Jira project's base url in the root of your project.
-# Example: https://name.jira.com
+# To use: add a .jira-url file in the base of your project
+# Setup: cd to/my/project
+         echo "https://name.jira.com" >> .jira-url
 # Usage: jira           # opens a new issue
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {

From b559f2f22127b3bf7f30dd5221fd8cb5ff3808fc Mon Sep 17 00:00:00 2001
From: Paul Redmond <paulrredmond@gmail.com>
Date: Fri, 28 Sep 2012 23:00:15 -0700
Subject: [PATCH 661/907] Correct error message.

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

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index d19296cb6..f63743c9c 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -5,7 +5,7 @@
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {
   if [ ! -f .jira-url ]; then
-    echo "There is no .jira-url file in the current directory or your home folder..."
+    echo "There is no .jira-url file in the current directory..."
     return 0;
   else
     jira_url=$(cat .jira-url);

From b7383b097e2b1dc6aaec2c906e7d2031f9446fba Mon Sep 17 00:00:00 2001
From: Dominik Bamberger <dmayer@suse.de>
Date: Mon, 1 Oct 2012 16:24:50 +0200
Subject: [PATCH 662/907] look for test/unit instead of test/units. #typo

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

diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index 48392f541..65fd88d9f 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -44,14 +44,14 @@ alias zucumber='zeus cucumber'
 alias zt='zeus test'
 alias zest='zeus test'
 
-alias zu='zeus test/units/*'
-alias zunits='zeus test/units/*'
+alias zu='zeus test/unit/*'
+alias zunits='zeus test/unit/*'
 
 alias zf='zeus test/functional/*'
 alias zunctional='zeus test/functional/*'
 
-alias za='zeus test test/units/*; zeus test test/functional/; zeus cucumber'
-alias zall='zeus test test/units/*; zeus test test/functional/; zeus cucumber'
+alias za='zeus test test/unit/*; zeus test test/functional/; zeus cucumber'
+alias zall='zeus test test/unit/*; zeus test test/functional/; zeus cucumber'
 
 # Clean up crashed zeus instances.
 alias zsw='rm .zeus.sock'

From 58d904a28960f6962eb27a6105e83d57cb553aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Augusto=20Rocha=20Elesb=C3=A3o?= <aelesbao@gmail.com>
Date: Mon, 1 Oct 2012 11:29:06 -0300
Subject: [PATCH 663/907] Added systemd plugin with aliases for systemctl
 commands.

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

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
new file mode 100644
index 000000000..7d3db0f8e
--- /dev/null
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -0,0 +1,11 @@
+user_commands=(
+  list-units is-active status show help list-unit-files
+  is-enabled list-jobs show-environment)
+
+sudo_commands=(
+  start stop reload restart try-restart isolate kill
+  reset-failed enable disable reenable preset mask unmask
+  link load cancel set-environment unset-environment)
+
+for c in $user_commands; do; alias sc-$c="systemctl $c"; done
+for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done

From 9acfaee2567bcbe8dcd3dc73a8d40c0983766fb6 Mon Sep 17 00:00:00 2001
From: Paul Redmond <paulrredmond@gmail.com>
Date: Mon, 1 Oct 2012 09:27:52 -0700
Subject: [PATCH 664/907] Missing comment line

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

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index f63743c9c..636e4619e 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -1,6 +1,6 @@
 # To use: add a .jira-url file in the base of your project
 # Setup: cd to/my/project
-         echo "https://name.jira.com" >> .jira-url
+#        echo "https://name.jira.com" >> .jira-url
 # Usage: jira           # opens a new issue
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {

From b932312ab78b7f422f501d03aaa577440bcd3a0c Mon Sep 17 00:00:00 2001
From: Dominik Bamberger <dmayer@suse.de>
Date: Tue, 2 Oct 2012 18:10:40 +0200
Subject: [PATCH 665/907] fix test aliases

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

diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh
index 65fd88d9f..2fc7e1ebf 100644
--- a/plugins/zeus/zeus.plugin.zsh
+++ b/plugins/zeus/zeus.plugin.zsh
@@ -44,11 +44,11 @@ alias zucumber='zeus cucumber'
 alias zt='zeus test'
 alias zest='zeus test'
 
-alias zu='zeus test/unit/*'
-alias zunits='zeus test/unit/*'
+alias zu='zeus test test/unit/*'
+alias zunits='zeus test test/unit/*'
 
-alias zf='zeus test/functional/*'
-alias zunctional='zeus test/functional/*'
+alias zf='zeus test test/functional/*'
+alias zunctional='zeus test test/functional/*'
 
 alias za='zeus test test/unit/*; zeus test test/functional/; zeus cucumber'
 alias zall='zeus test test/unit/*; zeus test test/functional/; zeus cucumber'

From 43bd46b780cdf60b318f452e40b893ae18e77c41 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.f.scherer@gmail.com>
Date: Wed, 3 Oct 2012 17:18:14 +0200
Subject: [PATCH 666/907] fix title setting bug in xterm and urxvt

Before this patch, commands containing %-signs set the title wrong
(urxvt and xterm) [1] and produce strange output in urxvt [2].

test for bug 1:
> sleep 10 && echo %
sets title to "sleep 10 && echo %<<"
> sleep 10 && echo %f
doesn't change the title at all

test for bug 2 (only urxvt):
> echo %f
39m%f
^^^^^----- output
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e26fef6d3..4701e46c5 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  title "$CMD" "%100>...>$2%<<"
+  title "$CMD" "%100>...>${2:gs/%/%%}%<<"
 }
 
 autoload -U add-zsh-hook

From e3de97ca89368bb433034431778a29f7f09db6c2 Mon Sep 17 00:00:00 2001
From: Daniel Gomes <me@danielcsgomes.com>
Date: Fri, 5 Oct 2012 21:12:40 +0100
Subject: [PATCH 667/907] added two aliases to Symfony2 Plugin

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

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 644266841..223401298 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -10,4 +10,8 @@ _symfony2 () {
   fi
 }
 
-compdef _symfony2 app/console
\ No newline at end of file
+compdef _symfony2 app/console
+
+#Alias
+alias sf2='php app/console'
+alias sf2clear='php app/console cache:clear'
\ No newline at end of file

From 6630919bce0ec9eb5ad33c26a32cd5f06529d570 Mon Sep 17 00:00:00 2001
From: Daniel Gomes <me@danielcsgomes.com>
Date: Fri, 5 Oct 2012 21:13:10 +0100
Subject: [PATCH 668/907] added Composer completition and aliases

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

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
new file mode 100644
index 000000000..a054ae2c5
--- /dev/null
+++ b/plugins/composer/composer.plugin.zsh
@@ -0,0 +1,28 @@
+# ------------------------------------------------------------------------------
+#          FILE:  composer.plugin.zsh
+#   DESCRIPTION:  oh-my-zsh composer plugin file.
+#        AUTHOR:  Daniel Gomes (me@danielcsgomes.com)
+#       VERSION:  1.0.0
+# ------------------------------------------------------------------------------
+
+# Composer basic command completion
+_composer_get_command_list () {
+	composer --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+}
+
+_composer () {
+  if [ -f composer.json ]; then
+    compadd `_composer_get_command_list`
+  fi
+}
+
+compdef _composer composer
+
+# Aliases
+alias c='composer'
+alias csu='composer self-update'
+alias cu='composer update'
+alias ci='composer install'
+alias ccp='composer create-project'
+
+alias cget='curl -s https://getcomposer.org/installer | php'
\ No newline at end of file

From 9365fd03f62854c48bc06388542ba4933eb067db Mon Sep 17 00:00:00 2001
From: Daniel Gomes <me@danielcsgomes.com>
Date: Fri, 5 Oct 2012 21:14:44 +0100
Subject: [PATCH 669/907] added a comment to the composer installation alias

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

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index a054ae2c5..c9b762d07 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -25,4 +25,5 @@ alias cu='composer update'
 alias ci='composer install'
 alias ccp='composer create-project'
 
+# install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
\ No newline at end of file

From a97e117281fa495bf13b7aa4179647cb9c7f5c01 Mon Sep 17 00:00:00 2001
From: Ian Chesal <ichesal@cyclecomputing.com>
Date: Mon, 8 Oct 2012 15:42:27 -0400
Subject: [PATCH 670/907] URL Tools Plugin

* Added urlencode -- alias to encode URLs from the command line using Python

* Added urldecode -- alias to decode URLs from the command line using Python
---
 plugins/urltools/urltools.plugin.zsh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/urltools/urltools.plugin.zsh

diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
new file mode 100644
index 000000000..0d29314d6
--- /dev/null
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -0,0 +1,9 @@
+# URL Tools
+# Adds handy command line aliases useful for dealing with URLs
+#
+# Taken from:
+# http://ruslanspivak.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/
+
+alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
+
+alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"'
\ No newline at end of file

From a0bcbfb111cc28c7e3e8320f001d28297614698e Mon Sep 17 00:00:00 2001
From: Dominik Bamberger <dmayer@suse.de>
Date: Tue, 9 Oct 2012 08:47:18 +0200
Subject: [PATCH 671/907] make README reflect latest changes

---
 plugins/zeus/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md
index 2cb85cec8..4409943fe 100644
--- a/plugins/zeus/README.md
+++ b/plugins/zeus/README.md
@@ -28,14 +28,14 @@
 * `zt` aliases `zeus test`
 * `zest` aliases `zeus test`
 
-* `zu` aliases `zeus test/units/*`
-* `zunits` aliases `zeus test/units/*`
+* `zu` aliases `zeus test test/unit/*`
+* `zunits` aliases `zeus test test/unit/*`
 
-* `zf` aliases `zeus test/functional/*`
-* `zunctional` aliases `zeus test/functional/*`
+* `zf` aliases `zeus test test/functional/*`
+* `zunctional` aliases `zeus test test/functional/*`
 
-* `za` aliases `zeus test test/units/*; zeus test test/functional/; zeus cucumber`
-* `zall` aliases `zeus test test/units/*; zeus test test/functional/; zeus cucumber`
+* `za` aliases `zeus test test/unit/*; zeus test test/functional/; zeus cucumber`
+* `zall` aliases `zeus test test/unit/*; zeus test test/functional/; zeus cucumber`
 
 * `zsw` aliases `rm .zeus.sock`
 * `zweep` aliases `rm .zeus.sock`

From af21abb134c023699b2d39db4463180ebdf81a83 Mon Sep 17 00:00:00 2001
From: Paul Redmond <paulrredmond@gmail.com>
Date: Tue, 9 Oct 2012 09:02:45 -0700
Subject: [PATCH 672/907] Wrong URL :zap:

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

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 636e4619e..de8d10529 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -14,7 +14,7 @@ open_jira_issue () {
       `open $jira_url/secure/CreateIssue!default.jspa`;
     else
       echo "Opening issue #$1";
-      `open $jira_url/issues/$1`;
+      `open $jira_url/browse/$1`;
     fi
   fi
 }

From 8d86bb298d51d619c88d2aad400007b67c4d438b Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Thu, 11 Oct 2012 09:26:39 -0600
Subject: [PATCH 673/907] moved spacing

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index bb250e19b..1d574664d 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,7 +5,7 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜%{$fg_bold[white]%}%t – %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} – %{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜%{$fg_bold[white]%}%t–%{$fg_bold[yellow]%}%W%{$fg_bold[white]%}–%{$reset_color%}"
 
 # Grab the current machine name 
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"

From bb5db62314b0fb31b21326d8483c5e97405c07bb Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Thu, 11 Oct 2012 13:48:38 -0600
Subject: [PATCH 674/907] removed weird characters

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index 1d574664d..f9bb28fad 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,10 +5,10 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[red]%}#➜%{$fg_bold[white]%}%t–%{$fg_bold[yellow]%}%W%{$fg_bold[white]%}–%{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#(%{$fg_bold[white]%}%t on %{$fg_bold[yellow]%}%W%{$fg_bold[white]%})%{$reset_color%}"
 
 # Grab the current machine name 
-JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}:%{$reset_color%}"
+JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}):%{$reset_color%}"
 
 # Grab the current username 
 JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}"

From 2ba668b91ccfdf6dd273d5b1358ee9cafa302534 Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Thu, 11 Oct 2012 13:57:21 -0600
Subject: [PATCH 675/907] parens tweak

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index f9bb28fad..835103532 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,10 +5,10 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[red]%}#(%{$fg_bold[white]%}%t on %{$fg_bold[yellow]%}%W%{$fg_bold[white]%})%{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %t on %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} )( %{$reset_color%}"
 
 # Grab the current machine name 
-JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%}):%{$reset_color%}"
+JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}"
 
 # Grab the current username 
 JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}"

From 5872daea49104607efd64208a314aba10823af0b Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Thu, 11 Oct 2012 13:59:08 -0600
Subject: [PATCH 676/907] spacing makes me something

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index 835103532..c2a96ed7b 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -31,4 +31,4 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗✗✗"
 
 # Put it all together!
 PROMPT="$JUNKFOOD_TIME_$JUNKFOOD_CURRENT_USER_@$JUNKFOOD_MACHINE_$JUNKFOOD_LOCA_
-   "
+    "

From 53412de75c982a07fac902e8deec929c4fe32abc Mon Sep 17 00:00:00 2001
From: Tyler Cipriani <tyler@tylercipriani.com>
Date: Thu, 11 Oct 2012 14:02:55 -0600
Subject: [PATCH 677/907] Something to be said for symmetry

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

diff --git a/themes/junkfood.zsh-theme b/themes/junkfood.zsh-theme
index c2a96ed7b..57b4070dc 100644
--- a/themes/junkfood.zsh-theme
+++ b/themes/junkfood.zsh-theme
@@ -5,7 +5,7 @@
 # ------------------------------------------------------------------------
 
 # Grab the current date (%W) and time (%t):
-JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %t on %{$fg_bold[yellow]%}%W%{$fg_bold[white]%} )( %{$reset_color%}"
+JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}"
 
 # Grab the current machine name 
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}"
@@ -31,4 +31,4 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗✗✗"
 
 # Put it all together!
 PROMPT="$JUNKFOOD_TIME_$JUNKFOOD_CURRENT_USER_@$JUNKFOOD_MACHINE_$JUNKFOOD_LOCA_
-    "
+   "

From 8f7b126d2f7369dde512f61f9351809ebf27649e Mon Sep 17 00:00:00 2001
From: Alexander Berezovsky <a.b@usa.com>
Date: Sat, 13 Oct 2012 13:33:28 -0700
Subject: [PATCH 678/907] updated symbol

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

diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 22c7a0981..7154e09f1 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -16,7 +16,7 @@ function virtualenv_info {
 }
 
 function prompt_char {
-    git branch >/dev/null 2>/dev/null && echo '±' && return
+    git branch >/dev/null 2>/dev/null && echo '⠠⠵' && return
     echo '○'
 }
 

From daa6ecebc1034dab162c90b4fd7f4cb605d969d4 Mon Sep 17 00:00:00 2001
From: Felix Dreissig <f30@f30.me>
Date: Sat, 13 Oct 2012 22:53:34 +0200
Subject: [PATCH 679/907] Set the '-R' option for less not in $PAGER, but as
 $LESS.

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

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 0f7e7e925..a8678b8ec 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -9,5 +9,7 @@ bindkey "^[m" copy-prev-shell-word
 setopt long_list_jobs
 
 ## pager
-export PAGER="less -R"
+export PAGER="less"
+export LESS="-R"
+
 export LC_CTYPE=$LANG

From 2fa02621b27fbb3b788ee8576717fa64b2cb0065 Mon Sep 17 00:00:00 2001
From: Henry Yan <yanhonglei@gmail.com>
Date: Sun, 14 Oct 2012 22:07:38 +0800
Subject: [PATCH 680/907] add git-extras plugin

---
 plugins/git-extras/git-extras.plugin.zsh | 285 +++++++++++++++++++++++
 1 file changed, 285 insertions(+)
 create mode 100644 plugins/git-extras/git-extras.plugin.zsh

diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh
new file mode 100644
index 000000000..8419166ab
--- /dev/null
+++ b/plugins/git-extras/git-extras.plugin.zsh
@@ -0,0 +1,285 @@
+#compdef git
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for git-extras (http://github.com/visionmedia/git-extras).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Alexis GRIMALDI (https://github.com/agrimaldi)
+#
+# ------------------------------------------------------------------------------
+# Inspirations
+# -----------
+#
+#  * git-extras (http://github.com/visionmedia/git-extras)
+#  * git-flow-completion (http://github.com/bobthecow/git-flow-completion)
+#
+# ------------------------------------------------------------------------------
+
+
+__git_command_successful () {
+    if (( ${#pipestatus:#0} > 0 )); then
+        _message 'not a git repository'
+        return 1
+    fi
+    return 0
+}
+
+
+__git_tag_names() {
+    local expl
+    declare -a tag_names
+    tag_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
+    __git_command_successful || return
+    _wanted tag-names expl tag-name compadd $* - $tag_names
+}
+
+
+__git_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_feature_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/feature 2>/dev/null)"}#refs/heads/feature/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_refactor_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/refactor 2>/dev/null)"}#refs/heads/refactor/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_bug_branch_names() {
+    local expl
+    declare -a branch_names
+    branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/bug 2>/dev/null)"}#refs/heads/bug/})
+    __git_command_successful || return
+    _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+
+__git_submodule_names() {
+    local expl
+    declare -a submodule_names
+    submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})
+    __git_command_successful || return
+    _wanted submodule-names expl submodule-name compadd $* - $submodule_names
+}
+
+
+__git_author_names() {
+    local expl
+    declare -a author_names
+    author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' | sort -u)"})
+    __git_command_successful || return
+    _wanted author-names expl author-name compadd $* - $author_names
+}
+
+
+_git-changelog() {
+    _arguments \
+        '(-l --list)'{-l,--list}'[list commits]' \
+}
+
+
+_git-effort() {
+    _arguments \
+        '--above[ignore file with less than x commits]' \
+}
+
+
+_git-contrib() {
+    _arguments \
+        ':author:__git_author_names'
+}
+
+
+_git-count() {
+    _arguments \
+        '--all[detailed commit count]'
+}
+
+
+_git-delete-branch() {
+    _arguments \
+        ':branch-name:__git_branch_names'
+}
+
+
+_git-delete-submodule() {
+    _arguments \
+        ':submodule-name:__git_submodule_names'
+}
+
+
+_git-delete-tag() {
+    _arguments \
+        ':tag-name:__git_tag_names'
+}
+
+
+_git-extras() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'update:update git-extras'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+    esac
+
+    _arguments \
+        '(-v --version)'{-v,--version}'[show current version]' \
+}
+
+
+_git-graft() {
+    _arguments \
+        ':src-branch-name:__git_branch_names' \
+        ':dest-branch-name:__git_branch_names'
+}
+
+
+_git-squash() {
+    _arguments \
+        ':branch-name:__git_branch_names'
+}
+
+
+_git-feature() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge feature into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_feature_branch_names'
+                    ;;
+            esac
+    esac
+}
+
+
+_git-refactor() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge refactor into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_refactor_branch_names'
+                    ;;
+            esac
+    esac
+}
+
+
+_git-bug() {
+    local curcontext=$curcontext state line ret=1
+    declare -A opt_args
+
+    _arguments -C \
+        ': :->command' \
+        '*:: :->option-or-argument' && ret=0
+
+    case $state in
+        (command)
+            declare -a commands
+            commands=(
+                'finish:merge bug into the current branch'
+            )
+            _describe -t commands command commands && ret=0
+            ;;
+        (option-or-argument)
+            curcontext=${curcontext%:*}-$line[1]:
+            case $line[1] in
+                (finish)
+                    _arguments -C \
+                        ':branch-name:__git_bug_branch_names'
+                    ;;
+            esac
+    esac
+}
+
+
+zstyle ':completion:*:*:git:*' user-commands \
+    changelog:'populate changelog file with commits since the previous tag' \
+    contrib:'display author contributions' \
+    count:'count commits' \
+    delete-branch:'delete local and remote branch' \
+    delete-submodule:'delete submodule' \
+    delete-tag:'delete local and remote tag' \
+    extras:'git-extras' \
+    graft:'merge commits from source branch to destination branch' \
+    squash:'merge commits from source branch into the current one as a single commit' \
+    feature:'create a feature branch' \
+    refactor:'create a refactor branch' \
+    bug:'create a bug branch' \
+    summary:'repository summary' \
+    effort:'display effort statistics' \
+    repl:'read-eval-print-loop' \
+    commits-since:'list commits since a given date' \
+    release:'release commit with the given tag' \
+    alias:'define, search and show aliases' \
+    ignore:'add patterns to .gitignore' \
+    info:'show info about the repository' \
+    create-branch:'create local and remote branch' \
+    fresh-branch:'create empty local branch' \
+    undo:'remove the latest commit' \
+    setup:'setup a git repository' \
+    touch:'one step creation of new files' \
+    obliterate:'Completely remove a file from the repository, including past commits and tags' \
+    local-commits:'list unpushed commits on the local branch' \

From c2cbd31b3ceaabcab09686c1c6ecf10c51715868 Mon Sep 17 00:00:00 2001
From: Paulo Luis Franchini Casaretto <pcasaretto@gmail.com>
Date: Wed, 17 Oct 2012 14:00:18 -0300
Subject: [PATCH 681/907] Add the heroku --remote switch

This remote selects the app based on your current repo remotes
For example heroku logs --remote staging
More info at https://devcenter.heroku.com/articles/using-the-cli
---
 plugins/heroku/_heroku | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku
index dc899e2b2..a95c38647 100644
--- a/plugins/heroku/_heroku
+++ b/plugins/heroku/_heroku
@@ -154,5 +154,6 @@ case "$words[1]" in
 _arguments \
   $_command_args \
   '(--app)--app[the app name]' \
+  '(--remote)--remote[the remote name]' \
   &&  return 0
 

From 91e5619a585f3c94a3c6c536a5b40c772f64bf85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96rjan=20Persson?= <orjan@spotify.com>
Date: Tue, 16 Oct 2012 22:36:56 -0700
Subject: [PATCH 682/907] Added last working directory plugin

Keeps track of the last changed directory. When a new shell is created,
the last directory will be restored. Mimics how tabs works in many
terminal emulators.
---
 .../last-working-dir.plugin.zsh               | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 plugins/last-working-dir/last-working-dir.plugin.zsh

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
new file mode 100644
index 000000000..5b3121d11
--- /dev/null
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -0,0 +1,23 @@
+#!/usr/bin/env zsh
+# Keeps track of the last used working directory and automatically jumps
+# into it for new shells.
+
+# Flag indicating if we've previously jumped to last directory.
+typeset -g ZSH_LAST_WORKING_DIRECTORY
+local cache_file="$ZSH/cache/last-working-dir"
+
+# Updates the last directory once directory is changed.
+function chpwd() {
+	echo "$PWD" > "$cache_file"
+}
+
+# Changes directory to the last working directory.
+function lwd() {
+	[[ ! -r "$cache_file" ]] || cd `cat "$cache_file"`
+}
+
+# Automatically jump to last working directory unless this isn't the first time
+# this plugin has been loaded.
+if [[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]]; then
+	lwd 2>/dev/null && ZSH_LAST_WORKING_DIRECTORY=1 || true
+fi

From b0cf0674ef732b4102bf793543ceed3d23897ab6 Mon Sep 17 00:00:00 2001
From: Eric Mathison <dev@ekmathison.com>
Date: Sun, 21 Oct 2012 02:19:56 -0700
Subject: [PATCH 683/907] Fix color syntax

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

diff --git a/tools/install.sh b/tools/install.sh
index b080be3a1..6f58db939 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -13,7 +13,7 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 then
-  echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m";
+  echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
   cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
   rm ~/.zshrc;
 fi

From 7e2156a1b17a16243e92569c4df82c562f75ffb2 Mon Sep 17 00:00:00 2001
From: Rainer Dreyer <rdrey1@gmail.com>
Date: Mon, 22 Oct 2012 00:12:00 +0200
Subject: [PATCH 684/907] Fixed node-docs

The `#anchor` tags on
[nodejs.org](http://nodejs.org/docs/v0.8.2/api/all.html) changed. This
fixes the `node-docs` command.
---
 plugins/node/node.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh
index 519bc18da..3bbed6f04 100644
--- a/plugins/node/node.plugin.zsh
+++ b/plugins/node/node.plugin.zsh
@@ -1,5 +1,5 @@
 # Open the node api for your current version to the optional section.
 # TODO: Make the section part easier to use.
 function node-docs {
-	open "http://nodejs.org/docs/$(node --version)/api/all.html#$1"
+	open "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1"
 }

From c592f55af1fbb2050b6060666312149711873133 Mon Sep 17 00:00:00 2001
From: dsx <dsx@droidnest.org>
Date: Fri, 26 Oct 2012 12:38:17 -0400
Subject: [PATCH 685/907] Added ability to specify list of directories for
 pyclean to override default current directory

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

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 8be3cd863..852c8b919 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,8 +1,12 @@
 # Find python file
 alias pyfind='find . -name "*.py"'
 
-# Remove python compiled byte-code
-alias pyclean='find . -type f -name "*.py[co]" -delete'
+# Remove python compiled byte-code in either current directory or in a
+# list of specified directories
+function pyclean() {
+    ZSH_PYCLEAN_PLACES=${*:-'.'}
+    find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
+}
 
 # Grep among .py files
 alias pygrep='grep --include="*.py"'

From 4d8fe543ff8099daad155e2c41974525370dc435 Mon Sep 17 00:00:00 2001
From: Guillermo Castro <gcastro-contractor@zappos.com>
Date: Fri, 26 Oct 2012 16:51:48 -0700
Subject: [PATCH 686/907] Updated code from answer URL

---
 plugins/terminalapp/terminalapp.plugin.zsh | 42 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh
index 4695ad055..2249b1e2f 100644
--- a/plugins/terminalapp/terminalapp.plugin.zsh
+++ b/plugins/terminalapp/terminalapp.plugin.zsh
@@ -1,11 +1,39 @@
 # Set Apple Terminal.app resume directory
 # based on this answer: http://superuser.com/a/315029
+# 2012-10-26: (javageek) Changed code using the updated answer
 
-function chpwd {
-  local SEARCH=' '
-  local REPLACE='%20'
-  local PWD_URL="file://$HOSTNAME${PWD//$SEARCH/$REPLACE}"
-  printf '\e]7;%s\a' "$PWD_URL"
-}
+# Tell the terminal about the working directory whenever it changes.
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
+  update_terminal_cwd() {
+        # Identify the directory using a "file:" scheme URL, including
+        # the host name to disambiguate local vs. remote paths.
 
-chpwd
\ No newline at end of file
+        # Percent-encode the pathname.
+        local URL_PATH=''
+        {
+            # Use LANG=C to process text byte-by-byte.
+            local i ch hexch LANG=C
+            for ((i = 1; i <= ${#PWD}; ++i)); do
+                ch="$PWD[i]"
+                if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
+                    URL_PATH+="$ch"
+                else
+                    hexch=$(printf "%02X" "'$ch")
+                    URL_PATH+="%$hexch"
+                fi
+            done
+        }
+
+        local PWD_URL="file://$HOST$URL_PATH"
+        #echo "$PWD_URL"        # testing
+        printf '\e]7;%s\a' "$PWD_URL"
+    }
+
+    # Register the function so it is called whenever the working
+    # directory changes.
+    autoload add-zsh-hook
+    add-zsh-hook chpwd update_terminal_cwd
+
+    # Tell the terminal about the initial directory.
+    update_terminal_cwd
+fi

From 1c9f2e81066a2e86d001fe14b5be48660273b5e4 Mon Sep 17 00:00:00 2001
From: "hjhart@gmail.com" <hjhart@gmail.com>
Date: Mon, 29 Oct 2012 10:26:19 -0700
Subject: [PATCH 687/907] Update plugins/jira/jira.plugin.zsh

Updated to allow for usage of the new Rapid Board jira url formats
---
 plugins/jira/jira.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index 636e4619e..de8d10529 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -14,7 +14,7 @@ open_jira_issue () {
       `open $jira_url/secure/CreateIssue!default.jspa`;
     else
       echo "Opening issue #$1";
-      `open $jira_url/issues/$1`;
+      `open $jira_url/browse/$1`;
     fi
   fi
 }

From 263446d7259e22a21fe797284607fd2423fb076b Mon Sep 17 00:00:00 2001
From: Hok Shun Poon <fushunpoon@googlemail.com>
Date: Tue, 30 Oct 2012 22:42:52 +0000
Subject: [PATCH 688/907] Expand for-loop so that it works under Snow Leopard
 Terminal.app.

---
 oh-my-zsh.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index ddef1ad6c..4a5b175d5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -11,7 +11,9 @@ 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) source $config_file
+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/
@@ -51,7 +53,9 @@ for plugin ($plugins); do
 done
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)) source $config_file
+for config_file ($ZSH_CUSTOM/*.zsh(N)); do
+  source $config_file
+done
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]

From 15563c1b785cee11aa09b5ce1e2c6b51cea11bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Borraz=C3=A1s?= <sanbor86@gmail.com>
Date: Thu, 1 Nov 2012 21:41:07 -0300
Subject: [PATCH 689/907] Added pass plugin in order to provide completion.

More info about pass tool: http://zx2c4.com/projects/password-store/
---
 plugins/pass/_pass | 119 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 plugins/pass/_pass

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
new file mode 100644
index 000000000..f6c1a6c4b
--- /dev/null
+++ b/plugins/pass/_pass
@@ -0,0 +1,119 @@
+#compdef pass
+#autoload
+
+# 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>
+# All Rights Reserved.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
+
+
+_pass () {
+	local cmd
+	if (( CURRENT > 2)); then
+		cmd=${words[2]}
+		# Set the context for the subcommand.
+		curcontext="${curcontext%:*:*}:pass-$cmd"
+		# Narrow the range of words we are looking at to exclude `pass'
+		(( CURRENT-- ))
+		shift words
+		# Run the completion for the subcommand
+		case "${cmd}" in
+			init)
+				_arguments : \
+					"-r[re-encrypt existing passwords]" \
+					"--reencrypt[re-encrypt existing passwords]"
+				_pass_complete_keys
+				;;
+			ls|list|edit)
+				_pass_complete_entries_with_subdirs
+				;;
+			insert)
+				_arguments : \
+					"-e[echo password to console]" \
+					"--echo[echo password to console]" \
+					"-m[multiline]" \
+					"--multiline[multiline]"
+				_pass_complete_entries_with_subdirs
+				;;
+			generate)
+				_arguments : \
+					"-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]"
+				_pass_complete_entries_with_subdirs
+				;;
+			rm)
+				_arguments : \
+					"-f[force deletion]" \
+					"--force[force deletion]" \
+					"-r[recursively delete]" \
+					"--recursive[recursively delete]"
+					_pass_complete_entries_with_subdirs
+				;;
+			git)
+				local -a subcommands
+				subcommands=(
+					"init:Initialize git repository"
+					"push:Push to remote repository"
+					"pull:Pull from remote repository"
+					"config:Show git config"
+					"log:Show git log"
+					"reflog:Show git reflog"
+				)
+				_describe -t commands 'pass git' subcommands
+				;;
+			show|*)
+				_pass_cmd_show
+				;;
+		esac
+	else
+		local -a subcommands
+		subcommands=(
+			"init:Initialize new password storage"
+			"ls:List passwords"
+			"show:Decrypt and print a password"
+			"insert:Insert a new password"
+			"generate:Generate a new password using pwgen"
+			"edit:Edit a password with \$EDITOR"
+			"rm:Remove the password"
+			"git:Call git on the password store"
+			"version:Output version information"
+			"help:Output help message"
+		)
+		_describe -t commands 'pass' subcommands
+		_arguments : \
+			"--version[Output version information]" \
+			"--help[Output help message]"
+		_pass_cmd_show
+	fi
+}
+
+_pass_cmd_show () {
+	_arguments : \
+		"-c[put it on the clipboard]" \
+		"--clip[put it on the clipboard]"
+	_pass_complete_entries
+}
+_pass_complete_entries_helper () {
+	local IFS=$'\n'
+	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
+	_values -C 'passwords' $(find "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print | sed -e "s#${prefix}.##" -e 's#\.gpg##' | sort)
+}
+
+_pass_complete_entries_with_subdirs () {
+	_pass_complete_entries_helper
+}
+
+_pass_complete_entries () {
+	_pass_complete_entries_helper -type f
+}
+
+_pass_complete_keys () {
+	local IFS=$'\n'
+	# 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')
+}

From 4e513d72b9542b7b5079451e3380b4a98b0b7b56 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Fri, 2 Nov 2012 11:06:32 -0400
Subject: [PATCH 690/907] Fixes for vi-mode terminal overwriting bugs

fixes #387 and https://github.com/robbyrussell/oh-my-zsh/pull/1321#issuecomment-9959540
and other problems of prompt overwriting when people did not realize that it
was vi mode causing the problem.  Hat tip to sorin ionescu, as I took this code
from prezto
---
 plugins/vi-mode/vi-mode.plugin.zsh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index d29eb1dda..e23bd3c54 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -1,8 +1,26 @@
-function zle-line-init zle-keymap-select {
+# Ensures that $terminfo values are valid and updates editor information when
+# the keymap changes.
+function zle-keymap-select zle-line-init zle-line-finish {
+  # The terminal must be in application mode when ZLE is active for $terminfo
+  # values to be valid.
+  if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
+    case "$0" in
+      (zle-line-init)
+        # Enable terminal application mode.
+        echoti smkx
+      ;;
+      (zle-line-finish)
+        # Disable terminal application mode.
+        echoti rmkx
+      ;;
+    esac
+  fi
   zle reset-prompt
+  zle -R
 }
 
 zle -N zle-line-init
+zle -N zle-line-finish
 zle -N zle-keymap-select
 
 #changing mode clobbers the keybinds, so store the keybinds before and execute 

From f09af5717923cca4e5c538e14846ea4816295949 Mon Sep 17 00:00:00 2001
From: Fuad Saud <fuadksd@gmail.com>
Date: Sat, 3 Nov 2012 05:05:38 -0200
Subject: [PATCH 691/907] agnoster theme shows error code instead of an "x"

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

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index c3107c06c..84b9649a6 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -73,7 +73,7 @@ prompt_git() {
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     ZSH_THEME_GIT_PROMPT_DIRTY='±'
     dirty=$(parse_git_dirty)
-    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+    ref=$(git symbolic-Fref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else
@@ -95,7 +95,7 @@ prompt_dir() {
 prompt_status() {
   local symbols
   symbols=()
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
+  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}$RETVAL"
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
 
@@ -106,10 +106,10 @@ prompt_status() {
 build_prompt() {
   RETVAL=$?
   prompt_status
-  prompt_context
+  prompt_contextx
   prompt_dir
   prompt_git
   prompt_end
 }
 
-PROMPT='%{%f%b%k%}$(build_prompt) '
+PROMPT='%{%f%b%k%}$(build_prompt) '
\ No newline at end of file

From cd0e7c5e4906c810b87f7c8f1b2c6c79e4b04889 Mon Sep 17 00:00:00 2001
From: Eugene Nikolsky <pluton.od@gmail.com>
Date: Mon, 5 Nov 2012 10:34:29 +0200
Subject: [PATCH 692/907] Fix sourcing brew's autojump of version 21.0.3+

Starting with autojump 21.0.3+ there is no file autojump in etc/
directory, so we source the autojump.zsh file directly. Version 20 has
it as well, so there should be no problems with earlier versions.

Comments on autojump's update in homebrew:
https://github.com/mxcl/homebrew/commit/5da9c4d5eb38e6abb516ba648898fb374ec360cd#Library/Formula/autojump.rb
---
 plugins/autojump/autojump.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index d367863b8..fdce3a246 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -5,7 +5,7 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
-  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
-    . `brew --prefix`/etc/autojump
+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew
+    . `brew --prefix`/etc/autojump.zsh
   fi
 fi

From 19aefa2bd6168a9d75ce9ccd255ffac20425232e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A4=E5=87=AF=20Kevin=20Tong?= <logicmd@gmail.com>
Date: Mon, 5 Nov 2012 16:55:55 +0800
Subject: [PATCH 693/907] Update plugins/sublime/sublime.plugin.zsh

Considering the situation when installing sublime text via apt-get (WebUpd8 Sublime Text 2 PPA)
---
 plugins/sublime/sublime.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 91b0279c5..171f00ef5 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -2,7 +2,11 @@
 #unamestr = 'uname'
 
 if [[ $('uname') == 'Linux' ]]; then
-	alias st='/usr/bin/sublime_text&'
+	if [ -f '/usr/bin/sublime_text' ]; then
+		alias st='/usr/bin/sublime_text&'
+	else
+		alias st='/usr/bin/sublime-text&'
+	fi
 elif  [[ $('uname') == 'Darwin' ]]; then
 	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
 fi

From ec9b5500a57a39f8937e50424868493087fa40b4 Mon Sep 17 00:00:00 2001
From: Hao Hong <agate.hao@gmail.com>
Date: Mon, 5 Nov 2012 16:33:21 -0800
Subject: [PATCH 694/907] Update plugins/git-flow/git-flow.plugin.zsh

Fixed git-flow feature publish's desc error

https://github.com/agate/oh-my-zsh/commit/72aeaa9d9ee55fbfe15b371c0bf127ab3948a965#commitcomment-2104214
---
 plugins/git-flow/git-flow.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 71b343884..ea4caa016 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -195,7 +195,7 @@ __git-flow-feature ()
 				'start:Start a new feature branch.'
 				'finish:Finish a feature branch.'
 				'list:List all your feature branches. (Alias to `git flow feature`)'
-				'publish: public'
+				'publish: publish'
 				'track: track'
 				'diff: diff'
 				'rebase: rebase'

From 15e0dc9ec937d98094419b59a89be60fe6dbff3f Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Tue, 6 Nov 2012 15:39:59 -0200
Subject: [PATCH 695/907] Added some maven love.

---
 plugins/mvn/mvn.color.plugin.zsh | 41 ++++++++++++++++++++++++++++++++
 plugins/mvn/mvn.plugin.zsh       | 14 ++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 plugins/mvn/mvn.color.plugin.zsh

diff --git a/plugins/mvn/mvn.color.plugin.zsh b/plugins/mvn/mvn.color.plugin.zsh
new file mode 100644
index 000000000..82281a706
--- /dev/null
+++ b/plugins/mvn/mvn.color.plugin.zsh
@@ -0,0 +1,41 @@
+# mvn-color based on https://gist.github.com/1027800
+export BOLD=`tput bold`
+export UNDERLINE_ON=`tput smul`
+export UNDERLINE_OFF=`tput rmul`
+export TEXT_BLACK=`tput setaf 0`
+export TEXT_RED=`tput setaf 1`
+export TEXT_GREEN=`tput setaf 2`
+export TEXT_YELLOW=`tput setaf 3`
+export TEXT_BLUE=`tput setaf 4`
+export TEXT_MAGENTA=`tput setaf 5`
+export TEXT_CYAN=`tput setaf 6`
+export TEXT_WHITE=`tput setaf 7`
+export BACKGROUND_BLACK=`tput setab 0`
+export BACKGROUND_RED=`tput setab 1`
+export BACKGROUND_GREEN=`tput setab 2`
+export BACKGROUND_YELLOW=`tput setab 3`
+export BACKGROUND_BLUE=`tput setab 4`
+export BACKGROUND_MAGENTA=`tput setab 5`
+export BACKGROUND_CYAN=`tput setab 6`
+export BACKGROUND_WHITE=`tput setab 7`
+export RESET_FORMATTING=`tput sgr0`
+
+ 
+# Wrapper function for Maven's mvn command.
+mvn-color()
+{
+  # Filter mvn output using sed
+  mvn $@ | sed -e "s/\(\[INFO\]\ \-.*\)/${TEXT_BLUE}${BOLD}\1/g" \
+               -e "s/\(\[INFO\]\ \[.*\)/${RESET_FORMATTING}${BOLD}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[WARNING\].*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
+               -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
+ 
+  # Make sure formatting is reset
+  echo -ne ${RESET_FORMATTING}
+}
+ 
+# Override the mvn command with the colorized one.
+alias mvn="mvn-color"
+
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index e8af2f49d..66d18074d 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,6 +1,18 @@
+# aliases
+alias mvncie='mvn clean install eclipse:eclipse'
+alias mvnci='mvn clean install'
+alias mvne='mvn eclipse:eclipse'
+alias mvnce='mvn clean eclipse:clean eclipse:eclipse'
+alias mvnd='mvn deploy'
+alias mvnp='mvn package'
+alias mvnc='mvn clean'
+alias mvncom='mvn compile'
+alias mvnt='mvn test'
+alias mvnag='mvn archetype:generate'
+
 function listMavenCompletions { 
 	 reply=(
 		cli:execute cli:execute-phase archetype:generate generate-sources compile clean install test test-compile deploy package cobertura:cobertura jetty:run gwt:run gwt:debug -DskipTests -Dmaven.test.skip=true -DarchetypeCatalog=http://tapestry.formos.com/maven-snapshot-repository -Dtest= `if [ -d ./src ] ; then find ./src -type f | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi`); 
 }
 
-compctl -K listMavenCompletions mvn
\ No newline at end of file
+compctl -K listMavenCompletions mvn

From 8723a2ce58abd951c6664ddb19b29d612219956a Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Tue, 6 Nov 2012 15:44:50 -0200
Subject: [PATCH 696/907] mvn.colors.plugin.zsh was not read... mergin with
 mvn.plugin.zsh.

---
 plugins/mvn/mvn.color.plugin.zsh | 41 --------------------------------
 plugins/mvn/mvn.plugin.zsh       | 41 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 plugins/mvn/mvn.color.plugin.zsh

diff --git a/plugins/mvn/mvn.color.plugin.zsh b/plugins/mvn/mvn.color.plugin.zsh
deleted file mode 100644
index 82281a706..000000000
--- a/plugins/mvn/mvn.color.plugin.zsh
+++ /dev/null
@@ -1,41 +0,0 @@
-# mvn-color based on https://gist.github.com/1027800
-export BOLD=`tput bold`
-export UNDERLINE_ON=`tput smul`
-export UNDERLINE_OFF=`tput rmul`
-export TEXT_BLACK=`tput setaf 0`
-export TEXT_RED=`tput setaf 1`
-export TEXT_GREEN=`tput setaf 2`
-export TEXT_YELLOW=`tput setaf 3`
-export TEXT_BLUE=`tput setaf 4`
-export TEXT_MAGENTA=`tput setaf 5`
-export TEXT_CYAN=`tput setaf 6`
-export TEXT_WHITE=`tput setaf 7`
-export BACKGROUND_BLACK=`tput setab 0`
-export BACKGROUND_RED=`tput setab 1`
-export BACKGROUND_GREEN=`tput setab 2`
-export BACKGROUND_YELLOW=`tput setab 3`
-export BACKGROUND_BLUE=`tput setab 4`
-export BACKGROUND_MAGENTA=`tput setab 5`
-export BACKGROUND_CYAN=`tput setab 6`
-export BACKGROUND_WHITE=`tput setab 7`
-export RESET_FORMATTING=`tput sgr0`
-
- 
-# Wrapper function for Maven's mvn command.
-mvn-color()
-{
-  # Filter mvn output using sed
-  mvn $@ | sed -e "s/\(\[INFO\]\ \-.*\)/${TEXT_BLUE}${BOLD}\1/g" \
-               -e "s/\(\[INFO\]\ \[.*\)/${RESET_FORMATTING}${BOLD}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[WARNING\].*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}/g" \
-               -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
-               -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
- 
-  # Make sure formatting is reset
-  echo -ne ${RESET_FORMATTING}
-}
- 
-# Override the mvn command with the colorized one.
-alias mvn="mvn-color"
-
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 66d18074d..cde467981 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,3 +1,44 @@
+# mvn-color based on https://gist.github.com/1027800
+export BOLD=`tput bold`
+export UNDERLINE_ON=`tput smul`
+export UNDERLINE_OFF=`tput rmul`
+export TEXT_BLACK=`tput setaf 0`
+export TEXT_RED=`tput setaf 1`
+export TEXT_GREEN=`tput setaf 2`
+export TEXT_YELLOW=`tput setaf 3`
+export TEXT_BLUE=`tput setaf 4`
+export TEXT_MAGENTA=`tput setaf 5`
+export TEXT_CYAN=`tput setaf 6`
+export TEXT_WHITE=`tput setaf 7`
+export BACKGROUND_BLACK=`tput setab 0`
+export BACKGROUND_RED=`tput setab 1`
+export BACKGROUND_GREEN=`tput setab 2`
+export BACKGROUND_YELLOW=`tput setab 3`
+export BACKGROUND_BLUE=`tput setab 4`
+export BACKGROUND_MAGENTA=`tput setab 5`
+export BACKGROUND_CYAN=`tput setab 6`
+export BACKGROUND_WHITE=`tput setab 7`
+export RESET_FORMATTING=`tput sgr0`
+
+ 
+# Wrapper function for Maven's mvn command.
+mvn-color()
+{
+  # Filter mvn output using sed
+  mvn $@ | sed -e "s/\(\[INFO\]\ \-.*\)/${TEXT_BLUE}${BOLD}\1/g" \
+               -e "s/\(\[INFO\]\ \[.*\)/${RESET_FORMATTING}${BOLD}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[WARNING\].*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}/g" \
+               -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
+               -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
+ 
+  # Make sure formatting is reset
+  echo -ne ${RESET_FORMATTING}
+}
+ 
+# Override the mvn command with the colorized one.
+alias mvn="mvn-color"
+
 # aliases
 alias mvncie='mvn clean install eclipse:eclipse'
 alias mvnci='mvn clean install'

From f967f2bfd7b104da78ec1b1f1c6f893c2356dabc Mon Sep 17 00:00:00 2001
From: Sean Escriva <sean.escriva@gmail.com>
Date: Tue, 6 Nov 2012 13:38:08 -0800
Subject: [PATCH 697/907] update autojump plugin for latest brew installed
 autojump

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index d367863b8..fdce3a246 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -5,7 +5,7 @@ if [ $commands[autojump] ]; then # check if autojump is installed
     . /etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
-  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
-    . `brew --prefix`/etc/autojump
+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew
+    . `brew --prefix`/etc/autojump.zsh
   fi
 fi

From 8871c7a6d00a7c0a1e586e4f4d7a21c255231783 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Wed, 7 Nov 2012 10:28:44 -0200
Subject: [PATCH 698/907] made dpkg -i more util

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

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 39d3ef36a..71f22f7bd 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -61,7 +61,8 @@ if [[ $use_sudo -eq 1 ]]; then
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
     # glob_subst
-    alias di='sudo dpkg -i ./*.deb'
+    alias dia='sudo dpkg -i ./*.deb'
+    alias di='sudo dpkg -i'
 
     # Remove ALL kernel images and headers EXCEPT the one in use
     alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \
@@ -100,7 +101,8 @@ else
 
     # Install all .deb files in the current directory
     # Assumes glob_subst is off
-    alias di='su -lc "dpkg -i ./*.deb" root'
+    alias dia='su -lc "dpkg -i ./*.deb" root'
+    alias di='su -lc "dpkg -i" root'
 
     # Remove ALL kernel images and headers EXCEPT the one in use
     alias kclean='su -lc '\''aptitude remove -P ?and(~i~nlinux-(ima|hea) \

From 99468cb4ec38f11b78ac71cae0c9ac70ac0a516e Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Wed, 7 Nov 2012 23:53:44 -0700
Subject: [PATCH 699/907] Update themes/minimal.zsh-theme

Cleans up minimal theme by not using a custom prompt function
Removed case of 2 spaces showing if not in a version controlled folder
Adds support for svn_prompt_info
---
 themes/minimal.zsh-theme | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index ee3ab6b22..a2a16031f 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -1,15 +1,18 @@
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
+ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
+ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
+ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
+ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
 
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
-git_custom_status() {
-  local cb=$(current_branch)
-  if [ -n "$cb" ]; then
-    echo "- $ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
-  fi
+vcs_status() {
+    if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then
+        svn_prompt_info
+    else
+        git_prompt_info
+    fi
 }
 
-
-PROMPT='%2~ $(git_custom_status) »%b '
\ No newline at end of file
+PROMPT='%2~ $(vcs_status)»%b '
\ No newline at end of file

From 1b768a3b407103cd77d21d856051183960e0349e Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Thu, 8 Nov 2012 13:48:43 -0700
Subject: [PATCH 700/907] Update plugins/svn/svn.plugin.zsh

Behave more like lib/git.zsh.
Set `SVN_SHOW_BRANCH="true"` to display branch/tag or trunk instead of just repo name.
Falls back to repo name if branch information is not available.

Idea and awk call from revans/bash-it/themes/base.theme.bash
---
 plugins/svn/svn.plugin.zsh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 4d5bfb8dd..bb46a7d0d 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,7 +1,14 @@
 function svn_prompt_info {
     if [ $(in_svn) ]; then
+        if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
+            unset SVN_SHOW_BRANCH
+            _DISPLAY=$(svn_get_branch_name)
+        else
+            _DISPLAY=$(svn_get_repo_name)
+        fi
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
+        unset _DISPLAY
     fi
 }
 
@@ -20,6 +27,16 @@ function svn_get_repo_name {
     fi
 }
 
+function svn_get_branch_name {
+    _DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }')
+    if [ "x$_DISPLAY" = "x" ]; then
+        svn_get_repo_name
+    else
+        echo $_DISPLAY
+    fi
+    unset _DISPLAY
+}
+
 function svn_get_rev_nr {
     if [ $(in_svn) ]; then
         svn info 2> /dev/null | sed -n s/Revision:\ //p

From f2ac08832ad8a6a156117c870ace622b9a6035ac Mon Sep 17 00:00:00 2001
From: Caleb Epstein <cae@bklyn.org>
Date: Mon, 12 Nov 2012 11:53:09 -0500
Subject: [PATCH 701/907] Handle metachars in svn status output using grep -q

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 4d5bfb8dd..d82e3b9ee 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -28,8 +28,8 @@ function svn_get_rev_nr {
 
 function svn_dirty_choose {
     if [ $(in_svn) ]; then
-        s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
-        if [ $s ]; then 
+        svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
+	if [ $pipestatus[-1] -ne 0 ]; then
             echo $1
         else 
             echo $2

From 91c57e6d426a1b5b3db3d7d9aaa5d922c00a5f09 Mon Sep 17 00:00:00 2001
From: Caleb Epstein <cae@bklyn.org>
Date: Tue, 13 Nov 2012 12:48:37 -0500
Subject: [PATCH 702/907] Untabify

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index d82e3b9ee..bd2767e3e 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -29,7 +29,7 @@ function svn_get_rev_nr {
 function svn_dirty_choose {
     if [ $(in_svn) ]; then
         svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
-	if [ $pipestatus[-1] -ne 0 ]; then
+        if [ $pipestatus[-1] -ne 0 ]; then
             echo $1
         else 
             echo $2

From 5b2ca3875a15bbae4f064cb98935461df2e93e15 Mon Sep 17 00:00:00 2001
From: CHH <whocareu2008@gmail.com>
Date: Wed, 14 Nov 2012 19:09:13 +0800
Subject: [PATCH 703/907] Improved statistics functions, effect:

 1  1124  24.6006%    c
 2  985   21.5583%    git
 3  343   7.50711%    rails
 4  328   7.17881%    cd
 5  314   6.8724%     rspec
 6  257   5.62486%    la
 7  197   4.31167%    rake
 8  154   3.37054%    s
 9  109   2.38564%    ..
10  95    2.07923%    rvm
11  68    1.48829%    guard
12  36    0.787919%   bundle
13  29    0.634712%   ssh
14  28    0.612826%   pry
15  27    0.590939%   open
16  26    0.569052%   middleman
17  26    0.569052%   gem
18  24    0.525279%   rm
19  24    0.525279%   heroku
20  23    0.503392%   nvm
---
 lib/functions.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index d2dcadd0c..63ab755cf 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,5 +1,5 @@
 function zsh_stats() {
-  history | awk '{print $2}' | sort | uniq -c | sort -rn | head
+  history | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
 }
 
 function uninstall_oh_my_zsh() {

From 9ba799111c254f6edb537255d447b7052c8a45e6 Mon Sep 17 00:00:00 2001
From: Jim Hester <james.f.hester@gmail.com>
Date: Fri, 16 Nov 2012 10:23:33 -0500
Subject: [PATCH 704/907] Replace reset-prompt with push-line and accept-line

The in memory history is not updated until an accept line command, so you
have to push enter before it is correct, this commit replaces the reset-prompt
with an accept-line.  It also adds a push-line, to preserve the current editing
buffer
---
 .../per-directory-history/per-directory-history.plugin.zsh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh
index 22383b8b9..61e8b5a62 100644
--- a/plugins/per-directory-history/per-directory-history.plugin.zsh
+++ b/plugins/per-directory-history/per-directory-history.plugin.zsh
@@ -65,12 +65,13 @@
 function per-directory-history-toggle-history() {
   if [[ $_per_directory_history_is_global == true ]]; then
     _per-directory-history-set-directory-history
-    echo "using local history\n"
+    print "\nusing local history\n"
   else
     _per-directory-history-set-global-history
-    echo "using global history\n"
+    print "\nusing global history\n"
   fi
-  zle reset-prompt
+  zle .push-line
+  zle .accept-line
 }
 
 autoload per-directory-history-toggle-history

From 7d9518d48d25c9510b765af04b3910de9a20a117 Mon Sep 17 00:00:00 2001
From: Jeong Mok Cho <niceview@gmail.com>
Date: Mon, 19 Nov 2012 17:04:10 +0900
Subject: [PATCH 705/907] Use rvm completion from ~/.rvm/scripts/zsh/Completion

---
 plugins/rvm/_rvm           | 147 -------------------------------------
 plugins/rvm/rvm.plugin.zsh |   2 +
 2 files changed, 2 insertions(+), 147 deletions(-)
 delete mode 100644 plugins/rvm/_rvm

diff --git a/plugins/rvm/_rvm b/plugins/rvm/_rvm
deleted file mode 100644
index bba5304a0..000000000
--- a/plugins/rvm/_rvm
+++ /dev/null
@@ -1,147 +0,0 @@
-#compdef rvm
-
-local curcontext="$curcontext" state line cmds ret=1
-
-_arguments -C \
-	'(- 1 *)'{-v,--version}'[display version information]' \
-	'(-l|--level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
-	'(--prefix)--prefix[path for all rvm files (~/.rvm/), with trailing slash!]:path:_files' \
-	'(--bin)--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
-	'(--source)--source[src directory to use (~/.rvm/src/)]:path:_files' \
-	'(--archives)--archives[directory for downladed files (~/.rvm/archives/)]:path:_files' \
-	'-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
-	'-e[Execute code from the command line]:code' \
-	'(-G)-G[root gem path to use]:path:_files' \
-	'(--gems)--gems[Used to set the gems_flag, use with remove to remove gems]' \
-	'(--archive)--archive[Used to set the archive_flag, use with remove to remove archive]' \
-	'(--patch)--patch[With MRI Rubies you may specify one or more full paths to patches]' \
-	'(-C|--configure)'{-C,--configure}'=[custom configure options]' \
-	'(--nice)--nice[process niceness (for slow computers, default 0)]:number' \
-	'(--ree)--ree-options[Options passed directly to ree ./installer on the command line]:options' \
-	'(--head)--head[with update, updates rvm to git head version]' \
-	'(--rubygems)--rubygems[with update, updates rubygems for selected ruby]' \
-	'(--default)--default[with ruby select, sets a default ruby for new shells]' \
-	'(--debug)--debug[Toggle debug mode on for very verbose output]' \
-	'(--trace)--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
-	'(--force)--force[Force install, removes old install & source before install]' \
-	'(--summary)--summary[Used with rubydo to print out a summary of the commands run]' \
-	'(--latest)--latest[with gemset --dump skips version strings for latest gem]' \
-	'(--gems)--gems[with uninstall/remove removes gems with the interpreter]' \
-	'(--docs)--docs[with install, attempt to generate ri after installation]' \
-	'(--reconfigure)--reconfigure[Force ./configure on install even if Makefile already exists]' \
-	'1: :->cmds' \
-	'*: :->args' && ret=0
-
-case $state in
-	cmds)
-		cmds=( 
-            "version:show the rvm version installed in rvm_path"
-            "use:setup current shell to use a specific ruby version"
-            "reload:reload rvm source itself (useful after changing rvm source)"
-            "implode:(seppuku) removes the rvm installation completely. This means everything in $rvm_path (~/.rvm)."
-            "update:upgrades rvm to the latest version."
-            "reset:remove current and stored default & system settings."
-            "info :show the *current* environment information for current ruby"
-            "current:print the *current* ruby version and the name of any gemset being used."
-            "debug:show info plus additional information for common issues"
-            "install:install one or many ruby versions"
-            "uninstall:uninstall one or many ruby versions, leaves their sources"
-            "remove:uninstall one or many ruby versions and remove their sources"
-            "migrate:Lets you migrate all gemsets from one ruby to another."
-            "upgrade:Lets you upgrade from one version of a ruby to another, including migrating your gemsets semi-automatically."
-            "wrapper:generates a set of wrapper executables for a given ruby with the specified ruby and gemset combination. Used under the hood for passenger support and the like."
-            "cleanup:Lets you remove stale source folders / archives and other miscellaneous data associated with rvm."
-            "repair:Lets you repair parts of your environment e.g. wrappers, env files and and similar files (e.g. general maintenance)."
-            "snapshot:Lets your backup / restore an rvm installation in a lightweight manner."
-            "disk-usage:Tells you how much disk space rvm install is using."
-            "tools:Provides general information about the ruby environment, primarily useful when scripting rvm."
-            "docs:Tools to make installing ri and rdoc documentation easier."
-            "rvmrc:Tools related to managing rvmrc trust and loading."
-            "exec:runs an arbitrary command as a set operation."
-            "ruby:runs a named ruby file against specified and/or all rubies"
-            "gem:runs a gem command using selected ruby's 'gem'"
-            "rake:runs a rake task against specified and/or all rubies"
-            "tests:runs 'rake test' across selected ruby versions"
-            "specs:runs 'rake spec' across selected ruby versions"
-            "monitor:Monitor cwd for testing, run rake {spec,test} on changes."
-            "gemset:gemsets: http://rvm.beginrescueend.com/gemsets/"
-            "rubygems:Switches the installed version of rubygems for the current ruby."
-            "gemdir:display the path to the current gem directory (GEM_HOME)."
-            "srcdir:display the path to rvm source directory (may be yanked)"
-            "fetch:Performs an archive / src fetch only of the selected ruby."
-            "list:show currently installed rubies, interactive output."
-            "package:Install a dependency package {readline,iconv,zlib,openssl}"
-            "notes:Display notes, with operating system specifics."
-            "export:Temporarily set an environment variable in the current shell."
-            "unexport:Undo changes made to the environment by 'rvm export'."
-        )
-		_describe -t commands 'rvm command' cmds && ret=0
-		;;
-	args)
-		case $line[1] in
-			(use|uninstall|remove|list)
-				_values -S , 'rubies' $(rvm list strings | sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') default system && ret=0
-				;;
-			(install|fetch)
-				_values -S , 'rubies' $(rvm list known_strings) && ret=0
-				;;
-			gemset)
-				if (( CURRENT == 3 )); then
-					_values 'gemset_commands' \
-                        'import' \
-                        'export' \
-                        'create' \
-                        'copy' \
-                        'rename' \
-                        'empty' \
-                        'delete' \
-                        'name' \
-                        'dir' \
-                        'list' \
-                        'list_all' \
-                        'gemdir' \
-                        'install' \
-                        'pristine' \
-                        'clear' \
-                        'use' \
-                        'update' \
-                        'unpack' \
-                        'globalcache'
-				else
-					_values -S , 'gemsets' $(rvm gemset list | grep -v gemset 2>/dev/null)
-				fi
-				ret=0
-				;;
-			package)
-				if (( CURRENT == 3 )); then
-					_values 'package_commands' \
-                        'install' \
-                        'uninstall'  
-				else
-					_values 'packages' \
-                        'readline' \
-                        'iconv' \
-                        'curl' \
-                        'openssl' \
-                        'zlib' \
-                        'autoconf' \
-                        'ncurses' \
-                        'pkgconfig' \
-                        'gettext' \
-                        'glib' \
-                        'mono' \
-                        'llvm' \
-                        'libxml2' \
-                        'libxslt' \
-                        'libyaml'
-				fi
-				ret=0
-				;;
-			*)
-				(( ret )) && _message 'no more arguments'
-				;;
-		esac
-		;;
-esac
-
-return ret
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 604c00713..27f29f2b3 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,3 +1,5 @@
+fpath=($rvm_path/scripts/zsh/Completion $fpath)
+
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 

From 4c96e530a3b4818b3d378949a5d13377ae7f45e9 Mon Sep 17 00:00:00 2001
From: Josh Davis <joshuadavis42@gmail.com>
Date: Mon, 19 Nov 2012 08:16:21 -0600
Subject: [PATCH 706/907] Added a CoffeeScript plugin.

---
 plugins/coffee/_coffee | 71 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 plugins/coffee/_coffee

diff --git a/plugins/coffee/_coffee b/plugins/coffee/_coffee
new file mode 100644
index 000000000..5c8eb9a08
--- /dev/null
+++ b/plugins/coffee/_coffee
@@ -0,0 +1,71 @@
+#compdef coffee
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Coffee.js v0.6.11 (http://coffeejs.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Mario Fernandez (https://github.com/sirech)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+_arguments -C \
+  '(- *)'{-h,--help}'[display this help message]' \
+  '(- *)'{-v,--version}'[display the version number]' \
+  '(-b --bare)'{-b,--bare}'[compile without a top-level function wrapper]' \
+  '(-e --eval)'{-e,--eval}'[pass a string from the command line as input]:Inline Script' \
+  '(-i --interactive)'{-i,--interactive}'[run an interactive CoffeeScript REPL]' \
+  '(-j --join)'{-j,--join}'[concatenate the source CoffeeScript before compiling]:Destination JS file:_files -g "*.js"' \
+  '(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]' \
+  '(--nodejs)--nodejs[pass options directly to the "node" binary]' \
+  '(-c --compile)'{-c,--compile}'[compile to JavaScript and save as .js files]' \
+  '(-o --output)'{-o,--output}'[set the output directory for compiled JavaScript]:Output Directory:_files -/' \
+  '(-n -t -p)'{-n,--nodes}'[print out the parse tree that the parser produces]' \
+  '(-n -t -p)'{-p,--print}'[print out the compiled JavaScript]' \
+  '(-n -t -p)'{-t,--tokens}'[print out the tokens that the lexer/rewriter produce]' \
+  '(-r --require)'{-r,--require}'[require a library before executing your script]:library' \
+  '(-s --stdio)'{-s,--stdio}'[listen for and compile scripts over stdio]' \
+  '(-w --watch)'{-w,--watch}'[watch scripts for changes and rerun commands]' \
+  '*:script or directory:_files' && ret=0
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From 6f6a3c84356f19f14d69fdf994497a4ebb3fa8c1 Mon Sep 17 00:00:00 2001
From: Rui Marinho <ruipmarinho@gmail.com>
Date: Sun, 29 Jul 2012 02:32:11 +0200
Subject: [PATCH 707/907] Added sf Symfony2 binary alias

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

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 223401298..cc9ffebc0 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -11,7 +11,9 @@ _symfony2 () {
 }
 
 compdef _symfony2 app/console
+compdef _symfony2 sf
 
 #Alias
 alias sf2='php app/console'
-alias sf2clear='php app/console cache:clear'
\ No newline at end of file
+alias sf2clear='php app/console cache:clear'
+

From 6c45d217af77552a4f0b09542985520a577af3d5 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tlr@seegno.com>
Date: Mon, 27 Aug 2012 17:20:07 +0100
Subject: [PATCH 708/907] Added host to prompt

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

diff --git a/themes/norm.zsh-theme b/themes/norm.zsh-theme
index 5f0ad03ee..13077ccf5 100644
--- a/themes/norm.zsh-theme
+++ b/themes/norm.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg[yellow]%}λ %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)%{$reset_color%}'
+PROMPT='%{$fg[yellow]%}λ %m %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}"

From 003b0da9e5b2b9f230296aeaedfc946579222d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Hermann=20Reynisson?= <arnihr@gmail.com>
Date: Tue, 20 Nov 2012 15:01:39 +0000
Subject: [PATCH 709/907] Use pull --rebase for 'gup' shortcut.

Instead of git fetch && git rebase.
---
 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 d3d3f702a..adedea79e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -5,7 +5,7 @@ alias gst='git status'
 compdef _git gst=git-status
 alias gl='git pull'
 compdef _git gl=git-pull
-alias gup='git fetch && git rebase'
+alias gup='git pull --rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push

From 7be660bf1d0d8ae054b645278ea4e79e71c8beec Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Tue, 20 Nov 2012 13:13:04 -0500
Subject: [PATCH 710/907] Adding grt alias to the git plugin.

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d3d3f702a..71388c53a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -39,6 +39,10 @@ compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 
+# Will cd into the top of the current repository
+# or submodule.
+alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
+
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git

From 72974ce409277c52eb30461e48f0755916a49f05 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Wed, 21 Nov 2012 15:29:09 -0200
Subject: [PATCH 711/907] totvs utils

---
 .gitignore                 |  1 -
 custom/totvs.zsh           | 74 ++++++++++++++++++++++++++++++++++++++
 plugins/mvn/mvn.plugin.zsh |  2 +-
 3 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 custom/totvs.zsh

diff --git a/.gitignore b/.gitignore
index 51a5ee6c3..4cb1720e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
-custom/*
 !custom/example
 !custom/example.zsh
 *.swp
diff --git a/custom/totvs.zsh b/custom/totvs.zsh
new file mode 100644
index 000000000..9ef5fd641
--- /dev/null
+++ b/custom/totvs.zsh
@@ -0,0 +1,74 @@
+#
+# Just some utilities for use in ecm development.
+#
+
+setopt rmstarsilent
+
+HOME="/home/carlos"
+ECM_WS="$HOME/totvs/ws"
+ECM_JBOSS="$HOME/Public/ecm/JBoss-7.1.1"
+ECM_PORT="8080"
+VOLDEMORT=$ECM_WS/voldemort
+ECM=$ECM_WS/ecm
+INSTALLER="n"
+
+# fuckin aliases
+alias ecmu=ecmup
+alias ecmb=ecmbuild
+alias ecmc=ecmclean
+alias ecms=ecmstart
+alias ecmo=ecmstop
+alias ecm=goecm
+
+
+# update ecm
+ecmup() {
+	echo "update all the things!"
+	cd $VOLDEMORT && svn up
+	cd $ECM && svn up
+}
+
+# build it!
+ecmbuild() {
+	vared -p 'build? no problem sir, do you want a installer? (y/N) ' INSTALLER
+	cd $VOLDEMORT && mvncie
+	cd $VOLDEMORT/social-ecm
+	cd $VOLDEMORT/wcm && mvncie
+	cd $ECM/ecm/wecmpackage && mvncie
+	cd $VOLDEMORT/ecm && mvncie
+	if [[ $INSTALLER -eq 'n' ]]; then
+		cd $VOLDEMORT/ecm/installer
+		mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
+	else
+		cd $VOLDEMORT/ecm/build && mvnci
+		cd $VOLDEMORT/social-ecm/build && mvnci
+	fi
+}
+
+# clean jboss trash folders
+ecmclean() {
+	echo "cleaning jboss shit"
+	rm -rf $ECM_JBOSS/standalone/{deployments/*,log,tmp} 2> /dev/null
+}
+
+# start jboss server
+ecmstart() {
+	echo "starting jboss"
+	JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" $ECM_JBOSS/bin/standalone.sh
+}
+
+# stop jboss (usually on 8080)
+ecmstop() {
+	echo "kill jboss (or whatever you are running on 8080"
+	fuser -k $ECM_PORT/tcp
+}
+
+# do all the things
+goecm() {
+	echo "serious business here. let's have a coffee.."
+	ecmstop
+	ecmclean
+	ecmbuild && ecmup && ecmstart
+}
+
+
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index cde467981..f250c2a27 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -37,7 +37,7 @@ mvn-color()
 }
  
 # Override the mvn command with the colorized one.
-alias mvn="mvn-color"
+#alias mvn="mvn-color"
 
 # aliases
 alias mvncie='mvn clean install eclipse:eclipse'

From 50e538aeb5cc2ac9388390fd03c2189635f17b57 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Wed, 21 Nov 2012 15:35:28 -0200
Subject: [PATCH 712/907] oops

---
 custom/totvs.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index 9ef5fd641..e9924c147 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -36,7 +36,7 @@ ecmbuild() {
 	cd $VOLDEMORT/wcm && mvncie
 	cd $ECM/ecm/wecmpackage && mvncie
 	cd $VOLDEMORT/ecm && mvncie
-	if [[ $INSTALLER -eq 'n' ]]; then
+	if [[ $INSTALLER -eq 'y' ]]; then
 		cd $VOLDEMORT/ecm/installer
 		mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
 	else
@@ -68,7 +68,8 @@ goecm() {
 	echo "serious business here. let's have a coffee.."
 	ecmstop
 	ecmclean
-	ecmbuild && ecmup && ecmstart
+	ecmup
+	ecmbuild && ecmstart
 }
 
 

From 89614be1af55be2f2fb2b49782f80644d619ef6f Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Wed, 21 Nov 2012 16:01:28 -0200
Subject: [PATCH 713/907] param -i para gerar installer

---
 custom/totvs.zsh | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index e9924c147..065413758 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -18,8 +18,8 @@ alias ecmb=ecmbuild
 alias ecmc=ecmclean
 alias ecms=ecmstart
 alias ecmo=ecmstop
-alias ecm=goecm
-
+alias ecmi=ecminstall
+alias ecm=ecmfull
 
 # update ecm
 ecmup() {
@@ -30,19 +30,31 @@ ecmup() {
 
 # build it!
 ecmbuild() {
-	vared -p 'build? no problem sir, do you want a installer? (y/N) ' INSTALLER
+	echo "build? no problem sir..."
+	
+	case $@ in
+	-*i*)
+		INSTALLER=y
+		;;
+	esac	
+
 	cd $VOLDEMORT && mvncie
 	cd $VOLDEMORT/social-ecm
 	cd $VOLDEMORT/wcm && mvncie
 	cd $ECM/ecm/wecmpackage && mvncie
 	cd $VOLDEMORT/ecm && mvncie
-	if [[ $INSTALLER -eq 'y' ]]; then
-		cd $VOLDEMORT/ecm/installer
-		mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
-	else
-		cd $VOLDEMORT/ecm/build && mvnci
-		cd $VOLDEMORT/social-ecm/build && mvnci
-	fi
+	ecminstall
+}
+
+# gen installer or cp wars...
+ecminstall() {
+        if [[ "$INSTALLER" == "y" ]]; then
+                cd $VOLDEMORT/ecm/installer
+                mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
+        else
+                cd $VOLDEMORT/ecm/build && mvnci
+                cd $VOLDEMORT/social-ecm/build && mvnci
+        fi
 }
 
 # clean jboss trash folders
@@ -53,8 +65,11 @@ ecmclean() {
 
 # start jboss server
 ecmstart() {
-	echo "starting jboss"
-	JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" $ECM_JBOSS/bin/standalone.sh
+	# why shall I start server if i just gen a installer?
+	if [[ "$INSTALLER" == "y" ]]; then
+		echo "starting jboss"
+		JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" $ECM_JBOSS/bin/standalone.sh
+	fi
 }
 
 # stop jboss (usually on 8080)
@@ -64,7 +79,7 @@ ecmstop() {
 }
 
 # do all the things
-goecm() {
+ecmfull() {
 	echo "serious business here. let's have a coffee.."
 	ecmstop
 	ecmclean

From 9b1c64d7ffeb9ee9ea806a560bc929a683ff15f1 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Wed, 21 Nov 2012 16:20:43 -0200
Subject: [PATCH 714/907] go

---
 custom/totvs.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index 065413758..d1456bdc5 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -49,10 +49,13 @@ ecmbuild() {
 # gen installer or cp wars...
 ecminstall() {
         if [[ "$INSTALLER" == "y" ]]; then
-                cd $VOLDEMORT/ecm/installer
+        	echo "generating installer..."
+	        cd $VOLDEMORT/ecm/installer
                 mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
         else
+		echo "cpying wars..."
                 cd $VOLDEMORT/ecm/build && mvnci
+		cd $VOLDEMORT/wcm/build && mvnci
                 cd $VOLDEMORT/social-ecm/build && mvnci
         fi
 }

From 2acd30ed0508ddbda188144c4f7b0c4bb351bd43 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Wed, 21 Nov 2012 16:35:31 -0200
Subject: [PATCH 715/907] fixing issue with solr in jboss start

---
 custom/totvs.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index d1456bdc5..25945548a 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -69,9 +69,10 @@ ecmclean() {
 # start jboss server
 ecmstart() {
 	# why shall I start server if i just gen a installer?
-	if [[ "$INSTALLER" == "y" ]]; then
+	if [[ "$INSTALLER" == "n" ]]; then
 		echo "starting jboss"
-		JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" $ECM_JBOSS/bin/standalone.sh
+		cd $ECM_JBOSS/bin
+		JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" ./standalone.sh
 	fi
 }
 

From af729cc47698e4a894c074f5c5d19384cf175baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denys=20L=C3=B3zko?= <denis.lozko@gmail.com>
Date: Thu, 22 Nov 2012 00:46:50 +0200
Subject: [PATCH 716/907] Add support of screen-* $TERM in screen plugin

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

diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index 98178e807..7009e7a91 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -1,6 +1,6 @@
 # if using GNU screen, let the zsh tell screen what the title and hardstatus
 # of the tab window should be.
-if [[ $TERM == "screen" ]]; then
+if [[ "$TERM" == screen* ]]; then
   if [[ $_GET_PATH == '' ]]; then
     _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
   fi

From a366456284d5a454d8c5a25fdf88ce428ca28f54 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Thu, 22 Nov 2012 09:20:31 -0200
Subject: [PATCH 717/907] fixing some build issues...

---
 custom/totvs.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index 25945548a..2de9f4ab6 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -38,11 +38,11 @@ ecmbuild() {
 		;;
 	esac	
 
-	cd $VOLDEMORT && mvncie
-	cd $VOLDEMORT/social-ecm
-	cd $VOLDEMORT/wcm && mvncie
-	cd $ECM/ecm/wecmpackage && mvncie
-	cd $VOLDEMORT/ecm && mvncie
+	cd $VOLDEMORT && mvncie && \
+	cd $VOLDEMORT/social-ecm && \
+	cd $VOLDEMORT/wcm && mvncie && \
+	cd $ECM/wecmpackage && mvncie && \
+	cd $VOLDEMORT/ecm && mvncie && \
 	ecminstall
 }
 
@@ -54,8 +54,8 @@ ecminstall() {
                 mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
         else
 		echo "cpying wars..."
-                cd $VOLDEMORT/ecm/build && mvnci
-		cd $VOLDEMORT/wcm/build && mvnci
+                cd $VOLDEMORT/ecm/build && mvnci && \
+		cd $VOLDEMORT/wcm/build && mvnci && \
                 cd $VOLDEMORT/social-ecm/build && mvnci
         fi
 }

From 60b7dd8af55d8e27a7326585753867f738c35dcd Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Thu, 22 Nov 2012 10:42:11 -0200
Subject: [PATCH 718/907] fixing various issues with build, add runinstall
 option

---
 custom/totvs.zsh | 62 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index 2de9f4ab6..f3a449da6 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -11,6 +11,7 @@ ECM_PORT="8080"
 VOLDEMORT=$ECM_WS/voldemort
 ECM=$ECM_WS/ecm
 INSTALLER="n"
+DRY_CLEAN="n"
 
 # fuckin aliases
 alias ecmu=ecmup
@@ -19,6 +20,7 @@ alias ecmc=ecmclean
 alias ecms=ecmstart
 alias ecmo=ecmstop
 alias ecmi=ecminstall
+alias ecmri=ecmruninstall
 alias ecm=ecmfull
 
 # update ecm
@@ -31,13 +33,6 @@ ecmup() {
 # build it!
 ecmbuild() {
 	echo "build? no problem sir..."
-	
-	case $@ in
-	-*i*)
-		INSTALLER=y
-		;;
-	esac	
-
 	cd $VOLDEMORT && mvncie && \
 	cd $VOLDEMORT/social-ecm && \
 	cd $VOLDEMORT/wcm && mvncie && \
@@ -48,34 +43,67 @@ ecmbuild() {
 
 # gen installer or cp wars...
 ecminstall() {
-        if [[ "$INSTALLER" == "y" ]]; then
-        	echo "generating installer..."
-	        cd $VOLDEMORT/ecm/installer
-                mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
-        else
+	case $@ in
+	-*i*)
+		INSTALLER=y
+		;;
+	esac	
+  if [[ "$INSTALLER" == "y" ]]; then
+  	echo "generating installer..."
+    cd $VOLDEMORT/ecm/installer
+          mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
+  else
 		echo "cpying wars..."
-                cd $VOLDEMORT/ecm/build && mvnci && \
+    cd $VOLDEMORT/ecm/build && mvnci && \
 		cd $VOLDEMORT/wcm/build && mvnci && \
-                cd $VOLDEMORT/social-ecm/build && mvnci
-        fi
+    cd $VOLDEMORT/social-ecm/build && mvnci
+	fi
 }
 
 # clean jboss trash folders
 ecmclean() {
 	echo "cleaning jboss shit"
-	rm -rf $ECM_JBOSS/standalone/{deployments/*,log,tmp} 2> /dev/null
+	case $@ in
+	-*d*)
+		DRY_CLEAN="y"
+		;;
+	esac
+	if [[ "$DRY_CLEAN" == "y" ]]; then
+		rm -rf $ECM_JBOSS/standalone/deployments/*.{failed,deployed,dodeploy,deploying}
+	else
+		rm -rf $ECM_JBOSS/standalone/deployments/*
+	fi
+	rm -rf $ECM_JBOSS/standalone/{log,tmp,data}
+	rm -rf $ECM_JBOSS/solr/zoo_data
 }
 
 # start jboss server
 ecmstart() {
 	# why shall I start server if i just gen a installer?
-	if [[ "$INSTALLER" == "n" ]]; then
+	if [[ "$INSTALLER" == "y" ]]; then
+		ecmruninstall
+	else
 		echo "starting jboss"
 		cd $ECM_JBOSS/bin
 		JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" ./standalone.sh
 	fi
 }
 
+ecmruninstall() {
+	echo "ok, lets install this crap :)"
+	cd $VOLDEMORT/ecm/installer/izpack/target
+	if [[ -f ECM-Linux64.zip ]]; then
+		mkdir -p /tmp/ecmi
+		rm -rf /tmp/ecmi/*
+		unzip ECM-Linux64 -d /tmp/ecmi/
+		cd /tmp/ecmi/
+		chmod a+x ECM-Installer-64.sh
+		./ECM-Installer-64.sh
+	else
+		echo "uhoh, installer doesnt exist ($VOLDEMORT/ecm/installer/izpack/target/ECM-Linux64.zip)"
+	fi
+}
+
 # stop jboss (usually on 8080)
 ecmstop() {
 	echo "kill jboss (or whatever you are running on 8080"

From 5ff4a0030f1b29d8e45e6f1336232a81c1b93b3d Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Thu, 22 Nov 2012 14:20:53 -0200
Subject: [PATCH 719/907] e alias

---
 custom/totvs.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/custom/totvs.zsh b/custom/totvs.zsh
index f3a449da6..883bdf7dd 100644
--- a/custom/totvs.zsh
+++ b/custom/totvs.zsh
@@ -22,6 +22,8 @@ alias ecmo=ecmstop
 alias ecmi=ecminstall
 alias ecmri=ecmruninstall
 alias ecm=ecmfull
+alias e='MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DskipTests=true" ecm'  
+
 
 # update ecm
 ecmup() {

From 5a11228e93c667dd6d1cc87ec385ddf39d9e4726 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 22 Nov 2012 17:38:39 +0100
Subject: [PATCH 720/907] Add gifast plugin

Using the upstream git completion and prompt stuff.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                |   78 +
 plugins/gitfast/git-completion.bash | 2483 +++++++++++++++++++++++++++
 plugins/gitfast/git-prompt.sh       |  290 ++++
 plugins/gitfast/gitfast.plugin.zsh  |    7 +
 4 files changed, 2858 insertions(+)
 create mode 100644 plugins/gitfast/_git
 create mode 100644 plugins/gitfast/git-completion.bash
 create mode 100644 plugins/gitfast/git-prompt.sh
 create mode 100644 plugins/gitfast/gitfast.plugin.zsh

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
new file mode 100644
index 000000000..45775021f
--- /dev/null
+++ b/plugins/gitfast/_git
@@ -0,0 +1,78 @@
+#compdef git gitk
+
+# zsh completion wrapper for git
+#
+# You need git's bash completion script installed somewhere, by default on the
+# same directory as this script.
+#
+# If your script is on ~/.git-completion.sh instead, you can configure it on
+# your ~/.zshrc:
+#
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.sh
+#
+# The recommended way to install this script is to copy to
+# '~/.zsh/completion/_git', and then add the following to your ~/.zshrc file:
+#
+#  fpath=(~/.zsh/completion $fpath)
+
+complete ()
+{
+	# do nothing
+	return 0
+}
+
+zstyle -s ":completion:*:*:git:*" script script
+test -z "$script" && script="$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+ZSH_VERSION='' . "$script"
+
+__gitcomp ()
+{
+	emulate -L zsh
+
+	local cur_="${3-$cur}"
+
+	case "$cur_" in
+	--*=)
+		;;
+	*)
+		local c IFS=$' \t\n'
+		local -a array
+		for c in ${=1}; do
+			c="$c${4-}"
+			case $c in
+			--*=*|*.) ;;
+			*) c="$c " ;;
+			esac
+			array+=("$c")
+		done
+		compset -P '*[=:]'
+		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+		;;
+	esac
+}
+
+__gitcomp_nl ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+}
+
+_git ()
+{
+	local _ret=1
+	() {
+		emulate -L ksh
+		local cur cword prev
+		cur=${words[CURRENT-1]}
+		prev=${words[CURRENT-2]}
+		let cword=CURRENT-1
+		__${service}_main
+	}
+	let _ret && _default -S '' && _ret=0
+	return _ret
+}
+
+_git
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
new file mode 100644
index 000000000..be800e09b
--- /dev/null
+++ b/plugins/gitfast/git-completion.bash
@@ -0,0 +1,2483 @@
+#!bash
+#
+# bash/zsh completion support for core Git.
+#
+# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
+# Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
+# Distributed under the GNU General Public License, version 2.0.
+#
+# The contained completion routines provide support for completing:
+#
+#    *) local and remote branch names
+#    *) local and remote tag names
+#    *) .git/remotes file names
+#    *) git 'subcommands'
+#    *) tree paths within 'ref:path/to/file' expressions
+#    *) common --long-options
+#
+# To use these routines:
+#
+#    1) Copy this file to somewhere (e.g. ~/.git-completion.sh).
+#    2) Add the following line to your .bashrc/.zshrc:
+#        source ~/.git-completion.sh
+#    3) Consider changing your PS1 to also show the current branch,
+#       see git-prompt.sh for details.
+
+if [[ -n ${ZSH_VERSION-} ]]; then
+	autoload -U +X bashcompinit && bashcompinit
+fi
+
+case "$COMP_WORDBREAKS" in
+*:*) : great ;;
+*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
+esac
+
+# __gitdir accepts 0 or 1 arguments (i.e., location)
+# returns location of .git repo
+__gitdir ()
+{
+	# Note: this function is duplicated in git-prompt.sh
+	# When updating it, make sure you update the other one to match.
+	if [ -z "${1-}" ]; then
+		if [ -n "${__git_dir-}" ]; then
+			echo "$__git_dir"
+		elif [ -n "${GIT_DIR-}" ]; then
+			test -d "${GIT_DIR-}" || return 1
+			echo "$GIT_DIR"
+		elif [ -d .git ]; then
+			echo .git
+		else
+			git rev-parse --git-dir 2>/dev/null
+		fi
+	elif [ -d "$1/.git" ]; then
+		echo "$1/.git"
+	else
+		echo "$1"
+	fi
+}
+
+__gitcomp_1 ()
+{
+	local c IFS=$' \t\n'
+	for c in $1; do
+		c="$c$2"
+		case $c in
+		--*=*|*.) ;;
+		*) c="$c " ;;
+		esac
+		printf '%s\n' "$c"
+	done
+}
+
+# The following function is based on code from:
+#
+#   bash_completion - programmable completion functions for bash 3.2+
+#
+#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
+#             © 2009-2010, Bash Completion Maintainers
+#                     <bash-completion-devel@lists.alioth.debian.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#   The latest version of this software can be obtained here:
+#
+#   http://bash-completion.alioth.debian.org/
+#
+#   RELEASE: 2.x
+
+# This function can be used to access a tokenized list of words
+# on the command line:
+#
+#	__git_reassemble_comp_words_by_ref '=:'
+#	if test "${words_[cword_-1]}" = -w
+#	then
+#		...
+#	fi
+#
+# The argument should be a collection of characters from the list of
+# word completion separators (COMP_WORDBREAKS) to treat as ordinary
+# characters.
+#
+# This is roughly equivalent to going back in time and setting
+# COMP_WORDBREAKS to exclude those characters.  The intent is to
+# make option types like --date=<type> and <rev>:<path> easy to
+# recognize by treating each shell word as a single token.
+#
+# It is best not to set COMP_WORDBREAKS directly because the value is
+# shared with other completion scripts.  By the time the completion
+# function gets called, COMP_WORDS has already been populated so local
+# changes to COMP_WORDBREAKS have no effect.
+#
+# Output: words_, cword_, cur_.
+
+__git_reassemble_comp_words_by_ref()
+{
+	local exclude i j first
+	# Which word separators to exclude?
+	exclude="${1//[^$COMP_WORDBREAKS]}"
+	cword_=$COMP_CWORD
+	if [ -z "$exclude" ]; then
+		words_=("${COMP_WORDS[@]}")
+		return
+	fi
+	# List of word completion separators has shrunk;
+	# re-assemble words to complete.
+	for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+		# Append each nonempty word consisting of just
+		# word separator characters to the current word.
+		first=t
+		while
+			[ $i -gt 0 ] &&
+			[ -n "${COMP_WORDS[$i]}" ] &&
+			# word consists of excluded word separators
+			[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
+		do
+			# Attach to the previous token,
+			# unless the previous token is the command name.
+			if [ $j -ge 2 ] && [ -n "$first" ]; then
+				((j--))
+			fi
+			first=
+			words_[$j]=${words_[j]}${COMP_WORDS[i]}
+			if [ $i = $COMP_CWORD ]; then
+				cword_=$j
+			fi
+			if (($i < ${#COMP_WORDS[@]} - 1)); then
+				((i++))
+			else
+				# Done.
+				return
+			fi
+		done
+		words_[$j]=${words_[j]}${COMP_WORDS[i]}
+		if [ $i = $COMP_CWORD ]; then
+			cword_=$j
+		fi
+	done
+}
+
+if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
+if [[ -z ${ZSH_VERSION:+set} ]]; then
+_get_comp_words_by_ref ()
+{
+	local exclude cur_ words_ cword_
+	if [ "$1" = "-n" ]; then
+		exclude=$2
+		shift 2
+	fi
+	__git_reassemble_comp_words_by_ref "$exclude"
+	cur_=${words_[cword_]}
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		cur)
+			cur=$cur_
+			;;
+		prev)
+			prev=${words_[$cword_-1]}
+			;;
+		words)
+			words=("${words_[@]}")
+			;;
+		cword)
+			cword=$cword_
+			;;
+		esac
+		shift
+	done
+}
+else
+_get_comp_words_by_ref ()
+{
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		cur)
+			cur=${COMP_WORDS[COMP_CWORD]}
+			;;
+		prev)
+			prev=${COMP_WORDS[COMP_CWORD-1]}
+			;;
+		words)
+			words=("${COMP_WORDS[@]}")
+			;;
+		cword)
+			cword=$COMP_CWORD
+			;;
+		-n)
+			# assume COMP_WORDBREAKS is already set sanely
+			shift
+			;;
+		esac
+		shift
+	done
+}
+fi
+fi
+
+# Generates completion reply with compgen, appending a space to possible
+# completion words, if necessary.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word (optional).
+__gitcomp ()
+{
+	local cur_="${3-$cur}"
+
+	case "$cur_" in
+	--*=)
+		COMPREPLY=()
+		;;
+	*)
+		local IFS=$'\n'
+		COMPREPLY=($(compgen -P "${2-}" \
+			-W "$(__gitcomp_1 "${1-}" "${4-}")" \
+			-- "$cur_"))
+		;;
+	esac
+}
+
+# Generates completion reply with compgen from newline-separated possible
+# completion words by appending a space to all of them.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words, separated by a single newline.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word instead of
+#    the default space (optional).  If specified but empty, nothing is
+#    appended.
+__gitcomp_nl ()
+{
+	local IFS=$'\n'
+	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
+}
+
+__git_heads ()
+{
+	local dir="$(__gitdir)"
+	if [ -d "$dir" ]; then
+		git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
+			refs/heads
+		return
+	fi
+}
+
+__git_tags ()
+{
+	local dir="$(__gitdir)"
+	if [ -d "$dir" ]; then
+		git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
+			refs/tags
+		return
+	fi
+}
+
+# __git_refs accepts 0, 1 (to pass to __gitdir), or 2 arguments
+# presence of 2nd argument means use the guess heuristic employed
+# by checkout for tracking branches
+__git_refs ()
+{
+	local i hash dir="$(__gitdir "${1-}")" track="${2-}"
+	local format refs
+	if [ -d "$dir" ]; then
+		case "$cur" in
+		refs|refs/*)
+			format="refname"
+			refs="${cur%/*}"
+			track=""
+			;;
+		*)
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
+				if [ -e "$dir/$i" ]; then echo $i; fi
+			done
+			format="refname:short"
+			refs="refs/tags refs/heads refs/remotes"
+			;;
+		esac
+		git --git-dir="$dir" for-each-ref --format="%($format)" \
+			$refs
+		if [ -n "$track" ]; then
+			# employ the heuristic used by git checkout
+			# Try to find a remote branch that matches the completion word
+			# but only output if the branch name is unique
+			local ref entry
+			git --git-dir="$dir" for-each-ref --shell --format="ref=%(refname:short)" \
+				"refs/remotes/" | \
+			while read -r entry; do
+				eval "$entry"
+				ref="${ref#*/}"
+				if [[ "$ref" == "$cur"* ]]; then
+					echo "$ref"
+				fi
+			done | uniq -u
+		fi
+		return
+	fi
+	case "$cur" in
+	refs|refs/*)
+		git ls-remote "$dir" "$cur*" 2>/dev/null | \
+		while read -r hash i; do
+			case "$i" in
+			*^{}) ;;
+			*) echo "$i" ;;
+			esac
+		done
+		;;
+	*)
+		git ls-remote "$dir" HEAD ORIG_HEAD 'refs/tags/*' 'refs/heads/*' 'refs/remotes/*' 2>/dev/null | \
+		while read -r hash i; do
+			case "$i" in
+			*^{}) ;;
+			refs/*) echo "${i#refs/*/}" ;;
+			*) echo "$i" ;;
+			esac
+		done
+		;;
+	esac
+}
+
+# __git_refs2 requires 1 argument (to pass to __git_refs)
+__git_refs2 ()
+{
+	local i
+	for i in $(__git_refs "$1"); do
+		echo "$i:$i"
+	done
+}
+
+# __git_refs_remotes requires 1 argument (to pass to ls-remote)
+__git_refs_remotes ()
+{
+	local i hash
+	git ls-remote "$1" 'refs/heads/*' 2>/dev/null | \
+	while read -r hash i; do
+		echo "$i:refs/remotes/$1/${i#refs/heads/}"
+	done
+}
+
+__git_remotes ()
+{
+	local i IFS=$'\n' d="$(__gitdir)"
+	test -d "$d/remotes" && ls -1 "$d/remotes"
+	for i in $(git --git-dir="$d" config --get-regexp 'remote\..*\.url' 2>/dev/null); do
+		i="${i#remote.}"
+		echo "${i/.url*/}"
+	done
+}
+
+__git_list_merge_strategies ()
+{
+	git merge -s help 2>&1 |
+	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
+		s/\.$//
+		s/.*://
+		s/^[ 	]*//
+		s/[ 	]*$//
+		p
+	}'
+}
+
+__git_merge_strategies=
+# 'git merge -s help' (and thus detection of the merge strategy
+# list) fails, unfortunately, if run outside of any git working
+# tree.  __git_merge_strategies is set to the empty string in
+# that case, and the detection will be repeated the next time it
+# is needed.
+__git_compute_merge_strategies ()
+{
+	test -n "$__git_merge_strategies" ||
+	__git_merge_strategies=$(__git_list_merge_strategies)
+}
+
+__git_complete_revlist_file ()
+{
+	local pfx ls ref cur_="$cur"
+	case "$cur_" in
+	*..?*:*)
+		return
+		;;
+	?*:*)
+		ref="${cur_%%:*}"
+		cur_="${cur_#*:}"
+		case "$cur_" in
+		?*/*)
+			pfx="${cur_%/*}"
+			cur_="${cur_##*/}"
+			ls="$ref:$pfx"
+			pfx="$pfx/"
+			;;
+		*)
+			ls="$ref"
+			;;
+		esac
+
+		case "$COMP_WORDBREAKS" in
+		*:*) : great ;;
+		*)   pfx="$ref:$pfx" ;;
+		esac
+
+		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
+				| sed '/^100... blob /{
+				           s,^.*	,,
+				           s,$, ,
+				       }
+				       /^120000 blob /{
+				           s,^.*	,,
+				           s,$, ,
+				       }
+				       /^040000 tree /{
+				           s,^.*	,,
+				           s,$,/,
+				       }
+				       s/^.*	//')" \
+			"$pfx" "$cur_" ""
+		;;
+	*...*)
+		pfx="${cur_%...*}..."
+		cur_="${cur_#*...}"
+		__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		;;
+	*..*)
+		pfx="${cur_%..*}.."
+		cur_="${cur_#*..}"
+		__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		;;
+	*)
+		__gitcomp_nl "$(__git_refs)"
+		;;
+	esac
+}
+
+
+__git_complete_file ()
+{
+	__git_complete_revlist_file
+}
+
+__git_complete_revlist ()
+{
+	__git_complete_revlist_file
+}
+
+__git_complete_remote_or_refspec ()
+{
+	local cur_="$cur" cmd="${words[1]}"
+	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
+	if [ "$cmd" = "remote" ]; then
+		((c++))
+	fi
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
+		--all)
+			case "$cmd" in
+			push) no_complete_refspec=1 ;;
+			fetch)
+				COMPREPLY=()
+				return
+				;;
+			*) ;;
+			esac
+			;;
+		-*) ;;
+		*) remote="$i"; break ;;
+		esac
+		((c++))
+	done
+	if [ -z "$remote" ]; then
+		__gitcomp_nl "$(__git_remotes)"
+		return
+	fi
+	if [ $no_complete_refspec = 1 ]; then
+		COMPREPLY=()
+		return
+	fi
+	[ "$remote" = "." ] && remote=
+	case "$cur_" in
+	*:*)
+		case "$COMP_WORDBREAKS" in
+		*:*) : great ;;
+		*)   pfx="${cur_%%:*}:" ;;
+		esac
+		cur_="${cur_#*:}"
+		lhs=0
+		;;
+	+*)
+		pfx="+"
+		cur_="${cur_#+}"
+		;;
+	esac
+	case "$cmd" in
+	fetch)
+		if [ $lhs = 1 ]; then
+			__gitcomp_nl "$(__git_refs2 "$remote")" "$pfx" "$cur_"
+		else
+			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		fi
+		;;
+	pull|remote)
+		if [ $lhs = 1 ]; then
+			__gitcomp_nl "$(__git_refs "$remote")" "$pfx" "$cur_"
+		else
+			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		fi
+		;;
+	push)
+		if [ $lhs = 1 ]; then
+			__gitcomp_nl "$(__git_refs)" "$pfx" "$cur_"
+		else
+			__gitcomp_nl "$(__git_refs "$remote")" "$pfx" "$cur_"
+		fi
+		;;
+	esac
+}
+
+__git_complete_strategy ()
+{
+	__git_compute_merge_strategies
+	case "$prev" in
+	-s|--strategy)
+		__gitcomp "$__git_merge_strategies"
+		return 0
+	esac
+	case "$cur" in
+	--strategy=*)
+		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
+		return 0
+		;;
+	esac
+	return 1
+}
+
+__git_list_all_commands ()
+{
+	local i IFS=" "$'\n'
+	for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
+	do
+		case $i in
+		*--*)             : helper pattern;;
+		*) echo $i;;
+		esac
+	done
+}
+
+__git_all_commands=
+__git_compute_all_commands ()
+{
+	test -n "$__git_all_commands" ||
+	__git_all_commands=$(__git_list_all_commands)
+}
+
+__git_list_porcelain_commands ()
+{
+	local i IFS=" "$'\n'
+	__git_compute_all_commands
+	for i in "help" $__git_all_commands
+	do
+		case $i in
+		*--*)             : helper pattern;;
+		applymbox)        : ask gittus;;
+		applypatch)       : ask gittus;;
+		archimport)       : import;;
+		cat-file)         : plumbing;;
+		check-attr)       : plumbing;;
+		check-ref-format) : plumbing;;
+		checkout-index)   : plumbing;;
+		commit-tree)      : plumbing;;
+		count-objects)    : infrequent;;
+		credential-cache) : credentials helper;;
+		credential-store) : credentials helper;;
+		cvsexportcommit)  : export;;
+		cvsimport)        : import;;
+		cvsserver)        : daemon;;
+		daemon)           : daemon;;
+		diff-files)       : plumbing;;
+		diff-index)       : plumbing;;
+		diff-tree)        : plumbing;;
+		fast-import)      : import;;
+		fast-export)      : export;;
+		fsck-objects)     : plumbing;;
+		fetch-pack)       : plumbing;;
+		fmt-merge-msg)    : plumbing;;
+		for-each-ref)     : plumbing;;
+		hash-object)      : plumbing;;
+		http-*)           : transport;;
+		index-pack)       : plumbing;;
+		init-db)          : deprecated;;
+		local-fetch)      : plumbing;;
+		lost-found)       : infrequent;;
+		ls-files)         : plumbing;;
+		ls-remote)        : plumbing;;
+		ls-tree)          : plumbing;;
+		mailinfo)         : plumbing;;
+		mailsplit)        : plumbing;;
+		merge-*)          : plumbing;;
+		mktree)           : plumbing;;
+		mktag)            : plumbing;;
+		pack-objects)     : plumbing;;
+		pack-redundant)   : plumbing;;
+		pack-refs)        : plumbing;;
+		parse-remote)     : plumbing;;
+		patch-id)         : plumbing;;
+		peek-remote)      : plumbing;;
+		prune)            : plumbing;;
+		prune-packed)     : plumbing;;
+		quiltimport)      : import;;
+		read-tree)        : plumbing;;
+		receive-pack)     : plumbing;;
+		remote-*)         : transport;;
+		repo-config)      : deprecated;;
+		rerere)           : plumbing;;
+		rev-list)         : plumbing;;
+		rev-parse)        : plumbing;;
+		runstatus)        : plumbing;;
+		sh-setup)         : internal;;
+		shell)            : daemon;;
+		show-ref)         : plumbing;;
+		send-pack)        : plumbing;;
+		show-index)       : plumbing;;
+		ssh-*)            : transport;;
+		stripspace)       : plumbing;;
+		symbolic-ref)     : plumbing;;
+		tar-tree)         : deprecated;;
+		unpack-file)      : plumbing;;
+		unpack-objects)   : plumbing;;
+		update-index)     : plumbing;;
+		update-ref)       : plumbing;;
+		update-server-info) : daemon;;
+		upload-archive)   : plumbing;;
+		upload-pack)      : plumbing;;
+		write-tree)       : plumbing;;
+		var)              : infrequent;;
+		verify-pack)      : infrequent;;
+		verify-tag)       : plumbing;;
+		*) echo $i;;
+		esac
+	done
+}
+
+__git_porcelain_commands=
+__git_compute_porcelain_commands ()
+{
+	__git_compute_all_commands
+	test -n "$__git_porcelain_commands" ||
+	__git_porcelain_commands=$(__git_list_porcelain_commands)
+}
+
+__git_pretty_aliases ()
+{
+	local i IFS=$'\n'
+	for i in $(git --git-dir="$(__gitdir)" config --get-regexp "pretty\..*" 2>/dev/null); do
+		case "$i" in
+		pretty.*)
+			i="${i#pretty.}"
+			echo "${i/ */}"
+			;;
+		esac
+	done
+}
+
+__git_aliases ()
+{
+	local i IFS=$'\n'
+	for i in $(git --git-dir="$(__gitdir)" config --get-regexp "alias\..*" 2>/dev/null); do
+		case "$i" in
+		alias.*)
+			i="${i#alias.}"
+			echo "${i/ */}"
+			;;
+		esac
+	done
+}
+
+# __git_aliased_command requires 1 argument
+__git_aliased_command ()
+{
+	local word cmdline=$(git --git-dir="$(__gitdir)" \
+		config --get "alias.$1")
+	for word in $cmdline; do
+		case "$word" in
+		\!gitk|gitk)
+			echo "gitk"
+			return
+			;;
+		\!*)	: shell command alias ;;
+		-*)	: option ;;
+		*=*)	: setting env ;;
+		git)	: git itself ;;
+		*)
+			echo "$word"
+			return
+		esac
+	done
+}
+
+# __git_find_on_cmdline requires 1 argument
+__git_find_on_cmdline ()
+{
+	local word subcommand c=1
+	while [ $c -lt $cword ]; do
+		word="${words[c]}"
+		for subcommand in $1; do
+			if [ "$subcommand" = "$word" ]; then
+				echo "$subcommand"
+				return
+			fi
+		done
+		((c++))
+	done
+}
+
+__git_has_doubledash ()
+{
+	local c=1
+	while [ $c -lt $cword ]; do
+		if [ "--" = "${words[c]}" ]; then
+			return 0
+		fi
+		((c++))
+	done
+	return 1
+}
+
+__git_whitespacelist="nowarn warn error error-all fix"
+
+_git_am ()
+{
+	local dir="$(__gitdir)"
+	if [ -d "$dir"/rebase-apply ]; then
+		__gitcomp "--skip --continue --resolved --abort"
+		return
+	fi
+	case "$cur" in
+	--whitespace=*)
+		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--3way --committer-date-is-author-date --ignore-date
+			--ignore-whitespace --ignore-space-change
+			--interactive --keep --no-utf8 --signoff --utf8
+			--whitespace= --scissors
+			"
+		return
+	esac
+	COMPREPLY=()
+}
+
+_git_apply ()
+{
+	case "$cur" in
+	--whitespace=*)
+		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--stat --numstat --summary --check --index
+			--cached --index-info --reverse --reject --unidiff-zero
+			--apply --no-add --exclude=
+			--ignore-whitespace --ignore-space-change
+			--whitespace= --inaccurate-eof --verbose
+			"
+		return
+	esac
+	COMPREPLY=()
+}
+
+_git_add ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--interactive --refresh --patch --update --dry-run
+			--ignore-errors --intent-to-add
+			"
+		return
+	esac
+	COMPREPLY=()
+}
+
+_git_archive ()
+{
+	case "$cur" in
+	--format=*)
+		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		return
+		;;
+	--remote=*)
+		__gitcomp_nl "$(__git_remotes)" "" "${cur##--remote=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--format= --list --verbose
+			--prefix= --remote= --exec=
+			"
+		return
+		;;
+	esac
+	__git_complete_file
+}
+
+_git_bisect ()
+{
+	__git_has_doubledash && return
+
+	local subcommands="start bad good skip reset visualize replay log run"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		if [ -f "$(__gitdir)"/BISECT_START ]; then
+			__gitcomp "$subcommands"
+		else
+			__gitcomp "replay start"
+		fi
+		return
+	fi
+
+	case "$subcommand" in
+	bad|good|reset|skip|start)
+		__gitcomp_nl "$(__git_refs)"
+		;;
+	*)
+		COMPREPLY=()
+		;;
+	esac
+}
+
+_git_branch ()
+{
+	local i c=1 only_local_ref="n" has_r="n"
+
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		-d|-m)	only_local_ref="y" ;;
+		-r)	has_r="y" ;;
+		esac
+		((c++))
+	done
+
+	case "$cur" in
+	--set-upstream-to=*)
+		__gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}"
+		;;
+	--*)
+		__gitcomp "
+			--color --no-color --verbose --abbrev= --no-abbrev
+			--track --no-track --contains --merged --no-merged
+			--set-upstream-to= --edit-description --list
+			--unset-upstream
+			"
+		;;
+	*)
+		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
+			__gitcomp_nl "$(__git_heads)"
+		else
+			__gitcomp_nl "$(__git_refs)"
+		fi
+		;;
+	esac
+}
+
+_git_bundle ()
+{
+	local cmd="${words[2]}"
+	case "$cword" in
+	2)
+		__gitcomp "create list-heads verify unbundle"
+		;;
+	3)
+		# looking for a file
+		;;
+	*)
+		case "$cmd" in
+			create)
+				__git_complete_revlist
+			;;
+		esac
+		;;
+	esac
+}
+
+_git_checkout ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp "
+			--quiet --ours --theirs --track --no-track --merge
+			--conflict= --orphan --patch
+			"
+		;;
+	*)
+		# check if --track, --no-track, or --no-guess was specified
+		# if so, disable DWIM mode
+		local flags="--track --no-track --no-guess" track=1
+		if [ -n "$(__git_find_on_cmdline "$flags")" ]; then
+			track=''
+		fi
+		__gitcomp_nl "$(__git_refs '' $track)"
+		;;
+	esac
+}
+
+_git_cherry ()
+{
+	__gitcomp "$(__git_refs)"
+}
+
+_git_cherry_pick ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "--edit --no-commit"
+		;;
+	*)
+		__gitcomp_nl "$(__git_refs)"
+		;;
+	esac
+}
+
+_git_clean ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "--dry-run --quiet"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_clone ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--local
+			--no-hardlinks
+			--shared
+			--reference
+			--quiet
+			--no-checkout
+			--bare
+			--mirror
+			--origin
+			--upload-pack
+			--template=
+			--depth
+			"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_commit ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--cleanup=*)
+		__gitcomp "default strip verbatim whitespace
+			" "" "${cur##--cleanup=}"
+		return
+		;;
+	--reuse-message=*|--reedit-message=*|\
+	--fixup=*|--squash=*)
+		__gitcomp_nl "$(__git_refs)" "" "${cur#*=}"
+		return
+		;;
+	--untracked-files=*)
+		__gitcomp "all no normal" "" "${cur##--untracked-files=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--all --author= --signoff --verify --no-verify
+			--edit --no-edit
+			--amend --include --only --interactive
+			--dry-run --reuse-message= --reedit-message=
+			--reset-author --file= --message= --template=
+			--cleanup= --untracked-files --untracked-files=
+			--verbose --quiet --fixup= --squash=
+			"
+		return
+	esac
+	COMPREPLY=()
+}
+
+_git_describe ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--all --tags --contains --abbrev= --candidates=
+			--exact-match --debug --long --match --always
+			"
+		return
+	esac
+	__gitcomp_nl "$(__git_refs)"
+}
+
+__git_diff_common_options="--stat --numstat --shortstat --summary
+			--patch-with-stat --name-only --name-status --color
+			--no-color --color-words --no-renames --check
+			--full-index --binary --abbrev --diff-filter=
+			--find-copies-harder
+			--text --ignore-space-at-eol --ignore-space-change
+			--ignore-all-space --exit-code --quiet --ext-diff
+			--no-ext-diff
+			--no-prefix --src-prefix= --dst-prefix=
+			--inter-hunk-context=
+			--patience
+			--raw
+			--dirstat --dirstat= --dirstat-by-file
+			--dirstat-by-file= --cumulative
+"
+
+_git_diff ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs --no-index
+			$__git_diff_common_options
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist_file
+}
+
+__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
+			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
+"
+
+_git_difftool ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--tool=*)
+		__gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}"
+		return
+		;;
+	--*)
+		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs
+			--no-renames --diff-filter= --find-copies-harder
+			--relative --ignore-submodules
+			--tool="
+		return
+		;;
+	esac
+	__git_complete_file
+}
+
+__git_fetch_options="
+	--quiet --verbose --append --upload-pack --force --keep --depth=
+	--tags --no-tags --all --prune --dry-run
+"
+
+_git_fetch ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "$__git_fetch_options"
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+_git_format_patch ()
+{
+	case "$cur" in
+	--thread=*)
+		__gitcomp "
+			deep shallow
+			" "" "${cur##--thread=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--stdout --attach --no-attach --thread --thread=
+			--output-directory
+			--numbered --start-number
+			--numbered-files
+			--keep-subject
+			--signoff --signature --no-signature
+			--in-reply-to= --cc=
+			--full-index --binary
+			--not --all
+			--cover-letter
+			--no-prefix --src-prefix= --dst-prefix=
+			--inline --suffix= --ignore-if-in-upstream
+			--subject-prefix=
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+_git_fsck ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--tags --root --unreachable --cache --no-reflogs --full
+			--strict --verbose --lost-found
+			"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_gc ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "--prune --aggressive"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_gitk ()
+{
+	_gitk
+}
+
+__git_match_ctag() {
+	awk "/^${1////\\/}/ { print \$1 }" "$2"
+}
+
+_git_grep ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--cached
+			--text --ignore-case --word-regexp --invert-match
+			--full-name --line-number
+			--extended-regexp --basic-regexp --fixed-strings
+			--perl-regexp
+			--files-with-matches --name-only
+			--files-without-match
+			--max-depth
+			--count
+			--and --or --not --all-match
+			"
+		return
+		;;
+	esac
+
+	case "$cword,$prev" in
+	2,*|*,-*)
+		if test -r tags; then
+			__gitcomp_nl "$(__git_match_ctag "$cur" tags)"
+			return
+		fi
+		;;
+	esac
+
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_help ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "--all --info --man --web"
+		return
+		;;
+	esac
+	__git_compute_all_commands
+	__gitcomp "$__git_all_commands $(__git_aliases)
+		attributes cli core-tutorial cvs-migration
+		diffcore gitk glossary hooks ignore modules
+		namespaces repository-layout tutorial tutorial-2
+		workflows
+		"
+}
+
+_git_init ()
+{
+	case "$cur" in
+	--shared=*)
+		__gitcomp "
+			false true umask group all world everybody
+			" "" "${cur##--shared=}"
+		return
+		;;
+	--*)
+		__gitcomp "--quiet --bare --template= --shared --shared="
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_ls_files ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "--cached --deleted --modified --others --ignored
+			--stage --directory --no-empty-directory --unmerged
+			--killed --exclude= --exclude-from=
+			--exclude-per-directory= --exclude-standard
+			--error-unmatch --with-tree= --full-name
+			--abbrev --ignored --exclude-per-directory
+			"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_ls_remote ()
+{
+	__gitcomp_nl "$(__git_remotes)"
+}
+
+_git_ls_tree ()
+{
+	__git_complete_file
+}
+
+# Options that go well for log, shortlog and gitk
+__git_log_common_options="
+	--not --all
+	--branches --tags --remotes
+	--first-parent --merges --no-merges
+	--max-count=
+	--max-age= --since= --after=
+	--min-age= --until= --before=
+	--min-parents= --max-parents=
+	--no-min-parents --no-max-parents
+"
+# Options that go well for log and gitk (not shortlog)
+__git_log_gitk_options="
+	--dense --sparse --full-history
+	--simplify-merges --simplify-by-decoration
+	--left-right --notes --no-notes
+"
+# Options that go well for log and shortlog (not gitk)
+__git_log_shortlog_options="
+	--author= --committer= --grep=
+	--all-match
+"
+
+__git_log_pretty_formats="oneline short medium full fuller email raw format:"
+__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
+
+_git_log ()
+{
+	__git_has_doubledash && return
+
+	local g="$(git rev-parse --git-dir 2>/dev/null)"
+	local merge=""
+	if [ -f "$g/MERGE_HEAD" ]; then
+		merge="--merge"
+	fi
+	case "$cur" in
+	--pretty=*|--format=*)
+		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
+			" "" "${cur#*=}"
+		return
+		;;
+	--date=*)
+		__gitcomp "$__git_log_date_formats" "" "${cur##--date=}"
+		return
+		;;
+	--decorate=*)
+		__gitcomp "long short" "" "${cur##--decorate=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			$__git_log_common_options
+			$__git_log_shortlog_options
+			$__git_log_gitk_options
+			--root --topo-order --date-order --reverse
+			--follow --full-diff
+			--abbrev-commit --abbrev=
+			--relative-date --date=
+			--pretty= --format= --oneline
+			--cherry-pick
+			--graph
+			--decorate --decorate=
+			--walk-reflogs
+			--parents --children
+			$merge
+			$__git_diff_common_options
+			--pickaxe-all --pickaxe-regex
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+__git_merge_options="
+	--no-commit --no-stat --log --no-log --squash --strategy
+	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
+"
+
+_git_merge ()
+{
+	__git_complete_strategy && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "$__git_merge_options"
+		return
+	esac
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_mergetool ()
+{
+	case "$cur" in
+	--tool=*)
+		__gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}"
+		return
+		;;
+	--*)
+		__gitcomp "--tool="
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_merge_base ()
+{
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_mv ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "--dry-run"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_name_rev ()
+{
+	__gitcomp "--tags --all --stdin"
+}
+
+_git_notes ()
+{
+	local subcommands='add append copy edit list prune remove show'
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+
+	case "$subcommand,$cur" in
+	,--*)
+		__gitcomp '--ref'
+		;;
+	,*)
+		case "$prev" in
+		--ref)
+			__gitcomp_nl "$(__git_refs)"
+			;;
+		*)
+			__gitcomp "$subcommands --ref"
+			;;
+		esac
+		;;
+	add,--reuse-message=*|append,--reuse-message=*|\
+	add,--reedit-message=*|append,--reedit-message=*)
+		__gitcomp_nl "$(__git_refs)" "" "${cur#*=}"
+		;;
+	add,--*|append,--*)
+		__gitcomp '--file= --message= --reedit-message=
+				--reuse-message='
+		;;
+	copy,--*)
+		__gitcomp '--stdin'
+		;;
+	prune,--*)
+		__gitcomp '--dry-run --verbose'
+		;;
+	prune,*)
+		;;
+	*)
+		case "$prev" in
+		-m|-F)
+			;;
+		*)
+			__gitcomp_nl "$(__git_refs)"
+			;;
+		esac
+		;;
+	esac
+}
+
+_git_pull ()
+{
+	__git_complete_strategy && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--rebase --no-rebase
+			$__git_merge_options
+			$__git_fetch_options
+		"
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+_git_push ()
+{
+	case "$prev" in
+	--repo)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+	esac
+	case "$cur" in
+	--repo=*)
+		__gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--all --mirror --tags --dry-run --force --verbose
+			--receive-pack= --repo= --set-upstream
+		"
+		return
+		;;
+	esac
+	__git_complete_remote_or_refspec
+}
+
+_git_rebase ()
+{
+	local dir="$(__gitdir)"
+	if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
+		__gitcomp "--continue --skip --abort"
+		return
+	fi
+	__git_complete_strategy && return
+	case "$cur" in
+	--whitespace=*)
+		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
+		return
+		;;
+	--*)
+		__gitcomp "
+			--onto --merge --strategy --interactive
+			--preserve-merges --stat --no-stat
+			--committer-date-is-author-date --ignore-date
+			--ignore-whitespace --whitespace=
+			--autosquash
+			"
+
+		return
+	esac
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_reflog ()
+{
+	local subcommands="show delete expire"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		__gitcomp_nl "$(__git_refs)"
+	fi
+}
+
+__git_send_email_confirm_options="always never auto cc compose"
+__git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
+
+_git_send_email ()
+{
+	case "$cur" in
+	--confirm=*)
+		__gitcomp "
+			$__git_send_email_confirm_options
+			" "" "${cur##--confirm=}"
+		return
+		;;
+	--suppress-cc=*)
+		__gitcomp "
+			$__git_send_email_suppresscc_options
+			" "" "${cur##--suppress-cc=}"
+
+		return
+		;;
+	--smtp-encryption=*)
+		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
+		return
+		;;
+	--*)
+		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
+			--compose --confirm= --dry-run --envelope-sender
+			--from --identity
+			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
+			--no-suppress-from --no-thread --quiet
+			--signed-off-by-cc --smtp-pass --smtp-server
+			--smtp-server-port --smtp-encryption= --smtp-user
+			--subject --suppress-cc= --suppress-from --thread --to
+			--validate --no-validate"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_stage ()
+{
+	_git_add
+}
+
+__git_config_get_set_variables ()
+{
+	local prevword word config_file= c=$cword
+	while [ $c -gt 1 ]; do
+		word="${words[c]}"
+		case "$word" in
+		--global|--system|--file=*)
+			config_file="$word"
+			break
+			;;
+		-f|--file)
+			config_file="$word $prevword"
+			break
+			;;
+		esac
+		prevword=$word
+		c=$((--c))
+	done
+
+	git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null |
+	while read -r line
+	do
+		case "$line" in
+		*.*=*)
+			echo "${line/=*/}"
+			;;
+		esac
+	done
+}
+
+_git_config ()
+{
+	case "$prev" in
+	branch.*.remote)
+		__gitcomp_nl "$(__git_remotes)"
+		return
+		;;
+	branch.*.merge)
+		__gitcomp_nl "$(__git_refs)"
+		return
+		;;
+	remote.*.fetch)
+		local remote="${prev#remote.}"
+		remote="${remote%.fetch}"
+		if [ -z "$cur" ]; then
+			COMPREPLY=("refs/heads/")
+			return
+		fi
+		__gitcomp_nl "$(__git_refs_remotes "$remote")"
+		return
+		;;
+	remote.*.push)
+		local remote="${prev#remote.}"
+		remote="${remote%.push}"
+		__gitcomp_nl "$(git --git-dir="$(__gitdir)" \
+			for-each-ref --format='%(refname):%(refname)' \
+			refs/heads)"
+		return
+		;;
+	pull.twohead|pull.octopus)
+		__git_compute_merge_strategies
+		__gitcomp "$__git_merge_strategies"
+		return
+		;;
+	color.branch|color.diff|color.interactive|\
+	color.showbranch|color.status|color.ui)
+		__gitcomp "always never auto"
+		return
+		;;
+	color.pager)
+		__gitcomp "false true"
+		return
+		;;
+	color.*.*)
+		__gitcomp "
+			normal black red green yellow blue magenta cyan white
+			bold dim ul blink reverse
+			"
+		return
+		;;
+	help.format)
+		__gitcomp "man info web html"
+		return
+		;;
+	log.date)
+		__gitcomp "$__git_log_date_formats"
+		return
+		;;
+	sendemail.aliasesfiletype)
+		__gitcomp "mutt mailrc pine elm gnus"
+		return
+		;;
+	sendemail.confirm)
+		__gitcomp "$__git_send_email_confirm_options"
+		return
+		;;
+	sendemail.suppresscc)
+		__gitcomp "$__git_send_email_suppresscc_options"
+		return
+		;;
+	--get|--get-all|--unset|--unset-all)
+		__gitcomp_nl "$(__git_config_get_set_variables)"
+		return
+		;;
+	*.*)
+		COMPREPLY=()
+		return
+		;;
+	esac
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--global --system --file=
+			--list --replace-all
+			--get --get-all --get-regexp
+			--add --unset --unset-all
+			--remove-section --rename-section
+			"
+		return
+		;;
+	branch.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur_"
+		return
+		;;
+	branch.*)
+		local pfx="${cur%.*}." cur_="${cur#*.}"
+		__gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "."
+		return
+		;;
+	guitool.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "
+			argprompt cmd confirm needsfile noconsole norescan
+			prompt revprompt revunmerged title
+			" "$pfx" "$cur_"
+		return
+		;;
+	difftool.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_"
+		return
+		;;
+	man.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_"
+		return
+		;;
+	mergetool.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+		return
+		;;
+	pager.*)
+		local pfx="${cur%.*}." cur_="${cur#*.}"
+		__git_compute_all_commands
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+		return
+		;;
+	remote.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "
+			url proxy fetch push mirror skipDefaultUpdate
+			receivepack uploadpack tagopt pushurl
+			" "$pfx" "$cur_"
+		return
+		;;
+	remote.*)
+		local pfx="${cur%.*}." cur_="${cur#*.}"
+		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
+		return
+		;;
+	url.*.*)
+		local pfx="${cur%.*}." cur_="${cur##*.}"
+		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+		return
+		;;
+	esac
+	__gitcomp "
+		add.ignoreErrors
+		advice.commitBeforeMerge
+		advice.detachedHead
+		advice.implicitIdentity
+		advice.pushNonFastForward
+		advice.resolveConflict
+		advice.statusHints
+		alias.
+		am.keepcr
+		apply.ignorewhitespace
+		apply.whitespace
+		branch.autosetupmerge
+		branch.autosetuprebase
+		browser.
+		clean.requireForce
+		color.branch
+		color.branch.current
+		color.branch.local
+		color.branch.plain
+		color.branch.remote
+		color.decorate.HEAD
+		color.decorate.branch
+		color.decorate.remoteBranch
+		color.decorate.stash
+		color.decorate.tag
+		color.diff
+		color.diff.commit
+		color.diff.frag
+		color.diff.func
+		color.diff.meta
+		color.diff.new
+		color.diff.old
+		color.diff.plain
+		color.diff.whitespace
+		color.grep
+		color.grep.context
+		color.grep.filename
+		color.grep.function
+		color.grep.linenumber
+		color.grep.match
+		color.grep.selected
+		color.grep.separator
+		color.interactive
+		color.interactive.error
+		color.interactive.header
+		color.interactive.help
+		color.interactive.prompt
+		color.pager
+		color.showbranch
+		color.status
+		color.status.added
+		color.status.changed
+		color.status.header
+		color.status.nobranch
+		color.status.untracked
+		color.status.updated
+		color.ui
+		commit.status
+		commit.template
+		core.abbrev
+		core.askpass
+		core.attributesfile
+		core.autocrlf
+		core.bare
+		core.bigFileThreshold
+		core.compression
+		core.createObject
+		core.deltaBaseCacheLimit
+		core.editor
+		core.eol
+		core.excludesfile
+		core.fileMode
+		core.fsyncobjectfiles
+		core.gitProxy
+		core.ignoreCygwinFSTricks
+		core.ignoreStat
+		core.ignorecase
+		core.logAllRefUpdates
+		core.loosecompression
+		core.notesRef
+		core.packedGitLimit
+		core.packedGitWindowSize
+		core.pager
+		core.preferSymlinkRefs
+		core.preloadindex
+		core.quotepath
+		core.repositoryFormatVersion
+		core.safecrlf
+		core.sharedRepository
+		core.sparseCheckout
+		core.symlinks
+		core.trustctime
+		core.warnAmbiguousRefs
+		core.whitespace
+		core.worktree
+		diff.autorefreshindex
+		diff.statGraphWidth
+		diff.external
+		diff.ignoreSubmodules
+		diff.mnemonicprefix
+		diff.noprefix
+		diff.renameLimit
+		diff.renames
+		diff.suppressBlankEmpty
+		diff.tool
+		diff.wordRegex
+		difftool.
+		difftool.prompt
+		fetch.recurseSubmodules
+		fetch.unpackLimit
+		format.attach
+		format.cc
+		format.headers
+		format.numbered
+		format.pretty
+		format.signature
+		format.signoff
+		format.subjectprefix
+		format.suffix
+		format.thread
+		format.to
+		gc.
+		gc.aggressiveWindow
+		gc.auto
+		gc.autopacklimit
+		gc.packrefs
+		gc.pruneexpire
+		gc.reflogexpire
+		gc.reflogexpireunreachable
+		gc.rerereresolved
+		gc.rerereunresolved
+		gitcvs.allbinary
+		gitcvs.commitmsgannotation
+		gitcvs.dbTableNamePrefix
+		gitcvs.dbdriver
+		gitcvs.dbname
+		gitcvs.dbpass
+		gitcvs.dbuser
+		gitcvs.enabled
+		gitcvs.logfile
+		gitcvs.usecrlfattr
+		guitool.
+		gui.blamehistoryctx
+		gui.commitmsgwidth
+		gui.copyblamethreshold
+		gui.diffcontext
+		gui.encoding
+		gui.fastcopyblame
+		gui.matchtrackingbranch
+		gui.newbranchtemplate
+		gui.pruneduringfetch
+		gui.spellingdictionary
+		gui.trustmtime
+		help.autocorrect
+		help.browser
+		help.format
+		http.lowSpeedLimit
+		http.lowSpeedTime
+		http.maxRequests
+		http.minSessions
+		http.noEPSV
+		http.postBuffer
+		http.proxy
+		http.sslCAInfo
+		http.sslCAPath
+		http.sslCert
+		http.sslCertPasswordProtected
+		http.sslKey
+		http.sslVerify
+		http.useragent
+		i18n.commitEncoding
+		i18n.logOutputEncoding
+		imap.authMethod
+		imap.folder
+		imap.host
+		imap.pass
+		imap.port
+		imap.preformattedHTML
+		imap.sslverify
+		imap.tunnel
+		imap.user
+		init.templatedir
+		instaweb.browser
+		instaweb.httpd
+		instaweb.local
+		instaweb.modulepath
+		instaweb.port
+		interactive.singlekey
+		log.date
+		log.decorate
+		log.showroot
+		mailmap.file
+		man.
+		man.viewer
+		merge.
+		merge.conflictstyle
+		merge.log
+		merge.renameLimit
+		merge.renormalize
+		merge.stat
+		merge.tool
+		merge.verbosity
+		mergetool.
+		mergetool.keepBackup
+		mergetool.keepTemporaries
+		mergetool.prompt
+		notes.displayRef
+		notes.rewrite.
+		notes.rewrite.amend
+		notes.rewrite.rebase
+		notes.rewriteMode
+		notes.rewriteRef
+		pack.compression
+		pack.deltaCacheLimit
+		pack.deltaCacheSize
+		pack.depth
+		pack.indexVersion
+		pack.packSizeLimit
+		pack.threads
+		pack.window
+		pack.windowMemory
+		pager.
+		pretty.
+		pull.octopus
+		pull.twohead
+		push.default
+		rebase.autosquash
+		rebase.stat
+		receive.autogc
+		receive.denyCurrentBranch
+		receive.denyDeleteCurrent
+		receive.denyDeletes
+		receive.denyNonFastForwards
+		receive.fsckObjects
+		receive.unpackLimit
+		receive.updateserverinfo
+		remotes.
+		repack.usedeltabaseoffset
+		rerere.autoupdate
+		rerere.enabled
+		sendemail.
+		sendemail.aliasesfile
+		sendemail.aliasfiletype
+		sendemail.bcc
+		sendemail.cc
+		sendemail.cccmd
+		sendemail.chainreplyto
+		sendemail.confirm
+		sendemail.envelopesender
+		sendemail.from
+		sendemail.identity
+		sendemail.multiedit
+		sendemail.signedoffbycc
+		sendemail.smtpdomain
+		sendemail.smtpencryption
+		sendemail.smtppass
+		sendemail.smtpserver
+		sendemail.smtpserveroption
+		sendemail.smtpserverport
+		sendemail.smtpuser
+		sendemail.suppresscc
+		sendemail.suppressfrom
+		sendemail.thread
+		sendemail.to
+		sendemail.validate
+		showbranch.default
+		status.relativePaths
+		status.showUntrackedFiles
+		status.submodulesummary
+		submodule.
+		tar.umask
+		transfer.unpackLimit
+		url.
+		user.email
+		user.name
+		user.signingkey
+		web.browser
+		branch. remote.
+	"
+}
+
+_git_remote ()
+{
+	local subcommands="add rename remove set-head set-branches set-url show prune update"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+		return
+	fi
+
+	case "$subcommand" in
+	rename|remove|set-url|show|prune)
+		__gitcomp_nl "$(__git_remotes)"
+		;;
+	set-head|set-branches)
+		__git_complete_remote_or_refspec
+		;;
+	update)
+		local i c='' IFS=$'\n'
+		for i in $(git --git-dir="$(__gitdir)" config --get-regexp "remotes\..*" 2>/dev/null); do
+			i="${i#remotes.}"
+			c="$c ${i/ */}"
+		done
+		__gitcomp "$c"
+		;;
+	*)
+		COMPREPLY=()
+		;;
+	esac
+}
+
+_git_replace ()
+{
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_reset ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "--merge --mixed --hard --soft --patch"
+		return
+		;;
+	esac
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_revert ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "--edit --mainline --no-edit --no-commit --signoff"
+		return
+		;;
+	esac
+	__gitcomp_nl "$(__git_refs)"
+}
+
+_git_rm ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		return
+		;;
+	esac
+	COMPREPLY=()
+}
+
+_git_shortlog ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--*)
+		__gitcomp "
+			$__git_log_common_options
+			$__git_log_shortlog_options
+			--numbered --summary
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+_git_show ()
+{
+	__git_has_doubledash && return
+
+	case "$cur" in
+	--pretty=*|--format=*)
+		__gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases)
+			" "" "${cur#*=}"
+		return
+		;;
+	--*)
+		__gitcomp "--pretty= --format= --abbrev-commit --oneline
+			$__git_diff_common_options
+			"
+		return
+		;;
+	esac
+	__git_complete_file
+}
+
+_git_show_branch ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--all --remotes --topo-order --current --more=
+			--list --independent --merge-base --no-name
+			--color --no-color
+			--sha1-name --sparse --topics --reflog
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+_git_stash ()
+{
+	local save_opts='--keep-index --no-keep-index --quiet --patch'
+	local subcommands='save list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		case "$cur" in
+		--*)
+			__gitcomp "$save_opts"
+			;;
+		*)
+			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+				__gitcomp "$subcommands"
+			else
+				COMPREPLY=()
+			fi
+			;;
+		esac
+	else
+		case "$subcommand,$cur" in
+		save,--*)
+			__gitcomp "$save_opts"
+			;;
+		apply,--*|pop,--*)
+			__gitcomp "--index --quiet"
+			;;
+		show,--*|drop,--*|branch,--*)
+			COMPREPLY=()
+			;;
+		show,*|apply,*|drop,*|pop,*|branch,*)
+			__gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
+					| sed -n -e 's/:.*//p')"
+			;;
+		*)
+			COMPREPLY=()
+			;;
+		esac
+	fi
+}
+
+_git_submodule ()
+{
+	__git_has_doubledash && return
+
+	local subcommands="add status init update summary foreach sync"
+	if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then
+		case "$cur" in
+		--*)
+			__gitcomp "--quiet --cached"
+			;;
+		*)
+			__gitcomp "$subcommands"
+			;;
+		esac
+		return
+	fi
+}
+
+_git_svn ()
+{
+	local subcommands="
+		init fetch clone rebase dcommit log find-rev
+		set-tree commit-diff info create-ignore propget
+		proplist show-ignore show-externals branch tag blame
+		migrate mkdirs reset gc
+		"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+	else
+		local remote_opts="--username= --config-dir= --no-auth-cache"
+		local fc_opts="
+			--follow-parent --authors-file= --repack=
+			--no-metadata --use-svm-props --use-svnsync-props
+			--log-window-size= --no-checkout --quiet
+			--repack-flags --use-log-author --localtime
+			--ignore-paths= $remote_opts
+			"
+		local init_opts="
+			--template= --shared= --trunk= --tags=
+			--branches= --stdlayout --minimize-url
+			--no-metadata --use-svm-props --use-svnsync-props
+			--rewrite-root= --prefix= --use-log-author
+			--add-author-from $remote_opts
+			"
+		local cmt_opts="
+			--edit --rmdir --find-copies-harder --copy-similarity=
+			"
+
+		case "$subcommand,$cur" in
+		fetch,--*)
+			__gitcomp "--revision= --fetch-all $fc_opts"
+			;;
+		clone,--*)
+			__gitcomp "--revision= $fc_opts $init_opts"
+			;;
+		init,--*)
+			__gitcomp "$init_opts"
+			;;
+		dcommit,--*)
+			__gitcomp "
+				--merge --strategy= --verbose --dry-run
+				--fetch-all --no-rebase --commit-url
+				--revision --interactive $cmt_opts $fc_opts
+				"
+			;;
+		set-tree,--*)
+			__gitcomp "--stdin $cmt_opts $fc_opts"
+			;;
+		create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\
+		show-externals,--*|mkdirs,--*)
+			__gitcomp "--revision="
+			;;
+		log,--*)
+			__gitcomp "
+				--limit= --revision= --verbose --incremental
+				--oneline --show-commit --non-recursive
+				--authors-file= --color
+				"
+			;;
+		rebase,--*)
+			__gitcomp "
+				--merge --verbose --strategy= --local
+				--fetch-all --dry-run $fc_opts
+				"
+			;;
+		commit-diff,--*)
+			__gitcomp "--message= --file= --revision= $cmt_opts"
+			;;
+		info,--*)
+			__gitcomp "--url"
+			;;
+		branch,--*)
+			__gitcomp "--dry-run --message --tag"
+			;;
+		tag,--*)
+			__gitcomp "--dry-run --message"
+			;;
+		blame,--*)
+			__gitcomp "--git-format"
+			;;
+		migrate,--*)
+			__gitcomp "
+				--config-dir= --ignore-paths= --minimize
+				--no-auth-cache --username=
+				"
+			;;
+		reset,--*)
+			__gitcomp "--revision= --parent"
+			;;
+		*)
+			COMPREPLY=()
+			;;
+		esac
+	fi
+}
+
+_git_tag ()
+{
+	local i c=1 f=0
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		-d|-v)
+			__gitcomp_nl "$(__git_tags)"
+			return
+			;;
+		-f)
+			f=1
+			;;
+		esac
+		((c++))
+	done
+
+	case "$prev" in
+	-m|-F)
+		COMPREPLY=()
+		;;
+	-*|tag)
+		if [ $f = 1 ]; then
+			__gitcomp_nl "$(__git_tags)"
+		else
+			COMPREPLY=()
+		fi
+		;;
+	*)
+		__gitcomp_nl "$(__git_refs)"
+		;;
+	esac
+}
+
+_git_whatchanged ()
+{
+	_git_log
+}
+
+__git_main ()
+{
+	local i c=1 command __git_dir
+
+	while [ $c -lt $cword ]; do
+		i="${words[c]}"
+		case "$i" in
+		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
+		--bare)      __git_dir="." ;;
+		--help) command="help"; break ;;
+		-c) c=$((++c)) ;;
+		-*) ;;
+		*) command="$i"; break ;;
+		esac
+		((c++))
+	done
+
+	if [ -z "$command" ]; then
+		case "$cur" in
+		--*)   __gitcomp "
+			--paginate
+			--no-pager
+			--git-dir=
+			--bare
+			--version
+			--exec-path
+			--exec-path=
+			--html-path
+			--info-path
+			--work-tree=
+			--namespace=
+			--no-replace-objects
+			--help
+			"
+			;;
+		*)     __git_compute_porcelain_commands
+		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
+		esac
+		return
+	fi
+
+	local completion_func="_git_${command//-/_}"
+	declare -f $completion_func >/dev/null && $completion_func && return
+
+	local expansion=$(__git_aliased_command "$command")
+	if [ -n "$expansion" ]; then
+		completion_func="_git_${expansion//-/_}"
+		declare -f $completion_func >/dev/null && $completion_func
+	fi
+}
+
+__gitk_main ()
+{
+	__git_has_doubledash && return
+
+	local g="$(__gitdir)"
+	local merge=""
+	if [ -f "$g/MERGE_HEAD" ]; then
+		merge="--merge"
+	fi
+	case "$cur" in
+	--*)
+		__gitcomp "
+			$__git_log_common_options
+			$__git_log_gitk_options
+			$merge
+			"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+__git_func_wrap ()
+{
+	if [[ -n ${ZSH_VERSION-} ]]; then
+		emulate -L bash
+		setopt KSH_TYPESET
+
+		# workaround zsh's bug that leaves 'words' as a special
+		# variable in versions < 4.3.12
+		typeset -h words
+
+		# workaround zsh's bug that quotes spaces in the COMPREPLY
+		# array if IFS doesn't contain spaces.
+		typeset -h IFS
+	fi
+	local cur words cword prev
+	_get_comp_words_by_ref -n =: cur words cword prev
+	$1
+}
+
+# Setup completion for certain functions defined above by setting common
+# variables and workarounds.
+# This is NOT a public function; use at your own risk.
+__git_complete ()
+{
+	local wrapper="__git_wrap${2}"
+	eval "$wrapper () { __git_func_wrap $2 ; }"
+	complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \
+		|| complete -o default -o nospace -F $wrapper $1
+}
+
+# wrapper for backwards compatibility
+_git ()
+{
+	__git_wrap__git_main
+}
+
+# wrapper for backwards compatibility
+_gitk ()
+{
+	__git_wrap__gitk_main
+}
+
+__git_complete git __git_main
+__git_complete gitk __gitk_main
+
+# The following are necessary only for Cygwin, and only are needed
+# when the user has tab-completed the executable name and consequently
+# included the '.exe' suffix.
+#
+if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
+__git_complete git.exe __git_main
+fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
new file mode 100644
index 000000000..bf20491ec
--- /dev/null
+++ b/plugins/gitfast/git-prompt.sh
@@ -0,0 +1,290 @@
+# bash/zsh git prompt support
+#
+# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
+# Distributed under the GNU General Public License, version 2.0.
+#
+# This script allows you to see the current branch in your prompt.
+#
+# To enable:
+#
+#    1) Copy this file to somewhere (e.g. ~/.git-prompt.sh).
+#    2) Add the following line to your .bashrc/.zshrc:
+#        source ~/.git-prompt.sh
+#    3) Change your PS1 to also show the current branch:
+#         Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
+#         ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#
+# The argument to __git_ps1 will be displayed only if you are currently
+# in a git repository.  The %s token will be the name of the current
+# branch.
+#
+# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty value,
+# unstaged (*) and staged (+) changes will be shown next to the branch
+# name.  You can configure this per-repository with the
+# bash.showDirtyState variable, which defaults to true once
+# GIT_PS1_SHOWDIRTYSTATE is enabled.
+#
+# You can also see if currently something is stashed, by setting
+# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
+# then a '$' will be shown next to the branch name.
+#
+# If you would like to see if there're untracked files, then you can set
+# GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked
+# files, then a '%' will be shown next to the branch name.
+#
+# If you would like to see the difference between HEAD and its upstream,
+# set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
+# indicates you are ahead, "<>" indicates you have diverged and "="
+# indicates that there is no difference. You can further control
+# behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
+# of values:
+#
+#     verbose       show number of commits ahead/behind (+/-) upstream
+#     legacy        don't use the '--count' option available in recent
+#                   versions of git-rev-list
+#     git           always compare HEAD to @{upstream}
+#     svn           always compare HEAD to your SVN upstream
+#
+# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
+# find one, or @{upstream} otherwise.  Once you have set
+# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
+# setting the bash.showUpstream config variable.
+
+# __gitdir accepts 0 or 1 arguments (i.e., location)
+# returns location of .git repo
+__gitdir ()
+{
+	# Note: this function is duplicated in git-completion.bash
+	# When updating it, make sure you update the other one to match.
+	if [ -z "${1-}" ]; then
+		if [ -n "${__git_dir-}" ]; then
+			echo "$__git_dir"
+		elif [ -n "${GIT_DIR-}" ]; then
+			test -d "${GIT_DIR-}" || return 1
+			echo "$GIT_DIR"
+		elif [ -d .git ]; then
+			echo .git
+		else
+			git rev-parse --git-dir 2>/dev/null
+		fi
+	elif [ -d "$1/.git" ]; then
+		echo "$1/.git"
+	else
+		echo "$1"
+	fi
+}
+
+# stores the divergence from upstream in $p
+# used by GIT_PS1_SHOWUPSTREAM
+__git_ps1_show_upstream ()
+{
+	local key value
+	local svn_remote svn_url_pattern count n
+	local upstream=git legacy="" verbose=""
+
+	svn_remote=()
+	# get some config options from git-config
+	local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
+	while read -r key value; do
+		case "$key" in
+		bash.showupstream)
+			GIT_PS1_SHOWUPSTREAM="$value"
+			if [[ -z "${GIT_PS1_SHOWUPSTREAM}" ]]; then
+				p=""
+				return
+			fi
+			;;
+		svn-remote.*.url)
+			svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value"
+			svn_url_pattern+="\\|$value"
+			upstream=svn+git # default upstream is SVN if available, else git
+			;;
+		esac
+	done <<< "$output"
+
+	# parse configuration values
+	for option in ${GIT_PS1_SHOWUPSTREAM}; do
+		case "$option" in
+		git|svn) upstream="$option" ;;
+		verbose) verbose=1 ;;
+		legacy)  legacy=1  ;;
+		esac
+	done
+
+	# Find our upstream
+	case "$upstream" in
+	git)    upstream="@{upstream}" ;;
+	svn*)
+		# get the upstream from the "git-svn-id: ..." in a commit message
+		# (git-svn uses essentially the same procedure internally)
+		local svn_upstream=($(git log --first-parent -1 \
+					--grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
+		if [[ 0 -ne ${#svn_upstream[@]} ]]; then
+			svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]}
+			svn_upstream=${svn_upstream%@*}
+			local n_stop="${#svn_remote[@]}"
+			for ((n=1; n <= n_stop; n++)); do
+				svn_upstream=${svn_upstream#${svn_remote[$n]}}
+			done
+
+			if [[ -z "$svn_upstream" ]]; then
+				# default branch name for checkouts with no layout:
+				upstream=${GIT_SVN_ID:-git-svn}
+			else
+				upstream=${svn_upstream#/}
+			fi
+		elif [[ "svn+git" = "$upstream" ]]; then
+			upstream="@{upstream}"
+		fi
+		;;
+	esac
+
+	# Find how many commits we are ahead/behind our upstream
+	if [[ -z "$legacy" ]]; then
+		count="$(git rev-list --count --left-right \
+				"$upstream"...HEAD 2>/dev/null)"
+	else
+		# produce equivalent output to --count for older versions of git
+		local commits
+		if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
+		then
+			local commit behind=0 ahead=0
+			for commit in $commits
+			do
+				case "$commit" in
+				"<"*) ((behind++)) ;;
+				*)    ((ahead++))  ;;
+				esac
+			done
+			count="$behind	$ahead"
+		else
+			count=""
+		fi
+	fi
+
+	# calculate the result
+	if [[ -z "$verbose" ]]; then
+		case "$count" in
+		"") # no upstream
+			p="" ;;
+		"0	0") # equal to upstream
+			p="=" ;;
+		"0	"*) # ahead of upstream
+			p=">" ;;
+		*"	0") # behind upstream
+			p="<" ;;
+		*)	    # diverged from upstream
+			p="<>" ;;
+		esac
+	else
+		case "$count" in
+		"") # no upstream
+			p="" ;;
+		"0	0") # equal to upstream
+			p=" u=" ;;
+		"0	"*) # ahead of upstream
+			p=" u+${count#0	}" ;;
+		*"	0") # behind upstream
+			p=" u-${count%	0}" ;;
+		*)	    # diverged from upstream
+			p=" u+${count#*	}-${count%	*}" ;;
+		esac
+	fi
+
+}
+
+
+# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
+# returns text to add to bash PS1 prompt (includes branch name)
+__git_ps1 ()
+{
+	local g="$(__gitdir)"
+	if [ -n "$g" ]; then
+		local r=""
+		local b=""
+		if [ -f "$g/rebase-merge/interactive" ]; then
+			r="|REBASE-i"
+			b="$(cat "$g/rebase-merge/head-name")"
+		elif [ -d "$g/rebase-merge" ]; then
+			r="|REBASE-m"
+			b="$(cat "$g/rebase-merge/head-name")"
+		else
+			if [ -d "$g/rebase-apply" ]; then
+				if [ -f "$g/rebase-apply/rebasing" ]; then
+					r="|REBASE"
+				elif [ -f "$g/rebase-apply/applying" ]; then
+					r="|AM"
+				else
+					r="|AM/REBASE"
+				fi
+			elif [ -f "$g/MERGE_HEAD" ]; then
+				r="|MERGING"
+			elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
+				r="|CHERRY-PICKING"
+			elif [ -f "$g/BISECT_LOG" ]; then
+				r="|BISECTING"
+			fi
+
+			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
+
+				b="$(
+				case "${GIT_PS1_DESCRIBE_STYLE-}" in
+				(contains)
+					git describe --contains HEAD ;;
+				(branch)
+					git describe --contains --all HEAD ;;
+				(describe)
+					git describe HEAD ;;
+				(* | default)
+					git describe --tags --exact-match HEAD ;;
+				esac 2>/dev/null)" ||
+
+				b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||
+				b="unknown"
+				b="($b)"
+			}
+		fi
+
+		local w=""
+		local i=""
+		local s=""
+		local u=""
+		local c=""
+		local p=""
+
+		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
+			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then
+				c="BARE:"
+			else
+				b="GIT_DIR!"
+			fi
+		elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
+			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
+				if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
+					git diff --no-ext-diff --quiet --exit-code || w="*"
+					if git rev-parse --quiet --verify HEAD >/dev/null; then
+						git diff-index --cached --quiet HEAD -- || i="+"
+					else
+						i="#"
+					fi
+				fi
+			fi
+			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
+				git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
+			fi
+
+			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
+				if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+					u="%"
+				fi
+			fi
+
+			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
+				__git_ps1_show_upstream
+			fi
+		fi
+
+		local f="$w$i$s$u"
+		printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
+	fi
+}
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
new file mode 100644
index 000000000..7e50cf721
--- /dev/null
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -0,0 +1,7 @@
+dir=$(dirname $0)
+source $dir/../git/git.plugin.zsh
+source $dir/git-prompt.sh
+
+function git_prompt_info() {
+  __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
+}

From 7991562e768733be9565fb05615c3f0f83ba4eb0 Mon Sep 17 00:00:00 2001
From: Stanislav Mekhonoshin <mehonoshin@sc.vsu.ru>
Date: Sat, 24 Nov 2012 11:23:44 +0400
Subject: [PATCH 721/907] Added gwc(git whatchanged alias)

Allows to view commit history in extended way
---
 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 d3d3f702a..03ad2edb0 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -38,6 +38,7 @@ alias gm='git merge'
 compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
+alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

From b2b5e3a7549fc323d3801054c51143142baf4f17 Mon Sep 17 00:00:00 2001
From: Srihari Sriraman <techie@visishta.net>
Date: Sat, 24 Nov 2012 20:42:40 +0530
Subject: [PATCH 722/907] Added alias to rake db:test:prepare

Quite often, db:test:prepare is run after db:migrate.
Added for convenience.
---
 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 4aa7a05d6..cd232a6ae 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -5,6 +5,7 @@ alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
+alias rdbtp='rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'

From 7c768543df965ce5102b34e83fab78cf5e73b626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20M=C4=83gheru=C8=99an-Stanciu?=
 <cristi.magherusan@gmail.com>
Date: Sat, 24 Nov 2012 20:33:25 +0100
Subject: [PATCH 723/907] Added a small mod of the tjkirch theme

- single-line prompt
- removed the extra line after each command output
---
 themes/tjkirch_mod.zsh-theme | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 themes/tjkirch_mod.zsh-theme

diff --git a/themes/tjkirch_mod.zsh-theme b/themes/tjkirch_mod.zsh-theme
new file mode 100644
index 000000000..1b206a7e1
--- /dev/null
+++ b/themes/tjkirch_mod.zsh-theme
@@ -0,0 +1,13 @@
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+function prompt_char {
+	if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
+}
+
+PROMPT='%(?,,%{$fg[red]%}FAIL: $?%{$reset_color%}
+)%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info) %_$(prompt_char) '
+
+RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'

From 75e5a6dcfc20a582a4b4653a25c074f4263dd7dc Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Sun, 25 Nov 2012 20:34:12 -0200
Subject: [PATCH 724/907] fixes my wrong commit - fixes #1423

---
 .gitignore       |   1 +
 custom/totvs.zsh | 124 -----------------------------------------------
 2 files changed, 1 insertion(+), 124 deletions(-)
 delete mode 100644 custom/totvs.zsh

diff --git a/.gitignore b/.gitignore
index 4cb1720e7..51a5ee6c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 locals.zsh
 log/.zsh_history
 projects.zsh
+custom/*
 !custom/example
 !custom/example.zsh
 *.swp
diff --git a/custom/totvs.zsh b/custom/totvs.zsh
deleted file mode 100644
index 883bdf7dd..000000000
--- a/custom/totvs.zsh
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Just some utilities for use in ecm development.
-#
-
-setopt rmstarsilent
-
-HOME="/home/carlos"
-ECM_WS="$HOME/totvs/ws"
-ECM_JBOSS="$HOME/Public/ecm/JBoss-7.1.1"
-ECM_PORT="8080"
-VOLDEMORT=$ECM_WS/voldemort
-ECM=$ECM_WS/ecm
-INSTALLER="n"
-DRY_CLEAN="n"
-
-# fuckin aliases
-alias ecmu=ecmup
-alias ecmb=ecmbuild
-alias ecmc=ecmclean
-alias ecms=ecmstart
-alias ecmo=ecmstop
-alias ecmi=ecminstall
-alias ecmri=ecmruninstall
-alias ecm=ecmfull
-alias e='MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DskipTests=true" ecm'  
-
-
-# update ecm
-ecmup() {
-	echo "update all the things!"
-	cd $VOLDEMORT && svn up
-	cd $ECM && svn up
-}
-
-# build it!
-ecmbuild() {
-	echo "build? no problem sir..."
-	cd $VOLDEMORT && mvncie && \
-	cd $VOLDEMORT/social-ecm && \
-	cd $VOLDEMORT/wcm && mvncie && \
-	cd $ECM/wecmpackage && mvncie && \
-	cd $VOLDEMORT/ecm && mvncie && \
-	ecminstall
-}
-
-# gen installer or cp wars...
-ecminstall() {
-	case $@ in
-	-*i*)
-		INSTALLER=y
-		;;
-	esac	
-  if [[ "$INSTALLER" == "y" ]]; then
-  	echo "generating installer..."
-    cd $VOLDEMORT/ecm/installer
-          mvnci -am -Drun=installer -DLinux64=true -DappServer=jboss
-  else
-		echo "cpying wars..."
-    cd $VOLDEMORT/ecm/build && mvnci && \
-		cd $VOLDEMORT/wcm/build && mvnci && \
-    cd $VOLDEMORT/social-ecm/build && mvnci
-	fi
-}
-
-# clean jboss trash folders
-ecmclean() {
-	echo "cleaning jboss shit"
-	case $@ in
-	-*d*)
-		DRY_CLEAN="y"
-		;;
-	esac
-	if [[ "$DRY_CLEAN" == "y" ]]; then
-		rm -rf $ECM_JBOSS/standalone/deployments/*.{failed,deployed,dodeploy,deploying}
-	else
-		rm -rf $ECM_JBOSS/standalone/deployments/*
-	fi
-	rm -rf $ECM_JBOSS/standalone/{log,tmp,data}
-	rm -rf $ECM_JBOSS/solr/zoo_data
-}
-
-# start jboss server
-ecmstart() {
-	# why shall I start server if i just gen a installer?
-	if [[ "$INSTALLER" == "y" ]]; then
-		ecmruninstall
-	else
-		echo "starting jboss"
-		cd $ECM_JBOSS/bin
-		JAVA_OPTS="-Xmx2048m -XX:MaxPermSize=512m -DzkRun -Dbootstrap_conf=true" ./standalone.sh
-	fi
-}
-
-ecmruninstall() {
-	echo "ok, lets install this crap :)"
-	cd $VOLDEMORT/ecm/installer/izpack/target
-	if [[ -f ECM-Linux64.zip ]]; then
-		mkdir -p /tmp/ecmi
-		rm -rf /tmp/ecmi/*
-		unzip ECM-Linux64 -d /tmp/ecmi/
-		cd /tmp/ecmi/
-		chmod a+x ECM-Installer-64.sh
-		./ECM-Installer-64.sh
-	else
-		echo "uhoh, installer doesnt exist ($VOLDEMORT/ecm/installer/izpack/target/ECM-Linux64.zip)"
-	fi
-}
-
-# stop jboss (usually on 8080)
-ecmstop() {
-	echo "kill jboss (or whatever you are running on 8080"
-	fuser -k $ECM_PORT/tcp
-}
-
-# do all the things
-ecmfull() {
-	echo "serious business here. let's have a coffee.."
-	ecmstop
-	ecmclean
-	ecmup
-	ecmbuild && ecmstart
-}
-
-

From 200a25818adf9570186c8ee0abf9d425577ae53b Mon Sep 17 00:00:00 2001
From: Eric Danielson <edanielson@twitter.com>
Date: Mon, 26 Nov 2012 11:35:16 -0800
Subject: [PATCH 725/907] Add UPDATE_ZSH_DAYS setting

---
 templates/zshrc.zsh-template | 3 +++
 tools/check_for_upgrade.sh   | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..758fc26b8 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -17,6 +17,9 @@ ZSH_THEME="robbyrussell"
 # Comment this out to disable weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
+# Change this value to set how frequently ZSH updates¬
+export UPDATE_ZSH_DAYS=13
+
 # Uncomment following line if you want to disable colors in ls
 # DISABLE_LS_COLORS="true"
 
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 612901cbe..581f03a07 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -14,6 +14,12 @@ function _upgrade_zsh() {
   _update_zsh_update
 }
 
+epoch_target=$UPDATE_ZSH_DAYS
+if [[ -z "$epoch_target" ]]; then
+  # Default to old behavior
+  epoch_target=13
+fi
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
@@ -23,7 +29,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt 13 ]
+  if [ $epoch_diff -gt $epoch_target ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then

From 79e620c392393f254d9614b18963af1c9ac234e7 Mon Sep 17 00:00:00 2001
From: Drarok Ithaqua <github@catchall.drarok.com>
Date: Tue, 27 Nov 2012 12:03:51 +0000
Subject: [PATCH 726/907] Whitespace cleanup.

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index bd2767e3e..142ac3bd3 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -15,7 +15,7 @@ function in_svn() {
 function svn_get_repo_name {
     if [ $(in_svn) ]; then
         svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
-    
+
         svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
     fi
 }
@@ -31,7 +31,7 @@ function svn_dirty_choose {
         svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
         if [ $pipestatus[-1] -ne 0 ]; then
             echo $1
-        else 
+        else
             echo $2
         fi
     fi

From 120db35b2dd7792b981401f66323e8886668c909 Mon Sep 17 00:00:00 2001
From: Drarok Ithaqua <github@catchall.drarok.com>
Date: Tue, 27 Nov 2012 12:08:18 +0000
Subject: [PATCH 727/907] Fix the backwards svn status, and add comments
 explaining which way grep does things.

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

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 142ac3bd3..79c8bdcdf 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,3 +1,4 @@
+
 function svn_prompt_info {
     if [ $(in_svn) ]; then
         echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
@@ -29,9 +30,11 @@ function svn_get_rev_nr {
 function svn_dirty_choose {
     if [ $(in_svn) ]; then
         svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
-        if [ $pipestatus[-1] -ne 0 ]; then
+        if [ $pipestatus[-1] -eq 0 ]; then
+            # Grep exits with 0 when "One or more lines were selected", return "dirty".
             echo $1
         else
+            # Otherwise, no lines were found, or an error occurred. Return clean.
             echo $2
         fi
     fi

From 7fc612bcb991919d561fedc18eeaedfd9c568942 Mon Sep 17 00:00:00 2001
From: Hauke Stange <stange.hauke@gmail.com>
Date: Tue, 27 Nov 2012 21:20:56 +0100
Subject: [PATCH 728/907] removed 'x' from prompt_context() function name

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

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 84b9649a6..5f83b820f 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -106,10 +106,10 @@ prompt_status() {
 build_prompt() {
   RETVAL=$?
   prompt_status
-  prompt_contextx
+  prompt_context
   prompt_dir
   prompt_git
   prompt_end
 }
 
-PROMPT='%{%f%b%k%}$(build_prompt) '
\ No newline at end of file
+PROMPT='%{%f%b%k%}$(build_prompt) '

From 3d7622831fd86a3eaf4bbe3a11102929716d3781 Mon Sep 17 00:00:00 2001
From: Hauke Stange <stange.hauke@gmail.com>
Date: Tue, 27 Nov 2012 21:43:23 +0100
Subject: [PATCH 729/907] fixed symbolic-ref git view of agnoster theme

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

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 5f83b820f..bd6f1a6a2 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -73,7 +73,7 @@ prompt_git() {
   if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
     ZSH_THEME_GIT_PROMPT_DIRTY='±'
     dirty=$(parse_git_dirty)
-    ref=$(git symbolic-Fref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git show-ref --head -s --abbrev |head -n1 2> /dev/null)"
     if [[ -n $dirty ]]; then
       prompt_segment yellow black
     else

From 53854754e0d052c41587c7d84b9be7868f31bfe8 Mon Sep 17 00:00:00 2001
From: Max Bane <max.bane@gmail.com>
Date: Wed, 28 Nov 2012 02:02:58 -0500
Subject: [PATCH 730/907] Revert "Fix to restore bindings after switching to
 vi-mode"

This reverts commit b609aa0e6c981f2039d777687cb01a84587f6edc -- this commit
was a bad idea, because it makes vi-mode very difficult to use. The default
`bindkey` keybindings are NOT MEANT to coexist with `bindkey -v` Vi mode;
that's why `bindkey -v` clears them in the first place! Restoring all of the
default keybindings after enabling Vi mode, the way the reverted commit did,
causes many collisions between those default keybindings that begin with ESC
and the command-mode-initiating ESC of Vi mode. See Issue 1438 of
robbyrussell/oh-my-zsh. If people have custom keybindings, they should create
them in their ~/.zshrc AFTER enabling the vi-mode plugin and sourcing
oh-my-zsh.sh.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   plugins/vi-mode/vi-mode.plugin.zsh
#
---
 plugins/vi-mode/vi-mode.plugin.zsh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index d29eb1dda..c47ab7211 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -5,12 +5,7 @@ function zle-line-init zle-keymap-select {
 zle -N zle-line-init
 zle -N zle-keymap-select
 
-#changing mode clobbers the keybinds, so store the keybinds before and execute 
-#them after
-binds=`bindkey -L`
 bindkey -v
-for bind in ${(@f)binds}; do eval $bind; done
-unset binds
 
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then

From 5d6252c6d0e3598f2e19b9a02f7eb8a49317b1f1 Mon Sep 17 00:00:00 2001
From: Hauke Stange <hauke@jimdo.com>
Date: Wed, 28 Nov 2012 10:39:59 +0100
Subject: [PATCH 731/907] fixed autojump plugin: works with homebrew again now

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index d367863b8..42d2d44d6 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,11 +1,11 @@
-if [ $commands[autojump] ]; then # check if autojump is installed
+if [ $commands[autojump] ]; then # check if autojump is
   if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
     . /usr/share/autojump/autojump.zsh
   elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
     . /etc/profile.d/autojump.zsh
   elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports
     . /opt/local/etc/profile.d/autojump.zsh
-  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
-    . `brew --prefix`/etc/autojump
+  elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew
+    . `brew --prefix`/etc/autojump.zsh
   fi
 fi

From 5c983257726dfc8ac97d5a5e259dcaa9540b808b Mon Sep 17 00:00:00 2001
From: Hauke Stange <hauke@jimdo.com>
Date: Wed, 28 Nov 2012 10:47:31 +0100
Subject: [PATCH 732/907] fixed autojump: autocompletion works with homebrew
 again

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

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 42d2d44d6..fdce3a246 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -1,4 +1,4 @@
-if [ $commands[autojump] ]; then # check if autojump is
+if [ $commands[autojump] ]; then # check if autojump is installed
   if [ -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 1b4393fbb67b24d90caad71067c1cb58e8706a69 Mon Sep 17 00:00:00 2001
From: Will Weaver <willw@aweber.com>
Date: Wed, 28 Nov 2012 08:09:25 -0500
Subject: [PATCH 733/907] Add autocomplete for git "hubflow"

This was copied from the git-flow plugin and necessary changes made for the additional features.

http://dev.datasift.com/blog/hubflow-github-and-gitflow-model-together

HubFlow is git flow with additional features to help with use of github.
---
 plugins/git-hubflow/git-hubflow.plugin.zsh | 348 +++++++++++++++++++++
 1 file changed, 348 insertions(+)
 create mode 100644 plugins/git-hubflow/git-hubflow.plugin.zsh

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

From 3b6fae14fb6f700bb623d48b2915736de552b387 Mon Sep 17 00:00:00 2001
From: Gustavo <gustavo@lacosox.org>
Date: Wed, 28 Nov 2012 20:33:45 -0300
Subject: [PATCH 734/907] Node.js version of urltools es more fast (53% aprox),
 you can try this with strace -o trace -c -Ttt

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

diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
index 0d29314d6..3de74ae3d 100644
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -4,6 +4,6 @@
 # Taken from:
 # http://ruslanspivak.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/
 
-alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
+alias urlencode='node -e "console.log(encodeURIComponent(process.argv[1]))"'
 
-alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"'
\ No newline at end of file
+alias urldecode='node -e "console.log(decodeURIComponent(process.argv[1]))"'

From 263107ed7faa7df15e70f5592c352021e74c6958 Mon Sep 17 00:00:00 2001
From: satoru <satorulogic@gmail.com>
Date: Fri, 30 Nov 2012 11:55:45 +0800
Subject: [PATCH 735/907] fix typo

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

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 84b9649a6..2e390640c 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -106,7 +106,7 @@ prompt_status() {
 build_prompt() {
   RETVAL=$?
   prompt_status
-  prompt_contextx
+  prompt_context
   prompt_dir
   prompt_git
   prompt_end

From ded745bf1471487c7dc537c781685615ff4c2515 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 30 Nov 2012 05:58:08 -0800
Subject: [PATCH 736/907] Modifying documentation in zshrc template for new
 config option

---
 templates/zshrc.zsh-template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 758fc26b8..2ea9934af 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -14,11 +14,11 @@ ZSH_THEME="robbyrussell"
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
-# Comment this out to disable weekly auto-update checks
+# Comment this out to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
-# Change this value to set how frequently ZSH updates¬
-export UPDATE_ZSH_DAYS=13
+# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
 
 # Uncomment following line if you want to disable colors in ls
 # DISABLE_LS_COLORS="true"

From 5b201468d109f87b0ec3dd0b190fa71813af542e Mon Sep 17 00:00:00 2001
From: Ryan Castillo <rmcastil@gmail.com>
Date: Sat, 1 Dec 2012 21:03:07 -0500
Subject: [PATCH 737/907] Improve formatting of step 2 for clarity

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

diff --git a/README.textile b/README.textile
index a38e2d7cf..e114da6d2 100644
--- a/README.textile
+++ b/README.textile
@@ -28,10 +28,10 @@ h3. The manual way
 
 2. Create a new zsh config by copying the zsh template we've provided.
 
-  *NOTE*: If you already have a ~/.zshrc file, you should back it up. @cp ~/.zshrc ~/.zshrc.orig@ in case you want to go back to your original settings.
-
   @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
 
+  *NOTE*: If you already have a ~/.zshrc file, you should back it up. @cp ~/.zshrc ~/.zshrc.orig@ in case you want to go back to your original settings.
+
 3. Set zsh as your default shell:
 
   @chsh -s /bin/zsh@

From 60c38134725e4a41c9849bb9ffc1a5cea86c00e3 Mon Sep 17 00:00:00 2001
From: Ryan Castillo <rmcastil@gmail.com>
Date: Sat, 1 Dec 2012 21:10:23 -0500
Subject: [PATCH 738/907] Make the NOTE an optional for improved instructions

---
 README.textile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.textile b/README.textile
index e114da6d2..0a4545bac 100644
--- a/README.textile
+++ b/README.textile
@@ -26,17 +26,20 @@ h3. The manual way
 
   @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
 
-2. Create a new zsh config by copying the zsh template we've provided.
+2. *OPTIONAL* Backup your existing ~/.zshrc file
+
+  @cp ~/.zshrc ~/.zshrc.orig@
+
+3. Create a new zsh config by copying the zsh template we've provided.
 
   @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
 
-  *NOTE*: If you already have a ~/.zshrc file, you should back it up. @cp ~/.zshrc ~/.zshrc.orig@ in case you want to go back to your original settings.
 
-3. Set zsh as your default shell:
+4. Set zsh as your default shell:
 
   @chsh -s /bin/zsh@
 
-4. Start / restart zsh (open a new terminal is easy enough...)
+5. Start / restart zsh (open a new terminal is easy enough...)
 
 h3. Problems?
 

From f29daef2973018e60900553b0ea69074a5d9a5de Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Sun, 2 Dec 2012 14:16:58 +0200
Subject: [PATCH 739/907] Fix repo for github.

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

diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 197e86a48..598b059c1 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -61,6 +61,7 @@ exist_gh() { # [DIRECTORY]
     cd "$1"
     name=$( git config user.name )
     ghuser=$( git config github.user )
+    repo=$1
 
     git remote add origin git@github.com:${ghuser}/${repo}.git
     git push -u origin master

From f9de64460ce51e105f27d30a9ecb20612ab65d57 Mon Sep 17 00:00:00 2001
From: Alexander Simonov <devil@zeus.(none)>
Date: Sun, 22 May 2011 01:29:41 +0200
Subject: [PATCH 740/907] Simonoff theme

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

diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
new file mode 100644
index 000000000..01f381c48
--- /dev/null
+++ b/themes/simonoff.zsh-theme
@@ -0,0 +1,142 @@
+# Prompt
+#
+# Below are the color init strings for the basic file types. A color init
+# string consists of one or more of the following numeric codes:
+# Attribute codes:
+# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
+# Text color codes:
+# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
+# Background color codes:
+# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
+function precmd {
+
+    local TERMWIDTH
+    (( TERMWIDTH = ${COLUMNS} - 1 ))
+
+
+    ###
+    # Truncate the path if it's too long.
+
+    PR_FILLBAR=""
+    PR_PWDLEN=""
+
+    local promptsize=${#${(%):---(%n@%M:%l)---()}}
+    local pwdsize=${#${(%):-%~}}
+    local gitbranch="$(git_prompt_info)"
+    local rvmprompt="$(rvm_prompt_info)"
+    local gitbranchsize=${#${gitbranch:-''}}
+    local rvmpromptsize=${#${rvmprompt:-''}}
+
+    if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
+        ((PR_PWDLEN=$TERMWIDTH - $promptsize))
+    else
+        PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
+    fi
+}
+
+
+setopt extended_glob
+
+preexec () {
+    if [[ "$TERM" == "screen" ]]; then
+        local CMD=${1[(wr)^(*=*|sudo|-*)]}
+        echo -n "\ek$CMD\e\\"
+    fi
+
+    if [[ "$TERM" == "xterm" ]]; then
+        print -Pn "\e]0;$1\a"
+    fi
+
+    if [[ "$TERM" == "rxvt" ]]; then
+        print -Pn "\e]0;$1\a"
+    fi
+
+}
+
+setprompt () {
+###
+# Need this so the prompt will work.
+
+    setopt prompt_subst
+
+
+###
+# See if we can use colors.
+
+    autoload colors zsh/terminfo
+    if [[ "$terminfo[colors]" -ge 8 ]]; then
+    colors
+    fi
+    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}]%}'
+    (( count = $count + 1 ))
+    done
+    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+
+
+###
+# See if we can use extended characters to look nicer.
+
+    typeset -A altchar
+#    set -A altchar "${(s..)terminfo[acsc]}"
+    PR_SET_CHARSET="%{$terminfo[enacs]%}"
+    PR_HBAR=${altchar[q]:--}
+    PR_ULCORNER=${altchar[l]:--}
+    PR_LLCORNER=${altchar[m]:--}
+    PR_LRCORNER=${altchar[j]:--}
+    PR_URCORNER=${altchar[k]:--}
+
+    ###
+    # Modify Git prompt
+    ZSH_THEME_GIT_PROMPT_PREFIX=" ["
+    ZSH_THEME_GIT_PROMPT_SUFFIX="]"
+    ###
+    # Modify RVM prompt
+    ZSH_THEME_RVM_PROMPT_PREFIX=" ["
+    ZSH_THEME_RVM_PROMPT_SUFFIX="]"
+    ZSH_THEME_RVM_PROMPT_OPTIONS=(v i)
+
+
+###
+# Decide if we need to set titlebar text.
+
+    case $TERM in
+    xterm*|*rxvt*)
+        PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
+        ;;
+    screen)
+        PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
+        ;;
+    *)
+        PR_TITLEBAR=''
+        ;;
+    esac
+
+
+###
+# Decide whether to set a screen title
+    if [[ "$TERM" == "screen" ]]; then
+        PR_STITLE=$'%{\ekzsh\e\\%}'
+    else
+        PR_STITLE=''
+    fi
+
+###
+# Finally, the prompt.
+#
+    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
+$PR_RED$PR_HBAR<\
+$PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
+$PR_RED>$PR_HBAR$PR_SPACE${(e)PR_FILLBAR}\
+$PR_RED$PR_HBAR<\
+$PR_GREEN%l$PR_RED>$PR_HBAR\
+
+$PR_RED$PR_HBAR<\
+%(?..$PR_LIGHT_RED%?$PR_BLUE:)\
+$PR_LIGHT_BLUE%(!.$PR_RED.$PR_WHITE)%#$PR_RED>$PR_HBAR\
+$PR_NO_COLOUR '
+
+}
+
+setprompt

From 30687c414785fbc7d7d7d44ae60166075be75da7 Mon Sep 17 00:00:00 2001
From: Alexander Simonov <alex@simonov.me>
Date: Sun, 22 May 2011 01:31:11 +0200
Subject: [PATCH 741/907] Fix RVM loading and RVM ruby version info

---
 lib/rvm.zsh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index cb870a9bb..a0a48960e 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,5 +1,11 @@
-# get the name of the branch we are on
+# load RVM
+[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
+
+# get the name of the ruby version
 function rvm_prompt_info() {
-  ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
-  [[ ! -z $ruby_version ]] && echo "($ruby_version)"
+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return
+  local rvm_prompt
+  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
+  [[ "${rvm_prompt}x" == "x" ]] && return
+  echo "$ZSH_THEME_RVM_PROMPT_PREFIX$rvm_prompt$ZSH_THEME_RVM_PROMPT_SUFFIX"
 }

From 27841ca7c1bb6bd19e0eb66e1dcc8fa3a6a6ebba Mon Sep 17 00:00:00 2001
From: Alexander Simonov <alex@simonov.me>
Date: Sun, 2 Dec 2012 20:30:25 +0200
Subject: [PATCH 742/907] Set default for rvm prompt prefix/suffix

---
 lib/rvm.zsh               | 5 +----
 themes/simonoff.zsh-theme | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index a0a48960e..e8744e61e 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,11 +1,8 @@
-# load RVM
-[[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
-
 # get the name of the ruby version
 function rvm_prompt_info() {
   [ -f $HOME/.rvm/bin/rvm-prompt ] || return
   local rvm_prompt
   rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ "${rvm_prompt}x" == "x" ]] && return
-  echo "$ZSH_THEME_RVM_PROMPT_PREFIX$rvm_prompt$ZSH_THEME_RVM_PROMPT_SUFFIX"
+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
 }
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index 01f381c48..fb4d32e24 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -95,7 +95,6 @@ setprompt () {
     # Modify RVM prompt
     ZSH_THEME_RVM_PROMPT_PREFIX=" ["
     ZSH_THEME_RVM_PROMPT_SUFFIX="]"
-    ZSH_THEME_RVM_PROMPT_OPTIONS=(v i)
 
 
 ###

From 54f199051124cbbbb3e555c681d65f1aa6942856 Mon Sep 17 00:00:00 2001
From: Viktor Gamov <gamussa@gmail.com>
Date: Sun, 2 Dec 2012 13:54:24 -0500
Subject: [PATCH 743/907] Update plugins/sublime/sublime.plugin.zsh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updated run sublime on linux with parameters 
---
 plugins/sublime/sublime.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 171f00ef5..9fee18610 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -3,10 +3,11 @@
 
 if [[ $('uname') == 'Linux' ]]; then
 	if [ -f '/usr/bin/sublime_text' ]; then
-		alias st='/usr/bin/sublime_text&'
+		st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
 	else
-		alias st='/usr/bin/sublime-text&'
+		st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
 	fi
+alias st=st_run
 elif  [[ $('uname') == 'Darwin' ]]; then
 	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
 fi

From e226fc048afaf7c849e089304f855f4ebb26ee95 Mon Sep 17 00:00:00 2001
From: Sean Jones <neuralsandwich@gmail.com>
Date: Sun, 2 Dec 2012 19:36:33 +0000
Subject: [PATCH 744/907] Added support for Mac to battery plugin

---
 plugins/battery/battery.plugin.zsh | 83 ++++++++++++++++++++++++------
 1 file changed, 67 insertions(+), 16 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index bc75c5cf9..9f404088a 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -1,20 +1,71 @@
-if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
-  function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
-  function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
-  function battery_pct_prompt() {
-    b=$(battery_pct_remaining)
-    if [ $b -gt 50 ] ; then
-      color='green'
-    elif [ $b -gt 20 ] ; then
-      color='yellow'
+###########################################
+# Battery plugin for oh-my-zsh            #
+# Original Author: Peter hoeg (peterhoeg) #
+# Email: peter@speartail.com              #
+###########################################
+# Author: Sean Jones (neuralsandwich)     #
+# Email: neuralsandwich@gmail.com         #
+# Modified to add support for Apple Mac   #
+###########################################
+
+if [[ $(uname) -eq "Darwin" ]] ; then
+
+  function battery_pct_remaining() {
+    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
+      typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
+      typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
+      integer i=$(((currentcapacity/maxcapacity) * 100))
+      echo $i
     else
-      color='red'
+      echo "External Power"
     fi
-    echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
   }
-else
-  error_msg='no battery'
-  function battery_pct_remaining() { echo $error_msg }
-  function battery_time_remaining() { echo $error_msg }
-  function battery_pct_prompt() { echo '' }
+
+  function battery_time_remaining() {
+    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
+      timeremaining=$(ioreg -rc "AppleSmartBattery"| grep '^.*"AvgTimeToEmpty"\ =\ ' | sed -e 's/^.*"AvgTimeToEmpty"\ =\ //')
+      echo "~$((timeremaining / 60)):$((timeremaining % 60))"
+    else
+      echo "∞"
+    fi
+  }
+
+  function battery_pct_prompt () {
+    if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
+      b=$(battery_pct_remaining)
+      if [ $b -gt 50 ] ; then
+        color='green'
+      elif [ $b -gt 20 ] ; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+    else
+      echo ""
+    fi
+  }
+
+elif [[ $(uname) -eq "Linux"  ]] ; then
+
+  if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
+    function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }
+    function battery_time_remaining() { echo $(acpi | cut -f3 -d ',') }
+    function battery_pct_prompt() {
+      b=$(battery_pct_remaining)
+      if [ $b -gt 50 ] ; then
+        color='green'
+      elif [ $b -gt 20 ] ; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+    }
+  else
+    error_msg='no battery'
+    function battery_pct_remaining() { echo $error_msg }
+    function battery_time_remaining() { echo $error_msg }
+    function battery_pct_prompt() { echo '' }
+  fi
 fi

From 5f62d2c183f93ef02b79675c6a51950cb530dfcb Mon Sep 17 00:00:00 2001
From: Sean Jones <neuralsandwich@gmail.com>
Date: Sun, 2 Dec 2012 19:46:53 +0000
Subject: [PATCH 745/907] Added Candy-Kingdom theme

---
 themes/candy-kingdom.zsh-theme | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 themes/candy-kingdom.zsh-theme

diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
new file mode 100644
index 000000000..25aeb6597
--- /dev/null
+++ b/themes/candy-kingdom.zsh-theme
@@ -0,0 +1,37 @@
+# neuralsanwich.zsh-theme
+#
+# Author: Sean Jones
+# URL: http://www.neuralsandwich.com
+# Repo: 
+# Direct link:
+# Create:
+# Modified: 
+
+if [ "x$OH_MY_ZSH_HG" = "x" ]; then
+    OH_MY_ZSH_HG="hg"
+fi
+
+function hg_prompt_info {
+    $OH_MY_ZSH_HG prompt --angle-brackets "\
+< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
+< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
+%{$fg[green]%}<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
+}
+
+function box_name {
+    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
+}
+
+PROMPT='
+%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}$(box_name)%{$reset_color%}:%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info)
+%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ '
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[magenta]%}branch: "
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[red]%}?"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[orange]%}!"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
+
+local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}"
+RPROMPT='${return_status}$(battery_time_remaining) $(battery_pct_prompt)%{$reset_color%}'

From 8fe6ea388973defc6bb77a32fb86cef5b8231aea Mon Sep 17 00:00:00 2001
From: Martin Putniorz <mputniorz@gmail.com>
Date: Sun, 2 Dec 2012 20:55:19 +0100
Subject: [PATCH 746/907] Functions for managing pacman-key

---
 plugins/archlinux/archlinux.plugin.zsh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 294dc5354..ae92a0b4c 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -11,7 +11,7 @@ if [[ -x `which yaourt` ]]; then
   alias yaupg='yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
   alias yasu='yaourt --sucre'      # Same as yaupg, but without confirmation
   alias yain='yaourt -S'           # Install specific package(s) from the repositories
-  alias yains='yaourt -U'          # Install specific package not from the repositories but from a file 
+  alias yains='yaourt -U'          # Install specific package not from the repositories but from a file
   alias yare='yaourt -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
   alias yarem='yaourt -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
   alias yarep='yaourt -Si'         # Display information about a given package in the repositories
@@ -35,7 +35,7 @@ fi
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
 alias pacin='sudo pacman -S'           # Install specific package(s) from the repositories
-alias pacins='sudo pacman -U'          # Install specific package not from the repositories but from a file 
+alias pacins='sudo pacman -U'          # Install specific package not from the repositories but from a file
 alias pacre='sudo pacman -R'           # Remove the specified package(s), retaining its configuration(s) and required dependencies
 alias pacrem='sudo pacman -Rns'        # Remove the specified package(s), its configuration(s) and unneeded dependencies
 alias pacrep='pacman -Si'              # Display information about a given package in the repositories
@@ -75,3 +75,19 @@ pacdisowned() {
 
   comm -23 "$fs" "$db"
 }
+
+pacmanallkeys() {
+  # Get all keys for developers and trusted users
+  curl https://www.archlinux.org/{developers,trustedusers}/ |
+  awk -F\" '(/pgp.mit.edu/) {sub(/.*search=0x/,"");print $1}' |
+  xargs sudo pacman-key --recv-keys
+}
+
+pacmansignkeys() {
+  for key in $*; do
+    sudo pacman-key --recv-keys $key
+    sudo pacman-key --lsign-key $key
+    printf 'trust\n3\n' | sudo gpg --homedir /etc/pacman.d/gnupg \
+      --no-permission-warning --command-fd 0 --edit-key $key
+  done
+}

From ab13d0756fcbf690d9550ec1329ff99da0dc3c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?= <marcus.mueller@student.kit.edu>
Date: Fri, 28 Sep 2012 17:19:28 +0200
Subject: [PATCH 747/907] git find

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

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 14ae78d41..0a19e0c1c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -39,11 +39,14 @@ compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
+alias gf='git ls-files | grep'
 
 # Will cd into the top of the current repository
 # or submodule.
 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
 
+
+
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git

From fe094712fb0c896eeec55b686807011226bc9208 Mon Sep 17 00:00:00 2001
From: Trae Robrock <trobrock@gmail.com>
Date: Tue, 20 Dec 2011 18:15:19 -0800
Subject: [PATCH 748/907] resolving conflict in termsupport plugin

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

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 4701e46c5..c056989eb 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -26,7 +26,7 @@ function omz_termsupport_precmd {
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
-  local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
+  local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
   title "$CMD" "%100>...>${2:gs/%/%%}%<<"
 }
 

From 5991bf3ac1865819fd43cbf38681c71c3d5c9ecb Mon Sep 17 00:00:00 2001
From: Sean Jones <neuralsandwich@gmail.com>
Date: Sun, 2 Dec 2012 20:39:01 +0000
Subject: [PATCH 749/907] Fixed Kernel Detection in battery plugin

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

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 9f404088a..95f890632 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) -eq "Darwin" ]] ; then
+if [[ $(uname) == "Darwin" ]] ; then
 
   function battery_pct_remaining() {
     if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
@@ -46,7 +46,7 @@ if [[ $(uname) -eq "Darwin" ]] ; then
     fi
   }
 
-elif [[ $(uname) -eq "Linux"  ]] ; then
+elif [[ $(uname) == "Linux"  ]] ; then
 
   if [[ $(acpi 2&>/dev/null | grep -c '^Battery.*Discharging') -gt 0 ]] ; then
     function battery_pct_remaining() { echo "$(acpi | cut -f2 -d ',' | tr -cd '[:digit:]')" }

From dfbafe6d58bf1463df393fd4478154be36a675aa Mon Sep 17 00:00:00 2001
From: Probably Not <probablynot@gmail.com>
Date: Sat, 4 Aug 2012 11:41:47 -0700
Subject: [PATCH 750/907] Fixing conflict in install scripts

---
 tools/install.sh   |  3 +--
 tools/uninstall.sh | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 6f58db939..41f83e354 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -14,8 +14,7 @@ echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 then
   echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
-  cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
-  rm ~/.zshrc;
+  mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
 fi
 
 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 8ff583322..41d601576 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -4,12 +4,20 @@ then
   rm -rf ~/.oh-my-zsh
 fi
 
-echo "Looking for an existing zsh config..."
+echo "Looking for original zsh config..."
 if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
 then
-  echo "Found ~/.zshrc. Backing up to ~/.zshrc.pre-oh-my-zsh";
-  rm ~/.zshrc;
-  cp ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
+  echo "Found ~/.zshrc.pre-oh-my-zsh -- Restoring to ~/.zshrc";
+
+  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
+  then
+    ZSHRC_SAVE=".zshrc.omz-uninstalled-`date +%Y%m%d%H%M%S`";
+    echo "Found ~/.zshrc -- Renaming to ~/${ZSHRC_SAVE}";
+    mv ~/.zshrc ~/${ZSHRC_SAVE};
+  fi
+
+  mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
+
   source ~/.zshrc;
 else
   echo "Switching back to bash"
@@ -17,4 +25,4 @@ else
   source /etc/profile
 fi
 
-echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
\ No newline at end of file
+echo "Thanks for trying out Oh My Zsh. It's been uninstalled."

From 51e05b7579a26266a0ed26398ab9eb5071800cd8 Mon Sep 17 00:00:00 2001
From: Lucas Sampaio <magal.lucas@gmail.com>
Date: Fri, 5 Oct 2012 17:27:05 -0300
Subject: [PATCH 751/907] hg_current_branch added to mercurial plugin

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

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index caf0d9efc..a3a6ff8b6 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -12,3 +12,9 @@ alias hgp='hg push'
 alias hgs='hg status'
 # this is the 'git commit --amend' equivalent
 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
+
+function hg_current_branch() {
+  if [ -d .hg ]; then
+    echo hg:$(hg branch)
+  fi
+}
\ No newline at end of file

From b9d5a39098036f4f62b1e88b8c2c045a35582546 Mon Sep 17 00:00:00 2001
From: "J. Randall Hunt" <randallhunt@gmail.com>
Date: Sun, 2 Dec 2012 16:32:29 -0500
Subject: [PATCH 752/907] use lazy load for virtualenvwrapper

Using lazy loading for virtualenvwrapper gives a mariginal speed
improvement and doesn't stop workon_cd from working. It has the
undesired effect of forcing you to call certain virtualenv commands
twice before they work (only once per shell instantiation).
---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index a5abb77c3..0ed2565b4 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -1,4 +1,4 @@
-wrapsource=`which virtualenvwrapper.sh`
+wrapsource=`which virtualenvwrapper_lazy.sh`
 
 if [[ -f "$wrapsource" ]]; then
   source $wrapsource
@@ -36,5 +36,5 @@ if [[ -f "$wrapsource" ]]; then
     }
   fi
 else
-  print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh. Please install with \`pip install virtualenvwrapper\`."
+  print "zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper_lazy.sh. Please install with \`pip install virtualenvwrapper\`."
 fi

From 39e5c9a6d7a88feb570f340ca52e87c8ff8cce61 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Sun, 2 Dec 2012 22:59:05 -0700
Subject: [PATCH 753/907] Backwards Compatible Jira URLs #1378

Adds support for Rapid Board without breaking backwards compatibility (like #1378)
Allows JIRA url to be set in .zshrc, current directory, and/or home directory.
---
 plugins/jira/jira.plugin.zsh | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh
index de8d10529..b91f93c95 100644
--- a/plugins/jira/jira.plugin.zsh
+++ b/plugins/jira/jira.plugin.zsh
@@ -1,20 +1,36 @@
 # To use: add a .jira-url file in the base of your project
+#         You can also set JIRA_URL in your .zshrc or put .jira-url in your home directory
+#         .jira-url in the current directory takes precedence
+#
+# If you use Rapid Board, set:
+#JIRA_RAPID_BOARD="yes"
+# in you .zshrc
+#
 # Setup: cd to/my/project
 #        echo "https://name.jira.com" >> .jira-url
 # Usage: jira           # opens a new issue
 #        jira ABC-123   # Opens an existing issue
 open_jira_issue () {
-  if [ ! -f .jira-url ]; then
-    echo "There is no .jira-url file in the current directory..."
-    return 0;
+  if [ -f .jira-url ]; then
+    jira_url=$(cat .jira-url)
+  elif [ -f ~/.jira-url ]; then
+    jira_url=$(cat ~/.jira-url)
+  elif [[ "x$JIRA_URL" != "x" ]]; then
+    jira_url=$JIRA_URL
   else
-    jira_url=$(cat .jira-url);
-    if [ -z "$1" ]; then
-      echo "Opening new issue";
-      `open $jira_url/secure/CreateIssue!default.jspa`;
+    echo "JIRA url is not specified anywhere."
+    return 0
+  fi
+
+  if [ -z "$1" ]; then
+    echo "Opening new issue"
+    `open $jira_url/secure/CreateIssue!default.jspa`
+  else
+    echo "Opening issue #$1"
+    if [[ "x$JIRA_RAPID_BOARD" = "yes" ]]; then
+      `open $jira_url/issues/$1`
     else
-      echo "Opening issue #$1";
-      `open $jira_url/browse/$1`;
+      `open $jira_url/browse/$1`
     fi
   fi
 }

From 80f151e56d7d6d30858acf581141fa84bfd79bc7 Mon Sep 17 00:00:00 2001
From: Brian Hartvigsen <brian.andrew@brianandjenny.com>
Date: Sun, 2 Dec 2012 23:06:11 -0700
Subject: [PATCH 754/907] urltools for Everyone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#1445 is great, if you use node.  For those that don't this should mean we can find a reasonable fallback.
Users can force urltools to use a specific system by setting `URLTOOLS_METHOD` to one of:
* `node`
* `python`
* `ruby`
* `php`
* `perl`

Note that you can't (currently) choose which `perl` sublibrary to use, it will use either `URI::Encode`, `URI::Escape`, or regular expressions in that order of preference.
---
 plugins/urltools/urltools.plugin.zsh | 31 ++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/plugins/urltools/urltools.plugin.zsh b/plugins/urltools/urltools.plugin.zsh
index 3de74ae3d..4ddfff8ce 100644
--- a/plugins/urltools/urltools.plugin.zsh
+++ b/plugins/urltools/urltools.plugin.zsh
@@ -4,6 +4,33 @@
 # Taken from:
 # http://ruslanspivak.com/2010/06/02/urlencode-and-urldecode-from-a-command-line/
 
-alias urlencode='node -e "console.log(encodeURIComponent(process.argv[1]))"'
+if [[ $(whence $URLTOOLS_METHOD) = "" ]]; then
+    URLTOOLS_METHOD=""
+fi
 
-alias urldecode='node -e "console.log(decodeURIComponent(process.argv[1]))"'
+if [[ $(whence node) != "" && ( "x$URLTOOLS_METHOD" = "x"  || "x$URLTOOLS_METHOD" = "xnode" ) ]]; then
+    alias urlencode='node -e "console.log(encodeURIComponent(process.argv[1]))"'
+    alias urldecode='node -e "console.log(decodeURIComponent(process.argv[1]))"'
+elif [[ $(whence python) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xpython" ) ]]; then
+    alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1])"'
+    alias urldecode='python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])"'
+elif [[ $(whence ruby) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xruby" ) ]]; then
+    alias urlencode='ruby -r cgi -e "puts CGI.escape(ARGV[0])"'
+    alias urldecode='ruby -r cgi -e "puts CGI.unescape(ARGV[0])"'
+elif [[ $(whence php) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xphp" ) ]]; then
+    alias urlencode='php -r "echo rawurlencode(\$argv[1]); echo \"\n\";"'
+    alias urldecode='php -r "echo rawurldecode(\$argv[1]); echo \"\\n\";"'
+elif [[ $(whence perl) != "" && ( "x$URLTOOLS_METHOD" = "x" || "x$URLTOOLS_METHOD" = "xperl" ) ]]; then
+    if perl -MURI::Encode -e 1&> /dev/null; then
+        alias urlencode='perl -MURI::Encode -ep "uri_encode($ARGV[0]);"'
+        alias urldecode='perl -MURI::Encode -ep "uri_decode($ARGV[0]);"'
+    elif perl -MURI::Escape -e 1 &> /dev/null; then
+        alias urlencode='perl -MURI::Escape -ep "uri_escape($ARGV[0]);"'
+        alias urldecode='perl -MURI::Escape -ep "uri_unescape($ARGV[0]);"'
+    else
+        alias urlencode="perl -e '\$new=\$ARGV[0]; \$new =~ s/([^A-Za-z0-9])/sprintf(\"%%%02X\", ord(\$1))/seg; print \"\$new\n\";'"
+        alias urldecode="perl -e '\$new=\$ARGV[0]; \$new =~ s/\%([A-Fa-f0-9]{2})/pack(\"C\", hex(\$1))/seg; print \"\$new\n\";'"
+    fi
+fi
+
+unset URLTOOLS_METHOD
\ No newline at end of file

From e096e4041f76c70a621df2b02bb67bed88e6bcee Mon Sep 17 00:00:00 2001
From: Andrei Gorgan <andrei.gorgan@cloudbit.ro>
Date: Mon, 3 Dec 2012 12:03:43 +0200
Subject: [PATCH 755/907] Print last exit status in mortalscumbag prompt

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

diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme
index 7e25b149f..ae3f1c9fc 100644
--- a/themes/mortalscumbag.zsh-theme
+++ b/themes/mortalscumbag.zsh-theme
@@ -46,7 +46,8 @@ function ssh_connection() {
   fi
 }
 
-PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n%# '
+local ret_status="%(?:%{$fg_bold[green]%}:%{$fg_bold[red]%})%?%{$reset_color%}"
+PROMPT=$'\n$(ssh_connection)%{$fg_bold[cyan]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '
 
 ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"
 ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"

From 98bd19a036c0c702591f456e1081e420ffb17ce0 Mon Sep 17 00:00:00 2001
From: Denis Cornehl <denis.cornehl@gmail.com>
Date: Mon, 3 Dec 2012 11:06:31 +0100
Subject: [PATCH 756/907] plugin last-working-dir: create cache-directory if it
 doesn't exist

---
 plugins/last-working-dir/last-working-dir.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index 5b3121d11..190bc279d 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -4,6 +4,7 @@
 
 # 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"
 
 # Updates the last directory once directory is changed.

From 8925cff334f9009a0f27d38922731bbcd82c42cb Mon Sep 17 00:00:00 2001
From: Andrei Gorgan <andrei.gorgan@cloudbit.ro>
Date: Mon, 3 Dec 2012 12:29:45 +0200
Subject: [PATCH 757/907] Fix prompt color: Change it back to green

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

diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme
index ae3f1c9fc..5dbf2e4f6 100644
--- a/themes/mortalscumbag.zsh-theme
+++ b/themes/mortalscumbag.zsh-theme
@@ -47,7 +47,7 @@ function ssh_connection() {
 }
 
 local ret_status="%(?:%{$fg_bold[green]%}:%{$fg_bold[red]%})%?%{$reset_color%}"
-PROMPT=$'\n$(ssh_connection)%{$fg_bold[cyan]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '
+PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '
 
 ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"
 ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"

From f7fc164377f3f5243c9aade09e4d17efc60ffc47 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <tim@timothyandrew.net>
Date: Wed, 5 Dec 2012 08:21:42 +0530
Subject: [PATCH 758/907] Added a `migrate` alias.

It migrates the DB and prepares the test DB.
---
 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 cd232a6ae..d3849b4f4 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -6,6 +6,7 @@ alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
 alias rdbtp='rake db:test:prepare'
+alias migrate='rake db:migrate && rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'

From 6c5e63022d9f8c0c9a930b0110da3a4b8fee6cf0 Mon Sep 17 00:00:00 2001
From: Larry Lv <larrylv1990@gmail.com>
Date: Wed, 5 Dec 2012 16:13:53 +0800
Subject: [PATCH 759/907] Unset `config_file` variable in oh-my-zsh.sh

`config_file` variable will mess up with `cd` auto-complete command.

eg. I have a local dir named `Code`, and when I type `cd co<Tab>`,
config_file will show up, and doesn't make any sense...
---
 oh-my-zsh.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 4a5b175d5..689a79fef 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -56,6 +56,7 @@ done
 for config_file ($ZSH_CUSTOM/*.zsh(N)); do
   source $config_file
 done
+unset config_file
 
 # Load the theme
 if [ "$ZSH_THEME" = "random" ]

From 1b91c84d2b49f00b64e5b6048678c5d4f26cd971 Mon Sep 17 00:00:00 2001
From: Benjamin Teuber <bsteuber@gmail.com>
Date: Thu, 6 Dec 2012 14:09:09 +0100
Subject: [PATCH 760/907] use feature names instead of failing branch names in
 "git flow feature"

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

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 4afb85b8b..ec21019e6 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -237,13 +237,13 @@ __git-flow-feature ()
 
 				(diff)
 					_arguments \
-						':branch:__git_branch_names'\
+						':branch:__git_flow_feature_list'\
 				;;
 
 				(rebase)
 					_arguments \
 						-i'[Do an interactive rebase]' \
-						':branch:__git_branch_names'
+						':branch:__git_flow_feature_list'
 				;;
 
 				(checkout)
@@ -254,7 +254,7 @@ __git-flow-feature ()
 				(pull)
 					_arguments \
 						':remote:__git_remotes'\
-						':branch:__git_branch_names'
+						':branch:__git_flow_feature_list'
 				;;
 
 				*)
@@ -334,4 +334,4 @@ __git_command_successful () {
 	return 0
 }
 
-zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
\ No newline at end of file
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'

From f3fea45dd2c8208cd951e813b82453d38aea3539 Mon Sep 17 00:00:00 2001
From: Weston Platter <weston.platter@novu.com>
Date: Thu, 6 Dec 2012 18:28:41 -0600
Subject: [PATCH 761/907] fixes #1474 add zeus to bundle exec listx

---
 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 2305c4979..f9843696b 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma zeus)
 
 ## Functions
 

From b9a989fea5f0462b3ced71a33abd3cec3e7809cb Mon Sep 17 00:00:00 2001
From: MAD <ecrire@madsgraphics.com>
Date: Fri, 7 Dec 2012 10:07:45 +0100
Subject: [PATCH 762/907] Add Stash toogle to display if there's some stash or
 not in `git_prompt_status`

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

diff --git a/lib/git.zsh b/lib/git.zsh
index 95dd3dd43..b1dfce357 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -85,6 +85,9 @@ git_prompt_status() {
   elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
+  if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
+  fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
@@ -102,7 +105,7 @@ git_prompt_status() {
 
 #compare the provided version of git to the version installed and on path
 #prints 1 if input version <= installed version
-#prints -1 otherwise 
+#prints -1 otherwise
 function git_compare_version() {
   local INPUT_GIT_VERSION=$1;
   local INSTALLED_GIT_VERSION

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

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

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

From e4624c6a36a48dbae2d16241ee39ee14ce003f9f Mon Sep 17 00:00:00 2001
From: Isaac Wolkerstorfer <i@agnoster.net>
Date: Fri, 21 Dec 2012 11:33:23 -0500
Subject: [PATCH 764/907] Revert "agnoster theme shows error code instead of an
 "x""

This reverts commit f09af5717923cca4e5c538e14846ea4816295949.

It is far more aesthetically pleasing, and conveys the correct amount of information. The exact numeric status code is extremely rarely of use, and increases cognitive parsing burden on the user.
(cherry picked from commit 8f664edcaf55adcc540f0fe43d4205b66e4f9fb6)
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index bd6f1a6a2..c3107c06c 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -95,7 +95,7 @@ prompt_dir() {
 prompt_status() {
   local symbols
   symbols=()
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}$RETVAL"
+  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
   [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
   [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
 

From a09cd713b4297b6720dc7c444cdcdbd8d3b9fb1a Mon Sep 17 00:00:00 2001
From: thisiskun <chenchaokun@gmail.com>
Date: Mon, 24 Dec 2012 17:27:23 +0800
Subject: [PATCH 765/907] add unbundled command

---
 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 f9843696b..10c221acd 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -33,6 +33,7 @@ _run-with-bundler() {
 
 ## Main program
 for cmd in $bundled_commands; do
+  eval "function unbundled_$cmd () { $cmd \$@ }"
   eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
   alias $cmd=bundled_$cmd
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From c5ecb4e13691404a4555dbf6fa72fe411d463ad9 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Mon, 31 Dec 2012 05:25:07 -0800
Subject: [PATCH 771/907] Fixes #1489

Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"

This reverts commit 8f89d4d5a5d584bae288d8111d83a6489a1369dc.
---
 lib/termsupport.zsh | 2 --
 1 file changed, 2 deletions(-)

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

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

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

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

From 003dd8f4b68062b7fd5e4e1725264189ee56e28a Mon Sep 17 00:00:00 2001
From: Greg Berenfield <gberenfield@berenfield.com>
Date: Wed, 2 Jan 2013 16:20:22 -0500
Subject: [PATCH 773/907] fix for Issue 1479

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

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index f91be70e4..27fb47c97 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -7,11 +7,11 @@ function zle-keymap-select zle-line-init zle-line-finish {
     case "$0" in
       (zle-line-init)
         # Enable terminal application mode.
-        echoti smkx
+        printf '%s' ${terminfo[smkx]}
       ;;
       (zle-line-finish)
         # Disable terminal application mode.
-        echoti rmkx
+        printf '%s' ${terminfo[rmkx]}
       ;;
     esac
   fi

From 93c90a6bf5817d09e978bd720eaa7f9be971a1c6 Mon Sep 17 00:00:00 2001
From: Greg Berenfield <gberenfield@berenfield.com>
Date: Wed, 2 Jan 2013 19:14:57 -0500
Subject: [PATCH 774/907] Fix the fix for Issue #1479

---
 plugins/vi-mode/vi-mode.plugin.zsh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 27fb47c97..a06100472 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -3,18 +3,13 @@
 function zle-keymap-select zle-line-init zle-line-finish {
   # The terminal must be in application mode when ZLE is active for $terminfo
   # values to be valid.
-  if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
-    case "$0" in
-      (zle-line-init)
-        # Enable terminal application mode.
-        printf '%s' ${terminfo[smkx]}
-      ;;
-      (zle-line-finish)
-        # Disable terminal application mode.
-        printf '%s' ${terminfo[rmkx]}
-      ;;
-    esac
+  if (( ${+terminfo[smkx]} )); then
+    printf '%s' ${terminfo[smkx]}
   fi
+  if (( ${+terminfo[rmkx]} )); then
+    printf '%s' ${terminfo[rmkx]}
+  fi
+
   zle reset-prompt
   zle -R
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From 615e41b0ecdb25acba513fd09619bd56c2eb24eb Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 15 Jan 2013 06:45:27 -0800
Subject: [PATCH 781/907] Adding MIT-LICENSE Closes #655

---
 MIT-LICENSE.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 MIT-LICENSE.txt

diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
new file mode 100644
index 000000000..f6edab65b
--- /dev/null
+++ b/MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2009-2013 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
+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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From 0854b18cdfa6b29b08848a23e79c3f214c5e0f8d Mon Sep 17 00:00:00 2001
From: Marko Bauhardt <marko.bauhardt@googlemail.com>
Date: Mon, 8 Apr 2013 22:32:00 +0200
Subject: [PATCH 874/907] a plugin (function) which copies the content of a
 file into the clipboard

---
 plugins/copyfile/copyfile.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 plugins/copyfile/copyfile.plugin.zsh

diff --git a/plugins/copyfile/copyfile.plugin.zsh b/plugins/copyfile/copyfile.plugin.zsh
new file mode 100644
index 000000000..944a903c6
--- /dev/null
+++ b/plugins/copyfile/copyfile.plugin.zsh
@@ -0,0 +1,5 @@
+function copyfile {
+  [[ "$#" != 1 ]] && return 1
+  local file_to_copy=$1
+  cat $file_to_copy | pbcopy
+}

From 2bae7ef4f9972d4b3accf6bd614e38d9a2410a70 Mon Sep 17 00:00:00 2001
From: Marc Paradise <marc@opscode.com>
Date: Mon, 8 Apr 2013 17:07:06 -0400
Subject: [PATCH 875/907]  initial support for chef 11 integrated
 knife-essentials

* added new commands 'diff' and 'upload'
* Add basic file completion for file-centric commands 'diff' and
  'upload'
---
 plugins/knife/_knife | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/knife/_knife b/plugins/knife/_knife
index 9f5b406af..b44283f78 100644
--- a/plugins/knife/_knife
+++ b/plugins/knife/_knife
@@ -31,7 +31,7 @@ _knife() {
   
   case $state in
   knifecmd)
-    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec environment index node recipe role search ssh status windows $cloudproviders
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff exec environment index node recipe role search ssh status upload windows $cloudproviders
   ;;
   knifesubcmd)
     case $words[2] in
@@ -47,9 +47,12 @@ _knife() {
     cookbook)
       compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
     ;;
-  environment)
+    diff)
+      _arguments '*:file or directory:_files -g "*"'
+    ;;
+    environment)
       compadd -Q "$@" list create delete edit show "from file"
-      ;;
+    ;;
     node)
      compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
     ;;
@@ -59,6 +62,9 @@ _knife() {
     role)
       compadd -Q "$@" "bulk delete" create delete edit "from file" list show
     ;; 
+    upload)
+     _arguments '*:file or directory:_files -g "*"'
+    ;;
     windows)
       compadd "$@" bootstrap
     ;;

From c8db4f81fa4716ff627b63e4f7022d01c4b712d7 Mon Sep 17 00:00:00 2001
From: Vladimir Zakharov <zakharov.vv@gmail.com>
Date: Tue, 9 Apr 2013 14:11:51 +0400
Subject: [PATCH 876/907] Add alias for 'hg bookmarks'

---
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 30e4be5b5..9aa2d167a 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -3,6 +3,7 @@
 alias hgc='hg commit'
 alias hgb='hg branch'
 alias hgba='hg branches'
+alias hgbk='hg bookmarks'
 alias hgco='hg checkout'
 alias hgd='hg diff'
 alias hged='hg diffmerge'

From 32a42f27b62b62bd915ab632b0b36fa939d22c0e Mon Sep 17 00:00:00 2001
From: Gaurav Misra <keyvez@gmail.com>
Date: Tue, 9 Apr 2013 11:45:16 -0700
Subject: [PATCH 877/907] Escape spaces in folder name so script won't fail

If the current directory has spaces, the script fails to change paths and fails.
---
 tools/upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index b2a1c06c4..cd689ba1f 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,4 +1,5 @@
 current_path=`pwd`
+current_path=${current_path/ /\\ }
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd $ZSH
 
@@ -16,4 +17,4 @@ else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
 fi
 
-cd "$current_path"
\ No newline at end of file
+cd "$current_path"

From 872ef081d30f32fd7b38360bb0264452ebfd96eb Mon Sep 17 00:00:00 2001
From: Brian Galey <bkgaley@gmail.com>
Date: Tue, 9 Apr 2013 19:52:49 -0700
Subject: [PATCH 878/907] Add collectstatic to django command completions

---
 plugins/django/django.plugin.zsh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 0bbd031fe..66e0d1539 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -20,6 +20,19 @@ _managepy-createcachetable(){
     $nul_args && ret=0
 }
 
+_managepy-collectstatic(){
+  _arguments -s : \
+    '--link=-[Create a symbolic link to each file instead of copying.]:' \
+    '--noinput=-[Do NOT prompt the user for input of any kind.]:' \
+    '--no-post-process=-[Do NOT post process collected files.]:' \
+    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]:' \
+    '--dry-run=-[Do everything except modify the filesystem.]:' \
+    '--clear=-[Clear the existing files using the storage before trying to copy or link the original file.]:' \
+    '--link=-[Create a symbolic link to each file instead of copying.]:' \
+    '--no-default-ignore=-[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]:' \
+    $nul_args && ret=0
+}
+
 _managepy-dbshell(){
   _arguments -s : \
     $nul_args && ret=0
@@ -163,6 +176,7 @@ _managepy-commands() {
   commands=(
     'adminindex:prints the admin-index template snippet for the given app name(s).'
     'createcachetable:creates the table needed to use the SQL cache backend.'
+    'collectstatic:Collect static files in a single location.'
     'dbshell:runs the command-line client for the current DATABASE_ENGINE.'
     "diffsettings:displays differences between the current settings.py and Django's default settings."
     'dumpdata:Output the contents of the database as a fixture of the given format.'

From c3b20a65415dacb87f8ea5c94144d8ed12f95341 Mon Sep 17 00:00:00 2001
From: Brian Galey <bkgaley@gmail.com>
Date: Tue, 9 Apr 2013 19:54:50 -0700
Subject: [PATCH 879/907] Use completions with django-admin.py

---
 plugins/django/django.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index 66e0d1539..9d898edca 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -234,4 +234,5 @@ _managepy() {
 
 compdef _managepy manage.py
 compdef _managepy django
+compdef _managepy django-admin.py
 compdef _managepy django-manage

From 0c9b4329efd79d33dd2c21bd960d5bd9b7627b7f Mon Sep 17 00:00:00 2001
From: George Miroshnykov <george.miroshnykov@gmail.com>
Date: Tue, 9 Apr 2013 17:41:48 +0300
Subject: [PATCH 880/907] Support for Sublime Text 3

---
 plugins/sublime/sublime.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index bfbc45a07..804410057 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -21,6 +21,7 @@ elif  [[ $('uname') == 'Darwin' ]]; then
 	for _sublime_path in $_sublime_darwin_paths; do
 		if [[ -a $_sublime_path ]]; then
 			alias st="'$_sublime_path'"
+			break
 		fi
 	done
 fi

From c50b9a24f1d80cf38f5f299ab02b5c9409faa7c8 Mon Sep 17 00:00:00 2001
From: bertabus <billy.rond@gmail.com>
Date: Thu, 11 Apr 2013 14:56:22 -0600
Subject: [PATCH 881/907] Added Vundle clean to remove bundles removed from
 vimrc

---
 plugins/vundle/vundle.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
index 005a58476..936c8d7d2 100644
--- a/plugins/vundle/vundle.plugin.zsh
+++ b/plugins/vundle/vundle.plugin.zsh
@@ -16,8 +16,12 @@ function vundle () {
   vim -c "execute \"BundleInstall\" | q | q"
 }
 
-
 function vundle-update () {
   vundle-init
   vim -c "execute \"BundleInstall!\" | q | q"
 }
+
+function vundle-clean () {
+  vundle-init
+  vim -c "execute \"BundleClean!\" | q | q"
+}

From 07738ea86330b7b77127fc6f18474b3da2c6ecec Mon Sep 17 00:00:00 2001
From: Oleg Kandaurov <okandaurov@at-consulting.ru>
Date: Fri, 12 Apr 2013 18:19:42 +0400
Subject: [PATCH 882/907] Add colorize plugin

---
 plugins/colorize/colorize.plugin.zsh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 plugins/colorize/colorize.plugin.zsh

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
new file mode 100644
index 000000000..0696607d9
--- /dev/null
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -0,0 +1,28 @@
+# Plugin for highligthing file content
+# Plugin highlights file content based on the filename extension.
+# If no highlighting method supported for given extension then it tries 
+# guess it by looking for file content.
+
+alias colorize='colorize_via_pygmentize'
+
+colorize_via_pygmentize() {
+    if [ ! -x $(which pygmentize) ]; then
+        echo package \'pygmentize\' is not installed!
+        exit -1
+    fi
+
+    if [ $# -eq 0 ]; then
+        pygmentize -g $@
+    fi
+
+    for FNAME in $@
+    do
+        filename=$(basename "$FNAME")
+        lexer=`pygmentize -N \"$filename\"`
+        if [ "Z$lexer" != "Ztext" ]; then
+            pygmentize -l $lexer "$FNAME"
+        else
+            pygmentize -g "$FNAME"
+        fi
+    done
+}
\ No newline at end of file

From 2d2aa641678f6cb691b67e40897c3fa185efadf8 Mon Sep 17 00:00:00 2001
From: Danyil Bohdan <danyil.bohdan@gmail.com>
Date: Fri, 12 Apr 2013 18:19:09 +0300
Subject: [PATCH 883/907] Implemented UTF-8 support in fishy.zsh-theme.

---
 themes/fishy.zsh-theme | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index e9f78a54e..8b24172a2 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -1,8 +1,13 @@
 # ZSH Theme emulating the Fish shell's default prompt.
 
 _fishy_collapsed_wd() {
-  echo $(pwd | perl -pe "s|^$HOME|~|g; s|/([^/])[^/]*(?=/)|/\$1|g")
-}
+  echo $(pwd | perl -pe "
+   BEGIN {
+      binmode STDIN,  ':encoding(UTF-8)';
+      binmode STDOUT, ':encoding(UTF-8)';
+   }; s|^$HOME|~|g; s|/([^/])[^/]*(?=/)|/\$1|g
+")
+} 
 
 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
 PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '

From 388ae92d4755dae0f2d205dbb40fb0bbd975c9b3 Mon Sep 17 00:00:00 2001
From: toctan <tianjin.sc@gmail.com>
Date: Sun, 14 Apr 2013 13:07:17 +0800
Subject: [PATCH 884/907] command-not-found support for Arch Linux

---
 plugins/command-not-found/command-not-found.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 567da1b45..f3d7ec2df 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -3,3 +3,7 @@
 # this is installed in Ubuntu
 
 [[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+
+# Arch Linux command-not-found support, you must have package pkgfile installed
+# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
+[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh

From 460cb3d0e0eb79f909a46ae3c1b9d1c19c55e0dd Mon Sep 17 00:00:00 2001
From: MatthR3D <matthr3d@gmail.com>
Date: Sun, 14 Apr 2013 13:08:03 +0200
Subject: [PATCH 885/907] Edit some yaourt aliases and add some

* yaupg now also updates AUR packages
* Add yalst alias : it lists the installed packages, even from AUR
* Add yaorph alias : it removes orphans using yaourt
---
 plugins/archlinux/archlinux.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index ae92a0b4c..bffe9657a 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -8,7 +8,7 @@ if [[ -x `which yaourt` ]]; then
   }
   alias yaconf='yaourt -C'        # Fix all configuration files with vimdiff
   # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
-  alias yaupg='yaourt -Syu'        # Synchronize with repositories before upgrading packages that are out of date on the local system.
+  alias yaupg='yaourt -Syua'        # Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system.
   alias yasu='yaourt --sucre'      # Same as yaupg, but without confirmation
   alias yain='yaourt -S'           # Install specific package(s) from the repositories
   alias yains='yaourt -U'          # Install specific package not from the repositories but from a file
@@ -18,6 +18,8 @@ if [[ -x `which yaourt` ]]; then
   alias yareps='yaourt -Ss'        # Search for package(s) in the repositories
   alias yaloc='yaourt -Qi'         # Display information about a given package in the local database
   alias yalocs='yaourt -Qs'        # Search for package(s) in the local database
+  alias yalst='yaourt -Qe'         # List installed packages, even those installed from AUR (they're tagged as "local")
+  alias yaorph='yaourt -Qtd'       # Remove orphans using yaourt
   # Additional yaourt alias examples
   if [[ -x `which abs` ]]; then
     alias yaupd='yaourt -Sy && sudo abs'   # Update and refresh the local package and ABS databases against repositories

From ad3f59252beaf1a28e188dfc431a267875ca50b9 Mon Sep 17 00:00:00 2001
From: Michael Nikitochkin <miry.sof@gmail.com>
Date: Tue, 16 Apr 2013 10:22:28 +0300
Subject: [PATCH 886/907] Added global aliases to use RAILS_ENV.

---
 plugins/rails/rails.plugin.zsh   | 3 +++
 plugins/rails3/rails3.plugin.zsh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index cd232a6ae..76522e18d 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -9,6 +9,9 @@ alias rdbtp='rake db:test:prepare'
 alias sc='ruby script/console'
 alias sd='ruby script/server --debugger'
 alias devlog='tail -f log/development.log'
+alias -g RET='RAILS_ENV=test'
+alias -g REP='RAILS_ENV=production'
+alias -g RED='RAILS_ENV=development'
 
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"
diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
index 237d0594b..a2697872a 100644
--- a/plugins/rails3/rails3.plugin.zsh
+++ b/plugins/rails3/rails3.plugin.zsh
@@ -21,3 +21,6 @@ alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
 alias rdm='rake db:migrate'
 alias rdr='rake db:rollback'
+alias -g RET='RAILS_ENV=test'
+alias -g REP='RAILS_ENV=production'
+alias -g RED='RAILS_ENV=development'

From 5dae44ac5965b36da1dfc20772059561d4973cda Mon Sep 17 00:00:00 2001
From: Roman Kamyk <roman.kamyk@gmail.com>
Date: Tue, 16 Apr 2013 10:10:21 -0700
Subject: [PATCH 887/907] Return code instead of dollar sign

---
 themes/rkj-repos.zsh-theme | 2 +-
 themes/rkj.zsh-theme       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 318c315bb..46b8e83a0 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -24,6 +24,6 @@ function mygit() {
 
 # alternate prompt with git & hg
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
 
diff --git a/themes/rkj.zsh-theme b/themes/rkj.zsh-theme
index 81b701e07..80122d5c6 100644
--- a/themes/rkj.zsh-theme
+++ b/themes/rkj.zsh-theme
@@ -3,6 +3,6 @@
 # entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
 
 PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
-%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b '
+%{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B]%{\e[0m%}%b '
 
 

From 0b3d5608668880fd1f50f8c6a2099b4a5dd7871a Mon Sep 17 00:00:00 2001
From: Zoltan Debre <zdebre@gmail.com>
Date: Wed, 17 Apr 2013 15:07:11 +0200
Subject: [PATCH 888/907] Update rvm.plugin.zsh to the latest ruby versions

Ruby version numbers update:
1.8.7-p371
1.9.3-p392
2.0.0-p0
---
 plugins/rvm/rvm.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 5000a49b3..cdd0a7847 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -3,9 +3,9 @@ fpath=($rvm_path/scripts/zsh/Completion $fpath)
 alias rubies='rvm list rubies'
 alias gemsets='rvm gemset list'
 
-local ruby18='ruby-1.8.7-p334'
-local ruby19='ruby-1.9.3-p385'
-local ruby20='ruby-2.0.0-rc2'
+local ruby18='ruby-1.8.7-p371'
+local ruby19='ruby-1.9.3-p392'
+local ruby20='ruby-2.0.0-p0'
 
 function rb18 {
 	if [ -z "$1" ]; then

From 7db2b20fc4982d0b523d5ac5c59d0351229bbc32 Mon Sep 17 00:00:00 2001
From: Stefan Tatschner <stefan.tatschner@gmail.com>
Date: Wed, 17 Apr 2013 15:07:53 +0200
Subject: [PATCH 889/907] Added git-flow-avh plugin.

git-flow-avh is a fork of gitflow, see: https://github.com/petervanderdoes/gitflow
---
 plugins/git-flow-avh/git-flow-avh.plugin.zsh | 416 +++++++++++++++++++
 1 file changed, 416 insertions(+)
 create mode 100644 plugins/git-flow-avh/git-flow-avh.plugin.zsh

diff --git a/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
new file mode 100644
index 000000000..d76f55ef6
--- /dev/null
+++ b/plugins/git-flow-avh/git-flow-avh.plugin.zsh
@@ -0,0 +1,416 @@
+#!zsh
+#
+# Installation
+# ------------
+#
+# To achieve git-flow completion nirvana:
+#
+#  0. Update your zsh's git-completion module to the newest verion.
+#     From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
+#
+#  1. Install this file. Either:
+#
+#     a. Place it in your .zshrc:
+#
+#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
+#        your .zshrc:
+#
+#            source ~/.git-flow-completion.zsh
+#
+#     c. Or, use this file as a oh-my-zsh plugin.
+#
+
+_git-flow ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'init:Initialize a new git repo with support for the branching model.'
+				'feature:Manage your feature branches.'
+				'config:Manage your configuration.'
+				'release:Manage your release branches.'
+				'hotfix:Manage your hotfix branches.'
+				'support:Manage your support branches.'
+				'version:Shows version information.'
+			)
+			_describe -t commands 'git flow' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(init)
+					_arguments \
+						-f'[Force setting of gitflow branches, even if already configured]'
+					;;
+
+					(version)
+					;;
+
+					(hotfix)
+						__git-flow-hotfix
+					;;
+
+					(release)
+						__git-flow-release
+					;;
+
+					(feature)
+						__git-flow-feature
+					;;
+					(config)
+					__git-flow-config
+					;;
+
+			esac
+		;;
+	esac
+}
+
+__git-flow-release ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new release branch.'
+				'finish:Finish a release branch.'
+				'list:List all your release branches. (Alias to `git flow release`)'
+				'publish:Publish release branch to remote.'
+				'track:Checkout remote release branch.'
+				'delet:Delete a release branch.'
+			)
+			_describe -t commands 'git flow release' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(delete)
+					_arguments \
+						-f'[Force deletion]' \
+						-r'[Delete remote branch]' \
+						':version:__git_flow_version_list'
+				;;
+
+				(publish)
+					_arguments \
+						':version:__git_flow_version_list'
+				;;
+
+				(track)
+					_arguments \
+						':version:__git_flow_version_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-hotfix ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new hotfix branch.'
+				'finish:Finish a hotfix branch.'
+				'delete:Delete a hotfix branch.'
+				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+			)
+			_describe -t commands 'git flow hotfix' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':hotfix:__git_flow_version_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				(delete)
+					_arguments \
+						-f'[Force deletion]' \
+						-r'[Delete remote branch]' \
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-feature ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new feature branch.'
+				'finish:Finish a feature branch.'
+				'delete:Delete a feature branch.'
+				'list:List all your feature branches. (Alias to `git flow feature`)'
+				'publish:Publish feature branch to remote.'
+				'track:Checkout remote feature branch.'
+				'diff:Show all changes.'
+				'rebase:Rebase from integration branch.'
+				'checkout:Checkout local feature branch.'
+				'pull:Pull changes from remote.'
+			)
+			_describe -t commands 'git flow feature' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':feature:__git_flow_feature_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-r'[Rebase instead of merge]'\
+						':feature:__git_flow_feature_list'
+				;;
+
+				(delete)
+					_arguments \
+						-f'[Force deletion]' \
+						-r'[Delete remote branch]' \
+						':feature:__git_flow_feature_list'
+				;;
+
+				(publish)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(track)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(diff)
+					_arguments \
+						':branch:__git_branch_names'\
+				;;
+
+				(rebase)
+					_arguments \
+						-i'[Do an interactive rebase]' \
+						':branch:__git_branch_names'
+				;;
+
+				(checkout)
+					_arguments \
+						':branch:__git_flow_feature_list'\
+				;;
+
+				(pull)
+					_arguments \
+						':remote:__git_remotes'\
+						':branch:__git_branch_names'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-config ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'list:List the configuration. (Alias to `git flow config`)'
+				'set:Set the configuration option'
+			)
+			_describe -t commands 'git flow config' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(set)
+					_arguments \
+						--local'[Use repository config file]' \
+						--global'[Use global config file]'\
+						--system'[Use system config file]'\
+						--file'[Use given config file]'\
+						':option:(master develop feature hotfix release support	versiontagprefix)'
+				;;
+
+				*)
+					_arguments \
+						--local'[Use repository config file]' \
+						--global'[Use global config file]'\
+						--system'[Use system config file]'\
+						--file'[Use given config file]'
+				;;
+			esac
+		;;
+	esac
+}
+__git_flow_version_list ()
+{
+	local expl
+	declare -a versions
+
+	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted versions expl 'version' compadd $versions
+}
+
+__git_flow_feature_list ()
+{
+	local expl
+	declare -a features
+
+	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+	local expl gitdir remotes
+
+	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+	__git_command_successful || return
+
+	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+	__git_command_successful || return
+
+	# TODO: Should combine the two instead of either or.
+	if (( $#remotes > 0 )); then
+		_wanted remotes expl remote compadd $* - $remotes
+	else
+		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+	fi
+}
+
+__git_flow_hotfix_list ()
+{
+	local expl
+	declare -a hotfixes
+
+	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_branch_names () {
+	local expl
+	declare -a branch_names
+
+	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+	__git_command_successful || return
+
+	_wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+	if (( ${#pipestatus:#0} > 0 )); then
+		_message 'not a git repository'
+		return 1
+	fi
+	return 0
+}
+
+zstyle ':completion:*:*:git:*' user-commands flow:'provide high-level repository operations'

From f2b915c56741c846e845b037e9fdeb7c3f063bc3 Mon Sep 17 00:00:00 2001
From: jaseg <s@jaseg.de>
Date: Wed, 17 Apr 2013 17:08:36 -0700
Subject: [PATCH 890/907] The safe-paste plugin now works with tmux, too

---
 plugins/safe-paste/safe-paste.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
index 0aa97965f..17c212c19 100644
--- a/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -43,12 +43,12 @@ function _paste_insert() {
 
 function _zle_line_init() {
   # Tell terminal to send escape codes around pastes.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004h'
+  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004h'
 }
 
 function _zle_line_finish() {
   # Tell it to stop when we leave zle, so pasting in other programs
   # doesn't get the ^[[200~ codes around the pasted text.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color ]] && printf '\e[?2004l'
+  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004l'
 }
 

From 52dc3b99f9963576f50ba87a46953e92591e4d7d Mon Sep 17 00:00:00 2001
From: Chris Borgia <cborgia@gmail.com>
Date: Thu, 18 Apr 2013 16:27:02 -0400
Subject: [PATCH 891/907] Edited Grammar in template file

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 2ea9934af..30399abf3 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -17,7 +17,7 @@ ZSH_THEME="robbyrussell"
 # Comment this out to disable bi-weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
-# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# Uncomment to change how often before auto-updates occur? (in days)
 # export UPDATE_ZSH_DAYS=13
 
 # Uncomment following line if you want to disable colors in ls

From a08f626f1c37043cdf1e2632f283e537396a205b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Garami=20G=C3=A1bor?= <hron@hron.me>
Date: Sat, 20 Apr 2013 21:40:15 +0200
Subject: [PATCH 892/907] Adding undocumented clean command to completion

Clean command is undocumented (not included in
bundle help output), however that is very useful,
especially in RVM environment you can clean up
outdated gems in gemset.
---
 plugins/bundler/_bundler | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/bundler/_bundler b/plugins/bundler/_bundler
index 5d22cac9a..2ec3a5f9c 100644
--- a/plugins/bundler/_bundler
+++ b/plugins/bundler/_bundler
@@ -23,6 +23,7 @@ case $state in
 			"viz[Generate a visual representation of your dependencies]" \
 			"init[Generate a simple Gemfile, placed in the current directory]" \
 			"gem[Create a simple gem, suitable for development with bundler]" \
+			"clean[Cleans up unused gems in your bundler directory]" \
 			"help[Describe available tasks or one specific task]"
 		ret=0
 		;;
@@ -62,6 +63,14 @@ case $state in
 			exec)
 				_normal && ret=0
 				;;
+			clean)
+				_arguments \
+					'(--force)--force[forces clean even if --path is not set]' \
+					'(--dry-run)--dry-run[only print out changes, do not actually clean gems]' \
+					'(--no-color)--no-color[Disable colorization in output]' \
+					'(--verbose)--verbose[Enable verbose output mode]'
+				ret=0
+				;;
 			(open|show)
 				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
 				if [[ $_gems != "" ]]; then

From bc385531b0e71b90b800502117bbdc8d1531e4c2 Mon Sep 17 00:00:00 2001
From: Ron Shapiro <shapiro.rd@gmail.com>
Date: Sat, 20 Apr 2013 22:37:36 -0400
Subject: [PATCH 893/907] Separate the battery_pct_remaining data into it's own
 function so that it can be obtained even if the battery is connected.

---
 plugins/battery/battery.plugin.zsh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 95f890632..0c7c9421f 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -10,12 +10,16 @@
 
 if [[ $(uname) == "Darwin" ]] ; then
 
+  function battery_pct() {
+    typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
+    typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
+    integer i=$(((currentcapacity/maxcapacity) * 100))
+    echo $i
+  }
+  
   function battery_pct_remaining() {
     if [[ $(ioreg -rc AppleSmartBattery | grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]] ; then
-      typeset -F maxcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"MaxCapacity"\ =\ ' | sed -e 's/^.*"MaxCapacity"\ =\ //')
-      typeset -F currentcapacity=$(ioreg -rc "AppleSmartBattery"| grep '^.*"CurrentCapacity"\ =\ ' | sed -e 's/^.*CurrentCapacity"\ =\ //')
-      integer i=$(((currentcapacity/maxcapacity) * 100))
-      echo $i
+      battery_pct
     else
       echo "External Power"
     fi

From d615f6437408d66fa8aad031eb45942bf84fed86 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 21 Apr 2013 02:10:21 -0500
Subject: [PATCH 894/907] git: fix parse_git_dirty()

If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 lib/git.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/git.zsh b/lib/git.zsh
index 76fe9b142..353c42f3c 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -21,6 +21,8 @@ parse_git_dirty() {
     else
       echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
     fi  
+  else
+    echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi  
 }
 

From 72a8c08cc897520ea74ae49e811cd9e34501c520 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 21 Apr 2013 01:34:44 -0500
Subject: [PATCH 895/907] gitfast: synchronize with upstream

Up to version 1.8.2.1.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                |   9 +
 plugins/gitfast/git-completion.bash | 447 +++++++++++++++++++++++-----
 plugins/gitfast/git-prompt.sh       | 149 ++++++++--
 3 files changed, 503 insertions(+), 102 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 45775021f..cf8116d47 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -60,6 +60,15 @@ __gitcomp_nl ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
+__gitcomp_file ()
+{
+	emulate -L zsh
+
+	local IFS=$'\n'
+	compset -P '*[=:]'
+	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+}
+
 _git ()
 {
 	local _ret=1
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index be800e09b..93eba4675 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -13,6 +13,7 @@
 #    *) .git/remotes file names
 #    *) git 'subcommands'
 #    *) tree paths within 'ref:path/to/file' expressions
+#    *) file paths within current working directory and index
 #    *) common --long-options
 #
 # To use these routines:
@@ -23,10 +24,6 @@
 #    3) Consider changing your PS1 to also show the current branch,
 #       see git-prompt.sh for details.
 
-if [[ -n ${ZSH_VERSION-} ]]; then
-	autoload -U +X bashcompinit && bashcompinit
-fi
-
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
 *)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
@@ -169,7 +166,6 @@ __git_reassemble_comp_words_by_ref()
 }
 
 if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
-if [[ -z ${ZSH_VERSION:+set} ]]; then
 _get_comp_words_by_ref ()
 {
 	local exclude cur_ words_ cword_
@@ -197,32 +193,6 @@ _get_comp_words_by_ref ()
 		shift
 	done
 }
-else
-_get_comp_words_by_ref ()
-{
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		cur)
-			cur=${COMP_WORDS[COMP_CWORD]}
-			;;
-		prev)
-			prev=${COMP_WORDS[COMP_CWORD-1]}
-			;;
-		words)
-			words=("${COMP_WORDS[@]}")
-			;;
-		cword)
-			cword=$COMP_CWORD
-			;;
-		-n)
-			# assume COMP_WORDBREAKS is already set sanely
-			shift
-			;;
-		esac
-		shift
-	done
-}
-fi
 fi
 
 # Generates completion reply with compgen, appending a space to possible
@@ -264,6 +234,124 @@ __gitcomp_nl ()
 	COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
 }
 
+# Generates completion reply with compgen from newline-separated possible
+# completion filenames.
+# It accepts 1 to 3 arguments:
+# 1: List of possible completion filenames, separated by a single newline.
+# 2: A directory prefix to be added to each possible completion filename
+#    (optional).
+# 3: Generate possible completion matches for this word (optional).
+__gitcomp_file ()
+{
+	local IFS=$'\n'
+
+	# XXX does not work when the directory prefix contains a tilde,
+	# since tilde expansion is not applied.
+	# This means that COMPREPLY will be empty and Bash default
+	# completion will be used.
+	COMPREPLY=($(compgen -P "${2-}" -W "$1" -- "${3-$cur}"))
+
+	# Tell Bash that compspec generates filenames.
+	compopt -o filenames 2>/dev/null
+}
+
+__git_index_file_list_filter_compat ()
+{
+	local path
+
+	while read -r path; do
+		case "$path" in
+		?*/*) echo "${path%%/*}/" ;;
+		*) echo "$path" ;;
+		esac
+	done
+}
+
+__git_index_file_list_filter_bash ()
+{
+	local path
+
+	while read -r path; do
+		case "$path" in
+		?*/*)
+			# XXX if we append a slash to directory names when using
+			# `compopt -o filenames`, Bash will append another slash.
+			# This is pretty stupid, and this the reason why we have to
+			# define a compatible version for this function.
+			echo "${path%%/*}" ;;
+		*)
+			echo "$path" ;;
+		esac
+	done
+}
+
+# Process path list returned by "ls-files" and "diff-index --name-only"
+# commands, in order to list only file names relative to a specified
+# directory, and append a slash to directory names.
+__git_index_file_list_filter ()
+{
+	# Default to Bash >= 4.x
+	__git_index_file_list_filter_bash
+}
+
+# Execute git ls-files, returning paths relative to the directory
+# specified in the first argument, and using the options specified in
+# the second argument.
+__git_ls_files_helper ()
+{
+	(
+		test -n "${CDPATH+set}" && unset CDPATH
+		# NOTE: $2 is not quoted in order to support multiple options
+		cd "$1" && git ls-files --exclude-standard $2
+	) 2>/dev/null
+}
+
+
+# Execute git diff-index, returning paths relative to the directory
+# specified in the first argument, and using the tree object id
+# specified in the second argument.
+__git_diff_index_helper ()
+{
+	(
+		test -n "${CDPATH+set}" && unset CDPATH
+		cd "$1" && git diff-index --name-only --relative "$2"
+	) 2>/dev/null
+}
+
+# __git_index_files accepts 1 or 2 arguments:
+# 1: Options to pass to ls-files (required).
+#    Supported options are --cached, --modified, --deleted, --others,
+#    and --directory.
+# 2: A directory path (optional).
+#    If provided, only files within the specified directory are listed.
+#    Sub directories are never recursed.  Path must have a trailing
+#    slash.
+__git_index_files ()
+{
+	local dir="$(__gitdir)" root="${2-.}"
+
+	if [ -d "$dir" ]; then
+		__git_ls_files_helper "$root" "$1" | __git_index_file_list_filter |
+			sort | uniq
+	fi
+}
+
+# __git_diff_index_files accepts 1 or 2 arguments:
+# 1) The id of a tree object.
+# 2) A directory path (optional).
+#    If provided, only files within the specified directory are listed.
+#    Sub directories are never recursed.  Path must have a trailing
+#    slash.
+__git_diff_index_files ()
+{
+	local dir="$(__gitdir)" root="${2-.}"
+
+	if [ -d "$dir" ]; then
+		__git_diff_index_helper "$root" "$1" | __git_index_file_list_filter |
+			sort | uniq
+	fi
+}
+
 __git_heads ()
 {
 	local dir="$(__gitdir)"
@@ -321,7 +409,7 @@ __git_refs ()
 				if [[ "$ref" == "$cur"* ]]; then
 					echo "$ref"
 				fi
-			done | uniq -u
+			done | sort | uniq -u
 		fi
 		return
 	fi
@@ -428,7 +516,7 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
+		__gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" 2>/dev/null \
 				| sed '/^100... blob /{
 				           s,^.*	,,
 				           s,$, ,
@@ -461,6 +549,46 @@ __git_complete_revlist_file ()
 }
 
 
+# __git_complete_index_file requires 1 argument: the options to pass to
+# ls-file
+__git_complete_index_file ()
+{
+	local pfx cur_="$cur"
+
+	case "$cur_" in
+	?*/*)
+		pfx="${cur_%/*}"
+		cur_="${cur_##*/}"
+		pfx="${pfx}/"
+
+		__gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_"
+		;;
+	*)
+		__gitcomp_file "$(__git_index_files "$1")" "" "$cur_"
+		;;
+	esac
+}
+
+# __git_complete_diff_index_file requires 1 argument: the id of a tree
+# object
+__git_complete_diff_index_file ()
+{
+	local pfx cur_="$cur"
+
+	case "$cur_" in
+	?*/*)
+		pfx="${cur_%/*}"
+		cur_="${cur_##*/}"
+		pfx="${pfx}/"
+
+		__gitcomp_file "$(__git_diff_index_files "$1" "$pfx")" "$pfx" "$cur_"
+		;;
+	*)
+		__gitcomp_file "$(__git_diff_index_files "$1")" "" "$cur_"
+		;;
+	esac
+}
+
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -562,10 +690,19 @@ __git_complete_strategy ()
 	return 1
 }
 
+__git_commands () {
+	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
+	then
+		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
+	else
+		git help -a|egrep '^  [a-zA-Z0-9]'
+	fi
+}
+
 __git_list_all_commands ()
 {
 	local i IFS=" "$'\n'
-	for i in $(git help -a|egrep '^  [a-zA-Z0-9]')
+	for i in $(__git_commands)
 	do
 		case $i in
 		*--*)             : helper pattern;;
@@ -585,7 +722,7 @@ __git_list_porcelain_commands ()
 {
 	local i IFS=" "$'\n'
 	__git_compute_all_commands
-	for i in "help" $__git_all_commands
+	for i in $__git_all_commands
 	do
 		case $i in
 		*--*)             : helper pattern;;
@@ -594,6 +731,7 @@ __git_list_porcelain_commands ()
 		archimport)       : import;;
 		cat-file)         : plumbing;;
 		check-attr)       : plumbing;;
+		check-ignore)     : plumbing;;
 		check-ref-format) : plumbing;;
 		checkout-index)   : plumbing;;
 		commit-tree)      : plumbing;;
@@ -753,6 +891,43 @@ __git_has_doubledash ()
 	return 1
 }
 
+# Try to count non option arguments passed on the command line for the
+# specified git command.
+# When options are used, it is necessary to use the special -- option to
+# tell the implementation were non option arguments begin.
+# XXX this can not be improved, since options can appear everywhere, as
+# an example:
+#	git mv x -n y
+#
+# __git_count_arguments requires 1 argument: the git command executed.
+__git_count_arguments ()
+{
+	local word i c=0
+
+	# Skip "git" (first argument)
+	for ((i=1; i < ${#words[@]}; i++)); do
+		word="${words[i]}"
+
+		case "$word" in
+			--)
+				# Good; we can assume that the following are only non
+				# option arguments.
+				((c = 0))
+				;;
+			"$1")
+				# Skip the specified git command and discard git
+				# main options
+				((c = 0))
+				;;
+			?*)
+				((c++))
+				;;
+		esac
+	done
+
+	printf "%d" $c
+}
+
 __git_whitespacelist="nowarn warn error error-all fix"
 
 _git_am ()
@@ -801,8 +976,6 @@ _git_apply ()
 
 _git_add ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "
@@ -811,7 +984,9 @@ _git_add ()
 			"
 		return
 	esac
-	COMPREPLY=()
+
+	# XXX should we check for --update and --all options ?
+	__git_complete_index_file "--others --modified"
 }
 
 _git_archive ()
@@ -961,15 +1136,15 @@ _git_cherry_pick ()
 
 _git_clean ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "--dry-run --quiet"
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	# XXX should we check for -x option ?
+	__git_complete_index_file "--others"
 }
 
 _git_clone ()
@@ -989,6 +1164,8 @@ _git_clone ()
 			--upload-pack
 			--template=
 			--depth
+			--single-branch
+			--branch
 			"
 		return
 		;;
@@ -998,7 +1175,19 @@ _git_clone ()
 
 _git_commit ()
 {
-	__git_has_doubledash && return
+	case "$prev" in
+	-c|-C)
+		__gitcomp_nl "$(__git_refs)" "" "${cur}"
+		return
+		;;
+	esac
+
+	case "$prev" in
+	-c|-C)
+		__gitcomp_nl "$(__git_refs)" "" "${cur}"
+		return
+		;;
+	esac
 
 	case "$cur" in
 	--cleanup=*)
@@ -1027,7 +1216,13 @@ _git_commit ()
 			"
 		return
 	esac
-	COMPREPLY=()
+
+	if git rev-parse --verify --quiet HEAD >/dev/null; then
+		__git_complete_diff_index_file "HEAD"
+	else
+		# This is the first commit
+		__git_complete_index_file "--cached"
+	fi
 }
 
 _git_describe ()
@@ -1043,6 +1238,8 @@ _git_describe ()
 	__gitcomp_nl "$(__git_refs)"
 }
 
+__git_diff_algorithms="myers minimal patience histogram"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
@@ -1053,10 +1250,11 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--no-ext-diff
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
-			--patience
+			--patience --histogram --minimal
 			--raw
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
+			--diff-algorithm=
 "
 
 _git_diff ()
@@ -1064,6 +1262,10 @@ _git_diff ()
 	__git_has_doubledash && return
 
 	case "$cur" in
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1116,6 +1318,14 @@ _git_fetch ()
 	__git_complete_remote_or_refspec
 }
 
+__git_format_patch_options="
+	--stdout --attach --no-attach --thread --thread= --output-directory
+	--numbered --start-number --numbered-files --keep-subject --signoff
+	--signature --no-signature --in-reply-to= --cc= --full-index --binary
+	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
+	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
+"
+
 _git_format_patch ()
 {
 	case "$cur" in
@@ -1126,21 +1336,7 @@ _git_format_patch ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stdout --attach --no-attach --thread --thread=
-			--output-directory
-			--numbered --start-number
-			--numbered-files
-			--keep-subject
-			--signoff --signature --no-signature
-			--in-reply-to= --cc=
-			--full-index --binary
-			--not --all
-			--cover-letter
-			--no-prefix --src-prefix= --dst-prefix=
-			--inline --suffix= --ignore-if-in-upstream
-			--subject-prefix=
-			"
+		__gitcomp "$__git_format_patch_options"
 		return
 		;;
 	esac
@@ -1251,8 +1447,6 @@ _git_init ()
 
 _git_ls_files ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "--cached --deleted --modified --others --ignored
@@ -1265,7 +1459,10 @@ _git_ls_files ()
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	# XXX ignore options like --modified and always suggest all cached
+	# files.
+	__git_complete_index_file "--cached"
 }
 
 _git_ls_remote ()
@@ -1397,7 +1594,14 @@ _git_mv ()
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	if [ $(__git_count_arguments "mv") -gt 0 ]; then
+		# We need to show both cached and untracked files (including
+		# empty directories) since this may not be the last argument.
+		__git_complete_index_file "--cached --others --directory"
+	else
+		__git_complete_index_file "--cached"
+	fi
 }
 
 _git_name_rev ()
@@ -1554,6 +1758,12 @@ _git_send_email ()
 		__gitcomp "ssl tls" "" "${cur##--smtp-encryption=}"
 		return
 		;;
+	--thread=*)
+		__gitcomp "
+			deep shallow
+			" "" "${cur##--thread=}"
+		return
+		;;
 	--*)
 		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
 			--compose --confirm= --dry-run --envelope-sender
@@ -1563,11 +1773,12 @@ _git_send_email ()
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
-			--validate --no-validate"
+			--validate --no-validate
+			$__git_format_patch_options"
 		return
 		;;
 	esac
-	COMPREPLY=()
+	__git_complete_revlist
 }
 
 _git_stage ()
@@ -1581,7 +1792,7 @@ __git_config_get_set_variables ()
 	while [ $c -gt 1 ]; do
 		word="${words[c]}"
 		case "$word" in
-		--global|--system|--file=*)
+		--system|--global|--local|--file=*)
 			config_file="$word"
 			break
 			;;
@@ -1687,7 +1898,7 @@ _git_config ()
 	case "$cur" in
 	--*)
 		__gitcomp "
-			--global --system --file=
+			--system --global --local --file=
 			--list --replace-all
 			--get --get-all --get-regexp
 			--add --unset --unset-all
@@ -1860,6 +2071,7 @@ _git_config ()
 		diff.suppressBlankEmpty
 		diff.tool
 		diff.wordRegex
+		diff.algorithm
 		difftool.
 		difftool.prompt
 		fetch.recurseSubmodules
@@ -2096,15 +2308,14 @@ _git_revert ()
 
 _git_rm ()
 {
-	__git_has_doubledash && return
-
 	case "$cur" in
 	--*)
 		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
 		return
 		;;
 	esac
-	COMPREPLY=()
+
+	__git_complete_index_file "--cached"
 }
 
 _git_shortlog ()
@@ -2134,6 +2345,10 @@ _git_show ()
 			" "" "${cur#*=}"
 		return
 		;;
+	--diff-algorithm=*)
+		__gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}"
+		return
+		;;
 	--*)
 		__gitcomp "--pretty= --format= --abbrev-commit --oneline
 			$__git_diff_common_options
@@ -2429,20 +2644,88 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
+if [[ -n ${ZSH_VERSION-} ]]; then
+	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
+
+	autoload -U +X compinit && compinit
+
+	__gitcomp ()
+	{
+		emulate -L zsh
+
+		local cur_="${3-$cur}"
+
+		case "$cur_" in
+		--*=)
+			;;
+		*)
+			local c IFS=$' \t\n'
+			local -a array
+			for c in ${=1}; do
+				c="$c${4-}"
+				case $c in
+				--*=*|*.) ;;
+				*) c="$c " ;;
+				esac
+				array[$#array+1]="$c"
+			done
+			compset -P '*[=:]'
+			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+			;;
+		esac
+	}
+
+	__gitcomp_nl ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	}
+
+	__gitcomp_file ()
+	{
+		emulate -L zsh
+
+		local IFS=$'\n'
+		compset -P '*[=:]'
+		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	}
+
+	__git_zsh_helper ()
+	{
+		emulate -L ksh
+		local cur cword prev
+		cur=${words[CURRENT-1]}
+		prev=${words[CURRENT-2]}
+		let cword=CURRENT-1
+		__${service}_main
+	}
+
+	_git ()
+	{
+		emulate -L zsh
+		local _ret=1
+		__git_zsh_helper
+		let _ret && _default -S '' && _ret=0
+		return _ret
+	}
+
+	compdef _git git gitk
+	return
+elif [[ -n ${BASH_VERSION-} ]]; then
+	if ((${BASH_VERSINFO[0]} < 4)); then
+		# compopt is not supported
+		__git_index_file_list_filter ()
+		{
+			__git_index_file_list_filter_compat
+		}
+	fi
+fi
+
 __git_func_wrap ()
 {
-	if [[ -n ${ZSH_VERSION-} ]]; then
-		emulate -L bash
-		setopt KSH_TYPESET
-
-		# workaround zsh's bug that leaves 'words' as a special
-		# variable in versions < 4.3.12
-		typeset -h words
-
-		# workaround zsh's bug that quotes spaces in the COMPREPLY
-		# array if IFS doesn't contain spaces.
-		typeset -h IFS
-	fi
 	local cur words cword prev
 	_get_comp_words_by_ref -n =: cur words cword prev
 	$1
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index afd76e86e..65f8368f1 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -10,9 +10,22 @@
 #    1) Copy this file to somewhere (e.g. ~/.git-prompt.sh).
 #    2) Add the following line to your .bashrc/.zshrc:
 #        source ~/.git-prompt.sh
-#    3) Change your PS1 to also show the current branch:
-#         Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
-#         ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#    3a) Change your PS1 to call __git_ps1 as
+#        command-substitution:
+#        Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
+#        ZSH:  PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
+#        the optional argument will be used as format string.
+#    3b) Alternatively, if you are using bash, __git_ps1 can be
+#        used for PROMPT_COMMAND with two parameters, <pre> and
+#        <post>, which are strings you would put in $PS1 before
+#        and after the status string generated by the git-prompt
+#        machinery.  e.g.
+#           PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
+#        will show username, at-sign, host, colon, cwd, then
+#        various status string, followed by dollar and SP, as
+#        your prompt.
+#        Optionally, you can supply a third argument with a printf
+#        format string to finetune the output of the branch status
 #
 # The argument to __git_ps1 will be displayed only if you are currently
 # in a git repository.  The %s token will be the name of the current
@@ -30,7 +43,10 @@
 #
 # If you would like to see if there're untracked files, then you can set
 # GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked
-# files, then a '%' will be shown next to the branch name.
+# files, then a '%' will be shown next to the branch name.  You can
+# configure this per-repository with the bash.showUntrackedFiles
+# variable, which defaults to true once GIT_PS1_SHOWUNTRACKEDFILES is
+# enabled.
 #
 # If you would like to see the difference between HEAD and its upstream,
 # set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
@@ -49,6 +65,19 @@
 # find one, or @{upstream} otherwise.  Once you have set
 # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
 # setting the bash.showUpstream config variable.
+#
+# If you would like to see more information about the identity of
+# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
+# to one of these values:
+#
+#     contains      relative to newer annotated tag (v1.6.3.2~35)
+#     branch        relative to newer tag or branch (master~4)
+#     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
+#     default       exactly matching tag
+#
+# If you would like a colored hint about the current dirty state, set
+# GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
+# the colored output of "git status -sb".
 
 # __gitdir accepts 0 or 1 arguments (i.e., location)
 # returns location of .git repo
@@ -195,11 +224,43 @@ __git_ps1_show_upstream ()
 
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
-# returns text to add to bash PS1 prompt (includes branch name)
+# when called from PS1 using command substitution
+# in this mode it prints text to add to bash PS1 prompt (includes branch name)
+#
+# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)
+# in that case it _sets_ PS1. The arguments are parts of a PS1 string.
+# when two arguments are given, the first is prepended and the second appended
+# to the state string when assigned to PS1.
+# The optional third parameter will be used as printf format string to further
+# customize the output of the git-status string.
+# In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
 __git_ps1 ()
 {
+	local pcmode=no
+	local detached=no
+	local ps1pc_start='\u@\h:\w '
+	local ps1pc_end='\$ '
+	local printf_format=' (%s)'
+
+	case "$#" in
+		2|3)	pcmode=yes
+			ps1pc_start="$1"
+			ps1pc_end="$2"
+			printf_format="${3:-$printf_format}"
+		;;
+		0|1)	printf_format="${1:-$printf_format}"
+		;;
+		*)	return
+		;;
+	esac
+
 	local g="$(__gitdir)"
-	if [ -n "$g" ]; then
+	if [ -z "$g" ]; then
+		if [ $pcmode = yes ]; then
+			#In PC mode PS1 always needs to be set
+			PS1="$ps1pc_start$ps1pc_end"
+		fi
+	else
 		local r=""
 		local b=""
 		if [ -f "$g/rebase-merge/interactive" ]; then
@@ -226,7 +287,7 @@ __git_ps1 ()
 			fi
 
 			b="$(git symbolic-ref HEAD 2>/dev/null)" || {
-
+				detached=yes
 				b="$(
 				case "${GIT_PS1_DESCRIBE_STYLE-}" in
 				(contains)
@@ -259,24 +320,25 @@ __git_ps1 ()
 				b="GIT_DIR!"
 			fi
 		elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then
-			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then
-				if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then
-					git diff --no-ext-diff --quiet --exit-code || w="*"
-					if git rev-parse --quiet --verify HEAD >/dev/null; then
-						git diff-index --cached --quiet HEAD -- || i="+"
-					else
-						i="#"
-					fi
+			if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
+			   [ "$(git config --bool bash.showDirtyState)" != "false" ]
+			then
+				git diff --no-ext-diff --quiet --exit-code || w="*"
+				if git rev-parse --quiet --verify HEAD >/dev/null; then
+					git diff-index --cached --quiet HEAD -- || i="+"
+				else
+					i="#"
 				fi
 			fi
 			if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
 				git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
 			fi
 
-			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
-				if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-					u="%%"
-				fi
+			if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
+			   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
+			   [ -n "$(git ls-files --others --exclude-standard)" ]
+			then
+				u="%%"
 			fi
 
 			if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
@@ -285,6 +347,53 @@ __git_ps1 ()
 		fi
 
 		local f="$w$i$s$u"
-		printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
+		if [ $pcmode = yes ]; then
+			local gitstring=
+			if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+				local c_red='\e[31m'
+				local c_green='\e[32m'
+				local c_lblue='\e[1;34m'
+				local c_clear='\e[0m'
+				local bad_color=$c_red
+				local ok_color=$c_green
+				local branch_color="$c_clear"
+				local flags_color="$c_lblue"
+				local branchstring="$c${b##refs/heads/}"
+
+				if [ $detached = no ]; then
+					branch_color="$ok_color"
+				else
+					branch_color="$bad_color"
+				fi
+
+				# Setting gitstring directly with \[ and \] around colors
+				# is necessary to prevent wrapping issues!
+				gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
+
+				if [ -n "$w$i$s$u$r$p" ]; then
+					gitstring="$gitstring "
+				fi
+				if [ "$w" = "*" ]; then
+					gitstring="$gitstring\[$bad_color\]$w"
+				fi
+				if [ -n "$i" ]; then
+					gitstring="$gitstring\[$ok_color\]$i"
+				fi
+				if [ -n "$s" ]; then
+					gitstring="$gitstring\[$flags_color\]$s"
+				fi
+				if [ -n "$u" ]; then
+					gitstring="$gitstring\[$bad_color\]$u"
+				fi
+				gitstring="$gitstring\[$c_clear\]$r$p"
+			else
+				gitstring="$c${b##refs/heads/}${f:+ $f}$r$p"
+			fi
+			gitstring=$(printf -- "$printf_format" "$gitstring")
+			PS1="$ps1pc_start$gitstring$ps1pc_end"
+		else
+			# NO color option unless in PROMPT_COMMAND mode
+			printf -- "$printf_format" "$c${b##refs/heads/}${f:+ $f}$r$p"
+		fi
 	fi
 }

From c944f8b465e6c28f9a42ac6d71c90ddf9a5b5742 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 29 Nov 2012 15:54:17 +0100
Subject: [PATCH 896/907] gitfast: fix prompt

Certain themes need the 'clean' mark, and some people like to have the
'dirty' one, just like the original git_promp_info().

We probably shouldn't be modifying that function, there's no other clean
way to achieve our own status information, so let's try to emulate the
original as much as possible.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/gitfast.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index 7e50cf721..dba1b1315 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -3,5 +3,6 @@ source $dir/../git/git.plugin.zsh
 source $dir/git-prompt.sh
 
 function git_prompt_info() {
-  __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
+  dirty="$(parse_git_dirty)"
+  __git_ps1 "${ZSH_THEME_GIT_PROMPT_PREFIX//\%/%%}%s${dirty//\%/%%}${ZSH_THEME_GIT_PROMPT_SUFFIX//\%/%%}"
 }

From e41714d72c6c5629efe632b1052b590f5f8905c5 Mon Sep 17 00:00:00 2001
From: Jeremy Attali <jeremy.attali@gmail.com>
Date: Mon, 22 Apr 2013 10:59:08 +0200
Subject: [PATCH 897/907] Added option to allow untracked files as non dirty

In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
---
 lib/git.zsh                  | 6 +++++-
 templates/zshrc.zsh-template | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 76fe9b142..5f8453112 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -15,7 +15,11 @@ parse_git_dirty() {
     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
           SUBMODULE_SYNTAX="--ignore-submodules=dirty"
     fi  
-    GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
+    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
+        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
+    else
+        GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
+    fi
     if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then
       echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
     else
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 2ea9934af..58f193550 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -29,6 +29,11 @@ ZSH_THEME="robbyrussell"
 # Uncomment following line if you want red dots to be displayed while waiting for completion
 # COMPLETION_WAITING_DOTS="true"
 
+# Uncomment following line if you want to disable marking untracked files under
+# VCS as dirty. This makes repository status check for large repositories much,
+# much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)

From 785b1c6337e1da6b2356e71b72ef6b4c93460e90 Mon Sep 17 00:00:00 2001
From: Dustin Hemmerling <dhemmerling@adacado.com>
Date: Mon, 22 Apr 2013 16:01:09 -0700
Subject: [PATCH 898/907] mvn plugin was missing "redeploy" completion for
 tomcat.

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index c2d8e7ed7..799f6fc8c 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -114,7 +114,7 @@ function listMavenCompletions {
         # jboss
         jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
         # tomcat
-        tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:undeploy
+        tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
         # tomcat6
         tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
         # tomcat7

From 680302c9f6ce71f69afaf7d020ed400cec2e5d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Sj=C3=B6sten?= <tobias.sjosten@gmail.com>
Date: Tue, 23 Apr 2013 09:35:27 +0300
Subject: [PATCH 899/907] Added 'jekyll' to list of bundled commands

---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index bc21da134..a288cffcd 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -6,7 +6,7 @@ alias bu="bundle update"
 
 # The following is based on https://github.com/gma/bundler-exec
 
-bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
+bundled_commands=(annotate cap capify cucumber foreman guard jekyll middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
 
 ## Functions
 

From d537193f262d277158f01bd319bfe76d154b751d Mon Sep 17 00:00:00 2001
From: Tobias Preuss <tobias.preuss@googlemail.com>
Date: Tue, 23 Apr 2013 10:41:58 +0200
Subject: [PATCH 900/907] Add auto-completion for zeus.

---
 plugins/zeus/_zeus | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 plugins/zeus/_zeus

diff --git a/plugins/zeus/_zeus b/plugins/zeus/_zeus
new file mode 100644
index 000000000..5a13bd9ec
--- /dev/null
+++ b/plugins/zeus/_zeus
@@ -0,0 +1,34 @@
+#compdef zeus
+#autoload
+
+# in order to make this work, you will need to have the gem zeus installed
+
+# zeus zsh completion, based on adb completion
+
+local -a _1st_arguments
+_1st_arguments=(
+'console:Lets you interact with your Rails application from the command line. (alias = c)'
+'cucumber:Runs cucumber.'
+'dbconsole:Figures out which database you are using and drops you into whichever command line interface.'
+'destroy:Figures out what generate did, and undoes it. (alias = d)'
+'generate:Uses templates to create a whole lot of things. (alias = g)'
+'rake:Execute rake tasks.'
+'runner:Runs Ruby code in the context of Rails non-interactively. (alias = r)'
+'server:Launches a small web server named WEBrick which comes bundled with Ruby. (alias = s)'
+'start:Preloads the zeus environment'
+'test:Runs RSpec tests. (alias = rspec, testrb)'
+'version:Shows the version number.'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+	'*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+	_describe -t commands "zeus subcommand" _1st_arguments
+	return
+fi
+
+_files

From 8cd1b21b931c0f7a310fc32c43dd3288203ecd40 Mon Sep 17 00:00:00 2001
From: Alexey Poimtsev <alec@alec-c4.com>
Date: Wed, 24 Apr 2013 01:40:09 +0400
Subject: [PATCH 901/907] Update rails4.plugin.zsh

added alias for rake db:create
---
 plugins/rails4/rails4.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh
index b6765365e..fce827ee3 100644
--- a/plugins/rails4/rails4.plugin.zsh
+++ b/plugins/rails4/rails4.plugin.zsh
@@ -22,8 +22,9 @@ alias rs='_rails_command server'
 alias rsd='_rails_command server --debugger'
 alias devlog='tail -f log/development.log'
 alias rdm='rake db:migrate'
+alias rdc='rake db:create'
 alias rdr='rake db:rollback'
 alias rds='rake db:seed'
 alias rlc='rake log:clear'
 alias rn='rake notes'
-alias rr='rake routes'
\ No newline at end of file
+alias rr='rake routes'

From d4d8939410edf3b81e6cd6a63b39744262691185 Mon Sep 17 00:00:00 2001
From: JamesFerguson <jim@The-Ocean.local>
Date: Wed, 24 Apr 2013 09:11:52 +1000
Subject: [PATCH 902/907] Only trim remote names; be git-flow friendly

 - don't remove everything before the last /
 - do remove <remote_name>/
 - allows flow style feature/foobar branch names
---
 plugins/git-remote-branch/git-remote-branch.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git-remote-branch/git-remote-branch.plugin.zsh b/plugins/git-remote-branch/git-remote-branch.plugin.zsh
index ff98cbf87..6c5ab8f70 100644
--- a/plugins/git-remote-branch/git-remote-branch.plugin.zsh
+++ b/plugins/git-remote-branch/git-remote-branch.plugin.zsh
@@ -6,7 +6,8 @@ _git_remote_branch() {
       compadd create publish rename delete track
     elif (( CURRENT == 3 )); then
       # second arg: remote branch name
-      compadd `git branch -r | grep -v HEAD | sed "s/.*\///" | sed "s/ //g"`
+      remotes=`git remote | tr '\n' '|' | sed "s/\|$//g"`
+      compadd `git branch -r | grep -v HEAD | sed "s/$remotes\///" | sed "s/ //g"`
     elif (( CURRENT == 4 )); then
       # third arg: remote name
       compadd `git remote`

From dd6247057ea9b8e238aea5e16446dee089f11f3e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 23 Apr 2013 20:52:18 -0700
Subject: [PATCH 903/907] Updating the README file

---
 README.textile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.textile b/README.textile
index 0a4545bac..46e69691e 100644
--- a/README.textile
+++ b/README.textile
@@ -1,5 +1,4 @@
-A handful of functions, auto-complete helpers, and stuff that makes you shout...
-
+oh-my-zsh is an open source, community-driven framework for managing your ZSH configuration. It comes bundled with a ton of helpful functions, helpers, plugins, themes, and few things that make you shout...
 
 bq. "OH MY ZSHELL!"
 
@@ -76,9 +75,7 @@ h3. (Don't) Send us your theme! (for now)
 
 -I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.-
 
-We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there. 
-
-
+We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there.
 
 h2. Contributors
 

From 17a092b0ffa1ecf4ef9f727054a414e26f9e1edd Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Mon, 29 Apr 2013 03:19:31 -0400
Subject: [PATCH 904/907] Change sublime text path select priority on mac.

User changed symbolic link for sublime binary is now top priority,
since this allows users to actually specify which version of sublime
they want to use. Sublime text 2 binary has higher priority over
sublime text (3) binary, since sublime text 2 is considered more
stable.
---
 plugins/sublime/sublime.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index e74695de0..82faf87c9 100755
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -2,10 +2,11 @@
 
 local _sublime_darwin_paths > /dev/null 2>&1
 _sublime_darwin_paths=(
-	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"/usr/local/bin/subl"
 	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
-	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 	"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
 )
 
 if [[ $('uname') == 'Linux' ]]; then

From f28e16a15856baf92163dba8ac6eec1e02cf6c1f Mon Sep 17 00:00:00 2001
From: Lindolfo 'Lorn' Rodrigues <lorn@lornlab.org>
Date: Tue, 30 Apr 2013 01:51:09 -0300
Subject: [PATCH 905/907] Cache for fasd --init

Using cache technique for faster fasd --init as shown at:
 https://github.com/clvv/fasdi#install
---
 plugins/fasd/fasd.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
index d42584f1a..8ad43fc23 100644
--- a/plugins/fasd/fasd.plugin.zsh
+++ b/plugins/fasd/fasd.plugin.zsh
@@ -1,5 +1,10 @@
 if [ $commands[fasd] ]; then # check if fasd is installed
-  eval "$(fasd --init auto)"
+  fasd_cache="$HOME/.fasd-init-cache"
+  if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then
+    fasd --init auto >| "$fasd_cache"
+  fi
+  source "$fasd_cache"
+  unset fasd_cache
   alias v='f -e vim'
   alias o='a -e open'
 fi

From f595ed4a8c09265adcc967eded308d80900ac42f Mon Sep 17 00:00:00 2001
From: Gufran <dogabhai@gmail.com>
Date: Fri, 10 May 2013 01:21:12 +0530
Subject: [PATCH 906/907] Improved autocompletion support for Laravel artisan,
 All default artisan features are now available

---
 plugins/laravel/_artisan           | 63 +++++++++++++++++++++++-------
 plugins/laravel/laravel.plugin.zsh |  3 +-
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/plugins/laravel/_artisan b/plugins/laravel/_artisan
index 8637514cf..294777d6b 100644
--- a/plugins/laravel/_artisan
+++ b/plugins/laravel/_artisan
@@ -5,36 +5,71 @@
 #
 # This plugin does the following:
 #  - Adds aliases and autocompletion for artisan
-#  - Adds aliases and autocompletion for bob
-
-local curcontext="$curcontext" state line _opts _bundles ret=1
+# - Adds aliases and autocompletion for bob
+# _opts _bundles
+ 
+local curcontext="$curcontext" state line ret=1
 _arguments -C \
     '1: :->cmds' \
-    '*:: :->args' && ret=0
+    '2:: :->args' && ret=0
 
 case $state in
     cmds)
 
     _values "Artisan command" \
-        'session\:install[Create a session table]' \
-        'migrate[Manage Migrations]' \
-        'test[Run a test]' \
-        'route\:\:call[Call a route in the CLI]' \
-        'key\:\:generate[Generate a key]'
+        'clear-compiled[Remove the compiled class file]' \
+        'down[Put the application into maintenance mode]' \
+        'dump-autoload[Regenerate framework autoload files]' \
+        'help[Displays help for a command]' \
+        'list[Lists commands]' \
+        'migrate[Run the database migrations]' \
+        'optimize[Optimize the framework for better performance]' \
+        'routes[List all registered routes]' \
+        'serve[Serve the application on the PHP development server]' \
+        'tinker[Interact with your application]' \
+        'up[Bring the application out of maintenace mode]' \
+        'workbench[Create a new package workbench]' \
+        'asset\:publish[Publish assets of a package to the public directory]' \
+        'auth\:reminders[Create a migration for the password reminders table]' \
+        'cache\:clear[Flush the application cache]' \
+        'command\:make[Create a new Artisan command]' \
+        'config\:publish[Publish configuration of a package to the application]' \
+        'controller\:make[Create a new resourceful controller]' \
+        'db\:seed[Seed the database with records]' \
+        'key\:generate[Set the application key]' \
+        'migrate\:install[Create the migration repository]' \
+        'migrate\:make[Create a new migration file]' \
+        'migrate\:refresh[Reset and re-run all migrations]' \
+        'migrate\:reset[Rollback all database migrations]' \
+        'migrate\:rollback[Rollback the last database migration]' \
+        'queue\:listen[Listen to a given queue]' \
+        'queue\:subscribe[Subscribe a URL to an Iron.io push queue]' \
+        'queue\:work[Process the next job on a queue]' \
+        'session\:table[Create a migration for the session database table]'
         ret=0
         ;;
+
     args)
         case $line[1] in
             migrate)
                 _values \
-                    'install[Create the Laravel migration table' \
-                    'make[Create a migration]' \
-                    'rollback[Roll back to the last migration operation]' \
-                    'reset[Roll back all migrations that have ever run]'
+                    'install    [Create the Laravel migration table' \
+                    'make       [Create a migration]' \
+                    'rollback   [Roll back to the last migration operation]' \
+                    'reset      [Roll back all migrations that have ever run]' \
+                    'refresh    [Reset and re-run all migrations]'
+                ret=0
+                ;;
+
+            queue)
+                _values \
+                    'listen     [Listen to a given queue]' \
+                    'subscribe  [Subscribe a URL to an Iron.io push queue]' \
+                    'work       [Process the next job on the queue]'
                 ret=0
                 ;;
         esac
         ;;
 esac
-
+;;
 return ret
diff --git a/plugins/laravel/laravel.plugin.zsh b/plugins/laravel/laravel.plugin.zsh
index ed932ee89..98d7b032d 100644
--- a/plugins/laravel/laravel.plugin.zsh
+++ b/plugins/laravel/laravel.plugin.zsh
@@ -1,3 +1,2 @@
 #!zsh
-alias artisan='php artisan'
-alias bob='php artisan bob::build'
+alias artisan='php artisan'
\ No newline at end of file

From b62c406f0bc2a7b5178f99c7d5639cea09dc9af7 Mon Sep 17 00:00:00 2001
From: Gufran <dogabhai@gmail.com>
Date: Sun, 2 Jun 2013 00:43:47 +0530
Subject: [PATCH 907/907] Fixed formatting of laravel artisan autocompletion

---
 plugins/laravel/_artisan | 84 ++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/plugins/laravel/_artisan b/plugins/laravel/_artisan
index 294777d6b..133fcb4cc 100644
--- a/plugins/laravel/_artisan
+++ b/plugins/laravel/_artisan
@@ -1,75 +1,77 @@
 #compdef artisan
-
-# Laravel autocompletion
-# Author: John Hamelink <john@johnhamelink.com>
+# Laravel Artisan autocompletion
+# Author: Mohammad Gufran<gufran@websterfolks.com>
 #
 # This plugin does the following:
 #  - Adds aliases and autocompletion for artisan
-# - Adds aliases and autocompletion for bob
-# _opts _bundles
- 
-local curcontext="$curcontext" state line ret=1
+local curcontext="$curcontext" state line _opts _bundles ret=1
 _arguments -C \
     '1: :->cmds' \
-    '2:: :->args' && ret=0
-
-case $state in
+    '*:: :->args' && ret=0
+case $state in 
     cmds)
-
     _values "Artisan command" \
-        'clear-compiled[Remove the compiled class file]' \
-        'down[Put the application into maintenance mode]' \
-        'dump-autoload[Regenerate framework autoload files]' \
-        'help[Displays help for a command]' \
-        'list[Lists commands]' \
-        'migrate[Run the database migrations]' \
-        'optimize[Optimize the framework for better performance]' \
-        'routes[List all registered routes]' \
-        'serve[Serve the application on the PHP development server]' \
-        'tinker[Interact with your application]' \
-        'up[Bring the application out of maintenace mode]' \
-        'workbench[Create a new package workbench]' \
+        '--ansi[Force ANSI output.]' \
+        '--env[The environment the command should run under.]' \
+        '--help[Display this help message.]' \
+        '--no-ansi[Disable ANSI output.]' \
+        '--no-interaction[Do not ask any interactive question.]' \
+        '--quiet[Do not output any message.]' \
+        '--verbose[Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug]' \
+        '--version[Display this application version.]' \
         'asset\:publish[Publish assets of a package to the public directory]' \
         'auth\:reminders[Create a migration for the password reminders table]' \
         'cache\:clear[Flush the application cache]' \
+        'clear-compiled[Remove the compiled class file]' \
         'command\:make[Create a new Artisan command]' \
         'config\:publish[Publish configuration of a package to the application]' \
         'controller\:make[Create a new resourceful controller]' \
         'db\:seed[Seed the database with records]' \
+        'down[Put the application into maintenance mode]' \
+        'dump-autoload[Regenerate framework autoload files]' \
+        'help[Displays help for a command]' \
         'key\:generate[Set the application key]' \
+        'list[Lists commands]' \
+        'migrate[Run the database migrations]' \
         'migrate\:install[Create the migration repository]' \
         'migrate\:make[Create a new migration file]' \
         'migrate\:refresh[Reset and re-run all migrations]' \
         'migrate\:reset[Rollback all database migrations]' \
         'migrate\:rollback[Rollback the last database migration]' \
+        'optimize[Optimize the framework for better performance]' \
         'queue\:listen[Listen to a given queue]' \
         'queue\:subscribe[Subscribe a URL to an Iron.io push queue]' \
         'queue\:work[Process the next job on a queue]' \
-        'session\:table[Create a migration for the session database table]'
-        ret=0
-        ;;
+        'routes[List all registered routes]' \
+        'serve[Serve the application on the PHP development server]' \
+        'session\:table[Create a migration for the session database table]' \
+        'tinker[Interact with your application]' \
+        'up[Bring the application out of maintenace mode]' \
+        'workbench[Create a new package workbench]' \
 
+        ret=0 
+        ;;
     args)
-        case $line[1] in
-            migrate)
+        case $line[1] in 
+        migrate)
                 _values \
-                    'install    [Create the Laravel migration table' \
-                    'make       [Create a migration]' \
-                    'rollback   [Roll back to the last migration operation]' \
-                    'reset      [Roll back all migrations that have ever run]' \
-                    'refresh    [Reset and re-run all migrations]'
-                ret=0
+                    'install[Create the Laravel migration table]' \
+                    'make[Create a migration]' \
+                    'rollback[Roll back to the last migration operation]' \
+                    'reset[Roll back all migrations that have ever run]' \
+                    'refresh[Reset and re-run all migrations]'
+                ret=0 
                 ;;
 
             queue)
                 _values \
-                    'listen     [Listen to a given queue]' \
-                    'subscribe  [Subscribe a URL to an Iron.io push queue]' \
-                    'work       [Process the next job on the queue]'
-                ret=0
+                    'listen[Listen to a given queue]' \
+                    'subscribe[Subscribe a URL to an Iron.io push queue]' \
+                    'work[Process the next job on the queue]'
+
+                ret=0 
                 ;;
-        esac
+        esac 
         ;;
-esac
-;;
+esac 
 return ret