import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / lisp / dumped-lisp.el

diff --git a/lisp/dumped-lisp.el b/lisp/dumped-lisp.el
index 1b33b17..884c9a0 100644 (file)
--- a/lisp/dumped-lisp.el
+++ b/lisp/dumped-lisp.el
@@ -32,7 +32,7 @@
        "events"
        "text-props"
        "process" ;; This is bad. network-streams may not be defined.
-       (when-feature multicast "multicast") ; #+network-streams implicitely true
+       (when-feature multicast "multicast") ; #+network-streams implicitly true
        "frame"                 ; move up here cause some stuff needs it here
        "map-ynp"
        "simple"
@@ -49,6 +49,7 @@
 ;; After fixing, eos/loaddefs-eos and loaddefs appear identical?!!
 ;; So just make loaddefs-eos go away...
 ;;(pureload (if (featurep 'sparcworks) "eos/loaddefs-eos" "loaddefs"))
+       "cus-file"
        "startup"               ; For initialization of
                                ;  `emacs-user-extension-dir'
        "misc"
@@ -79,12 +80,13 @@
        "text-mode"
        "fill"
        "auto-save"             ; Added for 20.4
-
+       "movemail"              ; Added for 21.2
        (when-feature windows-nt "winnt")
        (when-feature lisp-float-type "float-sup")
        "itimer"                ; for vars auto-save-timeout and
                                ; auto-gc-threshold
        "itimer-autosave"
+       "printer"
        (when-feature toolbar "toolbar")
        (when-feature scrollbar "scrollbar")
        (when-feature menubar "menubar")
@@ -133,7 +135,8 @@
        (when-feature mule "japanese")
        (when-feature mule "korean")
        (when-feature mule "misc-lang")
-       (when-feature mule "thai-xtis")
+       (when-feature mule "thai-xtis-chars")
+       (when-feature mule "mule/thai-xtis") ; overloaded in leim/quail
        (when-feature mule "viet-chars")
        (when-feature mule "vietnamese")
 
@@ -155,15 +158,17 @@
 ;; Moved to sunpro-load.el - the default only for Sun.
 ;;(pureload "mime-setup")
 ;;; mule-load.el ends here
+       (when-feature (and gutter window-system) "gutter")
        (when-feature window-system "gui")
        (when-feature window-system "mode-motion")
        (when-feature window-system "mouse")
-       (when-feature window-system "select")
+       "select"
        (when-feature dragdrop-api "dragdrop")
 ;; preload the X code, for faster startup.
        (when-feature (and (not infodock)
                           (or x mswindows) menubar) "menubar-items")
        (when-feature (and infodock (or x mswindows) menubar) "id-menus")
+       (when-feature (and gutter window-system) "gutter-items")
        (when-feature x "x-faces")
        (when-feature x "x-iso8859-1")
        (when-feature x "x-mouse")