diff options
| author | Richard M. Stallman | 1996-06-21 15:31:50 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-06-21 15:31:50 +0000 |
| commit | e649d07667c827997bfc1fbc51472d231af6a053 (patch) | |
| tree | f2f05c3099df819739fe5ea853d6221b28df5334 /src | |
| parent | a9d4f28a2bf1e8f962471ab6fc79091a7059dbb8 (diff) | |
| download | emacs-e649d07667c827997bfc1fbc51472d231af6a053.tar.gz emacs-e649d07667c827997bfc1fbc51472d231af6a053.zip | |
(kbd_buffer_get_event): Don't call x_activate_menubar for a deleted frame.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index e9f6dc7e49e..b8025a11b14 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -2697,7 +2697,8 @@ kbd_buffer_get_event (kbp, used_mouse_menu) | |||
| 2697 | { | 2697 | { |
| 2698 | kbd_fetch_ptr = event + 1; | 2698 | kbd_fetch_ptr = event + 1; |
| 2699 | input_pending = readable_events (0); | 2699 | input_pending = readable_events (0); |
| 2700 | x_activate_menubar (XFRAME (event->frame_or_window)); | 2700 | if (FRAME_LIVE_P (XFRAME (event->frame_or_window))) |
| 2701 | x_activate_menubar (XFRAME (event->frame_or_window)); | ||
| 2701 | } | 2702 | } |
| 2702 | #endif | 2703 | #endif |
| 2703 | /* Just discard these, by returning nil. | 2704 | /* Just discard these, by returning nil. |