diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-05 10:25:12 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-05 10:25:12 +0400 |
| commit | 257b3b03cb1cff917e0b3b7832ad3eab5b59f257 (patch) | |
| tree | f0c9f48325a8cef0bc8d12a7eed4508c48267ace /src/font.c | |
| parent | 98b7f4bdefcc684389bebbd855a02a8097f1bb45 (diff) | |
| download | emacs-257b3b03cb1cff917e0b3b7832ad3eab5b59f257.tar.gz | |
Make --without-x compatible with --enable-gcc-warnings.
* configure.ac: If both --without-x and --enable-gcc-warnings are
specified, use -Wno-unused-variable, -Wno-unused-but-set-variable
and -Wno-unused-but-set-parameter.
* src/font.c (register_font_driver): Move check under HAVE_WINDOW_SYSTEM.
* src/font.h (struct font_driver): Move draw, get_bitmap and free_bitmap
members under HAVE_WINDOW_SYSTEM.
* src/keyboard.c (make_lispy_focus_out): Likewise.
(record_menu_key): Move under HAVE_MENUS.
* src/xdisp.c (toplevel): Move hourglass_shown_p, hourglass_atimer and
THIN_SPACE_WIDTH under HAVE_WINDOW_SYSTEM.
(syms_of_xdisp): Adjust user.
(window_box_edges): Define only if HAVE_WINDOW_SYSTEM.
(start_hourglass, cancel_hourglass):
* src/xfaces.c (toplevel): Likewise with PT_PER_INCH,
clear_font_table_count, CLEAR_FONT_TABLE_COUNT
and CLEAR_FONT_TABLE_NFONTS.
(set_font_frame_param, clear_face_gcs, realize_non_ascii_face):
Declare only if HAVE_WINDOW_SYSTEM.
(lface_same_font_attributes_p, clear_face_gcs): Define only
if HAVE_WINDOW_SYSTEM.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/font.c b/src/font.c index 6a8262623dc..49398e1b876 100644 --- a/src/font.c +++ b/src/font.c @@ -3379,9 +3379,11 @@ register_font_driver (struct font_driver *driver, struct frame *f) struct font_driver_list *root = f ? f->font_driver_list : font_driver_list; struct font_driver_list *prev, *list; +#ifdef HAVE_WINDOW_SYSTEM if (f && ! driver->draw) error ("Unusable font driver for a frame: %s", SDATA (SYMBOL_NAME (driver->type))); +#endif /* HAVE_WINDOW_SYSTEM */ for (prev = NULL, list = root; list; prev = list, list = list->next) if (EQ (list->driver->type, driver->type)) |