--- src/xterm.h
+++ src/xterm.h
@@ -21,8 +21,8 @@
 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
-#include <X11/Xutil.h>
 #include <X11/keysym.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>

--- src/xterm.c
+++ src/xterm.c	Wed Oct 13 18:11:49 2004
@@ -10533,6 +10533,17 @@
 				|| ((unsigned)(orig_keysym) == XK_Num_Lock)
 #endif
 #endif /* not HAVE_X11R5 */
+				/* The symbols from XK_ISO_Lock
+				   to XK_ISO_Last_Group_Lock
+				   don't have real modifiers but
+				   should be treated similarly to
+				   Mode_switch by Emacs. */
+#if defined XK_ISO_Lock && defined XK_ISO_Last_Group_Lock
+				|| ((unsigned)(orig_keysym)
+				    >=  XK_ISO_Lock
+				    && (unsigned)(orig_keysym)
+				    <= XK_ISO_Last_Group_Lock)
+#endif
 				))
 			{
 			  if (temp_index == sizeof temp_buffer / sizeof (short))