Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
20edecd21f
2 changed files with 2 additions and 5 deletions
2
etc/NEWS
2
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'.
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue