summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-05-02 07:27:07 +0000
committerRichard M. Stallman <rms@gnu.org>1997-05-02 07:27:07 +0000
commit7c912f562c416f1986d5b405cf619162174ee2f2 (patch)
treeffd826a730172f76a2ec7dae886d00973af7f9a3
parentd497ddc9600deb819f26ec06f2df82cb55e50a88 (diff)
downloademacs-7c912f562c416f1986d5b405cf619162174ee2f2.tar.gz
(pop_up_menu): Update the call to x_catch_errors.
-rw-r--r--lwlib/xlwmenu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 1e2c3103ac5..d80fa0118c5 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1535,6 +1535,7 @@ pop_up_menu (mw, event)
int borderwidth = mw->menu.shadow_thickness;
Screen* screen = XtScreen (mw);
Display *display = XtDisplay (mw);
+ int count;
next_release_must_exit = 0;
@@ -1579,7 +1580,7 @@ pop_up_menu (mw, event)
}
#ifdef emacs
- x_catch_errors (display);
+ count = x_catch_errors (display);
#endif
XtGrabPointer ((Widget)mw, False,
(PointerMotionMask
@@ -1596,7 +1597,7 @@ pop_up_menu (mw, event)
pointer_grabbed = 0;
XtUngrabPointer ((Widget)mw, event->time);
}
- x_uncatch_errors (display);
+ x_uncatch_errors (display, count);
#endif
handle_motion_event (mw, (XMotionEvent*)event);