diff options
| author | Glenn Morris | 2020-08-03 08:32:39 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-08-03 08:32:39 -0700 |
| commit | 16b7f413a9ff819c374e07ee927c1fd2b4138109 (patch) | |
| tree | 9016754a5e2c0f1fda01b3b8acf0e92175e0d024 /src | |
| parent | 078d75fb475c1c81853de93df5a4090777a8b2ff (diff) | |
| parent | 8576297b2a657d1944b7d824b30a1cb6459685c6 (diff) | |
| download | emacs-16b7f413a9ff819c374e07ee927c1fd2b4138109.tar.gz emacs-16b7f413a9ff819c374e07ee927c1fd2b4138109.zip | |
Merge from origin/emacs-27
8576297b2a (origin/emacs-27) ; lisp/so-long.el: Prevent potential err...
986c12b20f ; * lisp/so-long.el: Byte-compilation bug fix
19f8f36f11 ; * lisp/so-long.el (so-long-variable-overrides): Improve doc
83bc4ad369 ; * so-long.el: Documentation and spelling
72c5f71cd4 Avoid segfaults if XIM is set but not xim_styles
f54ddb0198 (emacs-27) ; * test/lisp/emacs-lisp/generator-tests.el: St...
# Conflicts:
# test/lisp/emacs-lisp/generator-tests.el
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index 2ab5080d977..09dcbbfb92d 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -2652,7 +2652,7 @@ create_frame_xic (struct frame *f) | |||
| 2652 | goto out; | 2652 | goto out; |
| 2653 | 2653 | ||
| 2654 | xim = FRAME_X_XIM (f); | 2654 | xim = FRAME_X_XIM (f); |
| 2655 | if (!xim) | 2655 | if (!xim || ! FRAME_X_XIM_STYLES(f)) |
| 2656 | goto out; | 2656 | goto out; |
| 2657 | 2657 | ||
| 2658 | /* Determine XIC style. */ | 2658 | /* Determine XIC style. */ |