]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix compilation with GLYPH_DEBUG.
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Jul 2011 12:15:53 +0000 (08:15 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Jul 2011 12:15:53 +0000 (08:15 -0400)
 src/xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
 2008-02-22T17:42:09Z!monnier@iro.umontreal.ca.

src/ChangeLog
src/xfns.c

index ad207884753600a840adadedfe17439d83a6cd61..ef5aa7b19f5dde5846dab6436817f218353e0bff 100644 (file)
@@ -1,5 +1,8 @@
 2011-07-23  Eli Zaretskii  <eliz@gnu.org>
 
+       * xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
+       2008-02-22T17:42:09Z!monnier@iro.umontreal.ca.
+
        * xdisp.c (move_it_in_display_line_to): Record the best matching
        position for TO_CHARPOS while scanning the line, and restore it on
        exit if none of the characters scanned was an exact match.  Fixes
index 0d1e4a1bb5ec80064a5410210c549593b8f3728c..eec19b9d275813f805a36f63c5a7cd8e302acfce 100644 (file)
@@ -2933,7 +2933,7 @@ unwind_create_frame (Lisp_Object frame)
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
-      xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
+      xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
 #endif
       return Qt;
     }