diff options
| author | Brett Cannon <brett@python.org> | 2016-06-30 11:43:19 -0700 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2016-06-30 11:43:19 -0700 |
| commit | 9e901219e007aef771d614cede8c7a75ecf21e5d (patch) | |
| tree | 7a349d6dc414e55eb3c97a8880122b4324e4ffda /Lib/venv | |
| parent | 2f2f2f185a4f0ab9075e486c9b629b61b74f1c6c (diff) | |
| parent | bcb1c5628d40185991f6fd1e2e0215883a631055 (diff) | |
| download | cpython-9e901219e007aef771d614cede8c7a75ecf21e5d.tar.gz | |
Merge from 3.5 for issue #26664
Diffstat (limited to 'Lib/venv')
| -rw-r--r-- | Lib/venv/scripts/posix/activate.fish | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish index fb7f5c0db9..45391aa01c 100644 --- a/Lib/venv/scripts/posix/activate.fish +++ b/Lib/venv/scripts/posix/activate.fish @@ -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 |