comparison src/coding.c @ 103655:e2d67c929da2

(setup_coding_system): Initialize coding->carryover_bytes to 0. (Fset_keyboard_coding_system_internal): If CODING-SYSTEM is nil, use Qno_conversion.
author Kenichi Handa <handa@m17n.org>
date Wed, 01 Jul 2009 11:35:07 +0000
parents 091a55d2d6f7
children e72df94a89ca
comparison
equal deleted inserted replaced
103654:5bd89163676f 103655:e2d67c929da2
5791 5791
5792 val = CODING_ATTR_SAFE_CHARSETS (attrs); 5792 val = CODING_ATTR_SAFE_CHARSETS (attrs);
5793 coding->max_charset_id = SCHARS (val) - 1; 5793 coding->max_charset_id = SCHARS (val) - 1;
5794 coding->safe_charsets = SDATA (val); 5794 coding->safe_charsets = SDATA (val);
5795 coding->default_char = XINT (CODING_ATTR_DEFAULT_CHAR (attrs)); 5795 coding->default_char = XINT (CODING_ATTR_DEFAULT_CHAR (attrs));
5796 coding->carryover_bytes = 0;
5796 5797
5797 coding_type = CODING_ATTR_TYPE (attrs); 5798 coding_type = CODING_ATTR_TYPE (attrs);
5798 if (EQ (coding_type, Qundecided)) 5799 if (EQ (coding_type, Qundecided))
5799 { 5800 {
5800 coding->detector = NULL; 5801 coding->detector = NULL;
9384 Lisp_Object coding_system; 9385 Lisp_Object coding_system;
9385 Lisp_Object terminal; 9386 Lisp_Object terminal;
9386 { 9387 {
9387 struct terminal *t = get_terminal (terminal, 1); 9388 struct terminal *t = get_terminal (terminal, 1);
9388 CHECK_SYMBOL (coding_system); 9389 CHECK_SYMBOL (coding_system);
9389 setup_coding_system (Fcheck_coding_system (coding_system), 9390 if (NILP (coding_system))
9390 TERMINAL_KEYBOARD_CODING (t)); 9391 coding_system = Qno_conversion;
9392 else
9393 Fcheck_coding_system (coding_system);
9394 setup_coding_system (coding_system, TERMINAL_KEYBOARD_CODING (t));
9391 /* Characer composition should be disabled. */ 9395 /* Characer composition should be disabled. */
9392 TERMINAL_KEYBOARD_CODING (t)->common_flags 9396 TERMINAL_KEYBOARD_CODING (t)->common_flags
9393 &= ~CODING_ANNOTATE_COMPOSITION_MASK; 9397 &= ~CODING_ANNOTATE_COMPOSITION_MASK;
9394 return Qnil; 9398 return Qnil;
9395 } 9399 }