[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105310: Fix compilation with GLYPH_D
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105310: Fix compilation with GLYPH_DEBUG. |
Date: |
Sat, 23 Jul 2011 08:15:53 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105310
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-23 08:15:53 -0400
message:
Fix compilation with GLYPH_DEBUG.
src/xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
revision 84777 on 2008-02-22.
modified:
src/ChangeLog
src/xfns.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-07-23 10:46:21 +0000
+++ b/src/ChangeLog 2011-07-23 12:15:53 +0000
@@ -1,5 +1,8 @@
2011-07-23 Eli Zaretskii <address@hidden>
+ * xfns.c (unwind_create_frame) [GLYPH_DEBUG]: Adapt to changes in
+ revision 84777 on 2008-02-22.
+
* 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
=== modified file 'src/xfns.c'
--- a/src/xfns.c 2011-07-10 08:20:10 +0000
+++ b/src/xfns.c 2011-07-23 12:15:53 +0000
@@ -2933,7 +2933,7 @@
#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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105310: Fix compilation with GLYPH_DEBUG.,
Eli Zaretskii <=