keybindings → key_bindings (for consistency)

doc_src/bind.txt

@@ -46,7 +46,7 @@ test the function while editing, and the result is usually more
 readable as well.
 
 If you want to autoload bindings each time you start shell, you should 
-define them inside fish_user_keybindings function.
+define them inside fish_user_key_bindings function.
 
 - <tt>-a</tt> or <tt>--all</tt> If --key-names is specified, show all key names, not only the ones that actually are defined for the current terminal. If erase mode is specified, this switch will cause all current bindings to be erased.
 - <tt>-e</tt> or <tt>--erase</tt> Erase mode. All non-switch arguments are interpreted as character sequences and any commands associated with those sequences are erased.

input.cpp

@@ -162,7 +162,7 @@ static const wchar_t *desc_arr[] =
 	L"Move entire line to killring",
 	L"Move next word to killring",
 	L"Move previous word to killring",
-	L"Write out keybindings",
+	L"Write out key bindings",
 	L"Clear entire screen",
 	L"Quit the running program",
 	L"Search backward through list of previous commands for matching token",
@@ -865,4 +865,3 @@ wchar_t input_function_get_code( const wcstring &name )
 	}
 	return -1;		
 }
-

share/functions/__fish_config_interactive.fish

@@ -199,21 +199,21 @@ function __fish_config_interactive -d "Initializations that should be performed
 		set -U fish_key_bindings fish_default_key_bindings
 	end
 
-	# Reload keybindings when binding variable change
-	function __fish_reload_key_bindings -d "Reload keybindings when binding variable change" --on-variable fish_key_bindings
+	# Reload key bindings when binding variable change
+	function __fish_reload_key_bindings -d "Reload key bindings when binding variable change" --on-variable fish_key_bindings
 		# Do something nasty to avoid two forks
 		if test "$fish_key_bindings" =  fish_default_key_bindings
 			fish_default_key_bindings
-			#Load user keybindings if they are defined
-			if functions --query fish_user_keybindings > /dev/null
-			   fish_user_keybindings
+			#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
 	end
 
-	# Load keybindings
+	# Load key bindings
 	__fish_reload_key_bindings
 
 	# Repaint screen when window changes size