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

(ENCODE_DESIGNATION, decode_eol)

Browse source 
(make_conversion_work_buffer, code_conversion_restore)
(Fdefine_coding_system_internal): Convert Lisp types.
(code_conversion_restore): Use EQ, not ==.
(Fencode_coding_string): Fix code_convert_string call.
This commit is contained in:
Dave Love 2002-07-16 15:10:13 +00:00
parent 16fed1fc86
commit c197f19176
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/coding.c
View file

@ -3124,7 +3124,7 @@ decode_coding_iso_2022 (coding)
int c; \ int c; \
\ \
if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_REVISION) \ if (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_REVISION) \
revision = XINT (CHARSET_ISO_REVISION (charset)); \ revision = CHARSET_ISO_REVISION (charset); \
\ \
if (revision >= 0) \ if (revision >= 0) \
{ \ { \
@ -5128,7 +5128,7 @@ decode_eol (coding)
coding->dst_pos_byte + coding->produced); coding->dst_pos_byte + coding->produced);
undo_list = current_buffer->undo_list; undo_list = current_buffer->undo_list;
current_buffer->undo_list = Qt; current_buffer->undo_list = Qt;
del_range_2 (coding->dst_pos, coding->dst_pos_byte, GPT, GPT_BYTE, Qnil); del_range_2 (coding->dst_pos, coding->dst_pos_byte, GPT, GPT_BYTE, 0);
current_buffer->undo_list = undo_list; current_buffer->undo_list = undo_list;
pbeg = GPT_ADDR; pbeg = GPT_ADDR;
pend = pbeg + coding->produced; pend = pbeg + coding->produced;
@ -5783,7 +5783,7 @@ make_conversion_work_buffer (multibytep)
} }
else else
{ {
int depth = Flength (Vcode_conversion_work_buf_list); int depth = XINT (Flength (Vcode_conversion_work_buf_list));
char str[128]; char str[128];
sprintf (str, " *code-conversion-work*<%d>", depth); sprintf (str, " *code-conversion-work*<%d>", depth);
@ -5807,7 +5807,7 @@ Lisp_Object
code_conversion_restore (info) code_conversion_restore (info)
Lisp_Object info; Lisp_Object info;
{ {
int depth = Flength (Vcode_conversion_work_buf_list); int depth = XINT (Flength (Vcode_conversion_work_buf_list));
Lisp_Object buf; Lisp_Object buf;
if (depth > 0) if (depth > 0)
@ -5818,7 +5818,7 @@ code_conversion_restore (info)
Fkill_buffer (buf); Fkill_buffer (buf);
} }
if (saved_coding->dst_object == Qt if (EQ (saved_coding->dst_object, Qt)
&& saved_coding->destination) && saved_coding->destination)
xfree (saved_coding->destination); xfree (saved_coding->destination);
@ -6878,7 +6878,7 @@ not fully specified.) */)
Lisp_Object string, coding_system, nocopy, buffer; Lisp_Object string, coding_system, nocopy, buffer;
{ {
return code_convert_string (string, coding_system, buffer, return code_convert_string (string, coding_system, buffer,
nocopy, ! NILP (nocopy), 1); 1, ! NILP (nocopy), 1);
} }
@ -7493,7 +7493,7 @@ usage: (define-coding-system-internal ...) */)
{ {
val = Fcar (tail); val = Fcar (tail);
if (INTEGERP (val)) if (INTEGERP (val))
ASET (valids, XINT (val), 1); ASET (valids, XINT (val), make_number (1));
else else
{ {
int from, to; int from, to;
@ -7504,7 +7504,7 @@ usage: (define-coding-system-internal ...) */)
from = XINT (XCAR (val)); from = XINT (XCAR (val));
to = XINT (XCDR (val)); to = XINT (XCDR (val));
for (i = from; i <= to; i++) for (i = from; i <= to; i++)
ASET (valids, i, 1); ASET (valids, i, make_number (1));
} }
} }
ASET (attrs, coding_attr_ccl_valids, valids); ASET (attrs, coding_attr_ccl_valids, valids);