From 5acbd32c2ee6a5b2f75c3a04b402368b035280f3 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Thu, 21 Dec 2017 16:17:21 +0100 Subject: [PATCH] Fix "Unknown argument -s" error in fish_vi_key_bindings This was caused by it prepending "-s" to argv always, and later checking $argv[1]. As it turns out, that is kinda superfluous, so we can just add "-s" to the `bind` calls. Also adjust the tests so the vi-bindings are enabled via the function, which would have caught this. Fixes #4494. --- share/functions/fish_vi_key_bindings.fish | 294 +++++++++++----------- tests/bind.expect | 2 +- 2 files changed, 146 insertions(+), 150 deletions(-) diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish index 5033b23c9..4e0335339 100644 --- a/share/functions/fish_vi_key_bindings.fish +++ b/share/functions/fish_vi_key_bindings.fish @@ -17,11 +17,6 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish' bind --erase --all # clear earlier bindings, if any end - # Silence warnings about unavailable keys. See #4431, 4188 - if not contains -- -s $argv - set argv "-s" $argv - end - # Allow just calling this function to correctly set the bindings. # Because it's a rather discoverable name, users will execute it # and without this would then have subtly broken bindings. @@ -61,206 +56,207 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish' __fish_shared_key_bindings -M $mode end - bind -M insert \r execute - bind -M insert \n execute + # "-s" to silence warnings about unavailable keys. See #4431, 4188 + bind -s -M insert \r execute + bind -s -M insert \n execute - bind -M insert "" self-insert + bind -s -M insert "" self-insert # Add way to kill current command line while in insert mode. - bind -M insert \cc __fish_cancel_commandline + bind -s -M insert \cc __fish_cancel_commandline # Add a way to switch from insert to normal (command) mode. # Note if we are paging, we want to stay in insert mode # See #2871 - bind -M insert \e "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char force-repaint; end" + bind -s -M insert \e "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char force-repaint; end" # Default (command) mode - bind :q exit - bind -m insert \cc __fish_cancel_commandline - bind -M default h backward-char - bind -M default l forward-char - bind -m insert \n execute - bind -m insert \r execute - bind -m insert i force-repaint - bind -m insert I beginning-of-line force-repaint - bind -m insert a forward-char force-repaint - bind -m insert A end-of-line force-repaint - bind -m visual v begin-selection force-repaint + bind -s :q exit + bind -s -m insert \cc __fish_cancel_commandline + bind -s -M default h backward-char + bind -s -M default l forward-char + bind -s -m insert \n execute + bind -s -m insert \r execute + bind -s -m insert i force-repaint + bind -s -m insert I beginning-of-line force-repaint + bind -s -m insert a forward-char force-repaint + bind -s -m insert A end-of-line force-repaint + bind -s -m visual v begin-selection force-repaint - #bind -m insert o "commandline -a \n" down-line force-repaint - #bind -m insert O beginning-of-line "commandline -i \n" up-line force-repaint # doesn't work + #bind -s -m insert o "commandline -a \n" down-line force-repaint + #bind -s -m insert O beginning-of-line "commandline -i \n" up-line force-repaint # doesn't work - bind gg beginning-of-buffer - bind G end-of-buffer + bind -s gg beginning-of-buffer + bind -s G end-of-buffer for key in $eol_keys - bind $key end-of-line + bind -s $key end-of-line end for key in $bol_keys - bind $key beginning-of-line + bind -s $key beginning-of-line end - bind u history-search-backward - bind \cr history-search-forward + bind -s u history-search-backward + bind -s \cr history-search-forward - bind [ history-token-search-backward - bind ] history-token-search-forward + bind -s [ history-token-search-backward + bind -s ] history-token-search-forward - bind k up-or-search - bind j down-or-search - bind b backward-word - bind B backward-bigword - bind ge backward-word - bind gE backward-bigword - bind w forward-word forward-char - bind W forward-bigword forward-char - bind e forward-char forward-word backward-char - bind E forward-bigword backward-char + bind -s k up-or-search + bind -s j down-or-search + bind -s b backward-word + bind -s B backward-bigword + bind -s ge backward-word + bind -s gE backward-bigword + bind -s w forward-word forward-char + bind -s W forward-bigword forward-char + bind -s e forward-char forward-word backward-char + bind -s E forward-bigword backward-char # OS X SnowLeopard doesn't have these keys. Don't show an annoying error message. # Vi/Vim doesn't support these keys in insert mode but that seems silly so we do so anyway. - bind -M insert -k home beginning-of-line 2>/dev/null - bind -M default -k home beginning-of-line 2>/dev/null - bind -M insert -k end end-of-line 2>/dev/null - bind -M default -k end end-of-line 2>/dev/null + bind -s -M insert -k home beginning-of-line 2>/dev/null + bind -s -M default -k home beginning-of-line 2>/dev/null + bind -s -M insert -k end end-of-line 2>/dev/null + bind -s -M default -k end end-of-line 2>/dev/null # Vi moves the cursor back if, after deleting, it is at EOL. # To emulate that, move forward, then backward, which will be a NOP # if there is something to move forward to. - bind -M default x delete-char forward-char backward-char - bind -M default X backward-delete-char - bind -M insert -k dc delete-char forward-char backward-char - bind -M default -k dc delete-char forward-char backward-char + bind -s -M default x delete-char forward-char backward-char + bind -s -M default X backward-delete-char + bind -s -M insert -k dc delete-char forward-char backward-char + bind -s -M default -k dc delete-char forward-char backward-char # Backspace deletes a char in insert mode, but not in normal/default mode. - bind -M insert -k backspace backward-delete-char - bind -M default -k backspace backward-char - bind -M insert \ch backward-delete-char - bind -M default \ch backward-char - bind -M insert \x7f backward-delete-char - bind -M default \x7f backward-char - bind -M insert \e\[3\;2~ backward-delete-char # Mavericks Terminal.app shift-ctrl-delete - bind -M default \e\[3\;2~ backward-delete-char # Mavericks Terminal.app shift-ctrl-delete + bind -s -M insert -k backspace backward-delete-char + bind -s -M default -k backspace backward-char + bind -s -M insert \ch backward-delete-char + bind -s -M default \ch backward-char + bind -s -M insert \x7f backward-delete-char + bind -s -M default \x7f backward-char + bind -s -M insert \e\[3\;2~ backward-delete-char # Mavericks Terminal.app shift-ctrl-delete + bind -s -M default \e\[3\;2~ backward-delete-char # Mavericks Terminal.app shift-ctrl-delete - bind dd kill-whole-line - bind D kill-line - bind d\$ kill-line - bind d\^ backward-kill-line - bind dw kill-word - bind dW kill-bigword - bind diw forward-char forward-char backward-word kill-word - bind diW forward-char forward-char backward-bigword kill-bigword - bind daw forward-char forward-char backward-word kill-word - bind daW forward-char forward-char backward-bigword kill-bigword - bind de kill-word - bind dE kill-bigword - bind db backward-kill-word - bind dB backward-kill-bigword - bind dge backward-kill-word - bind dgE backward-kill-bigword + bind -s dd kill-whole-line + bind -s D kill-line + bind -s d\$ kill-line + bind -s d\^ backward-kill-line + bind -s dw kill-word + bind -s dW kill-bigword + bind -s diw forward-char forward-char backward-word kill-word + bind -s diW forward-char forward-char backward-bigword kill-bigword + bind -s daw forward-char forward-char backward-word kill-word + bind -s daW forward-char forward-char backward-bigword kill-bigword + bind -s de kill-word + bind -s dE kill-bigword + bind -s db backward-kill-word + bind -s dB backward-kill-bigword + bind -s dge backward-kill-word + bind -s dgE backward-kill-bigword - bind -m insert s delete-char force-repaint - bind -m insert S kill-whole-line force-repaint - bind -m insert cc kill-whole-line force-repaint - bind -m insert C kill-line force-repaint - bind -m insert c\$ kill-line force-repaint - bind -m insert c\^ backward-kill-line force-repaint - bind -m insert cw kill-word force-repaint - bind -m insert cW kill-bigword force-repaint - bind -m insert ciw forward-char forward-char backward-word kill-word force-repaint - bind -m insert ciW forward-char forward-char backward-bigword kill-bigword force-repaint - bind -m insert caw forward-char forward-char backward-word kill-word force-repaint - bind -m insert caW forward-char forward-char backward-bigword kill-bigword force-repaint - bind -m insert ce kill-word force-repaint - bind -m insert cE kill-bigword force-repaint - bind -m insert cb backward-kill-word force-repaint - bind -m insert cB backward-kill-bigword force-repaint - bind -m insert cge backward-kill-word force-repaint - bind -m insert cgE backward-kill-bigword force-repaint + bind -s -m insert s delete-char force-repaint + bind -s -m insert S kill-whole-line force-repaint + bind -s -m insert cc kill-whole-line force-repaint + bind -s -m insert C kill-line force-repaint + bind -s -m insert c\$ kill-line force-repaint + bind -s -m insert c\^ backward-kill-line force-repaint + bind -s -m insert cw kill-word force-repaint + bind -s -m insert cW kill-bigword force-repaint + bind -s -m insert ciw forward-char forward-char backward-word kill-word force-repaint + bind -s -m insert ciW forward-char forward-char backward-bigword kill-bigword force-repaint + bind -s -m insert caw forward-char forward-char backward-word kill-word force-repaint + bind -s -m insert caW forward-char forward-char backward-bigword kill-bigword force-repaint + bind -s -m insert ce kill-word force-repaint + bind -s -m insert cE kill-bigword force-repaint + bind -s -m insert cb backward-kill-word force-repaint + bind -s -m insert cB backward-kill-bigword force-repaint + bind -s -m insert cge backward-kill-word force-repaint + bind -s -m insert cgE backward-kill-bigword force-repaint - bind '~' capitalize-word - bind gu downcase-word - bind gU upcase-word + bind -s '~' capitalize-word + bind -s gu downcase-word + bind -s gU upcase-word - bind J end-of-line delete-char - bind K 'man (commandline -t) ^/dev/null; or echo -n \a' + bind -s J end-of-line delete-char + bind -s K 'man (commandline -t) ^/dev/null; or echo -n \a' - bind yy kill-whole-line yank - bind Y kill-whole-line yank - bind y\$ kill-line yank - bind y\^ backward-kill-line yank - bind yw kill-word yank - bind yW kill-bigword yank - bind yiw forward-char forward-char backward-word kill-word yank - bind yiW forward-char forward-char backward-bigword kill-bigword yank - bind yaw forward-char forward-char backward-word kill-word yank - bind yaW forward-char forward-char backward-bigword kill-bigword yank - bind ye kill-word yank - bind yE kill-bigword yank - bind yb backward-kill-word yank - bind yB backward-kill-bigword yank - bind yge backward-kill-word yank - bind ygE backward-kill-bigword yank + bind -s yy kill-whole-line yank + bind -s Y kill-whole-line yank + bind -s y\$ kill-line yank + bind -s y\^ backward-kill-line yank + bind -s yw kill-word yank + bind -s yW kill-bigword yank + bind -s yiw forward-char forward-char backward-word kill-word yank + bind -s yiW forward-char forward-char backward-bigword kill-bigword yank + bind -s yaw forward-char forward-char backward-word kill-word yank + bind -s yaW forward-char forward-char backward-bigword kill-bigword yank + bind -s ye kill-word yank + bind -s yE kill-bigword yank + bind -s yb backward-kill-word yank + bind -s yB backward-kill-bigword yank + bind -s yge backward-kill-word yank + bind -s ygE backward-kill-bigword yank - bind f forward-jump - bind F backward-jump - bind t forward-jump and backward-char - bind T backward-jump and forward-char + bind -s f forward-jump + bind -s F backward-jump + bind -s t forward-jump and backward-char + bind -s T backward-jump and forward-char # in emacs yank means paste - bind p yank - bind P backward-char yank - bind gp yank-pop + bind -s p yank + bind -s P backward-char yank + bind -s gp yank-pop - bind '"*p' "commandline -i ( xsel -p; echo )[1]" - bind '"*P' backward-char "commandline -i ( xsel -p; echo )[1]" + bind -s '"*p' "commandline -i ( xsel -p; echo )[1]" + bind -s '"*P' backward-char "commandline -i ( xsel -p; echo )[1]" # # Lowercase r, enters replace_one mode # - bind -m replace_one r force-repaint - bind -M replace_one -m default '' delete-char self-insert backward-char force-repaint - bind -M replace_one -m default \e cancel force-repaint + bind -s -m replace_one r force-repaint + bind -s -M replace_one -m default '' delete-char self-insert backward-char force-repaint + bind -s -M replace_one -m default \e cancel force-repaint # # visual mode # - bind -M visual h backward-char - bind -M visual l forward-char + bind -s -M visual h backward-char + bind -s -M visual l forward-char - bind -M visual k up-line - bind -M visual j down-line + bind -s -M visual k up-line + bind -s -M visual j down-line - bind -M visual b backward-word - bind -M visual B backward-bigword - bind -M visual ge backward-word - bind -M visual gE backward-bigword - bind -M visual w forward-word - bind -M visual W forward-bigword - bind -M visual e forward-word - bind -M visual E forward-bigword - bind -M visual o swap-selection-start-stop force-repaint + bind -s -M visual b backward-word + bind -s -M visual B backward-bigword + bind -s -M visual ge backward-word + bind -s -M visual gE backward-bigword + bind -s -M visual w forward-word + bind -s -M visual W forward-bigword + bind -s -M visual e forward-word + bind -s -M visual E forward-bigword + bind -s -M visual o swap-selection-start-stop force-repaint for key in $eol_keys - bind -M visual $key end-of-line + bind -s -M visual $key end-of-line end for key in $bol_keys - bind -M visual $key beginning-of-line + bind -s -M visual $key beginning-of-line end - bind -M visual -m insert c kill-selection end-selection force-repaint - bind -M visual -m default d kill-selection end-selection force-repaint - bind -M visual -m default x kill-selection end-selection force-repaint - bind -M visual -m default X kill-whole-line end-selection force-repaint - bind -M visual -m default y kill-selection yank end-selection force-repaint - bind -M visual -m default '"*y' "commandline -s | xsel -p" end-selection force-repaint + bind -s -M visual -m insert c kill-selection end-selection force-repaint + bind -s -M visual -m default d kill-selection end-selection force-repaint + bind -s -M visual -m default x kill-selection end-selection force-repaint + bind -s -M visual -m default X kill-whole-line end-selection force-repaint + bind -s -M visual -m default y kill-selection yank end-selection force-repaint + bind -s -M visual -m default '"*y' "commandline -s | xsel -p" end-selection force-repaint - bind -M visual -m default \cc end-selection force-repaint - bind -M visual -m default \e end-selection force-repaint + bind -s -M visual -m default \cc end-selection force-repaint + bind -s -M visual -m default \e end-selection force-repaint # Make it easy to turn an unexecuted command into a comment in the shell history. Also, remove # the commenting chars so the command can be further edited then executed. - bind -M default \# __fish_toggle_comment_commandline - bind -M visual \# __fish_toggle_comment_commandline + bind -s -M default \# __fish_toggle_comment_commandline + bind -s -M visual \# __fish_toggle_comment_commandline # Set the cursor shape # After executing once, this will have defined functions listening for the variable. diff --git a/tests/bind.expect b/tests/bind.expect index 99229b2fe..28b592dbf 100644 --- a/tests/bind.expect +++ b/tests/bind.expect @@ -51,7 +51,7 @@ expect_prompt -re {\r\ndefault\r\npaste} { # Test vi key bindings. # This should leave vi mode in the insert state. -send "set -g fish_key_bindings fish_vi_key_bindings\r" +send "fish_vi_key_bindings\r" expect_prompt # These vi tests assume the fish_vi_key_bindings default escape timeout of