(CHARSET_OK): Check that coding_system_table[IDX] != 0.

f024b6aa · Richard M. Stallman · 3527740c · f024b6aa
Commit f024b6aa authored Aug 09, 1998 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

src/coding.c src/coding.c +6 -5

No files found.
--- a/src/coding.c
+++ b/src/coding.c
@@ -652,11 +652,12 @@ detect_coding_emacs_mule (src, src_end)
 enum iso_code_class_type iso_code_class[256];
-#define CHARSET_OK(idx, charset)			\
+#define CHARSET_OK(idx, charset)				\
-  (coding_system_table[idx]->safe_charsets[charset]	\
+  (coding_system_table[idx]					\
-   || (CODING_SPEC_ISO_REQUESTED_DESIGNATION		\
+   && (coding_system_table[idx]->safe_charsets[charset]		\
-       (coding_system_table[idx], charset)		\
+       || (CODING_SPEC_ISO_REQUESTED_DESIGNATION		\
-       != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION))
+            (coding_system_table[idx], charset)			\
+           != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION)))
 #define SHIFT_OUT_OK(idx) \
  (CODING_SPEC_ISO_INITIAL_DESIGNATION (coding_system_table[idx], 1) >= 0)