From b94afbba13079e7ec78cf9fd42a9bfb44c8de194 Mon Sep 17 00:00:00 2001 From: pagedown Date: Mon, 18 Apr 2022 14:51:15 +0800 Subject: [PATCH] ... --- docs/shell-integration.rst | 5 ++--- .../fish/vendor_conf.d/kitty-shell-integration.fish | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/shell-integration.rst b/docs/shell-integration.rst index 545e10f2e..146ed3891 100644 --- a/docs/shell-integration.rst +++ b/docs/shell-integration.rst @@ -240,9 +240,8 @@ The :file:`clone-in-kitty` command takes almost all the same arguments as the window, etc. Arguments of launch that can cause code execution or that don't make sense when cloning are ignored. Most prominently, the following options are ignored: :option:`launch --allow-remote-control`, :option:`launch ---copy-cmdline`, :option:`launch --copy-env`, :option:`launch ---allow-remote-control`, :option:`launch --stdin-source`, :option:`launch ---marker` and :option:`launch --watcher`. +--copy-cmdline`, :option:`launch --copy-env`, :option:`launch --stdin-source`, +:option:`launch --marker` and :option:`launch --watcher`. :file:`clone-in-kitty` can be configured to source arbitrary code in the cloned window using environment variables. It will automatically clone virtual diff --git a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish index 7ae7ec0dc..ae321f6bc 100644 --- a/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish +++ b/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish @@ -122,7 +122,7 @@ function __ksi_schedule --on-event fish_prompt -d "Setup kitty integration after if _ksi_s_is_ok "venv" and test -n "$VIRTUAL_ENV" -a -r "$venv" set _ksi_sourced "y" - set -e VIRTUAL_ENV _OLD_FISH_PROMPT_OVERRIDE # activate.fish stupidly exports _OLD_FISH_PROMPT_OVERRIDE + set --erase VIRTUAL_ENV _OLD_FISH_PROMPT_OVERRIDE # activate.fish stupidly exports _OLD_FISH_PROMPT_OVERRIDE source "$venv" end if _ksi_s_is_ok "conda"