From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 04:37:14 +0000 (-0700)
Subject: * xrdb.c (x_load_resources): Omit unused local.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~40
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=723918432dca82feb36908666270bc58d9368267;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index bbe008ce96c..88611381119 100644
--- 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 ebbcb2dc6d4..b01e344edf2 100644
--- 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