Mercurial > hg > xemacs-beta
diff src/console-x.h @ 771:943eaba38521
[xemacs-hg @ 2002-03-13 08:51:24 by ben]
The big ben-mule-21-5 check-in!
Various files were added and deleted. See CHANGES-ben-mule.
There are still some test suite failures. No crashes, though.
Many of the failures have to do with problems in the test suite itself
rather than in the actual code. I'll be addressing these in the next
day or so -- none of the test suite failures are at all critical.
Meanwhile I'll be trying to address the biggest issues -- i.e. build
or run failures, which will almost certainly happen on various platforms.
All comments should be sent to ben@xemacs.org -- use a Cc: if necessary
when sending to mailing lists. There will be pre- and post- tags,
something like
pre-ben-mule-21-5-merge-in, and
post-ben-mule-21-5-merge-in.
| author | ben |
|---|---|
| date | Wed, 13 Mar 2002 08:54:06 +0000 |
| parents | 5fd7ba8b56e7 |
| children | e38acbeb1cae |
line wrap: on
line diff
--- a/src/console-x.h Fri Mar 08 13:33:14 2002 +0000 +++ b/src/console-x.h Wed Mar 13 08:54:06 2002 +0000 @@ -1,6 +1,7 @@ /* Define X specific console, device, and frame object for XEmacs. Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. + Copyright (C) 1996 Ben Wing. This file is part of XEmacs. @@ -479,28 +480,16 @@ #endif /* XIM_XLIB */ #endif /* HAVE_XIM */ +extern Lisp_Object Qxintl; +#define xintl_warn(str) warn_when_safe (Qxintl, Qwarning, str) +#define xintl_warn1(fmt, str) warn_when_safe (Qxintl, Qwarning, fmt, str) +#define xintl_info(str) warn_when_safe (Qxintl, Qinfo, str) + extern int in_resource_setting; extern int in_specifier_change_function; extern Lisp_Object Vx_initial_argv_list; /* #### ugh! */ -/* Standins for various X encodings, until we know them better */ - -/* !!#### Need to verify the encoding used in lwlib -- Qnative or Qctext? - Almost certainly the former. Use a standin for now. */ -#define Qlwlib_encoding Qnative - -#define Qx_atom_name_encoding Qctext -/* font names are often stored in atoms, so it gets sticky if we set this - to something different from atom-name encoding */ -#define Qx_font_name_encoding Qctext - -#define Qx_color_name_encoding Qctext - -/* the following probably must agree with Qcommand_argument_encoding and - Qenvironment_variable_encoding */ -#define Qx_display_name_encoding Qnative - #endif /* HAVE_X_WINDOWS */ #endif /* INCLUDED_console_x_h_ */