aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-06-22 20:12:59 +0000
committerGerd Moellmann2000-06-22 20:12:59 +0000
commit486a103debe2cc46a290143e2537bc3881a384aa (patch)
treefd9fe97d7f1999e35f4290961888bbce241c905e /src
parent64f3a16632337bbfb91531cdd6d1fe137fb59f5c (diff)
downloademacs-486a103debe2cc46a290143e2537bc3881a384aa.tar.gz
emacs-486a103debe2cc46a290143e2537bc3881a384aa.zip
(EmacsFrameRealize): Remove SubstructureRedirectMask.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/widget.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1f925dac136..092c58cb58b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12000-06-22 Gerd Moellmann <gerd@gnu.org> 12000-06-22 Gerd Moellmann <gerd@gnu.org>
2 2
3 * widget.c (EmacsFrameRealize): Remove SubstructureRedirectMask.
4
3 * xdisp.c (handle_stop): Initialize it->add_overlay_start to zero. 5 * xdisp.c (handle_stop): Initialize it->add_overlay_start to zero.
4 (handle_invisible_prop): Record the start of invisible text in 6 (handle_invisible_prop): Record the start of invisible text in
5 it->add_overlay_start. 7 it->add_overlay_start.
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)
731{ 731{
732 EmacsFrame ew = (EmacsFrame)widget; 732 EmacsFrame ew = (EmacsFrame)widget;
733 733
734 attrs->event_mask = (STANDARD_EVENT_SET | PropertyChangeMask 734 /* This used to contain SubstructureRedirectMask, but this turns out
735 | SubstructureNotifyMask | SubstructureRedirectMask); 735 to be a problem with XIM on Solaris, and events from that mask
736 don't seem to be used. Let's check that. */);
737 attrs->event_mask = (STANDARD_EVENT_SET
738 | PropertyChangeMask
739 | SubstructureNotifyMask);
736 *mask |= CWEventMask; 740 *mask |= CWEventMask;
737 XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask, 741 XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask,
738 attrs); 742 attrs);