T-Test Dialog: remove deprecated widgets

[pspp] / src / ui / terminal / terminal-opts.c

diff --git a/src/ui/terminal/terminal-opts.c b/src/ui/terminal/terminal-opts.c
index 45c503eecacc596c733a780ba7e754e5270c1e14..db81e6b7de2301c962744fd9b6e5b9109cced427 100644 (file)
--- a/src/ui/terminal/terminal-opts.c
+++ b/src/ui/terminal/terminal-opts.c
@@ -24,7 +24,6 @@
 
 
 #include "data/settings.h"
-#include "data/file-name.h"
 #include "language/lexer/include-path.h"
 #include "libpspp/argv-parser.h"
 #include "libpspp/assertion.h"
@@ -172,7 +171,7 @@ usage (void)
   char *inc_path = string_array_join (include_path_default (), " ");
 
   printf (_("\
-PSPP, a program for statistical analysis of sample data.\n\
+PSPP, a program for statistical analysis of sampled data.\n\
 Usage: %s [OPTION]... FILE...\n\
 \n\
 Arguments to long options also apply to equivalent short options.\n\
@@ -319,16 +318,16 @@ term_is_utf8_xterm (void)
 void
 terminal_opts_done (struct terminal_opts *to, int argc, char *argv[])
 {
-  if ((0 == strcmp (locale_charset (), "UTF-8"))
-      ||
-      (term_is_utf8_xterm ()) )
-    {
-      string_map_insert (&to->options, "box", "unicode");
-    }
-  
   register_output_driver (to);
   if (!to->has_output_driver)
     {
+      if ((0 == strcmp (locale_charset (), "UTF-8"))
+         ||
+         (term_is_utf8_xterm ()) )
+       {
+         string_map_insert (&to->options, "box", "unicode");
+       }
+  
       string_map_insert (&to->options, "output-file", "-");
       string_map_insert (&to->options, "format", "txt");
       register_output_driver (to);