diff options
| author | Richard M. Stallman | 1997-07-28 15:10:21 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-28 15:10:21 +0000 |
| commit | f8c39f5172952fda9c8e8aed960456a05ff9566e (patch) | |
| tree | 84e32fa8a08712dc83bd84af21466db4b43be76f | |
| parent | 4f5c44033032558a1a27f4bf922c44dc30a416a2 (diff) | |
| download | emacs-f8c39f5172952fda9c8e8aed960456a05ff9566e.tar.gz emacs-f8c39f5172952fda9c8e8aed960456a05ff9566e.zip | |
(x_term_init) [! HAVE_X11R5]: Don't try to use XtCvtStringToFont.
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
| 7020 | #endif /* ! defined (SIGIO) */ | 7020 | #endif /* ! defined (SIGIO) */ |
| 7021 | 7021 | ||
| 7022 | #ifdef USE_LUCID | 7022 | #ifdef USE_LUCID |
| 7023 | #ifdef HAVE_X11R5 /* It seems X11R4 lacks XtCvtStringToFont, and XPointer. */ | ||
| 7023 | /* Make sure that we have a valid font for dialog boxes | 7024 | /* Make sure that we have a valid font for dialog boxes |
| 7024 | so that Xt does not crash. */ | 7025 | so that Xt does not crash. */ |
| 7025 | { | 7026 | { |
| @@ -7042,6 +7043,7 @@ x_term_init (display_name, xrm_option, resource_name) | |||
| 7042 | x_uncatch_errors (dpy, count); | 7043 | x_uncatch_errors (dpy, count); |
| 7043 | } | 7044 | } |
| 7044 | #endif | 7045 | #endif |
| 7046 | #endif | ||
| 7045 | 7047 | ||
| 7046 | 7048 | ||
| 7047 | UNBLOCK_INPUT; | 7049 | UNBLOCK_INPUT; |