From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 28 Jul 1997 15:10:21 +0000 (+0000)
Subject: (x_term_init) [! HAVE_X11R5]: Don't try to use XtCvtStringToFont.
X-Git-Tag: emacs-20.1~925
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8c39f5172952fda9c8e8aed960456a05ff9566e;p=emacs.git

(x_term_init) [! HAVE_X11R5]: Don't try to use XtCvtStringToFont.
---

diff --git a/src/xterm.c b/src/xterm.c
index b79a32954c8..cc29cf915a7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7020,6 +7020,7 @@ x_term_init (display_name, xrm_option, resource_name)
 #endif /* ! defined (SIGIO) */
 
 #ifdef USE_LUCID
+#ifdef HAVE_X11R5 /* It seems X11R4 lacks XtCvtStringToFont, and XPointer.  */
   /* Make sure that we have a valid font for dialog boxes
      so that Xt does not crash.  */
   {
@@ -7042,6 +7043,7 @@ x_term_init (display_name, xrm_option, resource_name)
     x_uncatch_errors (dpy, count);
   }
 #endif
+#endif
 
 
   UNBLOCK_INPUT;