# HG changeset patch # User Kenichi Handa # Date 1246448107 0 # Node ID e2d67c929da2f8f91847bfd82434fc48fcb35ed1 # Parent 5bd89163676fe030b72da992607803663dbc3b64 (setup_coding_system): Initialize coding->carryover_bytes to 0. (Fset_keyboard_coding_system_internal): If CODING-SYSTEM is nil, use Qno_conversion. diff -r 5bd89163676f -r e2d67c929da2 src/coding.c --- a/src/coding.c Wed Jul 01 08:55:45 2009 +0000 +++ b/src/coding.c Wed Jul 01 11:35:07 2009 +0000 @@ -5793,6 +5793,7 @@ 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 @@ { 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;