/* This is the major type of the coding system -- one of Big5, ISO2022,
Shift-JIS, etc. See the constants above. */
/* This is the major type of the coding system -- one of Big5, ISO2022,
Shift-JIS, etc. See the constants above. */
eol_type_t eol_type;
/* Subsidiary coding systems that specify a particular type of EOL
marking, rather than autodetecting it. These will only be non-nil
if (eol_type == EOL_AUTODETECT). */
eol_type_t eol_type;
/* Subsidiary coding systems that specify a particular type of EOL
marking, rather than autodetecting it. These will only be non-nil
if (eol_type == EOL_AUTODETECT). */
{
/* For a CCL coding system, these specify the CCL programs used for
decoding (input) and encoding (output). */
{
/* For a CCL coding system, these specify the CCL programs used for
decoding (input) and encoding (output). */
-DECLARE_LRECORD (coding_system, struct Lisp_Coding_System);
-#define XCODING_SYSTEM(x) XRECORD (x, coding_system, struct Lisp_Coding_System)
+DECLARE_LRECORD (coding_system, Lisp_Coding_System);
+#define XCODING_SYSTEM(x) XRECORD (x, coding_system, Lisp_Coding_System)
#define XSETCODING_SYSTEM(x, p) XSETRECORD (x, p, coding_system)
#define CODING_SYSTEMP(x) RECORDP (x, coding_system)
#define CHECK_CODING_SYSTEM(x) CHECK_RECORD (x, coding_system)
#define XSETCODING_SYSTEM(x, p) XSETRECORD (x, p, coding_system)
#define CODING_SYSTEMP(x) RECORDP (x, coding_system)
#define CHECK_CODING_SYSTEM(x) CHECK_RECORD (x, coding_system)
-#define XCODING_SYSTEM_COMPOSITE(codesys) \
- CODING_SYSTEM_COMPOSITE (XCODING_SYSTEM (codesys))
+#define XCODING_SYSTEM_DISABLE_COMPOSITION(codesys) \
+ CODING_SYSTEM_DISABLE_COMPOSITION (XCODING_SYSTEM (codesys))
extern Lisp_Object Qucs4, Qutf8;
extern Lisp_Object Qbig5, Qccl, Qcharset_g0;
extern Lisp_Object Qcharset_g1, Qcharset_g2, Qcharset_g3, Qcoding_system_error;
extern Lisp_Object Qucs4, Qutf8;
extern Lisp_Object Qbig5, Qccl, Qcharset_g0;
extern Lisp_Object Qcharset_g1, Qcharset_g2, Qcharset_g3, Qcoding_system_error;
-extern Lisp_Object Qcoding_systemp, Qcr, Qcrlf, Qctext, Qdecode, Qencode;
+extern Lisp_Object Qcoding_systemp, Qcr, Qcrlf, Qdecode, Qencode;
extern Lisp_Object Qeol_cr, Qeol_crlf, Qeol_lf, Qeol_type, Qescape_quoted;
extern Lisp_Object Qforce_g0_on_output, Qforce_g1_on_output;
extern Lisp_Object Qforce_g2_on_output, Qforce_g3_on_output;
extern Lisp_Object Qeol_cr, Qeol_crlf, Qeol_lf, Qeol_type, Qescape_quoted;
extern Lisp_Object Qforce_g0_on_output, Qforce_g1_on_output;
extern Lisp_Object Qforce_g2_on_output, Qforce_g3_on_output;