diff options
| author | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-06-30 21:00:53 -0700 |
| commit | 4131a59d1a57d53bf711115317116a6c57483636 (patch) | |
| tree | c3b2a746fdc18708b4c18b33c4475f20bf9d4e61 /oh-my-zsh.sh | |
| parent | 3913106b2e7127d396f27b652df812340ec0c871 (diff) | |
| parent | 08632bb1780d51f6748b5c09ef5232862313f78f (diff) | |
| download | zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.gz zsh-4131a59d1a57d53bf711115317116a6c57483636.tar.bz2 zsh-4131a59d1a57d53bf711115317116a6c57483636.zip | |
Merge pull request #2827 from ncanceill/easymerge
...you folks are amazing. :-)
"Easy-to-merge"
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 3c0f4f8f5..c217b91bb 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -46,7 +46,9 @@ else fi # Save the location of the current completion dump file. -ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}" +if [ -z "$ZSH_COMPDUMP" ]; then + ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}" +fi # Load and run compinit autoload -U compinit |