* xrdb.c (x_load_resources): Omit unused local.

diff --git a/src/ChangeLog b/src/ChangeLog
index bbe008ce96c4ac88dd4cae33967d8898383d276d..88611381119047191aa41ef172505f836807f83d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,7 +9,7 @@
        Remove unused var.
        (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.
 
-       * xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.
+       * xrdb.c (x_load_resources): Omit unused local.
 
        * xfns.c (free_frame_menubar, atof): Remove duplicate decls.
        (x_window): Rename locals to avoid shadowing.

diff --git a/src/xrdb.c b/src/xrdb.c
index ebbcb2dc6d442b0c8a828eacffa3adee236228b7..b01e344edf214235e80350265e1f47ec20c1e9e0 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -479,8 +479,11 @@ x_load_resources (Display *display, const char *xrm_string,
   XrmDatabase db;
   char line[256];
 
-#ifdef USE_MOTIF
+#if defined USE_MOTIF || !defined HAVE_XFT || !defined USE_LUCID
   const char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
+#endif
+
+#ifdef USE_MOTIF
   const char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
 #endif