martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid assertion violations in tty menus in rare cases

Browse Source 
* src/term.c (mouse_get_xy): Restore the lost protection against
'mouse_position' returning nil as mouse coordinates.  (Bug#80603)
This commit is contained in:
Eli Zaretskii
2026-03-14 14:11:49 +02:00
parent 696a4e03bf
commit 7887f202c6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/term.c
View File

@@ -3154,9 +3154,13 @@ mouse_get_xy (int *x, int *y)
struct frame *sf = SELECTED_FRAME ();
if (f == sf || frame_ancestor_p (sf, f))
{
int mx = XFIXNUM (XCAR (XCDR (mouse)));
int my = XFIXNUM (XCDR (XCDR (mouse)));
root_xy (f, mx, my, x, y);
Lisp_Object lmx = XCAR (XCDR (mouse)), lmy = XCDR (XCDR (mouse));
if (FIXNUMP (lmx) && FIXNUMP (lmy))
{
int mx = XFIXNUM (lmx);
int my = XFIXNUM (lmy);
root_xy (f, mx, my, x, y);
}
}
}