github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 05:12:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use set --no-event in the key binding functions

Browse Source 
This is how we can use it in a backwards-compatible way. Eventually we
would remove the compatibility guff.
This commit is contained in:
Fabian Boehm 2023-01-10 18:27:15 +01:00
parent f1e19884fb
commit 24836f9652
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
share/functions/fish_default_key_bindings.fish
View File

@ -10,15 +10,24 @@ function fish_default_key_bindings -d "emacs-like key binds"
bind --erase --all --preset # clear earlier bindings, if any
if test "$fish_key_bindings" != fish_default_key_bindings
# Allow the user to set the variable universally
set -l scope
set -q fish_key_bindings
or set -g fish_key_bindings
# This triggers the handler, which calls us again and ensures the user_key_bindings
# are executed.
set fish_key_bindings fish_default_key_bindings
# unless the handler somehow doesn't exist, which would leave us without bindings.
# this happens in no-config mode.
functions -q __fish_reload_key_bindings
and return
or set scope -g
true
# We try to use `set --no-event`, but to avoid leaving the user without bindings
# if they run this with an older version we fall back on setting the variable
# with an event.
if ! set --no-event $scope fish_key_bindings fish_default_key_bindings 2>/dev/null
# This triggers the handler, which calls us again
set $scope fish_key_bindings fish_default_key_bindings
# unless the handler somehow doesn't exist, which would leave us without bindings.
# this happens in no-config mode.
functions -q __fish_reload_key_bindings
and return
else
# (we need to set the bind mode to default)
set --no-event fish_bind_mode default
end
end
end

24
share/functions/fish_vi_key_bindings.fish
View File

@ -23,16 +23,22 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
# and without this would then have subtly broken bindings.
if test "$fish_key_bindings" != fish_vi_key_bindings
and test "$rebind" = true
# Allow the user to set the variable universally.
# Allow the user to set the variable universally
set -l scope
set -q fish_key_bindings
or set -g fish_key_bindings
# This triggers the handler, which calls us again and ensures the user_key_bindings
# are executed.
set fish_key_bindings fish_vi_key_bindings
# unless the handler somehow doesn't exist, which would leave us without bindings.
# this happens in no-config mode.
functions -q __fish_reload_key_bindings
and return
or set scope -g
true
# We try to use `set --no-event`, but to avoid leaving the user without bindings
# if they run this with an older version we fall back on setting the variable
# with an event.
if ! set --no-event $scope fish_key_bindings fish_vi_key_bindings 2>/dev/null
# This triggers the handler, which calls us again
set $scope fish_key_bindings fish_vi_key_bindings
# unless the handler somehow doesn't exist, which would leave us without bindings.
# this happens in no-config mode.
functions -q __fish_reload_key_bindings
and return
end
end
set -l init_mode insert