From 9cac8cad638e3737714ebde07659e9f32cbb491d Mon Sep 17 00:00:00 2001
From: "github.token" <dcassler@gmail.com>
Date: Fri, 9 Mar 2012 10:12:58 -0500
Subject: [PATCH 1/8] Updated README.txt to reflect fork

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

diff --git a/README.textile b/README.textile
index bf6776665..063917da3 100644
--- a/README.textile
+++ b/README.textile
@@ -12,11 +12,11 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/zyce/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@
+@wget --no-check-certificate https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 

From e854b58eb8fc2d992ff95a9a4a08f9d74ab68488 Mon Sep 17 00:00:00 2001
From: "github.token" <dcassler@gmail.com>
Date: Fri, 9 Mar 2012 15:20:48 -0500
Subject: [PATCH 2/8] Checks zsh version for url-quote-magic before loading,
 makes compatible with old versions of zsh

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

diff --git a/lib/misc.zsh b/lib/misc.zsh
index 88732e664..8ef1f3f9f 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,6 +1,7 @@
 ## smart urls
-autoload -U url-quote-magic
-zle -N self-insert url-quote-magic
+if [ -f "/usr/share/zsh/functions/Zle/url-quote-magic" ] ; then
+    autoload -U url-quote-magic && zle -N self-insert url-quote-magic
+fi
 
 ## file rename magick
 bindkey "^[m" copy-prev-shell-word

From c9afbeabfe0b8d683411b13f787a0a909bbffa25 Mon Sep 17 00:00:00 2001
From: "github.token" <dcassler@gmail.com>
Date: Fri, 9 Mar 2012 15:29:10 -0500
Subject: [PATCH 3/8] Fix for add-zsh-hook function definition file not found

---
 lib/termsupport.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 221989502..777d8a64b 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,6 +28,10 @@ function omz_termsupport_preexec {
   title "$CMD" "%100>...>$2%<<"
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd  omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+#autoload -U add-zsh-hook
+#add-zsh-hook precmd  omz_termsupport_precmd
+#add-zsh-hook preexec omz_termsupport_preexec
+## Fix for zsh hook compatibility issues 
+if [ -f "/usr/share/zsh/functions/Zle/add-zsh-hook" ] ; then
+    autoload -U add-zsh-hook && add-zsh-hook precmd omz_termsupport_precmd && add-zsh-hook preexec omz_termsupport_preexec
+fi

From 16d0705d9438a6678bc087afd7fad0406f22a36a Mon Sep 17 00:00:00 2001
From: "github.token" <dcassler@gmail.com>
Date: Fri, 9 Mar 2012 15:40:05 -0500
Subject: [PATCH 4/8] Restored README.textfile to match bobbyrussel prior to
 pull request.

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

diff --git a/README.textile b/README.textile
index 063917da3..2ff9c452b 100644
--- a/README.textile
+++ b/README.textile
@@ -16,7 +16,7 @@ h4. via `curl`
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/bobbyrussel/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 

From 0c25eaeb4e8f569b5f666122a2a40e39a7eb316f Mon Sep 17 00:00:00 2001
From: Daniel Cassler <dcassler@gmail.com>
Date: Fri, 9 Mar 2012 22:38:34 -0500
Subject: [PATCH 5/8] fixed readme again

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

diff --git a/README.textile b/README.textile
index 2ff9c452b..f53da1cac 100644
--- a/README.textile
+++ b/README.textile
@@ -12,11 +12,11 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/bobbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/bobbyrussel/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/bobbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 

From fd6849479e718ea89299dd72952c482d509c46df Mon Sep 17 00:00:00 2001
From: Darin Cassler <darin@Maevoc.(none)>
Date: Thu, 15 Mar 2012 10:57:38 -0400
Subject: [PATCH 6/8] added zshconfig and ohmyzsh alias, changed default
 template to juanghurtado, changed readme to point to zyce's fork

---
 templates/zshrc.zsh-template  |  6 +++---
 templates/zshrc.zsh-template~ | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 templates/zshrc.zsh-template~

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..fe20ba51a 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -5,11 +5,11 @@ ZSH=$HOME/.oh-my-zsh
 # 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.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="juanghurtado"
 
 # Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
+alias zshconfig="nano ~/.zshrc"
+alias ohmyzsh="nano ~/.oh-my-zsh"
 
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
diff --git a/templates/zshrc.zsh-template~ b/templates/zshrc.zsh-template~
new file mode 100644
index 000000000..e52553241
--- /dev/null
+++ b/templates/zshrc.zsh-template~
@@ -0,0 +1,36 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# 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.
+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"
+
+# Comment this out to disable weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# 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/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# Customize to your needs...

From 3f40931c91d5b769831588c47e633b3b75419399 Mon Sep 17 00:00:00 2001
From: Darin Cassler <darin@Maevoc.(none)>
Date: Thu, 15 Mar 2012 11:00:07 -0400
Subject: [PATCH 7/8] added gEdit temp files to .gitignore

---
 .gitignore     | 1 +
 README.textile | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e8db7341..50396bda5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ custom/*
 !custom/example.zsh
 cache
 *.swp
+*~
diff --git a/README.textile b/README.textile
index f53da1cac..276267e98 100644
--- a/README.textile
+++ b/README.textile
@@ -12,18 +12,18 @@ You can install this via the command line with either `curl` or `wget`.
 
 h4. via `curl`
 
-@curl -L https://github.com/bobbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
+@curl -L https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh | sh@
 
 h4. via `wget`
 
-@wget --no-check-certificate https://github.com/bobbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
+@wget --no-check-certificate https://github.com/zyce/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
 
 h3. The manual way
 
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/zyce/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. Create a new zsh config by copying the zsh template we've provided.
 

From e586a4a8abc7341226b6c5c127f734926035bf52 Mon Sep 17 00:00:00 2001
From: Daniel Cassler <laughablename@gmail.com>
Date: Thu, 15 Mar 2012 11:14:40 -0400
Subject: [PATCH 8/8] Cleaned up /templates

---
 templates/zshrc.zsh-template~ | 36 -----------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 templates/zshrc.zsh-template~

diff --git a/templates/zshrc.zsh-template~ b/templates/zshrc.zsh-template~
deleted file mode 100644
index e52553241..000000000
--- a/templates/zshrc.zsh-template~
+++ /dev/null
@@ -1,36 +0,0 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
-
-# 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.
-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"
-
-# Comment this out to disable weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment following line if you want to disable colors in ls
-# DISABLE_LS_COLORS="true"
-
-# 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/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
-
-source $ZSH/oh-my-zsh.sh
-
-# Customize to your needs...