[Armedbear-cvs] r14666 - branches/1.3.1/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Apr 17 10:33:49 2014
New Revision: 14666

Log:
Backport r14655:  Normalized indentation.

Modified:
   branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp

Modified: branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp
==============================================================================
--- branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp	Thu Apr 17 10:32:44 2014	(r14665)
+++ branches/1.3.1/src/org/armedbear/lisp/abcl-contrib.lisp	Thu Apr 17 10:33:49 2014	(r14666)
@@ -48,10 +48,10 @@
 
 (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
   "Pathname of the ABCL contrib.
@@ -63,41 +63,40 @@
   "Introspects ABCL-CONTRIB-JAR for asdf systems to add to ASDF:*CENTRAL-REGISTRY*"
   (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))
   "Attempt to find the ABCL contrib jar and add its contents to ASDF.
 Returns the pathname of the contrib if it can be found."
   (if *abcl-contrib*
       (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*))
 
 (defun find-contrib ()
   "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
           find-contrib