Mercurial > emacs

changeset 9700:d09dc2f44ecb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(pop_up_menu): Pass a Display * to x_catch_errors, etc.
author Richard M. Stallman <rms@gnu.org>
date Wed, 26 Oct 1994 04:57:41 +0000
parents 0b471201bbd4
children 26a60dd57b6e
files lwlib/xlwmenu.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lwlib/xlwmenu.c	Wed Oct 26 04:43:33 1994 +0000
+++ b/lwlib/xlwmenu.c	Wed Oct 26 04:57:41 1994 +0000
@@ -1421,6 +1421,7 @@
   int		h;
   int		borderwidth = mw->menu.shadow_thickness;
   Screen*	screen = XtScreen (mw);
+  Display       *display = XtDisplay (mw);
 
   next_release_must_exit = 0;
 
@@ -1465,7 +1466,7 @@
     }
 
 #ifdef emacs
-  x_catch_errors ();
+  x_catch_errors (display);
 #endif
   XtGrabPointer ((Widget)mw, False,
 		 (PointerMotionMask
@@ -1477,12 +1478,12 @@
 		 event->time);
   pointer_grabbed = 1;
 #ifdef emacs
-  if (x_had_errors_p ())
+  if (x_had_errors_p (display))
     {
       pointer_grabbed = 0;
       XtUngrabPointer ((Widget)mw, event->time);
     }
-  x_uncatch_errors ();
+  x_uncatch_errors (display);
 #endif
 
   handle_motion_event (mw, (XMotionEvent*)event);