Merge remote-tracking branch 'origin/master' into for-steve

[sxemacs] / lisp / dumped-lisp.el

diff --git a/lisp/dumped-lisp.el b/lisp/dumped-lisp.el
index c57c71a..c592c05 100644 (file)
--- a/lisp/dumped-lisp.el
+++ b/lisp/dumped-lisp.el
@@ -8,14 +8,14 @@ in dumped-lisp.el and is not itself listed.")
 
 (setq preloaded-file-list
       (assemble-list
-        "backquote"            ; needed for defsubst etc.
+       "backquote"             ; needed for defsubst etc.
        "bytecomp-runtime"      ; define defsubst
        "find-paths"
        "packages"              ; Bootstrap run-time lisp environment
        "setup-paths"
        "dump-paths"
-       "subr"                  ; load the most basic Lisp functions
-       "replace"               ; match-string used in version.el.
+       "subr"                  ; load the most basic Lisp functions
+       "replace"               ; match-string used in version.el.
        ; Ignore compiled-by-mistake version.elc
        "version.el"
        "cl"
@@ -50,7 +50,7 @@ in dumped-lisp.el and is not itself listed.")
        "simple"
        "keydefs"               ; Before loaddefs so that keymap vars exist.
        "abbrev"
-        "number"
+       "number"
        "derived"
        "minibuf"
        "list-mode"
@@ -68,7 +68,7 @@ in dumped-lisp.el and is not itself listed.")
        "lisp-initd"
        "misc"
        "loadhist"              ; Must be dumped before loaddefs is loaded
-                               ; Used by help. 
+                               ; Used by help.
        ;; (pureload "profile")
        (unless-feature mule "help-nomule")
        "help"
@@ -200,7 +200,7 @@ in dumped-lisp.el and is not itself listed.")
 ;; id-menus is not here.  infodock needs to figure out a clever way to
 ;; advise this stuff or we need to export a clean way for infodock or
 ;; others to control this programmatically.
-       (when-feature (and infodock (or x gtk) menubar) "id-menus")
+       (when-feature (and infodock x menubar) "id-menus")
 ;; preload the X code.
        (when-feature x "x-faces")
        (when-feature x "x-iso8859-1")
@@ -211,25 +211,12 @@ in dumped-lisp.el and is not itself listed.")
        (when-feature x "x-init")
        (when-feature x "x-win-xfree86")
        (when-feature x "x-win-sun")
-;; preload the GTK code
-       (when-feature gtk "gtk-ffi")
-       (when-feature gtk "gtk-widgets")
-       (when-feature gtk "gdk")
-       (when-feature gtk "gtk-init")
-       (when-feature gtk "gtk-faces")
-       (when-feature gtk "gtk-iso8859-1")
-       (when-feature (and gtk dialog) "dialog-gtk")
-       (when-feature gtk "gtk-select")
-       (when-feature gtk "gtk-mouse")
-       (when-feature gtk "gtk-glyphs")
-       (when-feature glade "glade")
-       (when-feature gtk "widgets-gtk")
 
 ;; preload the TTY init code.
        (when-feature tty "tty-init")
-        "x-color"
-        "cus-face"
-        "font-lock"
+       "x-color"
+       "cus-face"
+       "font-lock"
        "fontl-hooks"
        "auto-show"
        (when-feature ldap "ldap")