ECL-CDB and ECL-CURL still used UTF-8 when not having unicode

contrib/ecl-cdb/ecl-help.lisp

@@ -18,7 +18,7 @@
 			     :element-type '(unsigned-byte 8)
 			     :initial-element 0))
 	 (stream (ext:make-sequence-output-stream
-		  vector :external-format :utf-8)))
+		  vector :external-format #+unicode :utf-8 #-unicode :default)))
     (with-standard-io-syntax
       (let ((si::*print-package* (find-package "CL")))
 	(write object :stream stream :pretty nil
@@ -27,7 +27,7 @@
 
 (defun from-cdb-vector (vector)
   (let* ((stream (ext:make-sequence-input-stream
-		  vector :external-format :utf-8)))
+		  vector :external-format #+unicode :utf-8 #-unicode :default)))
     (read stream nil nil nil)))
 
 (defun search-help-file (string path)

contrib/ecl-curl/ecl-curl.lisp

@@ -111,7 +111,7 @@
      :input t 
      :output t
      :buffering :full
-     :external-format :iso-8859-1)))
+     :external-format #+unicode :iso-8859-1 #-unicode :default)))
 
 ;;;---------------------------------------------------------------------------
 ;;; URL handling.
@@ -250,7 +250,9 @@
              (progn
                (setf o (open file-name 
                               :direction :output :if-exists :supersede
-                              :external-format :latin-1))
+                              :external-format
+			      #-unicode :default
+			      #+unicode :latin-1))
                (if length
                    (let ((buf (make-array length
                                           :element-type