diff options
| author | Gerd Moellmann | 2000-06-26 15:39:25 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-06-26 15:39:25 +0000 |
| commit | 4bd777b8571418cb0b34aeaf258e07c722cf85da (patch) | |
| tree | 37be3533eeeaa4ab1d49f6c05947d057faf041c9 /src | |
| parent | 5b01f1a918583ae34c58b220899c81e5042f7182 (diff) | |
| download | emacs-4bd777b8571418cb0b34aeaf258e07c722cf85da.tar.gz emacs-4bd777b8571418cb0b34aeaf258e07c722cf85da.zip | |
(x_window) [!USE_XIM]: Don't call create_frame_ic.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c index 8e66abbfa7f..bb6a5542630 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3522,8 +3522,10 @@ x_window (f, window_prompting, minibuffer_only) | |||
| 3522 | 3522 | ||
| 3523 | #ifdef HAVE_X_I18N | 3523 | #ifdef HAVE_X_I18N |
| 3524 | FRAME_XIC (f) = NULL; | 3524 | FRAME_XIC (f) = NULL; |
| 3525 | #ifdef USE_XIM | ||
| 3525 | create_frame_xic (f); | 3526 | create_frame_xic (f); |
| 3526 | #endif | 3527 | #endif |
| 3528 | #endif | ||
| 3527 | 3529 | ||
| 3528 | f->output_data.x->wm_hints.input = True; | 3530 | f->output_data.x->wm_hints.input = True; |
| 3529 | f->output_data.x->wm_hints.flags |= InputHint; | 3531 | f->output_data.x->wm_hints.flags |= InputHint; |
| @@ -3625,6 +3627,7 @@ x_window (f) | |||
| 3625 | attribute_mask, &attributes); | 3627 | attribute_mask, &attributes); |
| 3626 | 3628 | ||
| 3627 | #ifdef HAVE_X_I18N | 3629 | #ifdef HAVE_X_I18N |
| 3630 | #ifdef USE_XIM | ||
| 3628 | create_frame_xic (f); | 3631 | create_frame_xic (f); |
| 3629 | if (FRAME_XIC (f)) | 3632 | if (FRAME_XIC (f)) |
| 3630 | { | 3633 | { |
| @@ -3636,6 +3639,7 @@ x_window (f) | |||
| 3636 | XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 3639 | XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
| 3637 | attribute_mask, &attributes); | 3640 | attribute_mask, &attributes); |
| 3638 | } | 3641 | } |
| 3642 | #endif | ||
| 3639 | #endif /* HAVE_X_I18N */ | 3643 | #endif /* HAVE_X_I18N */ |
| 3640 | 3644 | ||
| 3641 | validate_x_resource_name (); | 3645 | validate_x_resource_name (); |