Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents e45d5e7c476e
children 262b8bb4a523
comparison
equal deleted inserted replaced
208:f427b8ec4379 209:41ff10fd062f
260 260
261 if (NILP (Vdefault_x_device)) 261 if (NILP (Vdefault_x_device))
262 Vdefault_x_device = device; 262 Vdefault_x_device = device;
263 263
264 #ifdef MULE 264 #ifdef MULE
265 #if defined(LWLIB_MENUBARS_MOTIF) || defined(USE_XFONTSET) 265 #if defined(LWLIB_MENUBARS_MOTIF) || defined(HAVE_XIM) || defined (USE_XFONTSET)
266 { 266 {
267 /* Read in locale-specific resources from 267 /* Read in locale-specific resources from
268 data-directory/app-defaults/$LANG/emacs-application-class. 268 data-directory/app-defaults/$LANG/emacs-application-class.
269 This is in addition to the standard app-defaults files, and 269 This is in addition to the standard app-defaults files, and
270 does not override resources defined elsewhere */ 270 does not override resources defined elsewhere */
279 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); 279 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class);
280 if (!access (path, R_OK)) 280 if (!access (path, R_OK))
281 XrmCombineFileDatabase (path, &db, False); 281 XrmCombineFileDatabase (path, &db, False);
282 } 282 }
283 } 283 }
284 #endif /* LWLIB_MENUBARS_MOTIF or USE_XFONTSET */ 284 #endif /* LWLIB_MENUBARS_MOTIF or HAVE_XIM USE_XFONTSET */
285 #endif /* MULE */ 285 #endif /* MULE */
286 286
287 if (NILP (DEVICE_NAME (d))) 287 if (NILP (DEVICE_NAME (d)))
288 DEVICE_NAME (d) = display; 288 DEVICE_NAME (d) = display;
289 289