diff --git a/etc/NEWS b/etc/NEWS index 56df5365135..dc2374c319c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -69,7 +69,7 @@ like tooltips. Other use-cases of child frames are not supported yet. In particular: - trying to create minibuffer-only child frames on a TTY frame will - signal an error. + signal an error; and - a TTY child frame cannot be converted to a root frame or vice-versa. To enable tooltips on TTY frames, call 'tty-tip-mode'. diff --git a/src/menu.c b/src/menu.c index f7a3f55b070..11a0a10d87d 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1112,10 +1112,7 @@ Lisp_Object x_popup_menu_1 (Lisp_Object position, Lisp_Object menu) { if (!NILP (Vx_popup_menu_function)) - { - Lisp_Object args[] = { Qx_popup_menu_function, position, menu, }; - return run_hook_with_args (3, args, Ffuncall); - } + return calln (Vx_popup_menu_function, position, menu); Lisp_Object keymap, tem, tem2 = Qnil; int xpos = 0, ypos = 0;