diff options
| author | Glenn Morris | 2011-02-22 20:19:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-22 20:19:28 -0800 |
| commit | cce7d53002e8abc346b67ea4100507b0e7c4d68e (patch) | |
| tree | faed484c15cde23eec2ec2463a1f30b9a8f4e43b /src/ChangeLog | |
| parent | 4902e827bc04d0e1cb17820fe522992995166fc7 (diff) | |
| parent | 51a13bdd9324860db6381e6da121411467087bec (diff) | |
| download | emacs-cce7d53002e8abc346b67ea4100507b0e7c4d68e.tar.gz emacs-cce7d53002e8abc346b67ea4100507b0e7c4d68e.zip | |
Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8befb78f91f..194f1c44f84 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-02-23 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 integer. | ||
| 5 | |||
| 1 | 2011-02-22 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-02-22 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * dired.c (Ffile_attributes): Simplify and avoid #ifdef. | 8 | * dired.c (Ffile_attributes): Simplify and avoid #ifdef. |