Mercurial > hg > xemacs-beta

comparison src/device-x.c @ 169:15872534500d r20-3b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b11
author cvs
date Mon, 13 Aug 2007 09:46:53 +0200
parents 85ec50267440
children 6075d714658b
comparison
equal deleted inserted replaced
168:9851d5c6556e 169:15872534500d
276 char path[MAXPATHLEN]; 276 char path[MAXPATHLEN];
277 XrmDatabase db = XtDatabase (dpy); /* ### XtScreenDatabase(dpy) ? */ 277 XrmDatabase db = XtDatabase (dpy); /* ### XtScreenDatabase(dpy) ? */
278 CONST char *locale = XrmLocaleOfDatabase (db); 278 CONST char *locale = XrmLocaleOfDatabase (db);
279 279
280 if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0) 280 if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0)
281 GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir); 281 {
282 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); 282 GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir);
283 if (!access (path, R_OK)) 283 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class);
284 XrmCombineFileDatabase (path, &db, False); 284 if (!access (path, R_OK))
285 XrmCombineFileDatabase (path, &db, False);
286 }
285 } 287 }
286 #endif /* MULE */ 288 #endif /* MULE */
287 289
288 if (NILP (DEVICE_NAME (d))) 290 if (NILP (DEVICE_NAME (d)))
289 DEVICE_NAME (d) = display; 291 DEVICE_NAME (d) = display;