dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 06:58:01 +00:00
Code Issues Releases Wiki Activity

Merge upstream/master

Browse Source
This commit is contained in:
Daniel Carrillo 2021-07-01 14:30:56 +02:00
commit 98f6306d1e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/python/init.zsh
View File

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

2
modules/utility/functions/diff
View File

@ -9,7 +9,7 @@
if zstyle -t ':prezto:module:utility:diff' color \
&& (( $+commands[colordiff] )); then
command colordiff "$@"
command diff "$@" | colordiff
else
command diff "$@"
fi