From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 21 Dec 1995 17:15:31 +0000 (+0000)
Subject: [X11R5_INHIBIT_I18N]: Undef HAVE_X_I18N if X11R5.
X-Git-Tag: emacs-19.34~2079
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=271d6c1c27da70780ac5fa01a0e43d62bb884435;p=emacs.git

[X11R5_INHIBIT_I18N]: Undef HAVE_X_I18N if X11R5.
---

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.  */
 #ifdef HAVE_X_WINDOWS
 extern void abort ();
 
+/* On some systems, the character-composition stuff is broken in X11R5.  */
+#if defined (HAVE_X11R5) && ! defined (HAVE_X11R6)
+#ifdef X11R5_INHIBIT_I18N
+#undef HAVE_X_I18N
+#endif
+#endif
+
 #ifndef VMS
 #if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work.  */
 #include "bitmaps/gray.xbm"