Fix two issues in xterm.c

* src/xterm.c (x_atom_refs): Make EMACS_SERVER_TIME_PROP atom
have a vendor-specific prefix.
(x_query_pointer_1): Fix leak of button mask.

diff --git a/src/xterm.c b/src/xterm.c
index e7f5525502107912cd85ef8113e6f7544620ece2..7a0a21b1369ee6c4b3b2163c539b7903ad8e1e86 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -952,7 +952,7 @@ static const struct x_atom_ref x_atom_refs[] =
     ATOM_REFS_INIT ("MULTIPLE", Xatom_MULTIPLE)
     ATOM_REFS_INIT ("INCR", Xatom_INCR)
     ATOM_REFS_INIT ("_EMACS_TMP_",  Xatom_EMACS_TMP)
-    ATOM_REFS_INIT ("EMACS_SERVER_TIME_PROP", Xatom_EMACS_SERVER_TIME_PROP)
+    ATOM_REFS_INIT ("_EMACS_SERVER_TIME_PROP", Xatom_EMACS_SERVER_TIME_PROP)
     ATOM_REFS_INIT ("TARGETS", Xatom_TARGETS)
     ATOM_REFS_INIT ("NULL", Xatom_NULL)
     ATOM_REFS_INIT ("ATOM", Xatom_ATOM)
@@ -13520,6 +13520,8 @@ x_query_pointer_1 (struct x_display_info *dpyinfo,
          xi_convert_button_state (&buttons, &state);
          *mask_return = state | modifiers.effective;
 
+         XFree (buttons.mask);
+
          *root_x_return = lrint (root_x);
          *root_y_return = lrint (root_y);
          *win_x_return = lrint (win_x);