projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with r21_2_14-1999-06-04-13.
[chise/xemacs-chise.git]
/
src
/
file-coding.c
diff --git
a/src/file-coding.c
b/src/file-coding.c
index
081f851
..
daae138
100644
(file)
--- a/
src/file-coding.c
+++ b/
src/file-coding.c
@@
-55,7
+55,7
@@
int coding_category_by_priority[CODING_CATEGORY_LAST + 1];
Lisp_Object Qcoding_system_p;
Lisp_Object Qcoding_system_p;
-Lisp_Object Qno_conversion, Qccl, Qiso2022;
+Lisp_Object Qraw_text, Qno_conversion, Qccl, Qiso2022;
/* Qinternal in general.c */
Lisp_Object Qmnemonic, Qeol_type;
/* Qinternal in general.c */
Lisp_Object Qmnemonic, Qeol_type;
@@
-1531,7
+1531,7
@@
coding_system_from_mask (int mask)
}
}
if (NILP (retval))
}
}
if (NILP (retval))
- retval = Fget_coding_system (Qno_conversion);
+ retval = Fget_coding_system (Qraw_text);
return retval;
}
else
return retval;
}
else
@@
-1553,7
+1553,7
@@
coding_system_from_mask (int mask)
if (cat >= 0)
return coding_category_system[cat];
else
if (cat >= 0)
return coding_category_system[cat];
else
- return Fget_coding_system (Qno_conversion);
+ return Fget_coding_system (Qraw_text);
}
}
}
}
@@
-5403,7
+5403,7
@@
convert_from_external_format (CONST Extbyte *ptr,
/************************************************************************/
void
/************************************************************************/
void
-syms_of_mule_coding (void)
+syms_of_file_coding (void)
{
defsymbol (&Qbuffer_file_coding_system, "buffer-file-coding-system");
deferror (&Qcoding_system_error, "coding-system-error",
{
defsymbol (&Qbuffer_file_coding_system, "buffer-file-coding-system");
deferror (&Qcoding_system_error, "coding-system-error",
@@
-5447,6
+5447,7
@@
syms_of_mule_coding (void)
#endif /* MULE */
defsymbol (&Qcoding_system_p, "coding-system-p");
defsymbol (&Qno_conversion, "no-conversion");
#endif /* MULE */
defsymbol (&Qcoding_system_p, "coding-system-p");
defsymbol (&Qno_conversion, "no-conversion");
+ defsymbol (&Qraw_text, "raw-text");
#ifdef MULE
defsymbol (&Qbig5, "big5");
defsymbol (&Qshift_jis, "shift-jis");
#ifdef MULE
defsymbol (&Qbig5, "big5");
defsymbol (&Qshift_jis, "shift-jis");
@@
-5515,7
+5516,7
@@
syms_of_mule_coding (void)
}
void
}
void
-lstream_type_create_mule_coding (void)
+lstream_type_create_file_coding (void)
{
LSTREAM_HAS_METHOD (decoding, reader);
LSTREAM_HAS_METHOD (decoding, writer);
{
LSTREAM_HAS_METHOD (decoding, reader);
LSTREAM_HAS_METHOD (decoding, writer);
@@
-5535,7
+5536,7
@@
lstream_type_create_mule_coding (void)
}
void
}
void
-vars_of_mule_coding (void)
+vars_of_file_coding (void)
{
int i;
{
int i;
@@
-5597,7
+5598,7
@@
Setting this to nil does not do anything.
}
void
}
void
-complex_vars_of_mule_coding (void)
+complex_vars_of_file_coding (void)
{
staticpro (&Vcoding_system_hash_table);
Vcoding_system_hash_table =
{
staticpro (&Vcoding_system_hash_table);
Vcoding_system_hash_table =
@@
-5643,15
+5644,22
@@
complex_vars_of_mule_coding (void)
DEFINE_CODESYS_PROP (CODESYS_PROP_CCL, Qdecode);
#endif /* MULE */
/* Need to create this here or we're really screwed. */
DEFINE_CODESYS_PROP (CODESYS_PROP_CCL, Qdecode);
#endif /* MULE */
/* Need to create this here or we're really screwed. */
- Fmake_coding_system (Qno_conversion, Qno_conversion, build_string ("No conversion"),
- list2 (Qmnemonic, build_string ("Noconv")));
+ Fmake_coding_system
+ (Qraw_text, Qno_conversion,
+ build_string ("Raw text, which means it converts only line-break-codes."),
+ list2 (Qmnemonic, build_string ("Raw")));
- Fcopy_coding_system (Fcoding_system_property (Qno_conversion, Qeol_lf),
- Qbinary);
+ Fmake_coding_system
+ (Qbinary, Qno_conversion,
+ build_string ("Binary, which means it does not convert anything."),
+ list4 (Qeol_type, Qlf,
+ Qmnemonic, build_string ("Binary")));
+
+ Fdefine_coding_system_alias (Qno_conversion, Qraw_text);
/* Need this for bootstrapping */
coding_category_system[CODING_CATEGORY_NO_CONVERSION] =
/* Need this for bootstrapping */
coding_category_system[CODING_CATEGORY_NO_CONVERSION] =
- Fget_coding_system (Qno_conversion);
+ Fget_coding_system (Qraw_text);
#ifdef MULE
{
#ifdef MULE
{