XEmacs 21.2.13

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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 4c836bb..ee86aa9 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -42,36 +42,18 @@
 (defvar preloaded-file-list nil
   "List of files preloaded into the XEmacs binary image.")
 
-(defvar Installation-string nil
-  "Description of XEmacs installation.")
 
 (let ((gc-cons-threshold 30000))
   
 ;; This is awfully damn early to be getting an error, right?
 (call-with-condition-handler 'really-early-error-handler
     #'(lambda ()
-
-       ;; Initializa Installation-string.  We do it before loading
-       ;; anything so that dumped code can make use of its value.
-       (setq Installation-string
-             (save-current-buffer
-               (set-buffer (get-buffer-create (generate-new-buffer-name
-                                               " *temp*")))
-               ;; insert-file-contents-internal bogusly calls
-               ;; format-decode without checking if it's defined.
-               (fset 'format-decode #'(lambda (f l &optional v) l))
-               (insert-file-contents-internal "../Installation")
-               (fmakunbound 'format-decode)
-               (prog1 (buffer-substring)
-                 (kill-buffer (current-buffer)))))
-
+       ;; message not defined yet ...
        (setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
        (setq module-load-path (split-path (getenv "EMACSBOOTSTRAPMODULEPATH")))
 
-       ;; message not defined yet ...
        (external-debugging-output (format "\nUsing load-path %s" load-path))
-       (external-debugging-output (format "\nUsing module-load-path %s"
-                                          module-load-path))
+       (external-debugging-output (format "\nUsing module-load-path %s" module-load-path))
 
        ;; We don't want to have any undo records in the dumped XEmacs.
        (buffer-disable-undo (get-buffer "*scratch*"))
@@ -104,8 +86,7 @@
        (defun pureload (file)
          (let ((full-path
                 (locate-file file load-path
-                             (if load-ignore-elc-files
-                                 '(".el" "") '(".elc" ".el" "")))))
+                             (if load-ignore-elc-files ".el:" ".elc:.el:"))))
            (if full-path
                (prog1
                  (load full-path)
@@ -164,6 +145,7 @@
 ;;; for the sake of the next call to precompute-menubar-bindings.
 ;(setq define-key-rebound-commands nil)
 
+
 ;; Note: all compiled Lisp files loaded above this point
 ;; must be among the ones parsed by make-docfile
 ;; to construct DOC.  Any that are not processed