aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1995-12-21 17:15:31 +0000
committerKarl Heuer1995-12-21 17:15:31 +0000
commit271d6c1c27da70780ac5fa01a0e43d62bb884435 (patch)
tree4e9c522e13d89f6d29061c0dc3a359d3b95a5552 /src
parent77ae0fe32418de7cd79e6b6f12f7cb09abfc3079 (diff)
downloademacs-271d6c1c27da70780ac5fa01a0e43d62bb884435.tar.gz
emacs-271d6c1c27da70780ac5fa01a0e43d62bb884435.zip
[X11R5_INHIBIT_I18N]: Undef HAVE_X_I18N if X11R5.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 2ae32fe016a..323d9594de5 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -40,6 +40,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
40#ifdef HAVE_X_WINDOWS 40#ifdef HAVE_X_WINDOWS
41extern void abort (); 41extern void abort ();
42 42
43/* On some systems, the character-composition stuff is broken in X11R5. */
44#if defined (HAVE_X11R5) && ! defined (HAVE_X11R6)
45#ifdef X11R5_INHIBIT_I18N
46#undef HAVE_X_I18N
47#endif
48#endif
49
43#ifndef VMS 50#ifndef VMS
44#if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */ 51#if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */
45#include "bitmaps/gray.xbm" 52#include "bitmaps/gray.xbm"