Ignore:
Timestamp:
12/07/08 23:24:31 (12 years ago)
Author:
ehuelsmann
Message:

Merge open-external-format branch back to trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/open.lisp

    r11391 r11434  
    107107       (if-does-not-exist nil if-does-not-exist-given)
    108108       (external-format :default))
    109   (declare (ignore external-format)) ; FIXME
     109;  (declare (ignore external-format)) ; FIXME
    110110  (setf element-type (case element-type
    111111                       ((character base-char)
     
    144144                   :format-control "The file ~S does not exist."
    145145                   :format-arguments (list namestring)))))
    146        (make-file-stream pathname namestring element-type :input nil))
     146       (make-file-stream pathname namestring element-type :input nil external-format))
    147147      (:probe
    148148       (case if-does-not-exist
     
    158158          ;; not yet exist." See java.io.File.createNewFile().
    159159          (create-new-file namestring)))
    160        (let ((stream (make-file-stream pathname namestring element-type :input nil)))
     160       (let ((stream (make-file-stream pathname namestring element-type
     161                                       :input nil external-format)))
    161162         (when stream
    162163           (close stream))
     
    205206                 :format-control "Option not supported: ~S."
    206207                 :format-arguments (list if-exists))))
    207        (let ((stream (make-file-stream pathname namestring element-type direction if-exists)))
     208       (let ((stream (make-file-stream pathname namestring element-type
     209                                       direction if-exists external-format)))
    208210         (unless stream
    209211           (error 'file-error
Note: See TracChangeset for help on using the changeset viewer.