]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix a hang on servers that don't support the X Keyboard Extension
authorPo Lu <luangruo@yahoo.com>
Wed, 29 Dec 2021 10:59:47 +0000 (18:59 +0800)
committerPo Lu <luangruo@yahoo.com>
Wed, 29 Dec 2021 10:59:47 +0000 (18:59 +0800)
* src/xfns.c (Fx_backspace_delete_keys_p): Don't block input
before checking for Xkb.

src/xfns.c

index ae01bb040536299d8131877cd0174de1fcc16915..7c4e694320316deba7c5bfacc0ffe1c6c40a5efc 100644 (file)
@@ -7749,11 +7749,11 @@ present and mapped to the usual X keysyms.  */)
   Display *dpy = FRAME_X_DISPLAY (f);
   Lisp_Object have_keys;
 
-  block_input ();
-
   if (!FRAME_DISPLAY_INFO (f)->supports_xkb)
     return Qlambda;
 
+  block_input ();
+
   /* In this code we check that the keyboard has physical keys with names
      that start with BKSP (Backspace) and DELE (Delete), and that they
      generate keysym XK_BackSpace and XK_Delete respectively.