Commit f1f3f537 authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files

Removed unused code causing tests to fail.

In system-configuration-directories the FLET function was only run on
windows.  On non-windows, at least on ACL, this was causing compilation
warnings, and hence test failures.  Juggled the position of the #+windows
to fix this.
parent baadd38b
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -2187,13 +2187,15 @@ output to `*verbose-out*`. Returns the shell's exit code."
(defun system-configuration-directories ()
  (remove-if
   #'null
   (append
    #+windows
    (flet ((try (x sub) (try-directory-subpath x sub :type :directory)))
     `(#+windows
      `(
       ,@`(#+lispworks ,(try (sys:get-folder-path :local-appdata) "common-lisp/config/")
           ;;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData
           #+(not cygwin)
           ,(try (getenv "ALLUSERSPROFILE") "Application Data/common-lisp/config/"))
       #p"/etc/"))))
           ,(try (getenv "ALLUSERSPROFILE") "Application Data/common-lisp/config/"))))
    (list #p"/etc/"))))
(defun in-first-directory (dirs x)
  (loop :for dir :in dirs
    :thereis (and dir (ignore-errors (truename (merge-pathnames* x (ensure-directory-pathname dir)))))))