Mercurial > emacs
comparison src/composite.c @ 81432:94b0b9678b0f
(update_compositions): Fix last fix.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 15 Jun 2007 00:02:03 +0000 |
| parents | ac14f6e0bfff |
| children | b98604865ea0 3619e7770f2e |
comparison
equal
deleted
inserted
replaced
| 81431:7587e14bd4da | 81432:94b0b9678b0f |
|---|---|
| 510 run_composition_function (start, end, prop); | 510 run_composition_function (start, end, prop); |
| 511 from = end; | 511 from = end; |
| 512 } | 512 } |
| 513 else if (from < ZV | 513 else if (from < ZV |
| 514 && find_composition (from, -1, &start, &from, &prop, Qnil) | 514 && find_composition (from, -1, &start, &from, &prop, Qnil) |
| 515 && COMPOSITION_VALID_P (start, end, prop)) | 515 && COMPOSITION_VALID_P (start, from, prop)) |
| 516 run_composition_function (start, from, prop); | 516 run_composition_function (start, from, prop); |
| 517 } | 517 } |
| 518 | 518 |
| 519 if (check_mask & CHECK_INSIDE) | 519 if (check_mask & CHECK_INSIDE) |
| 520 { | 520 { |
| 521 /* In this case, we are sure that (check & CHECK_TAIL) is also | 521 /* In this case, we are sure that (check & CHECK_TAIL) is also |
| 522 nonzero. Thus, here we should check only compositions before | 522 nonzero. Thus, here we should check only compositions before |
| 523 (to - 1). */ | 523 (to - 1). */ |
| 524 while (from < to - 1 | 524 while (from < to - 1 |
| 525 && find_composition (from, to, &start, &from, &prop, Qnil) | 525 && find_composition (from, to, &start, &from, &prop, Qnil) |
| 526 && COMPOSITION_VALID_P (start, end, prop) | 526 && COMPOSITION_VALID_P (start, from, prop) |
| 527 && from < to - 1) | 527 && from < to - 1) |
| 528 run_composition_function (start, from, prop); | 528 run_composition_function (start, from, prop); |
| 529 } | 529 } |
| 530 | 530 |
| 531 if (check_mask & CHECK_TAIL) | 531 if (check_mask & CHECK_TAIL) |