From: Po Lu <luangruo@yahoo.com>
Date: Fri, 21 Jan 2022 07:27:35 +0000 (+0800)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~2881
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=03f4a2ff640d50af11a0131498f15ebf6ed16d30;p=emacs.git

Merge from origin/emacs-28

11ea45c9e4 Fix UB in ebrowse
ba57b78064 Fix execute-extended-command-for-buffer in fundamental-mode
ef0c1d4c2c Add workaround to handle a problem with Enlightenment WM (...
---

03f4a2ff640d50af11a0131498f15ebf6ed16d30
diff --cc src/xterm.c
index 1cbea12b3db,b80d45f8552..244b11e0f75
--- a/src/xterm.c
+++ b/src/xterm.c
@@@ -16253,23 -13792,20 +16265,39 @@@ consuming frame position adjustments.  
  always uses gtk_window_move and ignores the value of this variable.  */);
    x_gtk_use_window_move = true;
  
 +  DEFVAR_LISP ("x-scroll-event-delta-factor", Vx_scroll_event_delta_factor,
 +	       doc: /* A scale to apply to pixel deltas reported in scroll events.
 +This option is only effective when Emacs is built with XInput 2
 +support. */);
 +  Vx_scroll_event_delta_factor = make_float (1.0);
+   DEFSYM (Qexpose, "expose");
  
 +  DEFVAR_BOOL ("x-gtk-use-native-input", x_gtk_use_native_input,
 +	       doc: /* Non-nil means to use GTK for input method support.
 +This provides better support for some modern input methods, and is
 +only effective when Emacs is built with GTK.  */);
 +  x_gtk_use_native_input = false;
 +
+   DEFVAR_LISP ("x-set-frame-visibility-more-laxly",
+ 	       x_set_frame_visibility_more_laxly,
+     doc: /* Non-nil means set frame visibility more laxly.
+ If this is nil, Emacs is more strict when marking a frame as visible.
+ Since this may cause problems on some window managers, this variable can
+ be also set as follows: The value `focus-in' means to mark a frame as
+ visible also when a FocusIn event is received for it on GTK builds.  The
+ value `expose' means to mark a frame as visible also when an Expose
+ event is received for it on any X build.  The value `t' means to mark a
+ frame as visible in either of these two cases.
+ 
+ Note that any non-nil setting may cause invisible frames get erroneously
+ reported as iconified.  */);
+   x_set_frame_visibility_more_laxly = Qnil;
++
 +  DEFVAR_BOOL ("x-input-grab-touch-events", x_input_grab_touch_events,
 +	       doc: /* Non-nil means to actively grab touch events.
 +This means touch sequences that started on an Emacs frame will
 +reliably continue to receive updates even if the finger moves off the
 +frame, but may cause crashes with some window managers and/or external
 +programs.  */);
 +  x_input_grab_touch_events = true;
  }