comparison src/device-x.c @ 278:90d73dddcdc4 r21-0b37

Import from CVS: tag r21-0b37
author cvs
date Mon, 13 Aug 2007 10:31:29 +0200
parents 6330739388db
children 7df0dd720c89
comparison
equal deleted inserted replaced
277:cfdf3ff11843 278:90d73dddcdc4
274 have_xemacs_resources_in_xrdb (Display *dpy) 274 have_xemacs_resources_in_xrdb (Display *dpy)
275 { 275 {
276 char *xdefs, *key; 276 char *xdefs, *key;
277 int len; 277 int len;
278 278
279 #ifdef INFODOCK
280 key = "InfoDock";
281 #else
279 key = "XEmacs"; 282 key = "XEmacs";
283 #endif
280 len = strlen (key); 284 len = strlen (key);
281 285
282 if (!dpy) 286 if (!dpy)
283 return 0; 287 return 0;
284 288
368 GET_C_STRING_CTEXT_DATA_ALLOCA (Vx_emacs_application_class, app_class); 372 GET_C_STRING_CTEXT_DATA_ALLOCA (Vx_emacs_application_class, app_class);
369 else 373 else
370 { 374 {
371 app_class = (NILP (Vx_emacs_application_class) && 375 app_class = (NILP (Vx_emacs_application_class) &&
372 have_xemacs_resources_in_xrdb (dpy)) 376 have_xemacs_resources_in_xrdb (dpy))
377 #ifdef INFODOCK
378 ? "InfoDock"
379 #else
373 ? "XEmacs" 380 ? "XEmacs"
381 #endif
374 : "Emacs"; 382 : "Emacs";
375 /* need to update Vx_emacs_application_class: */ 383 /* need to update Vx_emacs_application_class: */
376 Vx_emacs_application_class = build_string (app_class); 384 Vx_emacs_application_class = build_string (app_class);
377 } 385 }
378 386