(CODING_CATEGORY_IDX_ISO_7_ELSE): This macro is deleted

(CODING_CATEGORY_IDX_ISO_7_ELSE): New macro.
(CODING_CATEGORY_IDX_ISO_8_ELSE): New macro
(CODING_CATEGORY_MASK_ISO_ELSE): This macro is deleted.
(CODING_CATEGORY_MASK_ISO_7_ELSE): New macro.
(CODING_CATEGORY_MASK_ISO_8_ELSE): New macro.
(CODING_CATEGORY_MASK_ANY): Adjusted for the above change.

src/coding.h

@@ -332,10 +332,11 @@ struct coding_system
 #define CODING_CATEGORY_IDX_ISO_7	2
 #define CODING_CATEGORY_IDX_ISO_8_1	3
 #define CODING_CATEGORY_IDX_ISO_8_2	4
-#define CODING_CATEGORY_IDX_ISO_ELSE	5
-#define CODING_CATEGORY_IDX_BIG5	6
-#define CODING_CATEGORY_IDX_BINARY	7
-#define CODING_CATEGORY_IDX_MAX		8
+#define CODING_CATEGORY_IDX_ISO_7_ELSE	5
+#define CODING_CATEGORY_IDX_ISO_8_ELSE	6
+#define CODING_CATEGORY_IDX_BIG5	7
+#define CODING_CATEGORY_IDX_BINARY	8
+#define CODING_CATEGORY_IDX_MAX		9
 
 /* Definitions of flag bits returned by the function
    detect_coding_mask ().  */
@@ -344,7 +345,8 @@ struct coding_system
 #define CODING_CATEGORY_MASK_ISO_7	(1 << CODING_CATEGORY_IDX_ISO_7)
 #define CODING_CATEGORY_MASK_ISO_8_1	(1 << CODING_CATEGORY_IDX_ISO_8_1)
 #define CODING_CATEGORY_MASK_ISO_8_2	(1 << CODING_CATEGORY_IDX_ISO_8_2)
-#define CODING_CATEGORY_MASK_ISO_ELSE	(1 << CODING_CATEGORY_IDX_ISO_ELSE)
+#define CODING_CATEGORY_MASK_ISO_7_ELSE	(1 << CODING_CATEGORY_IDX_ISO_7_ELSE)
+#define CODING_CATEGORY_MASK_ISO_8_ELSE	(1 << CODING_CATEGORY_IDX_ISO_8_ELSE)
 #define CODING_CATEGORY_MASK_BIG5	(1 << CODING_CATEGORY_IDX_BIG5)
 
 /* This value is returned if detect_coding_mask () find nothing other
@@ -355,7 +357,8 @@ struct coding_system
    | CODING_CATEGORY_MASK_ISO_7	  	\
    | CODING_CATEGORY_MASK_ISO_8_1 	\
    | CODING_CATEGORY_MASK_ISO_8_2 	\
-   | CODING_CATEGORY_MASK_ISO_ELSE	\
+   | CODING_CATEGORY_MASK_ISO_7_ELSE	\
+   | CODING_CATEGORY_MASK_ISO_8_ELSE	\
    | CODING_CATEGORY_MASK_BIG5)
 
 /* Macros to decode or encode a character of JISX0208 in SJIS.  S1 and