X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fexecutor.c;h=d6486ee4e7977b0b93fd188eaebf6a10dc1ec382;hb=f1ae4ee2876bee191b1bf79672d4bf834750c227;hp=ee83c2c7d8daed3154d7d4680f5a2cb0f44c58df;hpb=7e152a7394dd2325e9040dd59cc5bba6d4b9dde5;p=pspp

diff --git a/src/ui/gui/executor.c b/src/ui/gui/executor.c
index ee83c2c7d8..d6486ee4e7 100644
--- a/src/ui/gui/executor.c
+++ b/src/ui/gui/executor.c
@@ -26,7 +26,7 @@
 #include "libpspp/cast.h"
 #include "output/driver.h"
 #include "ui/gui/psppire-data-store.h"
-#include "ui/gui/psppire-output-window.h"
+#include "ui/gui/psppire.h"
 
 /* Lazy casereader callback function used by execute_syntax. */
 static struct casereader *
@@ -134,14 +134,14 @@ execute_syntax (PsppireDataWindow *window, struct lex_reader *lex_reader)
       struct dataset *ds = session_active_dataset (the_session);
       enum cmd_result result = cmd_parse (lexer, ds);
 
-      if ( cmd_result_is_failure (result))
+      if (cmd_result_is_failure (result))
 	{
 	  retval = FALSE;
-	  if ( lex_get_error_mode (lexer) == LEX_ERROR_STOP )
+	  if (lex_get_error_mode (lexer) == LEX_ERROR_STOP)
 	    break;
 	}
 
-      if ( result == CMD_EOF || result == CMD_FINISH)
+      if (result == CMD_EOF || result == CMD_FINISH)
 	break;
     }
 
@@ -200,5 +200,5 @@ execute_syntax_string (PsppireDataWindow *window, gchar *syntax)
 void
 execute_const_syntax_string (PsppireDataWindow *window, const gchar *syntax)
 {
-  execute_syntax (window, lex_reader_for_string (syntax));
+  execute_syntax (window, lex_reader_for_string (syntax, "UTF-8"));
 }