diff options
author | Mark H Weaver <mhw@netris.org> | 2013-01-30 14:45:28 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2013-04-07 10:11:41 -0400 |
commit | 9a334eb3ab6bbb250d9c0f559b82d1c97f5eb21a (patch) | |
tree | 3a1e9076fdde272656c67e70303c08ed4dd95a5c /test-suite/tests/coding.test | |
parent | bc3901092dc777d832862862e606ae2ddeb6f2f8 (diff) | |
download | guile-9a334eb3ab6bbb250d9c0f559b82d1c97f5eb21a.tar.gz |
Do not scan for coding declarations in open-file.
* libguile/fports.c (scm_open_file): Do not scan for coding
declarations. Replace 'use_encoding' local variable with
'binary'. Update documentation string.
* module/ice-9/psyntax.scm (include): Add the same file-encoding
logic that's used in compile-file and scm_primitive_load.
* module/ice-9/psyntax-pp.scm: Regenerate.
* doc/ref/api-io.texi (File Ports): Update docs.
* test-suite/tests/ports.test: Change "open-file HONORS file coding
declarations" test to "open-file IGNORES file coding declaration".
* test-suite/tests/coding.test (scan-coding): Use 'file-encoding' to
scan for the encoding, since 'open-input-file' no longer does so.
Diffstat (limited to 'test-suite/tests/coding.test')
-rw-r--r-- | test-suite/tests/coding.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test-suite/tests/coding.test b/test-suite/tests/coding.test index 4152af86a..0a15d93de 100644 --- a/test-suite/tests/coding.test +++ b/test-suite/tests/coding.test @@ -1,6 +1,6 @@ ;;;; coding.test --- test suite for coding declarations. -*- mode: scheme -*- ;;;; -;;;; Copyright (C) 2011 Free Software Foundation, Inc. +;;;; Copyright (C) 2011, 2013 Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -40,7 +40,7 @@ ;; relies on the opportunistic filling of the input buffer, which ;; doesn't happen after a seek. (let* ((port (open-input-file name)) - (res (port-encoding port))) + (res (file-encoding port))) (close-port port) res)))) |