Mercurial > emacs
diff src/image.c @ 111449:132f2dfd549f
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 09 Nov 2010 15:07:10 -0500 |
parents | 230a50b33a46 0792cbcb42ed |
children | a5a188ddc758 |
line wrap: on
line diff
--- a/src/image.c Tue Nov 09 10:29:37 2010 +0000 +++ b/src/image.c Tue Nov 09 15:07:10 2010 -0500 @@ -1049,10 +1049,6 @@ /* Free resources, then free IMG. */ img->type->free (f, img); xfree (img); - - /* As display glyphs may still be referring to the image ID, we - must garbage the frame (Bug#6426). */ - SET_FRAME_GARBAGED (f); } } @@ -1471,7 +1467,12 @@ { struct image *img = search_image_cache (f, spec, sxhash (spec, 0)); if (img) - free_image (f, img); + { + free_image (f, img); + /* As display glyphs may still be referring to the image ID, we + must garbage the frame (Bug#6426). */ + SET_FRAME_GARBAGED (f); + } }