emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master d704c61e25: Fix two issues in xterm.c


From: Po Lu
Subject: master d704c61e25: Fix two issues in xterm.c
Date: Sun, 28 Aug 2022 00:03:55 -0400 (EDT)

branch: master
commit d704c61e25b5498fb7971187789956b9646b94f5
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    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.
---
 src/xterm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xterm.c b/src/xterm.c
index e7f5525502..7a0a21b136 100644
--- 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);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]