4 files changed, 32 insertions, 0 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions.cpp b/src/kvirc/kvs/KviKvsCoreFunctions.cpp
index 6d21bc739..4f48981e5 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions.cpp
@@ -80,6 +80,7 @@ namespace KviKvsCoreFunctions
 		_REGFNC("ic",context);
 		_REGFNC("icon",icon);
 		_REGFNC("iconName",iconName);
+		_REGFNC("insideAlias",insideAlias)
 		_REGFNC("int",integer)
 		_REGFNC("integer",integer)
 		_REGFNC("isBot",isBot)
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions.h b/src/kvirc/kvs/KviKvsCoreFunctions.h
index f73e9c73d..8d6ff8f82 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions.h
+++ b/src/kvirc/kvs/KviKvsCoreFunctions.h
@@ -85,6 +85,7 @@ namespace KviKvsCoreFunctions
 	KVSCF(hptimestamp);
 	KVSCF(icon);
 	KVSCF(iconName);
+	KVSCF(insideAlias);
 	KVSCF(integer);
 	KVSCF(isAnyConsoleConnected);
 	KVSCF(isBot);
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index dc15d202b..b1eba6737 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -446,6 +446,34 @@ KVSCF(gender)
 	}
 
 
+	/////////////////////////////////////////////////////////////////////////////////////////
+
+	/*
+		@doc: insideAlias
+		@type:
+			function
+		@title:
+			$insideAlias
+		@short:
+			Returns true if kvs is executing an alias
+		@syntax:
+			<bool> $insideAlias()
+		@description:
+			This function can be used to know if the code is currently being
+			executed in the context of an alias.
+			If $insideAlias is called from inside an alias, it returns true.
+			If $insideAlias is called from inside a function, event handler or
+			everything else not being a direct /alias call, it will return false.
+		@seealso:
+			[fnc]$sw[/fnc]
+	*/
+
+	KVSCF(insideAlias)
+	{
+		KVSCF_pRetBuffer->setBoolean(KVSCF_pContext->aliasSwitchList());
+		return true;
+	}
+
 	///////////////////////////////////////////////////////////////////////////////////////////////
 
 	/*
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index 27d847e86..253affd34 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -337,6 +337,8 @@ namespace KviKvsCoreFunctions
 			If the switch was not present at all then this function
 			returns an empty string (that evaluates to false in an expression).
 			A warning is printed if this function is used non-alias code.
+			@seealso:
+			[fnc]$insideAlias[/fnc]
 		@examples:
 			[example]
 				[cmd]alias[/cmd](test){