=== modified file 'src/frame.c'
--- src/frame.c	2012-08-22 16:05:04 +0000
+++ src/frame.c	2012-08-31 04:16:12 +0000
@@ -100,7 +100,6 @@
 Lisp_Object Qscreen_gamma;
 Lisp_Object Qline_spacing;
 static Lisp_Object Quser_position, Quser_size;
-Lisp_Object Qwait_for_wm;
 static Lisp_Object Qwindow_id;
 #ifdef HAVE_X_WINDOWS
 static Lisp_Object Qouter_window_id;
@@ -2694,7 +2693,6 @@
   {"line-spacing",		&Qline_spacing},
   {"left-fringe",		&Qleft_fringe},
   {"right-fringe",		&Qright_fringe},
-  {"wait-for-wm",		&Qwait_for_wm},
   {"fullscreen",                &Qfullscreen},
   {"font-backend",		&Qfont_backend},
   {"alpha",			&Qalpha},

=== modified file 'src/frame.h'
--- src/frame.h	2012-08-28 00:33:56 +0000
+++ src/frame.h	2012-08-31 04:16:15 +0000
@@ -1175,7 +1175,6 @@
 extern Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background;
 extern Lisp_Object Qscreen_gamma;
 extern Lisp_Object Qline_spacing;
-extern Lisp_Object Qwait_for_wm;
 extern Lisp_Object Qfullscreen;
 extern Lisp_Object Qfullwidth, Qfullheight, Qfullboth, Qmaximized;
 extern Lisp_Object Qsticky;

=== modified file 'src/nsfns.m'
--- src/nsfns.m	2012-08-17 23:38:43 +0000
+++ src/nsfns.m	2012-08-31 04:16:36 +0000
@@ -1029,7 +1029,6 @@
   x_set_line_spacing, /* generic OK, sets f->extra_line_spacing to int */
   x_set_fringe_width, /* generic OK */
   x_set_fringe_width, /* generic OK */
-  0, /* x_set_wait_for_wm, will ignore */
   0,  /* x_set_fullscreen will ignore */
   x_set_font_backend, /* generic OK */
   x_set_alpha,

=== modified file 'src/w32fns.c'
--- src/w32fns.c	2012-08-18 06:06:39 +0000
+++ src/w32fns.c	2012-08-31 04:16:40 +0000
@@ -6791,7 +6791,6 @@
   x_set_line_spacing,
   x_set_fringe_width,
   x_set_fringe_width,
-  0, /* x_set_wait_for_wm, */
   x_set_fullscreen,
   x_set_font_backend,
   x_set_alpha,

=== modified file 'src/xfns.c'
--- src/xfns.c	2012-08-18 06:06:39 +0000
+++ src/xfns.c	2012-08-31 04:17:17 +0000
@@ -634,18 +634,6 @@
   signal_error ("Undefined color", color_name);
 }
 
-
-
-/* Change the `wait-for-wm' frame parameter of frame F.  OLD_VALUE is
-   the previous value of that parameter, NEW_VALUE is the new value.
-   See also the comment of wait_for_wm in struct x_output.  */
-
-static void
-x_set_wait_for_wm (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
-{
-  f->output_data.x->wait_for_wm = !NILP (new_value);
-}
-
 static void
 x_set_tool_bar_position (struct frame *f,
                          Lisp_Object new_value,
@@ -3328,8 +3316,6 @@
 		       RES_TYPE_SYMBOL);
   x_default_parameter (f, parms, Qtitle, Qnil,
 		       "title", "Title", RES_TYPE_STRING);
-  x_default_parameter (f, parms, Qwait_for_wm, Qt,
-		       "waitForWM", "WaitForWM", RES_TYPE_BOOLEAN);
   x_default_parameter (f, parms, Qfullscreen, Qnil,
                        "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
   x_default_parameter (f, parms, Qtool_bar_position,
@@ -5770,7 +5756,6 @@
   x_set_line_spacing,
   x_set_fringe_width,
   x_set_fringe_width,
-  x_set_wait_for_wm,
   x_set_fullscreen,
   x_set_font_backend,
   x_set_alpha,

=== modified file 'src/xterm.h'
--- src/xterm.h	2012-08-31 04:14:59 +0000
+++ src/xterm.h	2012-08-31 04:17:36 +0000
@@ -600,13 +600,6 @@
      They are changed only when a different background is involved.  */
   unsigned long relief_background;
 
-  /* Xt waits for a ConfigureNotify event from the window manager in
-     EmacsFrameSetCharSize when the shell widget is resized.  For some
-     window managers like fvwm2 2.2.5 and KDE 2.1 this event doesn't
-     arrive for an unknown reason and Emacs hangs in Xt.  If this is
-     zero, tell Xt not to wait.  */
-  int wait_for_wm;
-
   /* As x_pixels_diff, but to FRAME_OUTER_WINDOW.  For some reason the
      two might differ by a pixel, depending on WM */
   int x_pixels_outer_diff;