(Fx_popup_menu): Allow a frame instead of a window, in arg.

Use Fcar, Fcdr when extracting from event, to check data types.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index aa8ec70a520..4d86a6296b2 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -132,9 +132,9 @@ be the return value for that line (i.e. if it is selected).")
     }
   else
     {
-      tem = EVENT_START (position);
-      window = POSN_WINDOW (tem);
-      tem = POSN_WINDOW_POSN (tem);
+      tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
+      window = Fcar (tem);	     /* POSN_WINDOW (tem) */
+      tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */
       x = Fcar (tem);
       y = Fcdr (tem);
     }