diff options
author | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
---|---|---|
committer | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
commit | db90589c8a02e98e657af17bb0b460b752d9ed61 (patch) | |
tree | d1354a9338bf9921ad0f66d2f5394272e1cfec77 /plugins/macports/macports.plugin.zsh | |
parent | 7066bf7c6b522af9147ebf03c00361c4c6490d42 (diff) | |
parent | 57f04b921ea1c12a0a283331778848cd4011bf21 (diff) | |
download | zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.gz zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.bz2 zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.zip |
Merge remote-tracking branch 'upstream/master' into emacs
Conflicts:
plugins/emacs/emacs.plugin.zsh
plugins/emacs/emacsclient.sh
Diffstat (limited to 'plugins/macports/macports.plugin.zsh')
-rw-r--r-- | plugins/macports/macports.plugin.zsh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh index cbbc49265..277352e32 100644 --- a/plugins/macports/macports.plugin.zsh +++ b/plugins/macports/macports.plugin.zsh @@ -6,7 +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) -autoload -U compinit -compinit -i |