Mercurial > emacs
comparison src/coding.c @ 112332:28ca83ef1128
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:24:36 -0800 |
| parents | 81d8294d0c45 |
| children | 42e22c4f06b7 |
comparison
equal
deleted
inserted
replaced
| 112331:f6578f2bd119 | 112332:28ca83ef1128 |
|---|---|
| 2627 if (cmp_status->ncomps > 0) | 2627 if (cmp_status->ncomps > 0) |
| 2628 cmp_status->state = COMPOSING_COMPONENT_CHAR; | 2628 cmp_status->state = COMPOSING_COMPONENT_CHAR; |
| 2629 else | 2629 else |
| 2630 EMACS_MULE_MAYBE_FINISH_COMPOSITION (); | 2630 EMACS_MULE_MAYBE_FINISH_COMPOSITION (); |
| 2631 } | 2631 } |
| 2632 continue; | |
| 2633 | |
| 2634 src = src_base; | |
| 2635 consumed_chars = consumed_chars_base; | |
| 2636 continue; | 2632 continue; |
| 2637 | 2633 |
| 2638 invalid_code: | 2634 invalid_code: |
| 2639 EMACS_MULE_MAYBE_FINISH_COMPOSITION (); | 2635 EMACS_MULE_MAYBE_FINISH_COMPOSITION (); |
| 2640 src = src_base; | 2636 src = src_base; |
| 10899 | 10895 |
| 10900 return str; | 10896 return str; |
| 10901 } | 10897 } |
| 10902 | 10898 |
| 10903 #endif /* emacs */ | 10899 #endif /* emacs */ |
| 10904 |