diff options
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 973f9c1b2a6..a9d47ebca16 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lread.c (Fload): Don't compare a possibly-garbage time_t value. | ||
| 4 | |||
| 3 | GLYPH_CODE_FACE returns EMACS_INT, not int. | 5 | GLYPH_CODE_FACE returns EMACS_INT, not int. |
| 4 | * dispextern.h (merge_faces): | 6 | * dispextern.h (merge_faces): |
| 5 | * xfaces.c (merge_faces): | 7 | * xfaces.c (merge_faces): |