Merge branch 'smartcom'

xml-examples/lua/startup.xml

@@ -4,10 +4,10 @@
  xsi:schemaLocation="http://clish.sourceforge.net/XMLSchema
                      http://clish.sourceforge.net/XMLSchema/clish.xsd">
 
-     <PLUGIN name="lua_hooks" file="clish_plugin_lua.so">
+     <PLUGIN name="lua" file="clish_plugin_lua.so">
 	 /usr2/klish-rw/xml-examples/lua
      </PLUGIN>
-     <STARTUP view="test-view" default_builtin="hook_action@lua_hooks"/>
+     <STARTUP view="test-view" default_builtin="lua@lua"/>
 
 </CLISH_MODULE>
 

xml-examples/lua/test.xml

@@ -81,14 +81,12 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 	</COMMAND>
 
 	<COMMAND name="test8" help="Call a Lua function">
-		<ACTION builtin="hook_action@lua_hooks">hello_world()</ACTION>
+		<ACTION builtin="lua@lua">hello_world()</ACTION>
 	</COMMAND>
 
 	<COMMAND name="eval" help="Evaluate a string as Lua chunk">
 		<PARAM name="str" help="String to evaluate" ptype="STRING"/>
-		<ACTION builtin="hook_action@lua_hooks">
-			loadstring("${str}")()
-		</ACTION>
+		<ACTION builtin="lua@lua">loadstring("${str}")()</ACTION>
 	</COMMAND>
 
 	<COMMAND name="test9" ref="eval" help="Alias for the eval command"/>