Commit 5161e2d4 authored by Robert Goldman's avatar Robert Goldman
Browse files

Merge branch 'better-component-encoding-warnings' into 'master' 

Better component encoding warnings

See merge request asdf/asdf!157
parents a5882874 ccdf970e

concatenate-source.lisp

+3 −2
Changes for concatenate-source.lisp: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -69,10 +69,11 @@ into a single file")) 
          :append

          (when (typep c 'cl-source-file)

            (let ((e (component-encoding c)))

              (unless (equal e encoding)

              (unless (or (equal e encoding)

                          (and (equal e :ASCII) (equal encoding :UTF-8)))

                (let ((a (assoc e other-encodings)))

                  (if a (push (component-find-path c) (cdr a))

                      (push (list a (component-find-path c)) other-encodings)))))

                      (push (list e (component-find-path c)) other-encodings)))))

            (unless (equal around-compile (around-compile-hook c))

              (push (component-find-path c) other-around-compile))

            (input-files (make-operation 'compile-op) c)) :into inputs