Use COND instead of IF and PROGN

COND forms are evaluated as implicit PROGN

Author: kilianmh

quicklisp/client-info.lisp

@@ -219,11 +219,11 @@
 
 (defun local-client-info ()
   (let ((info-file (qmerge "client-info.sexp")))
-    (if (probe-file info-file)
-        (load-client-info info-file)
-        (progn
-          (warn "Missing client-info.sexp, using mock info")
-          (mock-client-info)))))
+    (cond ((probe-file info-file)
+           (load-client-info info-file))
+          (t
+           (warn "Missing client-info.sexp, using mock info")
+           (mock-client-info)))))
 
 (defun newest-client-info (&optional (info (local-client-info)))
   (let ((latest (subscription-url info)))

quicklisp/impl-util.lisp

@@ -319,12 +319,12 @@ quicklisp at CL startup."
     (ql-ccl:delete-directory pathname)))
 
 (defimplementation (delete-directory-tree :qualifier :around) (pathname)
-  (if (directoryp pathname)
-      (call-next-method)
-      (progn
-        (warn "delete-directory-tree - not a directory, ~
-               deleting anyway -- ~s" pathname)
-        (delete-file pathname))))
+  (cond ((directoryp pathname)
+         (call-next-method))
+        (t
+         (warn "delete-directory-tree - not a directory, ~
+                deleting anyway -- ~s" pathname)
+         (delete-file pathname))))
 
 (defun map-directory-tree (directory fun)
   "Call FUN for every file in directory and all its subdirectories,