# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1225735053 0
# Node ID 16244bb150a16acf27080c231eb5b4a9e03c4b03
# Parent  49c34c663c000b5ab3d7690dc1cb6885e43e5dd8
(x-initialize-window-system): Call x-wm-set-size-hint after
initialization.

diff -r 49c34c663c00 -r 16244bb150a1 lisp/term/x-win.el
--- a/lisp/term/x-win.el	Mon Nov 03 17:57:21 2008 +0000
+++ b/lisp/term/x-win.el	Mon Nov 03 17:57:33 2008 +0000
@@ -1540,6 +1540,12 @@
   ;; Don't let Emacs suspend under X.
   (add-hook 'suspend-hook 'x-win-suspend-error)
 
+  ;; During initialization, we defer sending size hints to the window
+  ;; manager, because that can induce a race condition:
+  ;; http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html
+  ;; Send the size hints once initialization is done.
+  (add-hook 'after-init-hook 'x-wm-set-size-hint)
+
   ;; Turn off window-splitting optimization; X is usually fast enough
   ;; that this is only annoying.
   (setq split-window-keep-point t)