Commit af582a22 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.20.5: remove a style-warning on ACL, that hates (or :utf-8 :default) 

as expanded from the read-conditionals. Use (progn :default :utf-8) instead.
parent 485f7293

asdf.asd

+1 −1
Changes for asdf.asd: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  :licence "MIT"

  :description "Another System Definition Facility"

  :long-description "ASDF builds Common Lisp software organized into defined systems."

  :version "2.20.4" ;; to be automatically updated by bin/bump-revision

  :version "2.20.5" ;; to be automatically updated by bin/bump-revision

  :depends-on ()

  :components

  ((:file "asdf")

asdf.lisp

+5 −5
Changes for asdf.lisp: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line 
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-

;;; This is ASDF 2.20.4: Another System Definition Facility.

;;; This is ASDF 2.20.5: Another System Definition Facility.

;;;

;;; Feedback, bug reports, and patches are all welcome:

;;; please mail to <asdf-devel@common-lisp.net>.
@@ -112,7 +112,7 @@ 
         ;; "2.345.6" would be a development version in the official upstream

         ;; "2.345.0.7" would be your seventh local modification of official release 2.345

         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6

         (asdf-version "2.20.4")

         (asdf-version "2.20.5")

         (existing-asdf (find-class 'component nil))

         (existing-version *asdf-version*)

         (already-there (equal asdf-version existing-version)))
@@ -1293,10 +1293,10 @@ processed in order by OPERATE.")) 
  new-value)



(defparameter *utf-8-external-format*

  (or

  (progn ;; (or ... :default) triggers a warning on acl. Sigh.

    :default

    #+(or abcl allegro clozure cmu ecl lispworks (and sbcl sb-unicode) scl) :utf-8

   #+(and clisp unicode) charset:utf-8

   :default)

    #+(and clisp unicode) charset:utf-8)

  "Default :external-format argument to pass for CL:OPEN.

For modern implementations, this should be UTF-8.

On legacy implementations, we may fall back on some 8-bit encoding,