aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-07-23 08:15:53 -0400
committerEli Zaretskii2011-07-23 08:15:53 -0400
commitbe18c5a51f9a87f9842ac1a65004c9e44a9d6fd4 (patch)
treed4b704d6d0d071f35bdda19160e28aa8631b039e /src
parenta2709514e606b5bb03b0c8dfcc12aaa3dcf72a22 (diff)
downloademacs-be18c5a51f9a87f9842ac1a65004c9e44a9d6fd4.tar.gz
emacs-be18c5a51f9a87f9842ac1a65004c9e44a9d6fd4.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xfns.c2
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 @@
12011-07-23 Eli Zaretskii <eliz@gnu.org> 12011-07-23 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
4 2008-02-22T17:42:09Z!monnier@iro.umontreal.ca.
5
3 * xdisp.c (move_it_in_display_line_to): Record the best matching 6 * xdisp.c (move_it_in_display_line_to): Record the best matching
4 position for TO_CHARPOS while scanning the line, and restore it on 7 position for TO_CHARPOS while scanning the line, and restore it on
5 exit if none of the characters scanned was an exact match. Fixes 8 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)
2933#if GLYPH_DEBUG 2933#if GLYPH_DEBUG
2934 /* Check that reference counts are indeed correct. */ 2934 /* Check that reference counts are indeed correct. */
2935 xassert (dpyinfo->reference_count == dpyinfo_refcount); 2935 xassert (dpyinfo->reference_count == dpyinfo_refcount);
2936 xassert (dpyinfo->image_cache->refcount == image_cache_refcount); 2936 xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
2937#endif 2937#endif
2938 return Qt; 2938 return Qt;
2939 } 2939 }