diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-07-23 08:15:53 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-07-23 08:15:53 -0400 |
| commit | be18c5a51f9a87f9842ac1a65004c9e44a9d6fd4 (patch) | |
| tree | d4b704d6d0d071f35bdda19160e28aa8631b039e | |
| parent | a2709514e606b5bb03b0c8dfcc12aaa3dcf72a22 (diff) | |
| download | emacs-be18c5a51f9a87f9842ac1a65004c9e44a9d6fd4.tar.gz | |
Fix compilation with GLYPH_DEBUG.
src/xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
2008-02-22T17:42:09Z!monnier@iro.umontreal.ca.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ad207884753..ef5aa7b19f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 diff --git a/src/xfns.c b/src/xfns.c index 0d1e4a1bb5e..eec19b9d275 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -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; } |