summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2006-05-29 21:44:59 +0000
committerEli Zaretskii <eliz@gnu.org>2006-05-29 21:44:59 +0000
commita952cebe16c99c28c403758663de026b1a61cfeb (patch)
tree743f774ceead8129c843a55a7453115689ee3169
parente1511d8794a00f051c9a094f51b6c615260fb587 (diff)
downloademacs-a952cebe16c99c28c403758663de026b1a61cfeb.tar.gz
emacs-a952cebe16c99c28c403758663de026b1a61cfeb.tar.bz2
emacs-a952cebe16c99c28c403758663de026b1a61cfeb.zip
(Ffind_operation_coding_system): Doc fix.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/coding.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3aa41c16c73..14a46748955 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-30 Eli Zaretskii <eliz@gnu.org>
+
+ * coding.c (Ffind_operation_coding_system): Doc fix.
+
2006-05-29 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macfns.c [USE_MAC_FONT_PANEL] (Fmac_set_font_panel_visibility):
diff --git a/src/coding.c b/src/coding.c
index 03c07c3ba68..0809e2331ad 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7471,9 +7471,10 @@ which is a list of all the arguments given to this function.
If OPERATION is `insert-file-contents', the argument corresponding to
TARGET may be a cons (FILENAME . BUFFER). In that case, FILENAME is a
-file name to look up, and BUFFER is a buffer that already contains the
-file (but not yet decoded). If a function is found as above, the
-function must pay attention to this format of TARGET.
+file name to look up, and BUFFER is a buffer that will contain the
+file (not yet decoded). If `file-coding-system-alist' specifies a
+function to call for FILENAME, that function should examine the
+contents of BUFFER instead of reading the file.
usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */)
(nargs, args)