From b7b5ce3cc41b319038ed530a6ce2134ac0cde6ba Mon Sep 17 00:00:00 2001
From: Bruno Pinto <brunoferreirapinto@gmail.com>
Date: Tue, 6 Aug 2013 17:31:19 -0300
Subject: [PATCH] loading theme either from custom or from oh-my-fish dir

---
 oh-my-fish.fish | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/oh-my-fish.fish b/oh-my-fish.fish
index a646570..0f47e3c 100644
--- a/oh-my-fish.fish
+++ b/oh-my-fish.fish
@@ -41,6 +41,16 @@ function _fish_source_plugin_load_file
   end
 end
 
+function _fish_configure_theme
+  if test -d $fish_path/themes/$fish_theme
+    set fish_function_path $fish_path/themes/$fish_theme $fish_function_path
+  end
+
+  if test -d $fish_custom/themes/$fish_theme
+    set fish_function_path $fish_custom/themes/$fish_theme $fish_function_path
+  end
+end
+
 ###
 # Configuration
 ###
@@ -66,7 +76,7 @@ for plugin in $fish_plugins
 end
 
 # Add user defined theme
-set fish_function_path $fish_custom/themes/$fish_theme $fish_path/themes/$fish_theme $fish_function_path 
+_fish_configure_theme $fish_theme
 
 # Source all files inside custom folder
 for config_file in $fish_custom/*.load