Only load x-dnd and x-win when X is compiled in.

Load w32-win and dependencies on windows-nt.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1ee27ed427a1633b5c7ecbd5011504a570edac74..b20b40bc6c2e0870cb51d8b524f3c977201d0564 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -179,9 +179,12 @@
       (load "international/fontset")
       (load "dnd")
       (load "mwheel")
-      (load "tool-bar")
+      (load "tool-bar")))
+(if (featurep 'x)
+    (progn
       (load "x-dnd")
       (load "term/x-win")))
+      
 (message "%s" (garbage-collect))
 
 (if (eq system-type 'vax-vms)
@@ -189,6 +192,9 @@
       (load "vms-patch")))
 (if (eq system-type 'windows-nt)
     (progn
+      (load "international/ccl")
+      (load "international/code-pages")
+      (load "term/w32-win")
       (load "ls-lisp")
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
       (load "dos-w32")