summaryrefslogtreecommitdiff
path: root/src/coding.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2000-03-02 06:09:15 +0000
committerKenichi Handa <handa@m17n.org>2000-03-02 06:09:15 +0000
commit91bee88126fb98b16accc794aedc91469423e9d5 (patch)
tree80bc35cfab8c4e7e9b91ef60ebb81dcdbf4a903e /src/coding.c
parent0ba93ac4643ed8460a8e5a8f57aaf8d71ee70ce0 (diff)
downloademacs-91bee88126fb98b16accc794aedc91469423e9d5.tar.gz
(coding_save_composition): Be sure to allocate
composition data area in coding even if there's no composition in the current run.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c
index 26a234c6522..40fe424fe05 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -4380,7 +4380,10 @@ coding_save_composition (coding, from, to, obj)
Lisp_Object prop;
int start, end;
- coding->composing = COMPOSITION_DISABLED;
+ if (coding->composing == COMPOSITION_DISABLED)
+ return;
+ if (!coding->cmp_data)
+ coding_allocate_composition_data (coding, from);
if (!find_composition (from, to, &start, &end, &prop, obj)
|| end > to)
return;
@@ -4389,7 +4392,6 @@ coding_save_composition (coding, from, to, obj)
|| end > to))
return;
coding->composing = COMPOSITION_NO;
- coding_allocate_composition_data (coding, from);
do
{
if (COMPOSITION_VALID_P (start, end, prop))