aboutsummaryrefslogtreecommitdiffhomepage
path: root/share/functions/__fish_config_interactive.fish
diff options
context:
space:
mode:
authorGravatar Kevin Ballard <kevin@sb.org>2014-10-02 12:14:22 -0700
committerGravatar Kevin Ballard <kevin@sb.org>2014-10-02 12:14:22 -0700
commit4ba95ad1c307fe484d490e7ba5c2ece19c3ae90d (patch)
tree99e94f3d0932eac7336bf600d2b7a5ad9d0a03ac /share/functions/__fish_config_interactive.fish
parentbae2b2cc477cbde5442644a4313140be8f1007a6 (diff)
Minor tweaks to initial keybinding load
Remove comment that AFAICT is not true anymore. Ensure someone setting __fish_active_key_bindings as a universal variable doesn't screw up the initial keybinding load.
Diffstat (limited to 'share/functions/__fish_config_interactive.fish')
-rw-r--r--share/functions/__fish_config_interactive.fish4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index f98a9e6f..1a9aed98 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -220,10 +220,9 @@ function __fish_config_interactive -d "Initializations that should be performed
end
set -g __fish_active_key_bindings "$fish_key_bindings"
set -g fish_bind_mode default
- # Do something nasty to avoid two forks
if test "$fish_key_bindings" = fish_default_key_bindings
fish_default_key_bindings
- #Load user key bindings if they are defined
+ # Load user key bindings if they are defined
if functions --query fish_user_key_bindings > /dev/null
fish_user_key_bindings
end
@@ -233,6 +232,7 @@ function __fish_config_interactive -d "Initializations that should be performed
end
# Load key bindings. Redirect stderr per #1155
+ set -g __fish_active_key_bindings
__fish_reload_key_bindings ^ /dev/null
# Repaint screen when window changes size