# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1179271302 0
# Node ID 46d454fde3886f157ac5fe9e438bd7657224dbce
# Parent  6046e2e69b86226f485e9df78884cbc25f71e344
Only load x-dnd and x-win when X is compiled in.
Load w32-win and dependencies on windows-nt.

diff -r 6046e2e69b86 -r 46d454fde388 lisp/loadup.el
--- a/lisp/loadup.el	Tue May 15 23:21:10 2007 +0000
+++ b/lisp/loadup.el	Tue May 15 23:21:42 2007 +0000
@@ -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")