Correct manual wrt. encoding names.

* doc/ref/api-evaluation.texi (Character Encoding of Source Files):
  Don't suggest `latin1' as a good encoding name since Emacs cannot deal
  with it.

* libguile/read.c (scm_file_encoding): Fix "Emacs" spelling.

diff --git a/doc/ref/api-evaluation.texi b/doc/ref/api-evaluation.texi
index c2c3a4a..fda0291 100644 (file)
--- a/doc/ref/api-evaluation.texi
+++ b/doc/ref/api-evaluation.texi
@@ -664,8 +664,9 @@ However, there are some differences in encoding names recognized by
 Emacs and encoding names defined by IANA, the latter being essentially a
 subset of the former.  For instance, @code{latin-1} is a valid encoding
 name for Emacs, but it's not according to the IANA standard, which Guile
-follows; instead, you should use @code{latin1}, which is both understood
-by Emacs and dubbed by IANA.
+follows; instead, you should use @code{iso-8859-1}, which is both
+understood by Emacs and dubbed by IANA (IANA writes it uppercase but
+Emacs wants it lowercase and Guile is case insensitive.)
 
 For source code, only a subset of all possible character encodings can
 be interpreted by the built-in source code reader.  Only those

diff --git a/libguile/read.c b/libguile/read.c
index a81189f..4772c32 100644 (file)
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1554,7 +1554,7 @@ scm_i_scan_for_encoding (SCM port)
 
 SCM_DEFINE (scm_file_encoding, "file-encoding", 1, 0, 0,
             (SCM port),
-            "Scans the port for an EMACS-like character coding declaration\n"
+            "Scans the port for an Emacs-like character coding declaration\n"
             "near the top of the contents of a port with random-acessible contents.\n"
             "The coding declaration is of the form\n"
             "@code{coding: XXXXX} and must appear in a scheme comment.\n"