993e05da50543b9c2dcc5e4fedb93afd1c8b020c

Author
Pat Regan <thehead@patshead.com>
Committer
Pat Regan <thehead@patshead.com>
Date

Message

Replace redundant calls to compinit with a single call.

Diff

  1diff --git a/lib/completion.zsh b/lib/completion.zsh
  2index e8e9776a5b9f7e70e51bc8421d8080c9d637d793..3c5a41e142f473bf1664e7f14fce8b0a2bc3e3d3 100644
  3--- a/lib/completion.zsh
  4+++ b/lib/completion.zsh
  5@@ -9,9 +9,6 @@ setopt always_to_end
  6 
  7 WORDCHARS=''
  8 
  9-autoload -U compinit
 10-compinit -i
 11-
 12 zmodload -i zsh/complist
 13 
 14 ## case-insensitive (all),partial-word and then substring completion
 15diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
 16index 7196a88ffe3de7e8b1f4e8327ed58f050f8898b8..c7ad907d782d61c51f6e62bd03dbf960712285df 100644
 17--- a/lib/key-bindings.zsh
 18+++ b/lib/key-bindings.zsh
 19@@ -1,6 +1,4 @@
 20 # TODO: Explain what some of this does..
 21-autoload -U compinit
 22-compinit -i
 23 
 24 bindkey -e
 25 bindkey '\ew' kill-region
 26diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 27index 291772dfe0b8bc5345717ef2b185eb7b52fa3194..805e92428f9d60aec8a33c1ad29221dabd800ec8 100644
 28--- a/oh-my-zsh.sh
 29+++ b/oh-my-zsh.sh
 30@@ -17,6 +17,10 @@ for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 31 # Load the theme
 32 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 33 
 34+# Load and run compinit
 35+autoload -U compinit
 36+compinit -i
 37+
 38 # Check for updates on initial load...
 39 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 40 then
 41diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
 42index 353a18942ac594122f5bfc634fcef3f834d1c665..079c0fba01ed7c52105382a10bd97a38d0bea121 100644
 43--- a/plugins/brew/brew.plugin.zsh
 44+++ b/plugins/brew/brew.plugin.zsh
 45@@ -1,4 +1,2 @@
 46 # add brew completion function to path
 47 fpath=($ZSH/plugins/brew $fpath)
 48-autoload -U compinit
 49-compinit -i
 50diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
 51index af52d3e8b2567a2a61f9f41cae8f3b15e0d4b933..8425b5ad88ab24b7cdcc293cb076e8a5d4f553a4 100644
 52--- a/plugins/cpanm/cpanm.plugin.zsh
 53+++ b/plugins/cpanm/cpanm.plugin.zsh
 54@@ -1,4 +1,2 @@
 55 # add cpanm completion function to path
 56 fpath=($ZSH/plugins/cpanm $fpath)
 57-autoload -U compinit
 58-compinit -i
 59diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
 60index d4e5c6584a8289c6d4097cd2090fb71a48ef69c6..cdfad7ad672b02ff92c86cca70e49c500c5872f7 100644
 61--- a/plugins/gem/gem.plugin.zsh
 62+++ b/plugins/gem/gem.plugin.zsh
 63@@ -1,4 +1,2 @@
 64 # add gem completion function to path
 65 fpath=($ZSH/plugins/gem $fpath)
 66-autoload -U compinit
 67-compinit -i
 68diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
 69index c23504b85b464b411c14abcbe9301e9348ebf5f6..0858783ccc5ae896311d494cf518965c6437f059 100644
 70--- a/plugins/github/github.plugin.zsh
 71+++ b/plugins/github/github.plugin.zsh
 72@@ -1,4 +1,2 @@
 73 # add github completion function to path
 74 fpath=($ZSH/plugins/github $fpath)
 75-autoload -U compinit
 76-compinit -i
 77diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
 78index cbbc4926596480a1567ae5b36e812412c3c901d3..492a665b548b5ed0fb22142d34a89f6a45fe1b3f 100644
 79--- a/plugins/macports/macports.plugin.zsh
 80+++ b/plugins/macports/macports.plugin.zsh
 81@@ -8,5 +8,3 @@ alias pup="psu && puo"
 82 
 83 # add macports completion function to path
 84 fpath=($ZSH/plugins/macports $fpath)
 85-autoload -U compinit
 86-compinit -i
 87diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
 88index bf9f2396885713e6eb409342090be6c9790e3171..740f962077e8ce37775c9de4e2aaf654c552aaf7 100644
 89--- a/plugins/pip/pip.plugin.zsh
 90+++ b/plugins/pip/pip.plugin.zsh
 91@@ -1,4 +1,2 @@
 92 # add brew completion function to path
 93 fpath=($ZSH/plugins/pip $fpath)
 94-autoload -U compinit
 95-compinit -i
 96diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
 97index 5e9bcf10a4ed23a24bdd4040f6501f3b43562caf..98d2d705c48fa26ffdca16a9ec3717f84ec98556 100644
 98--- a/plugins/vagrant/vagrant.plugin.zsh
 99+++ b/plugins/vagrant/vagrant.plugin.zsh
100@@ -1,3 +1 @@
101 fpath=($ZSH/plugins/vagrant $fpath)
102-autoload -U compinit
103-compinit -i