mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 12:48:01 +00:00
Merge upstream/master
This commit is contained in:
commit
98f6306d1e
@ -44,7 +44,7 @@ fi
|
||||
unset local_pyenv
|
||||
|
||||
# Return if requirements are not found.
|
||||
if (( ! $#commands[(i)python[23]#] && ! $+functions[pyenv] )); then
|
||||
if (( ! $#commands[(i)python[23]#] && ! $+functions[pyenv] && ! $+commands[conda] )); then
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
if zstyle -t ':prezto:module:utility:diff' color \
|
||||
&& (( $+commands[colordiff] )); then
|
||||
command colordiff "$@"
|
||||
command diff "$@" | colordiff
|
||||
else
|
||||
command diff "$@"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user