[sawfish] Cleanup of user.jl; loading of wm-spec is moved to wm.jl

[Christopher Bratusek <chrisb src gnome org>]

commit 8ce0e49d240f2ba2420e1153038a98c78dc64964
Author: Teika kazura <teika lavabit com>
Date:   Wed Sep 15 22:23:58 2010 +0900

    Cleanup of user.jl; loading of wm-spec is moved to wm.jl

 lisp/sawfish/wm.jl      |    3 ++-
 lisp/sawfish/wm/user.jl |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/lisp/sawfish/wm.jl b/lisp/sawfish/wm.jl
index 6ee7f7e..cae7173 100644
--- a/lisp/sawfish/wm.jl
+++ b/lisp/sawfish/wm.jl
@@ -86,7 +86,8 @@
 			 sawfish.wm.state.shading
 			 sawfish.wm.state.iconify
 			 sawfish.wm.state.ignored
-			 sawfish.wm.server))
+			 sawfish.wm.server
+			 sawfish.wm.state.wm-spec))
 
 ;; create the exports from sawfish.wm
 (open-structures '(sawfish.wm.colors
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 83a750e..b6a7866 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -162,8 +162,6 @@ Possible values are \"kde\", \"gnome\", \"xfce\", or \"none\".")
   (unless (and (boundp 'window-menu) window-menu)
     (require 'sawfish.wm.ext.beos-window-menu))
 
-  (load-module 'sawfish.wm.state.wm-spec)
-
   ;; Use all arguments which are left.
   (let ((do-load (lambda (name)
 		   (cond ((file-exists-p name)