From 946598bf94b5a0fac989f3108a6ee2bc425611de Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 2 Jul 2008 16:23:35 +0000 Subject: [PATCH] (syms_of_xfns): Only define x-select-font when both HAVE_FREETYPE and USE_GTK. --- src/ChangeLog | 8 ++++++++ src/xfns.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4c3faeaf442..c26abef7885 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-07-02 Jason Rumney + + * xfns.c (syms_of_xfns): Only define x-select-font when both + HAVE_FREETYPE and USE_GTK + + * xdisp.c (next_element_from_display_vector): Move assignment out + of if statement. + 2008-07-02 Toru Tsuneyoshi * lisp.h (Qdelete_file, Qdelete_directory): Declare extern. diff --git a/src/xfns.c b/src/xfns.c index d32442fe7fa..07a343ccadf 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -6071,7 +6071,7 @@ the tool bar buttons. */); defsubr (&Sx_file_dialog); #endif -#ifdef USE_GTK +#if defined (USE_GTK) && defined (HAVE_FREETYPE) defsubr (&Sx_select_font); #endif } -- 2.39.2