aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-05-02 07:27:07 +0000
committerRichard M. Stallman1997-05-02 07:27:07 +0000
commit5efb61c794b8a17b749adef4dcb9f0db7087b8fe (patch)
treec1681446f9871d5ea6d85358ce1839a79e0c6070
parenta7b0df0db4e5534c8d05efc6053b6d1116dee3f6 (diff)
downloademacs-5efb61c794b8a17b749adef4dcb9f0db7087b8fe.tar.gz
emacs-5efb61c794b8a17b749adef4dcb9f0db7087b8fe.zip
(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)
1535 int borderwidth = mw->menu.shadow_thickness; 1535 int borderwidth = mw->menu.shadow_thickness;
1536 Screen* screen = XtScreen (mw); 1536 Screen* screen = XtScreen (mw);
1537 Display *display = XtDisplay (mw); 1537 Display *display = XtDisplay (mw);
1538 int count;
1538 1539
1539 next_release_must_exit = 0; 1540 next_release_must_exit = 0;
1540 1541
@@ -1579,7 +1580,7 @@ pop_up_menu (mw, event)
1579 } 1580 }
1580 1581
1581#ifdef emacs 1582#ifdef emacs
1582 x_catch_errors (display); 1583 count = x_catch_errors (display);
1583#endif 1584#endif
1584 XtGrabPointer ((Widget)mw, False, 1585 XtGrabPointer ((Widget)mw, False,
1585 (PointerMotionMask 1586 (PointerMotionMask
@@ -1596,7 +1597,7 @@ pop_up_menu (mw, event)
1596 pointer_grabbed = 0; 1597 pointer_grabbed = 0;
1597 XtUngrabPointer ((Widget)mw, event->time); 1598 XtUngrabPointer ((Widget)mw, event->time);
1598 } 1599 }
1599 x_uncatch_errors (display); 1600 x_uncatch_errors (display, count);
1600#endif 1601#endif
1601 1602
1602 handle_motion_event (mw, (XMotionEvent*)event); 1603 handle_motion_event (mw, (XMotionEvent*)event);