diff options
| author | Paul Eggert | 2011-06-10 22:47:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-10 22:47:05 -0700 |
| commit | 78cf1fe8a256ffc91533b43eb851bf4519e9fbcc (patch) | |
| tree | 84b4d0a579e858040d49e6561be096132860446b /src/ChangeLog | |
| parent | fc83f7d3d422039f041bbcc4f0cb75a1699421ad (diff) | |
| parent | b50691aaafa255709b1117000ce6fb98d9772695 (diff) | |
| download | emacs-78cf1fe8a256ffc91533b43eb851bf4519e9fbcc.tar.gz emacs-78cf1fe8a256ffc91533b43eb851bf4519e9fbcc.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9c2662699be..82fd3526785 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -70,6 +70,16 @@ | |||
| 70 | 70 | ||
| 71 | * alloc.c (Fmake_string): Check for out-of-range init. | 71 | * alloc.c (Fmake_string): Check for out-of-range init. |
| 72 | 72 | ||
| 73 | 2011-06-11 Chong Yidong <cyd@stupidchicken.com> | ||
| 74 | |||
| 75 | * dispextern.h (struct image): Replace data member, whose int_val | ||
| 76 | and ptr_val fields were not used by anything, with a single | ||
| 77 | lisp_val object. | ||
| 78 | |||
| 79 | * image.c (Fimage_metadata, make_image, mark_image, tiff_load) | ||
| 80 | (gif_clear_image, gif_load, imagemagick_load_image) | ||
| 81 | (gs_clear_image, gs_load): Callers changed. | ||
| 82 | |||
| 73 | 2011-06-10 Paul Eggert <eggert@cs.ucla.edu> | 83 | 2011-06-10 Paul Eggert <eggert@cs.ucla.edu> |
| 74 | 84 | ||
| 75 | * buffer.h: Include <time.h>, for time_t. | 85 | * buffer.h: Include <time.h>, for time_t. |