From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 2 May 1997 07:27:07 +0000 (+0000)
Subject: (pop_up_menu): Update the call to x_catch_errors.
X-Git-Tag: emacs-20.1~2323
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5efb61c794b8a17b749adef4dcb9f0db7087b8fe;p=emacs.git

(pop_up_menu): Update the call to x_catch_errors.
---

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);