procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fdefine_coding_system_internal): Fix checking of ascii compatibility.

Browse source
This commit is contained in:
Kenichi Handa 2003-11-23 02:17:20 +00:00
parent 0fabd612e2
commit 2bc515e458
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/coding.c
View file

@ -8107,7 +8107,6 @@ usage: (define-coding-system-internal ...) */)
if (EQ (coding_type, Qcharset)) if (EQ (coding_type, Qcharset))
{ {
Lisp_Object list;
/* Generate a lisp vector of 256 elements. Each element is nil, /* Generate a lisp vector of 256 elements. Each element is nil,
integer, or a list of charset IDs. integer, or a list of charset IDs.
@ -8119,8 +8118,10 @@ usage: (define-coding-system-internal ...) */)
If Nth element is a list of charset IDs, N is the first byte If Nth element is a list of charset IDs, N is the first byte
of one of them. The list is sorted by dimensions of the of one of them. The list is sorted by dimensions of the
charsets. A charset of smaller dimension comes firtst. charsets. A charset of smaller dimension comes firtst. */
*/ Lisp_Object list;
int maybe_ascii_compatible = 1;
for (list = Qnil, tail = charset_list; CONSP (tail); tail = XCDR (tail)) for (list = Qnil, tail = charset_list; CONSP (tail); tail = XCDR (tail))
{ {
struct charset *charset = CHARSET_FROM_ID (XFASTINT (XCAR (tail))); struct charset *charset = CHARSET_FROM_ID (XFASTINT (XCAR (tail)));
@ -8130,6 +8131,7 @@ usage: (define-coding-system-internal ...) */)
val = CHARSET_SUPERSET (charset); val = CHARSET_SUPERSET (charset);
for (; CONSP (val); val = XCDR (val)) for (; CONSP (val); val = XCDR (val))
list = Fcons (XCAR (XCAR (val)), list); list = Fcons (XCAR (XCAR (val)), list);
maybe_ascii_compatible = 0;
} }
else else
list = Fcons (XCAR (tail), list); list = Fcons (XCAR (tail), list);
@ -8143,7 +8145,8 @@ usage: (define-coding-system-internal ...) */)
int dim = CHARSET_DIMENSION (charset); int dim = CHARSET_DIMENSION (charset);
int idx = (dim - 1) * 4; int idx = (dim - 1) * 4;
if (CHARSET_ASCII_COMPATIBLE_P (charset)) if (CHARSET_ASCII_COMPATIBLE_P (charset)
&& maybe_ascii_compatible)
CODING_ATTR_ASCII_COMPAT (attrs) = Qt; CODING_ATTR_ASCII_COMPAT (attrs) = Qt;
for (i = charset->code_space[idx]; for (i = charset->code_space[idx];