From: Kenichi Handa Date: Tue, 25 May 2010 01:03:44 +0000 (+0900) Subject: merge trunk X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~204 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cdf522217cd425ca6dabb1fc6c0fb7fb9c95883b;p=emacs.git merge trunk --- cdf522217cd425ca6dabb1fc6c0fb7fb9c95883b diff --cc src/ChangeLog index 67911d5def3,dbd132aa3dc..959c3fbcb54 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,26 -1,7 +1,30 @@@ +2010-05-25 Kenichi Handa + + * dispextern.h (struct composition_it): New members rule_idx and + charpos. + + * xdisp.c (set_iterator_to_next): While scanning backward, assume + that the character positions of IT point the last character of the + current grapheme cluster. + (next_element_from_composition): Don't change character positions + of IT. + (append_composite_glyph): Set glyph->charpos to + it->cmp_it.charpos. + + * composite.c (autocmp_chars): Change the first argument to RULE, + and try composition with RULE only. + (composition_compute_stop_pos): Record the index number of the + composition rule in CMP_IT->rule_idx. + (composition_reseat_it): Call autocmp_chars repeatedly until the + correct rule of the composition is found. + (composition_update_it): Set CMP_IT->charpos. Assume the CHARPOS + is at the last character of the current grapheme cluster when + CMP_IT->reversed_p is nonzero. + + 2010-05-24 Stefan Monnier + + * editfns.c (Fbyte_to_string): New function. + 2010-05-24 Stefan Monnier * process.c (Fmake_network_process): Set :host to nil if it's not used.