diff options
| author | Stefan Monnier | 2025-02-18 10:07:34 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2025-02-18 10:07:34 -0500 |
| commit | 20edecd21f777848d51b1b892c4ed6192a088fc7 (patch) | |
| tree | d0694c9e7f466f9be513d8339ea3af95d6f45a34 /src | |
| parent | 41624d94cec98c1239c4fc9bb624e55ce0606068 (diff) | |
| parent | 4d3a6189418d9fe6b743ce3924a5eead6638dccb (diff) | |
| download | emacs-20edecd21f777848d51b1b892c4ed6192a088fc7.tar.gz emacs-20edecd21f777848d51b1b892c4ed6192a088fc7.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/menu.c | 5 |
1 files changed, 1 insertions, 4 deletions
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 | |||
| 1112 | x_popup_menu_1 (Lisp_Object position, Lisp_Object menu) | 1112 | x_popup_menu_1 (Lisp_Object position, Lisp_Object menu) |
| 1113 | { | 1113 | { |
| 1114 | if (!NILP (Vx_popup_menu_function)) | 1114 | if (!NILP (Vx_popup_menu_function)) |
| 1115 | { | 1115 | return calln (Vx_popup_menu_function, position, menu); |
| 1116 | Lisp_Object args[] = { Qx_popup_menu_function, position, menu, }; | ||
| 1117 | return run_hook_with_args (3, args, Ffuncall); | ||
| 1118 | } | ||
| 1119 | 1116 | ||
| 1120 | Lisp_Object keymap, tem, tem2 = Qnil; | 1117 | Lisp_Object keymap, tem, tem2 = Qnil; |
| 1121 | int xpos = 0, ypos = 0; | 1118 | int xpos = 0, ypos = 0; |