Changeset 11302

Timestamp:

Nov 5, 2008, 9:05:52 PM (13 years ago)

Author:

gb

Message:

Propagate r11301 to 1.2.

File:

• release/1.2/source/lib/dumplisp.lisp (modified) (2 diffs)

release/1.2/source/lib/dumplisp.lisp

@@ -90 +90 @@
                                        application-class)))
     (setq *application* (make-instance application-class)))
-  (when (not toplevel-function)
+  (if (not toplevel-function)
     (setq toplevel-function 
           #'(lambda ()
@@ -96 +96 @@
                                  (if init-file-p
                                    init-file
-                                   (application-init-file *application*))))))
+                                   (application-init-file *application*)))))
+    (let* ((user-toplevel-function (coerce-to-function toplevel-function)))
+      (setq toplevel-function
+            (lambda ()
+              (restore-lisp-pointers)
+              (initialize-interactive-streams)
+              (process-run-function "toplevel" (lambda ()
+                                                 (funcall user-toplevel-function)
+                                                 (quit)))
+              (%set-toplevel #'housekeeping-loop)
+              (toplevel)))))
   (when error-handler
     (make-application-error-handler *application* error-handler))