Shell integration: Dont override fish's native title setting functionality

See discussion: https://github.com/fish-shell/fish-shell/issues/8641
This commit is contained in:
Kovid Goyal 2022-01-16 15:58:11 +05:30
parent cf91e1973b
commit 71106bcd39
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 7 additions and 23 deletions

View File

@ -95,11 +95,11 @@ Detailed list of changes
rather than a plane. This means the first and last window are considered
neighbors (:iss:`4494`)
- Shell integration: Fix cursor shape not working with fish's vi mode
- Shell integration: fish: Fix cursor shape not working with fish's vi mode
(:iss:`4508`)
- Shell integration: fish: Only override fish_title if it has not been set by
the user (:iss:`4452`)
- Shell integration: fish: Dont override fish's native title setting functionality.
See `discussion https://github.com/fish-shell/fish-shell/issues/8641`__.
- macOS: Fix hiding via :kbd:`cmd+h` not working on macOS 10.15.7 (:iss:`4472`)

View File

@ -26,7 +26,7 @@ Features
to view it in a pager
* The current working directory or the command being executed are automatically
displayed in the kitty window titlebar/tab title.
displayed in the kitty window titlebar/tab title
* The text cursor is changed to a bar when editing commands at the shell prompt
@ -58,7 +58,9 @@ no-cursor
Turn off changing of the text cursor to a bar when editing text
no-title
Turn off setting the kitty window/tab title based on shell state
Turn off setting the kitty window/tab title based on shell state.
Note that for the ``fish`` shell kitty relies on fish's native title
setting functionality instead.
no-prompt-mark
Turn off marking of prompts. This disables jumping to prompt, browsing

View File

@ -76,24 +76,6 @@ function _ksi_main
functions --erase _ksi_set_vi_cursor
end
if not contains "no-title" $_ksi
function _ksi_function_is_not_overridden -d "Check if the specified function is not overridden"
functions --details $argv[1] | string match -q -- "$__fish_data_dir/functions/*"
end
if _ksi_function_is_not_overridden fish_title
function fish_title
if set -q argv[1]
echo $argv[1]
else
prompt_pwd
end
end
end
functions --erase _ksi_function_is_not_overridden
end
if not contains "no-prompt-mark" $_ksi
and not functions -q _ksi_mark
set --global _ksi_prompt_state "first-run"