From ecf0aebe13bfb4821cbd06811ee728223e01bf7e Mon Sep 17 00:00:00 2001
From: Jorge Bucaran <mail@jorgebucaran.com>
Date: Tue, 10 May 2016 21:32:45 +0900
Subject: [PATCH] Load conf.d first and source bindings after install. #272

---
 fisher.fish | 54 +++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/fisher.fish b/fisher.fish
index 8ce0ecf..6ad414c 100644
--- a/fisher.fish
+++ b/fisher.fish
@@ -694,6 +694,32 @@ end
 function __fisher_plugin_enable -a path
     set -l plugin_name (basename $path)
 
+    for file in $path/conf.d/*.{py,awk}
+        set -l base (basename "$file")
+        command ln -sf "$file" "$fish_config/conf.d/$base"
+    end
+
+    for file in $path/conf.d/*.fish
+        set -l base (basename "$file")
+        set -l target "$fish_config/conf.d/$base"
+
+        command ln -sf "$file" "$target"
+        builtin source "$target" ^ /dev/null
+    end
+
+    for file in $path/{functions/,}*.{py,awk}
+        set -l base (basename "$file")
+        command ln -sf "$file" "$fish_config/functions/$base"
+    end
+
+    for file in $path/completions/*.fish
+        set -l base (basename "$file")
+        set -l target "$fish_config/completions/$base"
+
+        command ln -sf "$file" "$target"
+        builtin source "$target" ^ /dev/null
+    end
+
     for file in $path/{functions/*,}*.fish
         set -l base (basename "$file")
 
@@ -738,32 +764,6 @@ function __fisher_plugin_enable -a path
         end
     end
 
-    for file in $path/conf.d/*.{py,awk}
-        set -l base (basename "$file")
-        command ln -sf "$file" "$fish_config/conf.d/$base"
-    end
-
-    for file in $path/{functions/,}*.{py,awk}
-        set -l base (basename "$file")
-        command ln -sf "$file" "$fish_config/functions/$base"
-    end
-
-    for file in $path/conf.d/*.fish
-        set -l base (basename "$file")
-        set -l target "$fish_config/conf.d/$base"
-
-        command ln -sf "$file" "$target"
-        builtin source "$target" ^ /dev/null
-    end
-
-    for file in $path/completions/*.fish
-        set -l base (basename "$file")
-        set -l target "$fish_config/completions/$base"
-
-        command ln -sf "$file" "$target"
-        builtin source "$target" ^ /dev/null
-    end
-
     return 0
 end
 
@@ -1402,6 +1402,8 @@ function __fisher_key_bindings_append -a plugin_name file
         '
     )
 
+    printf "%s\n" $plugin_key_bindings_source | source ^ /dev/null
+
     printf "%s\n" $key_bindings_source $plugin_key_bindings_source | awk '
 
         BEGIN {