X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Ftemporary.c;h=cdcfc7625097578c2a9a4b247bfceea7fd0ef94a;hb=72c9c6a2f92e94779b2e55d0726568090411871c;hp=2f8b4023c9c7a58765212c774cc357e891397fc0;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp

diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c
index 2f8b4023c9..cdcfc76250 100644
--- a/src/language/control/temporary.c
+++ b/src/language/control/temporary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,22 +16,19 @@
 
 #include <config.h>
 
-#include <stddef.h>
 #include <stdlib.h>
 
-#include "control-stack.h"
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/transformations.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -43,7 +40,8 @@ cmd_temporary (struct lexer *lexer, struct dataset *ds)
   if (!proc_in_temporary_transformations (ds))
     proc_start_temporary_transformations (ds);
   else
-    msg (SE, _("This command may only appear once between "
-               "procedures and procedure-like commands."));
-  return lex_end_of_command (lexer);
+    lex_ofs_error (lexer, 0, 0,
+                   _("This command may only appear once between "
+                     "procedures and procedure-like commands."));
+  return CMD_SUCCESS;
 }