From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 19 Jun 2010 19:43:47 +0000 (-0400)
Subject: * image.c (free_image): Mark frame as garbaged (Bug#6426).
X-Git-Tag: emacs-pretest-23.2.90~139^2~114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52ab9bb27b2d91a4050762bbe34f05db3018f62f;p=emacs.git

* image.c (free_image): Mark frame as garbaged (Bug#6426).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 680f364a1fa..cf6f8427b25 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
+	* image.c (free_image): Mark frame as garbaged (Bug#6426).
+
 	* keymap.c (Fdefine_key): Doc fix (Bug#6460).
 
 2010-06-15  Glenn Morris  <rgm@gnu.org>
diff --git a/src/image.c b/src/image.c
index 1265b900c6c..e7db3a7df1b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1094,6 +1094,10 @@ free_image (f, img)
       /* 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);
     }
 }