Reworked settings so as to use one large struct instead of lots of static

[pspp-builds.git] / src / language / syntax-file.c

diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c
index dde807c37c9c4409cc54b2d6049bc859679ee137..a48dba4a136cad55c78f873b5b395b2cdb60da13 100644 (file)
--- a/src/language/syntax-file.c
+++ b/src/language/syntax-file.c
@@ -27,7 +27,6 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
@@ -40,6 +39,8 @@
 
 #include "prompt.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -109,7 +110,7 @@ read_syntax_file (struct getl_interface *s,
   while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
 
   /* Echo to listing file, if configured to do so. */
-  if (get_echo ())
+  if (settings_get_echo ())
     tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (line));
 
   return true;