[Openmcl-cvs-notifications] r11035 - /trunk/source/cocoa-ide/start.lisp

[gb at clozure.com]

Author: gb
Date: Fri Oct 10 05:40:17 2008
New Revision: 11035

Log:
Don't set the CCL directory from preferences.

Modified:
    trunk/source/cocoa-ide/start.lisp

Modified: trunk/source/cocoa-ide/start.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/start.lisp (original)
+++ trunk/source/cocoa-ide/start.lisp Fri Oct 10 05:40:17 2008
@@ -5,12 +5,14 @@
 (if (< #&NSAppKitVersionNumber 824)
     (error "This application requires features introduced in OSX 10.4."))
 =

-(def-cocoa-default *ccl-directory* :string "" nil #'(lambda (old new)
-                                                      (when (equal new "")=
 (setq new nil))
-                                                      (unless (and new (eq=
ual old new))
-                                                        (init-interfaces-r=
oot)
-                                                        (ccl::replace-base=
-translation "ccl:"
-                                                                          =
             (or new (find-ccl-directory))))))
+(def-cocoa-default  *ccl-directory* :string "" nil
+                    #+no #'(lambda (old new)
+                             (when (equal new "") (setq new nil))
+                             (unless (and new (equal old new))
+                               (init-interfaces-root)
+                               (ccl::replace-base-translation
+                                "ccl:"
+                                (or new (find-ccl-directory))))))
 =

 ;; If there are interfaces inside the bundle, use those rather than the on=
es
 ;; in CCL:, since they're more likely to be valid.  CCL: could be some ran=
dom
@@ -31,6 +33,7 @@
     (if (equalp (last dir 2) '("Contents" "MacOS"))
         (make-pathname :directory (butlast dir 3))
         path)))
+
 =

 (defmethod ccl::ui-object-do-operation ((o ns:ns-application)
                                         operation
@@ -78,6 +81,7 @@
 ;;; bit better ... I'd tend to agree.)
 (defmethod ccl::parse-application-arguments ((a cocoa-application))
   (values nil nil nil nil))
+
 =

 (defmethod toplevel-function ((a cocoa-application) init-file)
   (declare (ignore init-file))