comparison src/console-x.h @ 120:cca96a509cfe r20-1b12

Import from CVS: tag r20-1b12
author cvs
date Mon, 13 Aug 2007 09:25:29 +0200
parents 54cc21c15cbb
children 0132846995bd
comparison
equal deleted inserted replaced
119:d101af7320b8 120:cca96a509cfe
373 #ifdef XIM_XLIB 373 #ifdef XIM_XLIB
374 #define FRAME_X_XIC(f) (FRAME_X_DATA (f)->xic) 374 #define FRAME_X_XIC(f) (FRAME_X_DATA (f)->xic)
375 #define FRAME_X_XIC_STYLE(f) (FRAME_X_DATA (f)->xic_style) 375 #define FRAME_X_XIC_STYLE(f) (FRAME_X_DATA (f)->xic_style)
376 #endif /* XIM_XLIB */ 376 #endif /* XIM_XLIB */
377 #endif /* HAVE_XIM */ 377 #endif /* HAVE_XIM */
378
379 /* This needs to go in an include file that's included by inline.c
380 in order for the error-checking functions to get defined. */
381 #ifdef EPOCH
382 DECLARE_LRECORD (x_resource, struct Lisp_X_Resource);
383 #endif
384 378
385 /* Variables associated with the X display frame this emacs is using. */ 379 /* Variables associated with the X display frame this emacs is using. */
386 extern XtAppContext Xt_app_con; 380 extern XtAppContext Xt_app_con;
387 381
388 extern Lisp_Object Vx_gc_pointer_shape; 382 extern Lisp_Object Vx_gc_pointer_shape;
503 void describe_Status (Status status); 497 void describe_Status (Status status);
504 #endif /* DEBUG_XEMACS */ 498 #endif /* DEBUG_XEMACS */
505 #endif /* XIM_XLIB */ 499 #endif /* XIM_XLIB */
506 #endif /* HAVE_XIM */ 500 #endif /* HAVE_XIM */
507 501
508 #ifdef EPOCH
509 extern Lisp_Object Qx_property_change, Qx_client_message, Qx_map, Qx_unmap;
510 extern Lisp_Object Vepoch_event, Vepoch_event_handler;
511 #endif
512
513 extern int in_resource_setting; 502 extern int in_resource_setting;
514 extern int in_specifier_change_function; 503 extern int in_specifier_change_function;
515 504
516 extern Lisp_Object Vx_initial_argv_list; /* #### ugh! */ 505 extern Lisp_Object Vx_initial_argv_list; /* #### ugh! */
517 506