Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 207:e45d5e7c476e r20-4b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b2
author cvs
date Mon, 13 Aug 2007 10:03:52 +0200
parents acd284d43ca1
children 41ff10fd062f
comparison
equal deleted inserted replaced
206:d3e9274cbc4e 207:e45d5e7c476e
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 { 266 {
266 /* Read in locale-specific resources from 267 /* Read in locale-specific resources from
267 data-directory/app-defaults/$LANG/emacs-application-class. 268 data-directory/app-defaults/$LANG/emacs-application-class.
268 This is in addition to the standard app-defaults files, and 269 This is in addition to the standard app-defaults files, and
269 does not override resources defined elsewhere */ 270 does not override resources defined elsewhere */
278 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); 279 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class);
279 if (!access (path, R_OK)) 280 if (!access (path, R_OK))
280 XrmCombineFileDatabase (path, &db, False); 281 XrmCombineFileDatabase (path, &db, False);
281 } 282 }
282 } 283 }
284 #endif /* LWLIB_MENUBARS_MOTIF or USE_XFONTSET */
283 #endif /* MULE */ 285 #endif /* MULE */
284 286
285 if (NILP (DEVICE_NAME (d))) 287 if (NILP (DEVICE_NAME (d)))
286 DEVICE_NAME (d) = display; 288 DEVICE_NAME (d) = display;
287 289