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

diff --cc src/image.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
index 406a7c5c06049eafadeeb99ece6eedcf1a3f6a77,34a713ea2ca3e23853d01bee1a36f51b6c8d0b3f..e7171ba072f81fd9aeb9e76354f316e745f49f81
--- 1/src/xterm.h
--- 2/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;