diff options
| author | Chong Yidong | 2011-07-07 12:18:25 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-07-07 12:18:25 -0400 |
| commit | 412f24b9ddf1e07022f8c5fe05f0717f130c4c02 (patch) | |
| tree | cf8450140b0907d14ac4dbdcf025f033a992bc98 /src/ChangeLog | |
| parent | af0905c84a232b034b4f792847aa05531f8cdefc (diff) | |
| parent | 15fa4783a39e7a8d99cc6b5e783307c08b25a823 (diff) | |
| download | emacs-412f24b9ddf1e07022f8c5fe05f0717f130c4c02.tar.gz emacs-412f24b9ddf1e07022f8c5fe05f0717f130c4c02.zip | |
Merge from emacs-23 branch
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6485ed08027..9186061530e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-07-07 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * composite.c (composition_compute_stop_pos): Ignore a static | ||
| 4 | composition starting before CHARPOS (Bug#8915). | ||
| 5 | |||
| 6 | * xdisp.c (handle_composition_prop): Likewise. | ||
| 7 | |||
| 1 | 2011-07-07 Eli Zaretskii <eliz@gnu.org> | 8 | 2011-07-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what. | 10 | * term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what. |