xemacs-beta: lisp/prim/loadup.el comparison

comparison lisp/prim/loadup.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2

author	cvs
date	Mon, 13 Aug 2007 08:46:35 +0200
parents	376386a54a3c
children	b82b59fe008d

comparison

equal deleted inserted replaced

-:c0c6a60d29db
+:ac2d302a0011
 ;;; loadup.el --- load up standardly loaded Lisp files for XEmacs.
 ;; It is not a good idea to edit this file.  Use site-init.el or site-load.el
 ;; instead.
 ;;
-;; Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1994 Free Software Foundation, Inc.
 ;; Copyright (C) 1996 Richard Mlynarik.
 ;; Copyright (C) 1995, 1996 Ben Wing.
 ;; Maintainer: FSF
 ;; Keywords: internal
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;; General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
-;;; Synched up with: FSF 19.30.
+;;; Synched up with: Last synched with FSF 19.30, with divergence since.
 ;;; Commentary:
 ;; This is loaded into a bare Emacs to make a dumpable one.
 			      (cons temp-path load-path))))
 (setq load-warn-when-source-newer t ; set to nil at the end
 	   load-warn-when-source-only t)
-(let ((l #'(lambda (x)
+;; garbage collect after loading every file in an attempt to
-(load x)
+;; minimize the size of the dumped image (if we don't do this,
-;; garbage collect after loading every file in an attempt to
+;; there will be lots of extra space in the data segment filled
-;; minimize the size of the dumped image (if we don't do
+;; with garbage-collected junk)
-;; this, there will be lots of extra space in the data
+(defmacro load-gc (file)
-;; segment filled with garbage-collected junk)
+(list 'prog1 (list 'load file) '(garbage-collect)))
-(garbage-collect))))
+(load-gc "backquote") 		; needed for defsubst etc.
-(funcall l "backquote") ; needed for defsubst etc.
+(load-gc "bytecomp-runtime")	; define defsubst
-(funcall l "bytecomp-runtime")	; define defsubst
+(load-gc "subr") 			; load the most basic Lisp functions
-(funcall l "subr") ;; now load the most basic Lisp functions
+(load-gc "replace") 		; match-string used in version.el.
-(funcall l "replace") ;; match-string used in version.el.
+(load-gc "version.el")		; Ignore compiled-by-mistake version.elc
-(funcall l "version.el")	;Ignore compiled-by-mistake version.elc
+(load-gc "cl")
-(funcall l "cl")
+(load-gc "cmdloop")
-(funcall l "cmdloop")
+(or (fboundp 'recursive-edit) (load-gc "cmdloop1"))
-(or (fboundp 'recursive-edit) (funcall l "cmdloop1"))
+(load-gc "keymap")
-(funcall l "keymap")
+(load-gc "syntax")
-(funcall l "syntax")
+(load-gc "device")
-(funcall l "device")
+(load-gc "console")
-(funcall l "console")
+(load-gc "obsolete")
-(funcall l "obsolete")
+(load-gc "specifier")
-(funcall l "specifier")
+(load-gc "faces")	; must be loaded before any make-face call
-(funcall l "faces")	; must be loaded before any make-face call
+;(load-gc "facemenu") #### not yet ported
-;(funcall l "facemenu") #### not yet ported
+(load-gc "glyphs")
-(funcall l "glyphs")
+(load-gc "objects")
-(funcall l "objects")
+(load-gc "extents")
-(funcall l "extents")
+(load-gc "events")
-(funcall l "events")
+(load-gc "text-props")
-(funcall l "text-props")
+(load-gc "process")
-(funcall l "process")
+(load-gc "frame") ; move up here cause some stuff needs it here
-(funcall l "frame") ; move up here cause some stuff needs it here
+(load-gc "map-ynp")
-(funcall l "map-ynp")
+(load-gc "simple")
-(funcall l "simple")
+(load-gc "keydefs") ; Before loaddefs so that keymap vars exist.
-(funcall l "keydefs")	; Before loaddefs so that keymap vars exist.
+(load-gc "abbrev")
-(funcall l "abbrev")
+(load-gc "derived")
-(funcall l "derived")
+(load-gc "minibuf")
-(funcall l "minibuf")
+(load-gc "list-mode")
-(funcall l "list-mode")
+(load-gc "modeline") ; after simple.el so it can reference functions
-(funcall l "modeline") ;after simple.el so it can reference functions
+			  ; defined there.
-			      ;defined there.
+;; If SparcWorks support is included some additional packages are
-;; If SparcWorks support is included some additional packages are
+;; dumped which would normally have autoloads.  To avoid
-;; dumped which would normally have autoloads.  To avoid
+;; duplicate doc string warnings, SparcWorks uses a separate
-;; duplicate doc string warnings, SparcWorks uses a separate
+;; autoloads file with the dumped packages removed.
-;; autoloads file with the dumped packages removed.
+;;; After fixing, eos/loaddefs-eos and loaddefs appear identical?!!
-(if (featurep 'sparcworks)
+;;; So just make loaddefs-eos go away...
-(funcall l "eos/loaddefs-eos")
+;;;(load-gc (if (featurep 'sparcworks) "eos/loaddefs-eos" "loaddefs"))
-(funcall l "loaddefs"))
+(load-gc "loaddefs")
-(funcall l "misc")
+(load-gc "misc")
-(funcall l "profile")
+(load-gc "profile")
-(funcall l "help")
+(load-gc "help")
-;; (funcall l "hyper-apropos")  Soon...
+;; (load-gc "hyper-apropos")  Soon...
-(funcall l "files")
+(load-gc "files")
-(funcall l "lib-complete")
+(load-gc "lib-complete")
-(funcall l "format")
+(load-gc "format")
-(funcall l "indent")
+(load-gc "indent")
-(funcall l "isearch-mode")
+(load-gc "isearch-mode")
-(funcall l "buffer")
+(load-gc "buffer")
-(funcall l "buff-menu")
+(load-gc "buff-menu")
-(funcall l "undo-stack")
+(load-gc "undo-stack")
-(funcall l "window")
+(load-gc "window")
-(funcall l "paths.el")		; don't get confused if paths compiled.
+(load-gc "paths.el")		; don't get confused if paths compiled.
-(funcall l "startup")
+(load-gc "startup")
-(funcall l "lisp")
+(load-gc "lisp")
-(funcall l "page")
+(load-gc "page")
-(funcall l "register")
+(load-gc "register")
-(funcall l "iso8859-1")		; This must be before any modes
+(load-gc "iso8859-1")		; This must be before any modes
 ; (sets standard syntax table.)
-(funcall l "paragraphs")
+(load-gc "paragraphs")
-(funcall l "lisp-mode")
+(load-gc "lisp-mode")
-(funcall l "text-mode")
+(load-gc "text-mode")
-(funcall l "fill")
+(load-gc "fill")
-(funcall l "cc-mode")
+(load-gc "cc-mode")
-(if (eq system-type 'vax-vms)
+;; we no longer load buff-menu automatically.
-(funcall l "vmsproc"))
+;; it will get autoloaded if needed.
-(if (eq system-type 'vax-vms)
-(funcall l "vms-patch"))
+(cond  ; Differences based on system-type
-(if (eq system-type 'windows-nt)
+((eq system-type 'vax-vms)
-	   (progn
+(load-gc "vmsproc")
-	     (funcall l "ls-lisp")
+(load-gc "vms-patch"))
-	     (funcall l "winnt")))
+((eq system-type 'windows-nt)
-(if (eq system-type 'ms-dos)
+(load-gc "ls-lisp")
-	   (progn
+(load-gc "winnt"))
-	     (funcall l "ls-lisp")
+((eq system-type 'ms-dos)
-	     (funcall l "dos-fns")
+(load-gc "ls-lisp")
-	     (funcall l "disp-table")	; needed to setup ibm-pc char set,
+(load-gc "dos-fns")
-					; see internal.el
+(load-gc "disp-table")))	; needed to setup ibm-pc char set,
-	     ))
+				; see internal.el
-(if (featurep 'lisp-float-type)
+(when (featurep 'lisp-float-type)
-(funcall l "float-sup"))
+(load-gc "float-sup"))
-(funcall l "itimer") ; for vars auto-save-timeout and auto-gc-threshold
+(load-gc "itimer") ; for vars auto-save-timeout and auto-gc-threshold
 (if (featurep 'toolbar)
-(funcall l "toolbar")
+(load-gc "toolbar")
-(progn
+;; else still define a few functions.
-;; but still define a few functions.
+(defun toolbar-button-p    (obj) "No toolbar support." nil)
-(defun toolbar-button-p (obj) "No toolbar support." nil)
+(defun toolbar-specifier-p (obj) "No toolbar support." nil))
-(defun toolbar-specifier-p (obj) "No toolbar support." nil)))
+(when (featurep 'scrollbar)
-(if (featurep 'scrollbar)
+(load-gc "scrollbar"))
-(funcall l "scrollbar"))
+(when (featurep 'menubar)
-(if (featurep 'menubar)
+(load-gc "menubar"))
-(funcall l "menubar"))
+(when (featurep 'dialog)
-(if (featurep 'dialog)
+(load-gc "dialog"))
-(funcall l "dialog"))
+(when (featurep 'window-system)
-(if (featurep 'window-system)
+(load-gc "gui")
-(progn
+(load-gc "mode-motion")
-	     (funcall l "gui")
+(load-gc "mouse"))
-(funcall l "mode-motion")
+(when (featurep 'x)
-(funcall l "mouse")))
+;; preload the X code, for faster startup.
-(if (featurep 'x)
+(when (featurep 'menubar)
-;; preload the X code, for faster startup.
+(load-gc "x-menubar")
-(progn
+;; autoload this.
-(if (featurep 'menubar)
+;;(load-gc "x-font-menu")
-(progn
+)
-(funcall l "x-menubar")
+(load-gc "x-faces")
-;; autoload this.
+(load-gc "x-iso8859-1")
-;;(funcall l "x-font-menu")
+(load-gc "x-mouse")
-))
+(load-gc "x-select")
-(funcall l "x-faces")
+(when (featurep 'scrollbar)
-(funcall l "x-iso8859-1")
+(load-gc "x-scrollbar"))
-(funcall l "x-mouse")
+(load-gc "x-misc")
-(funcall l "x-select")
+(load-gc "x-init")
-(if (featurep 'scrollbar)
+(when (featurep 'toolbar)
-(funcall l "x-scrollbar"))
+(load-gc "x-toolbar"))
-(funcall l "x-misc")
+)
-(funcall l "x-init")
+(when (featurep 'tty)
-(if (featurep 'toolbar)
+;; preload the TTY init code.
-(funcall l "x-toolbar"))
+(load-gc "tty-init"))
-))
+(when (featurep 'tooltalk)
-(if (featurep 'tty)
+(load-gc "tooltalk/tooltalk-load"))
-;; preload the TTY init code.
+(load-gc "vc-hooks")
-(funcall l "tty-init"))
+(load-gc "ediff-hook")
-(if (featurep 'tooltalk)
+(load-gc "fontl-hooks")
-(funcall l "tooltalk/tooltalk-load"))
+(load-gc "auto-show")
-(funcall l "vc-hooks")
+(when (featurep 'energize)
-(funcall l "ediff-hook")
+(load-gc "energize/energize-load.el"))
-(funcall l "fontl-hooks")
+(when (featurep 'sparcworks)
-(funcall l "auto-show")
+(load-gc "sunpro/sunpro-load.el"))
-(if (featurep 'energize)
+(fmakunbound 'load-gc)
-(funcall l "energize/energize-load.el"))
+)) ;; end of call-with-condition-handler
-(if (featurep 'sparcworks)
-(funcall l "sunpro/sunpro-load.el"))
-))) ;; end of call-with-condition-handler
 (setq load-warn-when-source-newer nil ; set to t at top of file
 load-warn-when-source-only nil)
 (if (or (equal (nth 4 command-line-args) "no-site-file")
 	(equal (nth 5 command-line-args) "no-site-file"))
 (setq site-start-file nil))
-;;; If you want additional libraries to be preloaded and their
+;; If you want additional libraries to be preloaded and their
-;;; doc strings kept in the DOC file rather than in core,
+;; doc strings kept in the DOC file rather than in core,
-;;; you may load them with a "site-load.el" file.
+;; you may load them with a "site-load.el" file.
-;;; But you must also cause them to be scanned when the DOC file
+;; But you must also cause them to be scanned when the DOC file
-;;; is generated.  For VMS, you must edit ../../vms/makedoc.com.
+;; is generated.  For VMS, you must edit ../../vms/makedoc.com.
-;;; For other systems, you must edit ../../src/Makefile.in.in.
+;; For other systems, you must edit ../../src/Makefile.in.in.
 (if (load "site-load" t)
 (garbage-collect))
 ;FSFmacs randomness
 ;(if (fboundp 'x-popup-menu)
 ;				   emacs-version
 ;				   (if versions
 ;				       (1+ (apply 'max versions))
 ;				     1)))))
-;;; Note: all compiled Lisp files loaded above this point
+;; Note: all compiled Lisp files loaded above this point
-;;; must be among the ones parsed by make-docfile
+;; must be among the ones parsed by make-docfile
-;;; to construct DOC.  Any that are not processed
+;; to construct DOC.  Any that are not processed
-;;; for DOC will not have doc strings in the dumped XEmacs.
+;; for DOC will not have doc strings in the dumped XEmacs.
-;;; Don't bother with these if we're running temacs, i.e. if we're
+;; Don't bother with these if we're running temacs, i.e. if we're
-;;; just debugging don't waste time finding doc strings.
+;; just debugging don't waste time finding doc strings.
 (if (or (equal (nth 3 command-line-args) "dump")
 	(equal (nth 4 command-line-args) "dump"))
 (progn
 (message "Finding pointers to doc strings...")
 	(Snarf-documentation "DOC"))
 (message "Finding pointers to doc strings...done")
 (Verify-documentation)
 ))
-;;; Note: You can cause additional libraries to be preloaded
+; Note: You can cause additional libraries to be preloaded
-;;; by writing a site-init.el that loads them.
+; by writing a site-init.el that loads them.
-;;; See also "site-load" above.
+; See also "site-load" above.
 (if (stringp site-start-file)
 (load "site-init" t))
 (setq current-load-list nil)
 (garbage-collect)
 			     (substring name (match-end 0)))))
 	(if (string-match "-+\\'" name)
 	    (setq name (substring name 0 (match-beginning 0))))
 	(if (eq system-type 'ms-dos)
 	    (message "Dumping under the name xemacs")
-	  (message "Dumping under names xemacs and %s" name)))
+	  (message "Dumping under names xemacs and %s" name))
-(condition-case ()
+(condition-case () (delete-file  name   ) (file-error nil))
-	  (delete-file "xemacs")
+(condition-case () (delete-file "xemacs") (file-error nil))
-	(file-error nil))
+)
 (if (fboundp 'really-free)
 	  (really-free))
 ;; Note that FSF used to dump under `xemacs'!
 (dump-emacs "xemacs" "temacs")
 ;This is done automatically.
 			 4 5)
 		     command-line-args))
 ;; run-emacs-from-temacs doesn't actually return anyway.
 (kill-emacs)))
-;;; Avoid error if user loads some more libraries now.
+;; Avoid error if user loads some more libraries now.
 (setq purify-flag nil)
-;;; If you are using 'recompile', then you should have used -l loadup-el.el
+;; XEmacs change
-;;; so that the .el files always get loaded (the .elc files may be out-of-
+;; If you are using 'recompile', then you should have used -l loadup-el.el
-;;; date or bad).
+;; so that the .el files always get loaded (the .elc files may be out-of-
+;; date or bad).
 (if (or (equal (nth 3 command-line-args) "recompile")
 	(equal (nth 4 command-line-args) "recompile"))
 (progn
 (let ((command-line-args-left
 	     (nthcdr (if (equal (nth 3 command-line-args) "recompile")
 		     command-line-args)))
 	(batch-byte-recompile-directory)
 	(kill-emacs))))
-;;; For machines with CANNOT_DUMP defined in config.h,
-;;; this file must be loaded each time XEmacs is run.
-;;; So run the startup code now.
 ;; For machines with CANNOT_DUMP defined in config.h,
 ;; this file must be loaded each time Emacs is run.
 ;; So run the startup code now.
 (or (fboundp 'dump-emacs)

Mercurial > hg > xemacs-beta

comparison lisp/prim/loadup.el @ 2:ac2d302a0011 r19-15b2