Mercurial > emacs
diff src/coding.c @ 18613:614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 04 Jul 1997 20:44:52 +0000 |
| parents | 69c0e220b626 |
| children | aa3f2820e2ac |
line wrap: on
line diff
--- a/src/coding.c Fri Jul 04 20:43:49 1997 +0000 +++ b/src/coding.c Fri Jul 04 20:44:52 1997 +0000 @@ -702,7 +702,9 @@ /* Set designation state into CODING. */ #define DECODE_DESIGNATION(reg, dimension, chars, final_char) \ do { \ - int charset = ISO_CHARSET_TABLE (dimension, chars, final_char); \ + int charset = ISO_CHARSET_TABLE (make_number (dimension), \ + make_number (chars), \ + make_number (final_char)); \ if (charset >= 0) \ { \ if (coding->direction == 1 \ @@ -3515,9 +3517,10 @@ || (EQ (operation, Qopen_network_stream) && INTEGERP (target)))) error ("Invalid %dth argument", XINT (target_idx) + 1); - chain = (operation == Qinsert_file_contents || operation == Qwrite_region + chain = ((EQ (operation, Qinsert_file_contents) + || EQ (operation, Qwrite_region)) ? Vfile_coding_system_alist - : (operation == Qopen_network_stream + : (EQ (operation, Qopen_network_stream) ? Vnetwork_coding_system_alist : Vprocess_coding_system_alist)); if (NILP (chain))