From: Po Lu <luangruo@yahoo.com>
Date: Mon, 22 May 2023 13:00:20 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6dc9a3eeb755b5b0047b39f2bd7ebdefb10a1dc4;p=emacs.git

Merge remote-tracking branch 'origin/master' into feature/android
---

6dc9a3eeb755b5b0047b39f2bd7ebdefb10a1dc4
diff --cc src/xterm.h
index 406a7c5c060,34a713ea2ca..e7171ba072f
--- a/src/xterm.h
+++ b/src/xterm.h
@@@ -920,20 -924,8 +924,15 @@@ struct x_display_inf
       server_time_monotonic_p will be true).  */
    int_fast64_t server_time_offset;
  #endif
 +
 +  /* Keysym that will cause Emacs to quit if pressed twice within 150
 +     ms.  */
 +  KeySym quit_keysym;
 +
 +  /* The last time that keysym was pressed.  */
 +  Time quit_keysym_time;
  };
  
- #ifdef HAVE_X_I18N
- /* Whether or not to use XIM if we have it.  */
- extern bool use_xim;
- #endif
- 
  #ifdef HAVE_XINPUT2
  /* Defined in xmenu.c. */
  extern int popup_activated_flag;