diff options
| author | Chong Yidong | 2010-11-05 14:28:19 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-11-05 14:28:19 -0400 |
| commit | be3faa809a959dcd7e985a0d536ac815d5138976 (patch) | |
| tree | e183133c72d2861c068071956845a249c63c5344 /src/ChangeLog | |
| parent | a7702be668334560736769e99cbfc9cd01cdcf2b (diff) | |
| download | emacs-be3faa809a959dcd7e985a0d536ac815d5138976.tar.gz emacs-be3faa809a959dcd7e985a0d536ac815d5138976.zip | |
Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
* image.c (free_image): Don't garbage the frame here, since this
function can be called while redisplaying (Bug#7210).
(uncache_image): Garbage the frame here (Bug#6426).
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b803582e5f6..cba2b4b478d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-11-05 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * image.c (free_image): Don't garbage the frame here, since this | ||
| 4 | function can be called while redisplaying (Bug#7210). | ||
| 5 | (uncache_image): Garbage the frame here (Bug#6426). | ||
| 6 | |||
| 1 | 2010-11-04 Chong Yidong <cyd@stupidchicken.com> | 7 | 2010-11-04 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * process.c (Fmake_network_process): Don't apply Bug#5173 fix for | 9 | * process.c (Fmake_network_process): Don't apply Bug#5173 fix for |