1 files changed, 6 insertions, 2 deletions

diff --git a/src/widget.c b/src/widget.c
index 70a84aad2e1..a96aad7f8eb 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -731,8 +731,12 @@ EmacsFrameRealize (widget, mask, attrs)
 {
   EmacsFrame ew = (EmacsFrame)widget;
 
-  attrs->event_mask = (STANDARD_EVENT_SET | PropertyChangeMask
-                       | SubstructureNotifyMask | SubstructureRedirectMask);
+  /* This used to contain SubstructureRedirectMask, but this turns out
+     to be a problem with XIM on Solaris, and events from that mask
+     don't seem to be used.  Let's check that.  */);
+  attrs->event_mask = (STANDARD_EVENT_SET
+                       | PropertyChangeMask
+                       | SubstructureNotifyMask);
   *mask |= CWEventMask;
   XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask,
                   attrs);