aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2020-02-27 11:18:28 -0500
committerStefan Monnier2020-02-27 11:18:28 -0500
commitc32d35e9b7777a9136e96d6805a7e5b9f48772b0 (patch)
tree6dbcbf62c6a5b9f548911ce578bec79180a8330f /src
parent125da00b149f8f384ff288880cdd1b2e776c9444 (diff)
downloademacs-c32d35e9b7777a9136e96d6805a7e5b9f48772b0.tar.gz
emacs-c32d35e9b7777a9136e96d6805a7e5b9f48772b0.zip
* src/gtkutil.c, src/nsterm.m: Fix bug#39808
Complete 3b4bd4be1d where I apparently failed to grep properly and missed two more places where the dummy events were generated. * src/nsterm.m ([EmacsView toolbarClicked:]): * src/gtkutil.c (xg_tool_bar_callback): Don't emit dummy "prefix" events.
Diffstat (limited to 'src')
-rw-r--r--src/gtkutil.c7
-rw-r--r--src/nsterm.m6
2 files changed, 0 insertions, 13 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5e7cf3d2114..338c6036c2c 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4398,13 +4398,6 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
4398 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); 4398 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY);
4399 XSETFRAME (frame, f); 4399 XSETFRAME (frame, f);
4400 4400
4401 /* We generate two events here. The first one is to set the prefix
4402 to `(tool_bar)', see keyboard.c. */
4403 event.kind = TOOL_BAR_EVENT;
4404 event.frame_or_window = frame;
4405 event.arg = frame;
4406 kbd_buffer_store_event (&event);
4407
4408 event.kind = TOOL_BAR_EVENT; 4401 event.kind = TOOL_BAR_EVENT;
4409 event.frame_or_window = frame; 4402 event.frame_or_window = frame;
4410 event.arg = key; 4403 event.arg = key;
diff --git a/src/nsterm.m b/src/nsterm.m
index c0535825eee..aefbb2721ef 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8185,12 +8185,6 @@ not_in_argv (NSString *arg)
8185 if (!emacs_event) 8185 if (!emacs_event)
8186 return self; 8186 return self;
8187 8187
8188 /* Send first event (for some reason two needed). */
8189 theEvent = [[self window] currentEvent];
8190 emacs_event->kind = TOOL_BAR_EVENT;
8191 XSETFRAME (emacs_event->arg, emacsframe);
8192 EV_TRAILER (theEvent);
8193
8194 emacs_event->kind = TOOL_BAR_EVENT; 8188 emacs_event->kind = TOOL_BAR_EVENT;
8195 /* XSETINT (emacs_event->code, 0); */ 8189 /* XSETINT (emacs_event->code, 0); */
8196 emacs_event->arg = AREF (emacsframe->tool_bar_items, 8190 emacs_event->arg = AREF (emacsframe->tool_bar_items,