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: Replace redundant calls to compinit with a single call.

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

(limited to 'oh-my-zsh.sh')

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
-- 
cgit v1.2.3-70-g09d2


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: 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(-)

(limited to 'oh-my-zsh.sh')

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" ]
-- 
cgit v1.2.3-70-g09d2


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: Removed commented out code.

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

(limited to 'oh-my-zsh.sh')

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
-- 
cgit v1.2.3-70-g09d2


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: 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(-)

(limited to 'oh-my-zsh.sh')

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"
 
-- 
cgit v1.2.3-70-g09d2


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: 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

(limited to 'oh-my-zsh.sh')

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)
-- 
cgit v1.2.3-70-g09d2


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: 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(-)

(limited to 'oh-my-zsh.sh')

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
-- 
cgit v1.2.3-70-g09d2


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: Minor reformatting

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

(limited to 'oh-my-zsh.sh')

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
-- 
cgit v1.2.3-70-g09d2


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: Move sourcing of custom to below plugins

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

(limited to 'oh-my-zsh.sh')

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"
 
-- 
cgit v1.2.3-70-g09d2