Merge branch 'master' into ast

Conflicts:
	parse_util.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/function.h b/function.h
index fd945570..847c818b 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.
 */