comparison lisp/dumped-lisp.el @ 1315:70921960b980

[xemacs-hg @ 2003-02-20 08:19:28 by ben] check in makefile fixes et al Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory into src/. Simplify the dependencies -- everything in src/ is dependent on the single entry `src' in MAKE_SUBDIRS. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. mule/mule-msw-init.el: Removed. Delete this file. mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows native, boys and girls! bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc file in a non-Mule XEmacs. Formerly you got the rather cryptic "The required feature `mule' cannot be provided". Now you get "Loading this file requires Mule support". finder.el: Remove dependency on which directory this function is invoked from. update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that Makefile.in.in and xemacs.mak are in sync, both of them use NEEDTODUMP and the other one isn't used. dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so we can have arbitrary forms, not just `when-feature'. very-early-lisp.el: Nuke this file. finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp. msw-glyphs.el: Comment clarification. xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro section is now completely in sync with src/Makefile.in.in. Copy check-features, load-shadows, and rebuilding finder-inf.el from src/Makefile.in.in. The main build/dump/recompile process is now synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE' and `error checking' to `error-checking' TO avoid tripping faux warnings and errors in the VC++ IDE. Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory from top-level Makefile.in.in to here. Simplify the dependencies. Rearrange into logical subsections. Synchronize the main compile/dump/build-elcs section with xemacs.mak, which is already clean and in good working order. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS, TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so it doesn't need to ignore the return value from dumping. Add .NO_PARALLEL since various aspects of building and dumping must be serialized but do not always have dependencies between them (this is impossible in some cases). Everything related to src/ now gets built in one pass in this directory by just running `make' (except the Makefiles themselves and config.h, paths.h, Emacs.ad.h, and other generated .h files). console.c: Update list of possibly valid console types. emacs.c: Rationalize the specifying and handling of the type of the first frame. This was originally prompted by a workspace in which I got GTK to compile under C++ and in the process fixed it so it could coexist with X in the same build -- hence, a combined TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However, you can't simultaneously *display* more than one kind of device connection -- but getting that to work is not that difficult. Perhaps a project for a bored grad student. I (ben) would do it but don't see the use.) To make sense of this, I added new switches that can be used to specifically indicate the window system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka --use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka --use-gnome, same as --use-gtk]. -nw continues as an alias for -tty. When none have been given, XEmacs checks for other parameters implying particular device types (-t -> tty, -display -> x [or should it have same treatment as DISPLAY below?]), and has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or gtk? perhaps should check whether gnome is running), else MS Windows if it exsits, else TTY if it exists, else stream, and you must be running in batch mode. This also fixes an existing bug whereby compiling with no x, no mswin, no tty, when running non- interactively (e.g. to dump) I get "sorry, must have TTY support". emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even when occurring extremely early in reinitialization. emacs.c: Try to make sure that the user can see message output under Windows (i.e. it doesn't just disappear right away) regardless of when it occurs, e.g. in the middle of creating the first frame. emacs.c: Define new function `emacs-run-status', indicating whether XEmacs is noninteractive or interactive, whether raw, post-dump/pdump-load or run-temacs, whether we are dumping, whether pdump is in effect. event-stream.c: It's "mommas are fat", not "momas are fat". Fix other typo. event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS, because it won't exist on w/o menubar support, lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it blank only for GCC 2.5 through 2.999999999999999. Declare Vstack_trace_on_error. profile.c: Need to include "profile.h" to fix warnings. sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0). That way we can distinguish between a dumping failing expectedly (due to lack of stack space, triggering another dump) and unexpectedly, in which case, we want to stop building. (or go on, if -K is given) syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong, and fix warnings thereby. syntax.h: Fix crash caused by an edge condition in the syntax-cache macros. text.h: Spacing fixes. xmotif.h: New file, to get around shadowing warnings. EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h. alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC. config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead. Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY. lisp.h: More futile attempts to walk and chew gum at the same time when dealing with subr's that don't return.
author ben
date Thu, 20 Feb 2003 08:19:44 +0000
parents 960da99ad52b
children 4542b72c005e
comparison
equal deleted inserted replaced
1314:15a91d7ae2d1 1315:70921960b980
1 (setq preloaded-file-list 1 (setq preloaded-file-list
2 (assemble-list 2 (list
3 "backquote" ; needed for defsubst etc. 3 "backquote" ; needed for defsubst etc.
4 "bytecomp-runtime" ; define defsubst 4 "bytecomp-runtime" ; define defsubst
5 "find-paths" 5 "find-paths"
6 "packages" ; Bootstrap run-time lisp environment 6 "packages" ; Bootstrap run-time lisp environment
7 "setup-paths" 7 "setup-paths"
8 "dump-paths" 8 "dump-paths"
9 "subr" ; load the most basic Lisp functions 9 "subr" ; load the most basic Lisp functions
10 "post-gc" 10 "post-gc"
11 "replace" ; match-string used in version.el. 11 "replace" ; match-string used in version.el.
12 ; Ignore compiled-by-mistake version.elc 12
13 "version.el" 13 "version.el" ; Ignore compiled-by-mistake version.elc
14 "cl" 14
15 "cl-extra" 15 "cl"
16 "cl-seq" 16 "cl-extra"
17 "widget" 17 "cl-seq"
18 "custom" ; Before the world so everything can be 18 "widget"
19 ; customized 19 "custom" ; Before the world so everything can be
20 "cus-start" ; for customization of builtin variables 20 ; customized
21 "cmdloop" 21 "cus-start" ; for customization of builtin variables
22 "keymap" 22 "cmdloop"
23 "syntax" 23 "keymap"
24 "device" 24 "syntax"
25 "console" 25 "device"
26 "obsolete" 26 "console"
27 "specifier" 27 "obsolete"
28 "frame" ; needed by faces 28 "specifier"
29 (when-feature x "x-faces") ; needed by faces 29 "frame" ; needed by faces
30 (when-feature gtk "gtk-faces") 30 (when (featurep 'x) "x-faces") ; needed by faces
31 (when-feature mswindows "msw-faces") 31 (when (featurep 'gtk) "gtk-faces")
32 "faces" ; must be loaded before any make-face call 32 (when (valid-console-type-p 'mswindows) "msw-faces")
33 ;;(pureload "facemenu") #### not yet ported 33 "faces" ; must be loaded before any make-face call
34 "glyphs" 34 ;;(pureload "facemenu") #### not yet ported
35 "objects" 35 "glyphs"
36 "extents" 36 "objects"
37 "events" 37 "extents"
38 "hash-table" 38 "events"
39 "text-props" 39 "hash-table"
40 "process" ;; This is bad. network-streams may not be defined. 40 "text-props"
41 (when-feature multicast "multicast") ; #+network-streams implicitly true 41 "process" ;; This is bad. network-streams may not be defined.
42 "map-ynp" 42 (when (featurep 'multicast) "multicast") ; #+network-streams implicitly true
43 "undo-stack" 43 "map-ynp"
44 "window" ; simple needs `save-window-excursion' 44 "undo-stack"
45 "window-xemacs" 45 "window" ; simple needs `save-window-excursion'
46 "simple" 46 "window-xemacs"
47 "keydefs" ; Before loaddefs so that keymap vars exist. 47 "simple"
48 "abbrev" 48 "keydefs" ; Before loaddefs so that keymap vars exist.
49 "derived" 49 "abbrev"
50 "minibuf" 50 "derived"
51 "list-mode" 51 "minibuf"
52 "modeline" ; needs simple.el to be loaded first 52 "list-mode"
53 "modeline" ; needs simple.el to be loaded first
53 ;; If SparcWorks support is included some additional packages are 54 ;; If SparcWorks support is included some additional packages are
54 ;; dumped which would normally have autoloads. To avoid 55 ;; dumped which would normally have autoloads. To avoid
55 ;; duplicate doc string warnings, SparcWorks uses a separate 56 ;; duplicate doc string warnings, SparcWorks uses a separate
56 ;; autoloads file with the dumped packages removed. 57 ;; autoloads file with the dumped packages removed.
57 ;; After fixing, eos/loaddefs-eos and loaddefs appear identical?!! 58 ;; After fixing, eos/loaddefs-eos and loaddefs appear identical?!!
58 ;; So just make loaddefs-eos go away... 59 ;; So just make loaddefs-eos go away...
59 ;;(pureload (if (featurep 'sparcworks) "eos/loaddefs-eos" "loaddefs")) 60 ;;(pureload (if (featurep 'sparcworks) "eos/loaddefs-eos" "loaddefs"))
60 "cus-file" 61 "cus-file"
61 "startup" ; For initialization of 62 "startup" ; For initialization of
62 ; `emacs-user-extension-dir' 63 ; `emacs-user-extension-dir'
63 "misc" 64 "misc"
64 ;; (pureload "profile") 65 ;; (pureload "profile")
65 "help" 66 "help"
66 ;; (pureload "hyper-apropos") Soon... 67 ;; (pureload "hyper-apropos") Soon...
67 "files" 68 "files"
68 "lib-complete" 69 "lib-complete"
69 "format" 70 "format"
70 "indent" 71 "indent"
71 "isearch-mode" 72 "isearch-mode"
72 "buffer" 73 "buffer"
73 "buff-menu" 74 "buff-menu"
74 "paths.el" ; don't get confused if paths compiled. 75 "paths.el" ; don't get confused if paths compiled.
75 "lisp" 76 "lisp"
76 "page" 77 "page"
77 "register" 78 "register"
78 "iso8859-1" ; This must be before any modes 79 "iso8859-1" ; This must be before any modes
79 ; (sets standard syntax table.) 80 ; (sets standard syntax table.)
80 "paragraphs" 81 "paragraphs"
81 "easymenu" ; Added for 20.3. 82 "easymenu" ; Added for 20.3.
82 "lisp-mode" 83 "lisp-mode"
83 "text-mode" 84 "text-mode"
84 "fill" 85 "fill"
85 "auto-save" ; Added for 20.4 86 "auto-save" ; Added for 20.4
86 "movemail" ; Added for 21.2 87 "movemail" ; Added for 21.2
87 (when-feature windows-nt "win32-native") 88 (when (eq system-type 'windows-nt) "win32-native")
88 (when-feature lisp-float-type "float-sup") 89 (when (featurep 'lisp-float-type) "float-sup")
89 "itimer" ; for vars auto-save-timeout and 90 "itimer" ; for vars auto-save-timeout and
90 ; auto-gc-threshold 91 ; auto-gc-threshold
91 "itimer-autosave" 92 "itimer-autosave"
92 "printer" 93 "printer"
93 "behavior" 94 "behavior"
94 "behavior-defs" 95 "behavior-defs"
95 "diagnose" 96 "diagnose"
96 97
97 ;;;;;;;;;;;;;;;;;; GUI support 98 ;;;;;;;;;;;;;;;;;; GUI support
98 (when-feature window-system "gui") 99 (when (featurep 'window-system)
99 (when-feature window-system "mouse") 100 '("gui"
100 (when-feature window-system "mode-motion") 101 "mouse"
101 (when-feature toolbar "toolbar") 102 "mode-motion"
102 (when-feature scrollbar "scrollbar") 103 ))
103 (when-feature menubar "menubar") 104 (when (featurep 'toolbar) "toolbar")
104 (when-feature dialog "dialog") 105 (when (featurep 'scrollbar) "scrollbar")
105 (when-feature gutter "gutter") 106 (when (featurep 'menubar) "menubar")
106 (when-feature dragdrop-api "dragdrop") 107 (when (featurep 'dialog) "dialog")
107 "select" 108 (when (featurep 'gutter) "gutter")
108 109 (when (featurep 'dragdrop-api) "dragdrop")
110 "select"
111
109 ;;;;;;;;;;;;;;;;;; Content for GUI's 112 ;;;;;;;;;;;;;;;;;; Content for GUI's
110 ;; There used to be window-system inserted in the when-feature, 113 ;; There used to be window-system inserted in the when-feature,
111 ;; but IMHO your configure script should turn off the menubar, 114 ;; but IMHO your configure script should turn off the menubar,
112 ;; toolbar, etc. features when there is no window system. We 115 ;; toolbar, etc. features when there is no window system. We
113 ;; should just be able to assume that, if (featurep 'menubar), 116 ;; should just be able to assume that, if (featurep 'menubar),
114 ;; the menubar should work and if items are added, they can be 117 ;; the menubar should work and if items are added, they can be
115 ;; seen clearly and usefully. 118 ;; seen clearly and usefully.
116 (when-feature (and (not infodock) menubar) "menubar-items") 119 (when (featurep '(and (not infodock) menubar)) "menubar-items")
117 (when-feature (and gutter) "gutter-items") 120 (when (featurep '(and gutter)) "gutter-items")
118 (when-feature (and (not infodock) toolbar) "toolbar-items") 121 (when (featurep '(and (not infodock) toolbar)) "toolbar-items")
119 (when-feature (and (not infodock) dialog) "dialog-items") 122 (when (featurep '(and (not infodock) dialog)) "dialog-items")
120 123
121 ;;;;;;;;;;;;;;;;;; Coding-system support 124 ;;;;;;;;;;;;;;;;;; Coding-system support
122 "coding" 125 "coding"
123 "code-files" 126 "code-files"
124 ;; Handle process with encoding/decoding coding-system. 127 ;; Handle process with encoding/decoding coding-system.
125 "code-process" 128 "code-process"
126 ;; Provide basic commands to set coding systems to user 129 ;; Provide basic commands to set coding systems to user
127 "code-cmds" 130 "code-cmds"
128 "unicode" 131 "unicode"
129 ;;;;;;;;;;;;;;;;;; MULE support 132 ;;;;;;;;;;;;;;;;;; MULE support
130 (when-feature mule "mule-charset") 133 (when (featurep 'mule)
131 (when-feature mule "mule-cmds") ; to sync with Emacs 20.1 134 '("mule-charset"
132 (when-feature mule "mule-coding") 135 "mule-cmds" ; to sync with Emacs 20.1
133 (when-feature mule "mule-composite-stub") 136 "mule-coding"
134 (when-feature mule "mule-composite") 137 "mule-composite-stub"
135 ;; may initialize coding systems 138 "mule-composite"
136 (when-feature (and mule x) "mule-x-init") 139 ))
137 (when-feature (and mule tty) "mule-tty-init") 140 ;; may initialize coding systems
138 (when-feature (and mule mswindows) "mule-msw-init") 141 (when (featurep '(and mule x)) "mule-x-init")
139 "code-init" ; set up defaults 142 (when (featurep '(and mule tty)) "mule-tty-init")
140 ;; All files after this can have extended characters in them. 143 (when (and (featurep 'mule) (memq system-type '(windows-nt cygwin32)))
141 (when-feature mule "mule-category") 144 "mule-win32-init")
142 (when-feature mule "mule-ccl") 145 "code-init" ; set up defaults
143 (when-feature mule "kinsoku") 146 ;; All files after this can have extended characters in them.
147 (when (featurep 'mule)
148 '("mule-category"
149 "mule-ccl"
150 "kinsoku"
151 ))
144 152
145 ;; after this goes the specific lisp routines for a particular input system 153 ;; after this goes the specific lisp routines for a particular input system
146 ;; 97.2.5 JHod Shouldn't these go into a site-load file to allow site 154 ;; 97.2.5 JHod Shouldn't these go into a site-load file to allow site
147 ;; or user switching of input systems??? 155 ;; or user switching of input systems???
148 ;(if (featurep 'wnn) 156 ;(if (featurep 'wnn)
158 ;; Now load files to set up all the different languages/environments that 166 ;; Now load files to set up all the different languages/environments that
159 ;; Mule knows about. Formerly we had to worry about files shadowed by 167 ;; Mule knows about. Formerly we had to worry about files shadowed by
160 ;; those of the same name in leim/quail.el, but no longer, since we now 168 ;; those of the same name in leim/quail.el, but no longer, since we now
161 ;; compile with -no-packages. 169 ;; compile with -no-packages.
162 170
163 (when-feature mule "arabic") 171 (when (featurep 'mule)
164 (when-feature mule "chinese") 172 '("arabic"
165 (when-feature mule "cyrillic") 173 "chinese"
166 (when-feature mule "english") 174 "cyrillic"
167 (when-feature mule "ethiopic") 175 "english"
168 (when-feature mule "european") 176 "ethiopic"
169 (when-feature mule "greek") 177 "european"
170 (when-feature mule "hebrew") 178 "greek"
171 (when-feature mule "indian") 179 "hebrew"
172 (when-feature mule "devanagari") ; must be loaded after indian.el 180 "indian"
173 (when-feature mule "japanese") 181 "devanagari" ; must be loaded after indian.el
174 (when-feature mule "korean") 182 "japanese"
175 (when-feature mule "lao") 183 "korean"
176 (when-feature mule "latin") 184 "lao"
177 (when-feature mule "misc-lang") 185 "latin"
178 ;; #### merge thai and thai-xtis!!! 186 "misc-lang"
179 ;(when-feature mule "thai") 187 ;; "thai" #### merge thai and thai-xtis!!!
180 (when-feature mule "thai-xtis") 188 "thai-xtis"
181 (when-feature mule "tibetan") 189 "tibetan"
182 (when-feature mule "vietnamese") 190 "vietnamese"
183 191 ))
192
184 ;; Specialized language support 193 ;; Specialized language support
185 (when-feature (and mule CANNA) "canna-leim") 194 (when (featurep '(and mule CANNA)) "canna-leim")
186 ;; Egg/Its is now a package 195 ;; Egg/Its is now a package
187 ; (when-feature (and mule wnn) "egg-leim") 196 ; (when (featurep '(and mule wnn))
188 ; (when-feature (and mule wnn) "egg-kwnn-leim") 197 ; '("egg-leim" "egg-kwnn-leim" "egg-cwnn-leim"))
189 ; (when-feature (and mule wnn) "egg-cwnn-leim") 198 ; (when (featurep 'mule) "egg-sj3-leim")
190 ; (when-feature mule "egg-sj3-leim")
191 ;; SKK is now a package 199 ;; SKK is now a package
192 ; (when-feature mule "skk-leim") 200 ; (when (featurep 'mule) "skk-leim")
193 201
194 ;; Enable Mule capability for Gnus, mail, etc... 202 ;; Enable Mule capability for Gnus, mail, etc...
195 ;; Moved to sunpro-load.el - the default only for Sun. 203 ;; Moved to sunpro-load.el - the default only for Sun.
196 ;;(pureload "mime-setup") 204 ;;(pureload "mime-setup")
197 205
198 ;; needs access to the charsets created by the above 206 ;; needs access to the charsets created by the above
199 ;; language-specific files. 207 ;; language-specific files.
200 (when-feature (and mule mswindows) "mule-msw-init-late") 208 (when (and (featurep 'mule) (valid-console-type-p 'mswindows))
209 "mule-msw-init-late")
201 210
202 ;;; mule-load.el ends here 211 ;;; mule-load.el ends here
203 212
204 ;; preload InfoDock stuff. should almost certainly not be here if 213 ;; preload InfoDock stuff. should almost certainly not be here if
205 ;; id-menus is not here. infodock needs to figure out a clever way to 214 ;; id-menus is not here. infodock needs to figure out a clever way to
206 ;; advise this stuff or we need to export a clean way for infodock or 215 ;; advise this stuff or we need to export a clean way for infodock or
207 ;; others to control this programmatically. 216 ;; others to control this programmatically.
208 (when-feature (and infodock (or x mswindows gtk) menubar) "id-menus") 217 (when (featurep '(and infodock (or x mswindows gtk) menubar))
218 "id-menus")
209 ;; preload the X code. 219 ;; preload the X code.
210 (when-feature x "x-iso8859-1") 220 (when (featurep '(and x scrollbar)) "x-scrollbar")
211 (when-feature x "x-mouse") 221 (when (featurep 'x)
212 (when-feature x "x-select") 222 '("x-iso8859-1"
213 (when-feature (and x scrollbar) "x-scrollbar") 223 "x-mouse"
214 (when-feature x "x-misc") 224 "x-select"
215 (when-feature x "x-init") 225 "x-misc"
216 (when-feature x "x-win-xfree86") 226 "x-init"
217 (when-feature x "x-win-sun") 227 "x-win-xfree86"
218 ;; preload the GTK code 228 "x-win-sun"))
219 (when-feature gtk "gtk-ffi") 229 ;; preload the GTK code
220 (when-feature gtk "gtk-widgets") 230 (when (featurep 'gtk)
221 (when-feature gtk "gdk") 231 '("gtk-ffi"
222 (when-feature gtk "gtk-init") 232 "gtk-widgets"
223 (when-feature gtk "gtk-iso8859-1") 233 "gdk"
224 (when-feature (and gtk dialog) "dialog-gtk") 234 "gtk-init"
225 (when-feature gtk "gtk-select") 235 "gtk-iso8859-1"
226 (when-feature gtk "gtk-mouse") 236 "gtk-select"
227 (when-feature gtk "gtk-glyphs") 237 "gtk-mouse"
228 (when-feature glade "glade") 238 "gtk-glyphs"
229 (when-feature gtk "widgets-gtk") 239 "widgets-gtk"))
240 (when (featurep '(and gtk dialog)) "dialog-gtk")
241 (when (featurep 'glade) "glade")
230 242
231 ;; preload the mswindows code. 243 ;; preload the mswindows code.
232 (when-feature mswindows "msw-glyphs") 244 (when (valid-console-type-p 'mswindows)
233 (when-feature mswindows "msw-mouse") 245 '("msw-glyphs"
234 (when-feature mswindows "msw-init") 246 "msw-mouse"
235 (when-feature mswindows "msw-select") 247 "msw-init"
248 "msw-select"))
236 ;; preload the TTY init code. 249 ;; preload the TTY init code.
237 (when-feature tty "tty-init") 250 (when (featurep 'tty) "tty-init")
238 ;;; Formerly in tooltalk/tooltalk-load.el 251 ;;; Formerly in tooltalk/tooltalk-load.el
239 ;; Moved to tooltalk package 252 ;; Moved to tooltalk package
240 ;; (when-feature tooltalk "tooltalk-macros") 253 ;; (when (featurep 'tooltalk)
241 ;; (when-feature tooltalk "tooltalk-util") 254 ;; '("tooltalk-macros" "tooltalk-util" "tooltalk-init"))
242 ;; (when-feature tooltalk "tooltalk-init")
243 ;; "vc-hooks" ; Packaged. Available in two versions. 255 ;; "vc-hooks" ; Packaged. Available in two versions.
244 ;; "ediff-hook" ; Packaged. 256 ;; "ediff-hook" ; Packaged.
245 "fontl-hooks" 257 "fontl-hooks"
246 "auto-show" 258 "auto-show"
247 "resize-minibuffer" 259 "resize-minibuffer"
248 (when-feature ldap "ldap") 260 (when (featurep 'ldap) "ldap")
249 261
250 ;; (when-feature energize "energize/energize-load.el") 262 ;; (when (featurep 'energize) "energize/energize-load.el")
251 ;;; formerly in sunpro/sunpro-load.el 263 ;;; formerly in sunpro/sunpro-load.el
252 ;; (when-feature (and mule sparcworks) "mime-setup") 264 ;; (when (featurep '(and mule sparcworks)) "mime-setup")
253 265
254 ;; Moved to Sun package 266 ;; Moved to Sun package
255 ;; (when-feature sparcworks "cc-mode") ; Requires cc-mode package 267 ;; (when (featurep 'sparcworks)
256 ;; (when-feature sparcworks "sunpro-init") 268 ;; '("cc-mode" ; Requires cc-mode package
257 ;; (when-feature sparcworks "ring") 269 ;; "sunpro-init"
258 ;; (when-feature sparcworks "comint") ; Requires comint package 270 ;; "ring"
259 ;; (when-feature sparcworks "annotations") 271 ;; "comint" ; Requires comint package
272 ;; "annotations"))
260 273
261 ;;; formerly in eos/sun-eos-load.el 274 ;;; formerly in eos/sun-eos-load.el
262 ;; (when-feature sparcworks "sun-eos-init") 275 ;; (when (featurep 'sparcworks)
263 ;; (when-feature sparcworks "sun-eos-common") 276 ;; '("sun-eos-init"
264 ;; (when-feature sparcworks "sun-eos-editor") 277 ;; "sun-eos-common"
265 ;; (when-feature sparcworks "sun-eos-browser") 278 ;; "sun-eos-editor"
266 ;; (when-feature sparcworks "sun-eos-debugger") 279 ;; "sun-eos-browser"
267 ;; (when-feature sparcworks "sun-eos-debugger-extra") 280 ;; "sun-eos-debugger"
268 ;; (when-feature sparcworks "sun-eos-menubar") 281 ;; "sun-eos-debugger-extra"
269 "loadhist" ; Must be dumped before loaddefs is loaded 282 ;; "sun-eos-menubar"))
270 "loaddefs" ; <=== autoloads get loaded here 283 "loadhist" ; Must be dumped before loaddefs is loaded
271 )) 284 "loaddefs" ; <=== autoloads get loaded here
285 ))
286
287 (setq preloaded-file-list
288 (apply #'nconc
289 (mapcar #'(lambda (x)
290 (if (listp x) x (list x)))
291 preloaded-file-list)))