From 624bda0987593f3e3933fa9d9db6ebad98db81c7 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 1 Jul 2009 11:35:07 +0000 Subject: [PATCH] (setup_coding_system): Initialize coding->carryover_bytes to 0. (Fset_keyboard_coding_system_internal): If CODING-SYSTEM is nil, use Qno_conversion. --- src/coding.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/coding.c b/src/coding.c index 3fc43df636..20583a388d 100644 --- a/src/coding.c +++ b/src/coding.c @@ -5793,6 +5793,7 @@ setup_coding_system (coding_system, coding) coding->max_charset_id = SCHARS (val) - 1; coding->safe_charsets = SDATA (val); coding->default_char = XINT (CODING_ATTR_DEFAULT_CHAR (attrs)); + coding->carryover_bytes = 0; coding_type = CODING_ATTR_TYPE (attrs); if (EQ (coding_type, Qundecided)) @@ -9386,8 +9387,11 @@ DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_intern { struct terminal *t = get_terminal (terminal, 1); CHECK_SYMBOL (coding_system); - setup_coding_system (Fcheck_coding_system (coding_system), - TERMINAL_KEYBOARD_CODING (t)); + if (NILP (coding_system)) + coding_system = Qno_conversion; + else + Fcheck_coding_system (coding_system); + setup_coding_system (coding_system, TERMINAL_KEYBOARD_CODING (t)); /* Characer composition should be disabled. */ TERMINAL_KEYBOARD_CODING (t)->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; -- 2.20.1