Mercurial > emacs
comparison src/xdisp.c @ 71492:db787aec9421
(handle_composition_prop): Set stop_charpos before push_it.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 27 Jun 2006 11:21:31 +0000 |
parents | ee60680fee73 |
children | 0b31608be4a1 |
comparison
equal
deleted
inserted
replaced
71491:c7bb40f0c3d5 | 71492:db787aec9421 |
---|---|
4486 IT_BYTEPOS (*it) = CHAR_TO_BYTE (end); | 4486 IT_BYTEPOS (*it) = CHAR_TO_BYTE (end); |
4487 } | 4487 } |
4488 return HANDLED_RECOMPUTE_PROPS; | 4488 return HANDLED_RECOMPUTE_PROPS; |
4489 } | 4489 } |
4490 | 4490 |
4491 it->stop_charpos = end; | |
4491 push_it (it); | 4492 push_it (it); |
4493 | |
4492 it->method = GET_FROM_COMPOSITION; | 4494 it->method = GET_FROM_COMPOSITION; |
4493 it->cmp_id = id; | 4495 it->cmp_id = id; |
4494 it->cmp_len = COMPOSITION_LENGTH (prop); | 4496 it->cmp_len = COMPOSITION_LENGTH (prop); |
4495 /* For a terminal, draw only the first character of the | 4497 /* For a terminal, draw only the first character of the |
4496 components. */ | 4498 components. */ |
4497 it->c = COMPOSITION_GLYPH (composition_table[id], 0); | 4499 it->c = COMPOSITION_GLYPH (composition_table[id], 0); |
4498 it->len = (STRINGP (it->string) | 4500 it->len = (STRINGP (it->string) |
4499 ? string_char_to_byte (it->string, end) | 4501 ? string_char_to_byte (it->string, end) |
4500 : CHAR_TO_BYTE (end)) - pos_byte; | 4502 : CHAR_TO_BYTE (end)) - pos_byte; |
4501 it->stop_charpos = end; | |
4502 handled = HANDLED_RETURN; | 4503 handled = HANDLED_RETURN; |
4503 } | 4504 } |
4504 } | 4505 } |
4505 | 4506 |
4506 return handled; | 4507 return handled; |