From 4baf668f2818ea2151e25fdb276a1584bae4a051 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sat, 19 May 2007 14:07:23 +0300 Subject: [PATCH] UTF-8, set_screen_driver_opt: Don't test driver->opt.utf8 after utf8_io. They have the same value so one test will suffice. --- src/terminal/screen.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/terminal/screen.c b/src/terminal/screen.c index 9e0a6cf7..ecb7355a 100644 --- a/src/terminal/screen.c +++ b/src/terminal/screen.c @@ -270,11 +270,7 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec) driver->opt.frame = frame_restrict; #ifdef CONFIG_UTF8 - if (get_opt_bool_tree(term_spec, "m11_hack")) - driver->opt.frame_seqs = m11_hack_frame_seqs; - - if (driver->opt.utf8) - driver->opt.frame_seqs = utf8_linux_frame_seqs; + driver->opt.frame_seqs = utf8_linux_frame_seqs; #else /* !CONFIG_UTF8 */ driver->opt.charsets[1] = get_cp_index("cp437"); #endif /* !CONFIG_UTF8 */ @@ -313,13 +309,10 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec) if (get_opt_bool_tree(term_spec, "m11_hack")) driver->opt.frame_seqs = m11_hack_frame_seqs; -#ifdef CONFIG_UTF8 - if (driver->opt.utf8) - driver->opt.frame_seqs = utf8_linux_frame_seqs; -#endif /* CONFIG_UTF8 */ } else if (driver->type == TERM_FREEBSD) { if (get_opt_bool_tree(term_spec, "m11_hack")) driver->opt.frame_seqs = m11_hack_frame_seqs; + } else if (driver->type == TERM_VT100) { driver->opt.frame = frame_vt100; }