aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2006-05-29 01:24:05 +0000
committerKenichi Handa2006-05-29 01:24:05 +0000
commit6d3906d52bba3dca4abd9c541850a5f30a673b95 (patch)
tree6c0df98594e9863e8ce5ec2dcd113df461945db8
parent6ad0381ce14cbb2b348c62ce57c00a50929f7cf8 (diff)
downloademacs-6d3906d52bba3dca4abd9c541850a5f30a673b95.tar.gz
emacs-6d3906d52bba3dca4abd9c541850a5f30a673b95.zip
(find-operation-coding-system): Describe the new
argument format (FILENAME . BUFFER).
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/nonascii.texi8
2 files changed, 13 insertions, 0 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 7db6cb47e63..2e20af7fc78 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12006-05-29 Kenichi Handa <handa@m17n.org>
2
3 * nonascii.texi (find-operation-coding-system): Describe the new
4 argument format (FILENAME . BUFFER).
5
12006-05-28 Richard Stallman <rms@gnu.org> 62006-05-28 Richard Stallman <rms@gnu.org>
2 7
3 * tips.texi (Coding Conventions): Better explain reasons not to 8 * tips.texi (Coding Conventions): Better explain reasons not to
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 0f4a70404af..d9050de33fc 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -1116,6 +1116,14 @@ or port number.
1116Depending on @var{operation}, this function looks up the target in 1116Depending on @var{operation}, this function looks up the target in
1117@code{file-coding-system-alist}, @code{process-coding-system-alist}, 1117@code{file-coding-system-alist}, @code{process-coding-system-alist},
1118or @code{network-coding-system-alist}. 1118or @code{network-coding-system-alist}.
1119
1120If @var{operation} is @code{insert-file-contents}, the argument
1121corresponding to the target may be a cons cell of the form
1122@code{(@var{filename} . @code{buffer})}). In that case,
1123@code{filename} is a file name to look up, and @code{buffer} is a
1124buffer that already contains the file (but not yet decoded). A
1125function specified in @code{file-coding-system-alist} must pay
1126attention to this format of the target.
1119@end defun 1127@end defun
1120 1128
1121@node Specifying Coding Systems 1129@node Specifying Coding Systems