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 1/6] 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 3ea34d71..8be3cd86 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 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 2/6] 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 00000000..e0f6e052
--- /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 3/6] 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 e0f6e052..c42c68df 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 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 4/6] 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 e2cf96ca..4d5bfb8d 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 5/6] 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 732a403b..e360344b 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 6/6] 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 e360344b..c2b6049c 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
-