From: Gerd Möllmann <gerd@gnu.org>
Date: Thu, 31 Oct 2024 20:16:13 +0000 (+0100)
Subject: Fix mouse-position for xterm-mouse-mode
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6af0db40ffcf9a855c896fb3bbaccf79101afd51;p=emacs.git

Fix mouse-position for xterm-mouse-mode

* lisp/xt-mouse.el (xterm-mouse-position-function): Return the frame
recorded in the terminal parameter xterm-mouse-frame.

(cherry picked from commit e2323775246c6f09b2d7fb82f8888ebe8f317b0e)
---

diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 82ffc2db5f1..4f1ac4f2b16 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -151,10 +151,11 @@ https://invisible-island.net/xterm/ctlseqs/ctlseqs.html)."
 
 (defun xterm-mouse-position-function (pos)
   "Bound to `mouse-position-function' in XTerm mouse mode."
-  (when (terminal-parameter nil 'xterm-mouse-x)
-    (setcdr pos (cons (terminal-parameter nil 'xterm-mouse-x)
-		      (terminal-parameter nil 'xterm-mouse-y))))
-  pos)
+  (if (terminal-parameter nil 'xterm-mouse-x)
+      (cons (terminal-parameter nil 'xterm-mouse-frame)
+            (cons (terminal-parameter nil 'xterm-mouse-x)
+		  (terminal-parameter nil 'xterm-mouse-y)))
+    pos))
 
 (define-obsolete-function-alias 'xterm-mouse-truncate-wrap 'truncate "27.1")