Index: level-1/l1-boot-lds.lisp =================================================================== RCS file: /usr/local/tmpcvs/ccl-0.14-dev/ccl/level-1/l1-boot-lds.lisp,v retrieving revision 1.4 diff -c -r1.4 l1-boot-lds.lisp *** level-1/l1-boot-lds.lisp 22 Mar 2004 17:32:51 -0000 1.4 --- level-1/l1-boot-lds.lisp 27 Dec 2004 00:25:38 -0000 *************** *** 26,36 **** (defun command-line-arguments () *command-line-argument-list*) ! (defun startup-ccl (&optional init-file) (with-simple-restart (abort "Abort startup.") ! (when init-file ! (with-simple-restart (continue "Skip loading init file.") ! (load init-file :if-does-not-exist nil :verbose nil))) (flet ((eval-string (s) (with-simple-restart (continue "Skip evaluation of ~a" s) (eval (read-from-string s)))) --- 26,41 ---- (defun command-line-arguments () *command-line-argument-list*) ! (defun startup-ccl (&optional init-file-or-files) (with-simple-restart (abort "Abort startup.") ! (let ((init-files (if (atom init-file-or-files) ! (list init-file-or-files) ! init-file-or-files))) ! (dolist (f init-files) ! (with-simple-restart (continue "Skip loading init file.") ! (and f ! (load f :if-does-not-exist nil :verbose nil) ! (return f))))) (flet ((eval-string (s) (with-simple-restart (continue "Skip evaluation of ~a" s) (eval (read-from-string s)))) Index: level-1/l1-application.lisp =================================================================== RCS file: /usr/local/tmpcvs/ccl-0.14-dev/ccl/level-1/l1-application.lisp,v retrieving revision 1.1 diff -c -r1.1 l1-application.lisp *** level-1/l1-application.lisp 22 Mar 2004 17:32:33 -0000 1.1 --- level-1/l1-application.lisp 27 Dec 2004 00:25:38 -0000 *************** *** 257,264 **** (defmethod application-init-file ((app lisp-development-system)) ! "home:openmcl-init") ! ; redefined by hide-listener-support (defmethod application-error ((a application) condition error-pointer) --- 257,266 ---- (defmethod application-init-file ((app lisp-development-system)) ! (list ! (make-pathname :host "HOME" :name "openmcl-init" :type "lisp") ! (make-pathname :host "HOME" :name ".openmclrc" :type nil) ! (make-pathname :host "CCL" :name "openmcl-init" :type "lisp"))) ; redefined by hide-listener-support (defmethod application-error ((a application) condition error-pointer)