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

(coding_allocate_composition_data): Reset

Browse source 
coding->composing to COMPOSITION_NO.
(coding_restore_composition): Detect invalid composition data.
Give Fstring and Fvector a Lispy integer, not C int.
This commit is contained in:
Kenichi Handa 2003-11-07 05:55:43 +00:00
parent 9f6a7e77d9
commit 4307d5349e
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/coding.c
View file

@ -1689,6 +1689,7 @@ coding_allocate_composition_data (coding, char_offset)
coding->cmp_data->next = cmp_data;
coding->cmp_data = cmp_data;
coding->cmp_data_start = 0;
coding->composing = COMPOSITION_NO;
}
/* Handle composition start sequence ESC 0, ESC 2, ESC 3, or ESC 4.
@ -5440,6 +5441,10 @@ coding_restore_composition (coding, obj)
enum composition_method method = (enum composition_method) data[3];
Lisp_Object components;
if (data[0] < 0 || i + data[0] > cmp_data->used)
/* Invalid composition data. */
break;
if (method == COMPOSITION_RELATIVE)
components = Qnil;
else
@ -5453,7 +5458,8 @@ coding_restore_composition (coding, obj)
for (j = 0; j < len; j++)
args[j] = make_number (data[4 + j]);
components = (method == COMPOSITION_WITH_ALTCHARS
? Fstring (len, args) : Fvector (len, args));
? Fstring (make_number (len), args)
: Fvector (make_number (len), args));
}
compose_text (data[1], data[2], components, Qnil, obj);
}