diff src/device-x.c @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents e45d5e7c476e
children 262b8bb4a523
line wrap: on
line diff
--- a/src/device-x.c	Mon Aug 13 10:03:54 2007 +0200
+++ b/src/device-x.c	Mon Aug 13 10:04:58 2007 +0200
@@ -262,7 +262,7 @@
     Vdefault_x_device = device;
 
 #ifdef MULE
-#if defined(LWLIB_MENUBARS_MOTIF) || defined(USE_XFONTSET)
+#if defined(LWLIB_MENUBARS_MOTIF) || defined(HAVE_XIM) || defined (USE_XFONTSET)
   {
     /* Read in locale-specific resources from
        data-directory/app-defaults/$LANG/emacs-application-class.
@@ -281,7 +281,7 @@
 	  XrmCombineFileDatabase (path, &db, False);
       }
   }
-#endif /* LWLIB_MENUBARS_MOTIF or USE_XFONTSET */
+#endif /* LWLIB_MENUBARS_MOTIF or HAVE_XIM USE_XFONTSET */
 #endif /* MULE */
 
   if (NILP (DEVICE_NAME (d)))