Date: Monday, November 29, 2010 @ 23:09:42 Author: rtoy Path: /project/cmucl/cvsroot/src/code
Modified: extfmts.lisp
o *FILENAME-ENCODING* was never getting set. Fix that. (From Paul Foley.) o While we're here, canonicalize *FILENAME-ENCODING* using the actual external format name.
--------------+ extfmts.lisp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Index: src/code/extfmts.lisp diff -u src/code/extfmts.lisp:1.41 src/code/extfmts.lisp:1.42 --- src/code/extfmts.lisp:1.41 Tue Sep 7 22:58:06 2010 +++ src/code/extfmts.lisp Mon Nov 29 23:09:42 2010 @@ -5,7 +5,7 @@ ;;; domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.41 2010-09-08 02:58:06 rtoy Rel $") + "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.42 2010-11-30 04:09:42 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1102,11 +1102,12 @@ (when filenames (unless (find-external-format filenames) (error (intl:gettext "Can't find external-format ~S.") filenames)) + (setq filenames (ef-name (find-external-format filenames))) (when (and unix::*filename-encoding* (not (eq unix::*filename-encoding* filenames))) (cerror (intl:gettext "Change it anyway.") - (intl:gettext "The external-format for encoding filenames is already set.")) - (setq unix::*filename-encoding* filenames))) + (intl:gettext "The external-format for encoding filenames is already set."))) + (setq unix::*filename-encoding* filenames)) t)