Merge from emacs--devo--0

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1ee27ed427a1633b5c7ecbd5011504a570edac74..b6464372a41ae0d1b5875ce828805f8ffcddf5d6 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -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")
@@ -206,6 +212,9 @@
 (if (eq system-type 'macos)
     (progn
       (load "ls-lisp")))
+(if (featurep 'mac-carbon)
+    (progn
+      (load "term/mac-win")))
 (if (fboundp 'atan)    ; preload some constants and
     (progn             ; floating pt. functions if we have float support.
       (load "emacs-lisp/float-sup")))