master a51a2a13ed 4/5: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit a51a2a13ede7d7054ba3654624354e7d1243b1cb
Merge: b44505d6ec b63baeafd2
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 src/xterm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 81baeddbca..36e0045d2e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9276,7 +9276,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           int modifiers;
           Lisp_Object coding_system = Qlatin_1;
          Lisp_Object c;
-         /* Event will be modified.  */
+         /* `xkey' will be modified, but it's not important to modify
+            `event' itself.  */
          XKeyEvent xkey = event->xkey;
 
 #ifdef USE_GTK
@@ -9538,8 +9539,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
            if (keysym == NoSymbol)
              break;
          }
-         /* FIXME: check side effects and remove this.  */
-         ((XEvent *) event)->xkey = xkey;
         }
     done_keysym:
 #ifdef HAVE_X_I18N