Fixes #26348: Merged fix from 3.5.

This commit is contained in:
Vinay Sajip 2016-02-13 16:27:25 +00:00
commit 6f79c2c826
1 changed files with 2 additions and 2 deletions

View File

@ -55,8 +55,8 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
# with the original prompt function renamed, we can override with our own.
function fish_prompt
# Prompt override?
if test -n "__VENV_PROMPT__"
printf "%s%s%s" "__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
if test -n "$__VENV_PROMPT__"
printf "%s%s%s" "$__VENV_PROMPT__" (set_color normal) (_old_fish_prompt)
return
end
# ...Otherwise, prepend env