Ignore:
Timestamp:
Oct 29, 2010, 3:53:56 PM (9 years ago)
Author:
rme
Message:

Merge trunk changes r14361 through r14380.

Location:
release/1.6/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/1.6/source

  • release/1.6/source/level-1/l1-files.lisp

    r14353 r14381  
    12451245            (*readtable* *readtable*))
    12461246        (load-from-stream file-name print))
     1247      (return-from %load file-name))
     1248    (when (and (stringp file-name)
     1249               (eql (length "http://") (string-lessp "http://" file-name)))
     1250      (when verbose
     1251        (format t "~&;Loading from URL ~S..." file-name)
     1252        (force-output))
     1253      (let* ((vec (if if-does-not-exist
     1254                    (snarf-url file-name)
     1255                    (handler-case (snarf-url file-name)
     1256                      (error () (return-from %load nil)))))
     1257             (*package* *package*)
     1258             (*readtable* *readtable*)
     1259             (*loading-file-source-file* file-name)
     1260             (*loading-files* (cons file-name (specialv *loading-files*))))
     1261        (with-input-from-vector (stream vec :external-format external-format)
     1262          (load-from-stream stream print)))
    12471263      (return-from %load file-name))
    12481264    (unless (streamp file-name)
Note: See TracChangeset for help on using the changeset viewer.