diff options
| author | Dmitry Antipov | 2012-06-28 11:50:27 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-06-28 11:50:27 +0400 |
| commit | a54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch) | |
| tree | 447eb906b698dee37a17779ea15f448079b8f54b /src/ftfont.c | |
| parent | 1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff) | |
| download | emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.tar.gz emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.zip | |
Generalize run-time debugging checks.
* configure.in (ENABLE_CHECKING): Update comment.
* src/dispextern.h (XASSERTS): Remove.
* src/fontset.c (xassert): Remove.
Convert from xassert to eassert.
* src/alloc.c: Convert from xassert to eassert.
* src/bidi.c: Likewise.
* src/dispnew.c: Likewise.
* src/fns.c: Likewise.
* src/fringe.c: Likewise.
* src/ftfont.c: Likewise.
* src/gtkutil.c: Likewise.
* src/image.c: Likewise.
* src/keyboard.c: Likewise.
* src/menu.c: Likewise.
* src/process.c: Likewise.
* src/scroll.c: Likewise.
* src/sound.c: Likewise.
* src/term.c: Likewise.
* src/w32console.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32term.c: Likewise.
* src/window.c: Likewise.
* src/xdisp.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xselect.c: Likewise.
* src/xterm.c: Likewise.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index bfce7425af4..29732e4c870 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -372,7 +372,7 @@ ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for) | |||
| 372 | { | 372 | { |
| 373 | entity = key; | 373 | entity = key; |
| 374 | val = assq_no_quit (QCfont_entity, AREF (entity, FONT_EXTRA_INDEX)); | 374 | val = assq_no_quit (QCfont_entity, AREF (entity, FONT_EXTRA_INDEX)); |
| 375 | xassert (CONSP (val)); | 375 | eassert (CONSP (val)); |
| 376 | key = XCDR (val); | 376 | key = XCDR (val); |
| 377 | } | 377 | } |
| 378 | else | 378 | else |
| @@ -1325,7 +1325,7 @@ ftfont_close (FRAME_PTR f, struct font *font) | |||
| 1325 | 1325 | ||
| 1326 | val = Fcons (font->props[FONT_FILE_INDEX], make_number (ftfont_info->index)); | 1326 | val = Fcons (font->props[FONT_FILE_INDEX], make_number (ftfont_info->index)); |
| 1327 | cache = ftfont_lookup_cache (val, FTFONT_CACHE_FOR_FACE); | 1327 | cache = ftfont_lookup_cache (val, FTFONT_CACHE_FOR_FACE); |
| 1328 | xassert (CONSP (cache)); | 1328 | eassert (CONSP (cache)); |
| 1329 | val = XCDR (cache); | 1329 | val = XCDR (cache); |
| 1330 | (XSAVE_VALUE (val)->integer)--; | 1330 | (XSAVE_VALUE (val)->integer)--; |
| 1331 | if (XSAVE_VALUE (val)->integer == 0) | 1331 | if (XSAVE_VALUE (val)->integer == 0) |