From ae65f2089cfe108d761f8150280de520dba51b28 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 15 Jan 2022 20:14:31 +0800 Subject: [PATCH] Use preferred XIM style without trying to detect if it's supported The old code would in general fall back to the default if the preferred style wasn't available, which is usually worse than what the user specified * src/xfns.c (best_xim_style): Stop checking if the preferred input style is supported. --- src/xfns.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index ffad0bc3d1a..d73e951754b 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2643,11 +2643,7 @@ best_xim_style (struct x_display_info *dpyinfo, int nr_supported = ARRAYELTS (supported_xim_styles); if (dpyinfo->preferred_xim_style) - { - for (j = 0; j < xim->count_styles; ++j) - if (dpyinfo->preferred_xim_style == xim->supported_styles[j]) - return dpyinfo->preferred_xim_style; - } + return dpyinfo->preferred_xim_style; for (i = 0; i < nr_supported; ++i) for (j = 0; j < xim->count_styles; ++j) -- 2.39.5