From 5f080fcfc990ad6673f15c0382c7d6468c1b083e Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Tue, 1 Sep 2015 11:50:50 +0200 Subject: [PATCH] Load fish_user_key_bindings for any binding (including vi) fish_user_key_bindings is the user's, and they should know if they want vi-ish bindings or emacs-ish (or nano-ish). If they want to define multiple, they can also do that (e.g. via checking what $fish_key_bindings is set to). Fixes #2254 CC @kballard --- share/functions/__fish_config_interactive.fish | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index e9e2d9122..48161d911 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -169,13 +169,13 @@ function __fish_config_interactive -d "Initializations that should be performed set -g fish_bind_mode default if test "$fish_key_bindings" = fish_default_key_bindings fish_default_key_bindings - # Load user key bindings if they are defined - if functions --query fish_user_key_bindings > /dev/null - fish_user_key_bindings - end else eval $fish_key_bindings ^/dev/null end + # Load user key bindings if they are defined + if functions --query fish_user_key_bindings > /dev/null + fish_user_key_bindings + end end # Load key bindings. Redirect stderr per #1155