From 1349d129c51e0c698645c3806601a7c9ebfcef95 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <glitchmr@myopera.com>
Date: Sat, 12 Oct 2013 21:55:11 +0200
Subject: [PATCH] Fix #213. You can now remove autoloaded functions.

Oddly enough, the code is here, but is internal function.
---
 builtin.cpp  | 2 +-
 function.cpp | 5 +----
 function.h   | 3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/builtin.cpp b/builtin.cpp
index f1e73c0af..379d52907 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -1339,7 +1339,7 @@ static int builtin_functions(parser_t &parser, wchar_t **argv)
     {
         int i;
         for (i=woptind; i<argc; i++)
-            function_remove(argv[i]);
+            function_remove_ignore_autoload(argv[i]);
         return STATUS_BUILTIN_OK;
     }
     else if (desc)
diff --git a/function.cpp b/function.cpp
index 08fb85560..da7574d39 100644
--- a/function.cpp
+++ b/function.cpp
@@ -61,9 +61,6 @@ function_autoload_t::function_autoload_t() : autoload_t(L"fish_function_path", N
 {
 }
 
-/** Removes a function from our internal table, returning true if it was found and false if not */
-static bool function_remove_ignore_autoload(const wcstring &name);
-
 /** Callback when an autoloaded function is removed */
 void function_autoload_t::command_removed(const wcstring &cmd)
 {
@@ -220,7 +217,7 @@ int function_exists_no_autoload(const wcstring &cmd, const env_vars_snapshot_t &
     return loaded_functions.find(cmd) != loaded_functions.end() || function_autoloader.can_load(cmd, vars);
 }
 
-static bool function_remove_ignore_autoload(const wcstring &name)
+bool function_remove_ignore_autoload(const wcstring &name)
 {
     scoped_lock lock(functions_lock);
     bool erased = (loaded_functions.erase(name) > 0);
diff --git a/function.h b/function.h
index 2f8dfc36c..e2896f18e 100644
--- a/function.h
+++ b/function.h
@@ -95,6 +95,9 @@ void function_init();
 /** Add a function. */
 void function_add(const function_data_t &data, const parser_t &parser);
 
+/** Removes a function from our internal table, returning true if it was found and false if not */
+bool function_remove_ignore_autoload(const wcstring &name);
+
 /**
    Remove the function with the specified name.
 */