Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 263:727739f917cb r20-5b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 11cf20601dec
children 966663fcf606
comparison
equal deleted inserted replaced
262:9d8607af9e13 263:727739f917cb
323 323
324 #ifdef MULE 324 #ifdef MULE
325 #if defined(LWLIB_MENUBARS_MOTIF) || defined(HAVE_XIM) || defined (USE_XFONTSET) 325 #if defined(LWLIB_MENUBARS_MOTIF) || defined(HAVE_XIM) || defined (USE_XFONTSET)
326 { 326 {
327 /* Read in locale-specific resources from 327 /* Read in locale-specific resources from
328 data-directory/app-defaults/$LANG/emacs-application-class. 328 data-directory/app-defaults/$LANG/Emacs.
329 This is in addition to the standard app-defaults files, and 329 This is in addition to the standard app-defaults files, and
330 does not override resources defined elsewhere */ 330 does not override resources defined elsewhere */
331 CONST char *data_dir; 331 CONST char *data_dir;
332 char path[MAXPATHLEN]; 332 char path[MAXPATHLEN];
333 XrmDatabase db = XtDatabase (dpy); /* ### XtScreenDatabase(dpy) ? */ 333 XrmDatabase db = XtDatabase (dpy); /* ### XtScreenDatabase(dpy) ? */
335 335
336 if (STRINGP (Vx_app_defaults_directory) && 336 if (STRINGP (Vx_app_defaults_directory) &&
337 XSTRING_LENGTH (Vx_app_defaults_directory) > 0) 337 XSTRING_LENGTH (Vx_app_defaults_directory) > 0)
338 { 338 {
339 GET_C_STRING_FILENAME_DATA_ALLOCA(Vx_app_defaults_directory, data_dir); 339 GET_C_STRING_FILENAME_DATA_ALLOCA(Vx_app_defaults_directory, data_dir);
340 sprintf (path, "%s%s/%s", data_dir, locale, app_class); 340 sprintf (path, "%s%s/Emacs", data_dir, locale);
341 if (!access (path, R_OK)) 341 if (!access (path, R_OK))
342 XrmCombineFileDatabase (path, &db, False); 342 XrmCombineFileDatabase (path, &db, False);
343 } 343 }
344 else if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0) 344 else if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0)
345 { 345 {
346 GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir); 346 GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir);
347 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); 347 sprintf (path, "%sapp-defaults/%s/Emacs", data_dir, locale);
348 if (!access (path, R_OK)) 348 if (!access (path, R_OK))
349 XrmCombineFileDatabase (path, &db, False); 349 XrmCombineFileDatabase (path, &db, False);
350 } 350 }
351 } 351 }
352 #endif /* LWLIB_MENUBARS_MOTIF or HAVE_XIM USE_XFONTSET */ 352 #endif /* LWLIB_MENUBARS_MOTIF or HAVE_XIM USE_XFONTSET */