X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fterminal-opts.c;h=284d2c9d6115e9f4ae7477caac58544599ada0a6;hb=91ced0102521c876f1ac4602977fd15c73b25697;hp=cd58f81e94d8a123b7ee8c0511e528dc0fc75ba4;hpb=6706543a7b6222b4ce0802e898d48cdb581af7c5;p=pspp diff --git a/src/ui/terminal/terminal-opts.c b/src/ui/terminal/terminal-opts.c index cd58f81e94..284d2c9d61 100644 --- a/src/ui/terminal/terminal-opts.c +++ b/src/ui/terminal/terminal-opts.c @@ -275,33 +275,12 @@ terminal_opts_init (struct argv_parser *ap, return to; } -/* Return true iff the terminal appears to be an xterm with - UTF-8 capabilities */ -static bool -term_is_utf8_xterm (void) -{ - char *s = NULL; - - if ( (s = getenv ("TERM")) && (0 == strcmp ("xterm", s)) ) - if ( (s = getenv ("XTERM_LOCALE")) ) - return strcasestr (s, "utf8") || strcasestr (s, "utf-8"); - - return false; -} - void terminal_opts_done (struct terminal_opts *to, int argc, char *argv[]) { 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);