diff options
| author | Kenichi Handa | 2011-02-23 10:56:49 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-02-23 10:56:49 +0900 |
| commit | 9c02aefc951cca753d1548de717d3b5017e96187 (patch) | |
| tree | b364f2d54248257512be84f7f89b3b42d31d86d1 /src | |
| parent | 2e15a2cf4ddfbda0bbf972036c11d464f7ba6226 (diff) | |
| parent | e3b300a497971596f3cc6c0f3eb187c903d43dd0 (diff) | |
| download | emacs-9c02aefc951cca753d1548de717d3b5017e96187.tar.gz emacs-9c02aefc951cca753d1548de717d3b5017e96187.zip | |
merge emacs-23
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 26da194f228..addaab34572 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-02-22 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * font.c (font_open_entity): Be sure to set scaled_pixel_size. | ||
| 4 | (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is | ||
| 5 | integer. | ||
| 6 | |||
| 1 | 2011-02-19 Chong Yidong <cyd@stupidchicken.com> | 7 | 2011-02-19 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. | 9 | * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. |