aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2021-12-29 18:59:47 +0800
committerPo Lu2021-12-29 18:59:47 +0800
commitfb386e22e129f77bbb2d9faa757cf5bc4f5d90e1 (patch)
tree98cf68e949d142532dd729a82f85f26c16debd7c /src
parent7d672ed069f7936b9410f61cff2df97f804fabff (diff)
downloademacs-fb386e22e129f77bbb2d9faa757cf5bc4f5d90e1.tar.gz
emacs-fb386e22e129f77bbb2d9faa757cf5bc4f5d90e1.zip
Fix a hang on servers that don't support the X Keyboard Extension
* src/xfns.c (Fx_backspace_delete_keys_p): Don't block input before checking for Xkb.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c
index ae01bb04053..7c4e6943203 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -7749,11 +7749,11 @@ present and mapped to the usual X keysyms. */)
7749 Display *dpy = FRAME_X_DISPLAY (f); 7749 Display *dpy = FRAME_X_DISPLAY (f);
7750 Lisp_Object have_keys; 7750 Lisp_Object have_keys;
7751 7751
7752 block_input ();
7753
7754 if (!FRAME_DISPLAY_INFO (f)->supports_xkb) 7752 if (!FRAME_DISPLAY_INFO (f)->supports_xkb)
7755 return Qlambda; 7753 return Qlambda;
7756 7754
7755 block_input ();
7756
7757 /* In this code we check that the keyboard has physical keys with names 7757 /* In this code we check that the keyboard has physical keys with names
7758 that start with BKSP (Backspace) and DELE (Delete), and that they 7758 that start with BKSP (Backspace) and DELE (Delete), and that they
7759 generate keysym XK_BackSpace and XK_Delete respectively. 7759 generate keysym XK_BackSpace and XK_Delete respectively.