Merge master into output branch.

[pspp] / src / language / command.c

diff --git a/src/language/command.c b/src/language/command.c
index c00d94b9c4b3597bcc2416ae0e29fd56018b229f..74f99a89a682009dfa0fa62452669cf8622a446c 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -37,7 +37,6 @@
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <output/manager.h>
-#include <output/table.h>
 #include <libpspp/getl.h>
 
 #if HAVE_SYS_WAIT_H
@@ -231,9 +230,9 @@ do_parse_command (struct lexer *lexer,
 
   /* Execute command. */
   msg_set_command_name (command->name);
-  tab_set_command_name (command->name);
+  som_set_command_name (command->name);
   result = command->function (lexer, ds);
-  tab_set_command_name (NULL);
+  som_set_command_name (NULL);
   msg_set_command_name (NULL);
 
   assert (cmd_result_is_valid (result));