diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-16 11:45:33 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-12-16 11:45:33 +0400 |
| commit | 5ae356d99130af32b51a0cd67d1933ed9e6cd20e (patch) | |
| tree | 4d68dfd538ce4a7ef56027218f5ec1582d5b73df /src/font.h | |
| parent | 2013a2f955e4dc6edf9869767e9f5d70fbf9d69c (diff) | |
| download | emacs-5ae356d99130af32b51a0cd67d1933ed9e6cd20e.tar.gz | |
* font.c (valid_font_driver) [ENABLE_CHECKING]: New function
intended to find bogus pointers in font objects (Bug#16140).
* font.h (valid_font_driver) [ENABLE_CHECKING]: Add prototype.
* alloc.c (cleanup_vector): Use valid_font_driver in eassert.
(compact_font_cache_entry, compact_font_caches) [!HAVE_NTGUI]:
Disable for MS-Windows due to Bug#15876; apparently this
requires more or less substantial changes in fontset code.
* xfont.c (xfont_close):
* xftfont.c (xftfont_close): Call x_display_info_for_display
to check whether 'Display *' is valid (Bug#16093 and probably
Bug#16069).
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/font.h b/src/font.h index 2c7456a2f29..8fb80a9b617 100644 --- a/src/font.h +++ b/src/font.h @@ -787,6 +787,9 @@ extern int font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int bytes); extern void register_font_driver (struct font_driver *driver, struct frame *f); extern void free_font_driver_list (struct frame *f); +#ifdef ENABLE_CHECKING +extern bool valid_font_driver (struct font_driver *); +#endif extern Lisp_Object font_update_drivers (struct frame *f, Lisp_Object list); extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *, struct window *, struct face *, |