Changeset 14655

Timestamp:

03/21/14 10:26:02 (10 years ago)

Author:

Mark Evenson

Message:

Normalized indentation.

File:

• trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/abcl-contrib.lisp

@@ -49 +49 @@
 (defun find-system-jar ()
   "Return the pathname of the system jar, one of `abcl.jar` or `abcl-m.n.p.jar` or `abcl-m.n.p[.~-]something.jar`."
-    (dolist (loader (java:dump-classpath))
-      (let ((abcl-jar (some #'system-jar-p loader)))
-        (when abcl-jar
-          (return abcl-jar)))))
+  (dolist (loader (java:dump-classpath))
+    (let ((abcl-jar (some #'system-jar-p loader)))
+      (when abcl-jar
+        (return abcl-jar)))))
 
 (defvar *abcl-contrib* nil
@@ -64 +64 @@
   (when abcl-contrib-jar
     (dolist (asdf-file
-              (directory (make-pathname :device (list abcl-contrib-jar)
-                                        :directory '(:absolute :wild)
-                                        :name :wild
-                                        :type "asd")))
+             (directory (make-pathname :device (list abcl-contrib-jar)
+                                       :directory '(:absolute :wild)
+                                       :name :wild
+                                       :type "asd")))
       (let ((asdf-directory (make-pathname :defaults asdf-file :name nil :type nil)))
         (unless (find asdf-directory asdf:*central-registry* :test #'equal)
           (push asdf-directory asdf:*central-registry*)
           (format *verbose* "~&Added ~A to ASDF.~&" asdf-directory))))))
-
 
 (defun find-and-add-contrib (&key (verbose nil))
@@ -80 +79 @@
       (format verbose "~&Using already initialized value of abcl-contrib:~&'~A'.~%"
               *abcl-contrib*)
-      (progn
-        (setf *abcl-contrib* (find-contrib))
-        (format verbose "~&Using probed value of abcl-contrib:~&'~A'.~%"
-                *abcl-contrib*)))
+    (progn
+      (setf *abcl-contrib* (find-contrib))
+      (format verbose "~&Using probed value of abcl-contrib:~&'~A'.~%"
+              *abcl-contrib*)))
   (add-contrib *abcl-contrib*))
 
@@ -89 +88 @@
   "Introspect runtime classpaths to find a loadable ABCL-CONTRIB."
   (or (ignore-errors
-                (when (find-system-jar)
-                  (probe-file
-                   (make-pathname :defaults (find-system-jar)
-                                                  :name "abcl-contrib"))))
-          (some
-           (lambda (u)
-                 (probe-file (make-pathname
-                                          :defaults (java:jcall "toString" u)
-                                          :name "abcl-contrib")))
-           (java:jcall "getURLs" (boot-classloader)))))
+        (when (find-system-jar)
+          (probe-file
+           (make-pathname :defaults (find-system-jar)
+                          :name "abcl-contrib"))))
+      (some
+       (lambda (u)
+         (probe-file (make-pathname
+                      :defaults (java:jcall "toString" u)
+                      :name "abcl-contrib")))
+       (java:jcall "getURLs" (boot-classloader)))))
 
 (export `(find-system