Mercurial > emacs
comparison src/coding.c @ 90359:041f75914d0c
(produce_composition): Compare charbuf[i] instead of
args[i] against 0.
(Fterminal_coding_system): Use EQ to compare Lisp objects.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 09 Mar 2006 01:22:51 +0000 |
| parents | 450fb16a4bf4 |
| children | ec0a46fadd7e |
comparison
equal
deleted
inserted
replaced
| 90358:47abdf8178fc | 90359:041f75914d0c |
|---|---|
| 6038 len -= 4; | 6038 len -= 4; |
| 6039 charbuf += 4; | 6039 charbuf += 4; |
| 6040 for (i = 0; i < len; i++) | 6040 for (i = 0; i < len; i++) |
| 6041 { | 6041 { |
| 6042 args[i] = make_number (charbuf[i]); | 6042 args[i] = make_number (charbuf[i]); |
| 6043 if (args[i] < 0) | 6043 if (charbuf[i] < 0) |
| 6044 return; | 6044 return; |
| 6045 } | 6045 } |
| 6046 components = (method == COMPOSITION_WITH_ALTCHARS | 6046 components = (method == COMPOSITION_WITH_ALTCHARS |
| 6047 ? Fstring (len, args) : Fvector (len, args)); | 6047 ? Fstring (len, args) : Fvector (len, args)); |
| 6048 } | 6048 } |
| 8245 { | 8245 { |
| 8246 Lisp_Object coding_system; | 8246 Lisp_Object coding_system; |
| 8247 | 8247 |
| 8248 coding_system = CODING_ID_NAME (terminal_coding.id); | 8248 coding_system = CODING_ID_NAME (terminal_coding.id); |
| 8249 /* For backward compatibility, return nil if it is `undecided'. */ | 8249 /* For backward compatibility, return nil if it is `undecided'. */ |
| 8250 return (coding_system != Qundecided ? coding_system : Qnil); | 8250 return (! EQ (coding_system, Qundecided) ? coding_system : Qnil); |
| 8251 } | 8251 } |
| 8252 | 8252 |
| 8253 DEFUN ("set-keyboard-coding-system-internal", | 8253 DEFUN ("set-keyboard-coding-system-internal", |
| 8254 Fset_keyboard_coding_system_internal, | 8254 Fset_keyboard_coding_system_internal, |
| 8255 Sset_keyboard_coding_system_internal, 1, 1, 0, | 8255 Sset_keyboard_coding_system_internal, 1, 1, 0, |
