(mark_terminals): Typo.

[gnu-emacs] / src / coding.c

diff --git a/src/coding.c b/src/coding.c
index 8dc20ef6a3acc6ed0ac2dbf5c01f9c62482eea3f..b6299097d55ed857092da067a9fcfc889eb6386b 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -4335,10 +4335,10 @@ detect_coding (coding, src, src_bytes)
 
 static int
 detect_eol_type (source, src_bytes, skip)
-     unsigned char *source;
+     const unsigned char *source;
      int src_bytes, *skip;
 {
-  unsigned char *src = source, *src_end = src + src_bytes;
+  const unsigned char *src = source, *src_end = src + src_bytes;
   unsigned char c;
   int total = 0;               /* How many end-of-lines are found so far.  */
   int eol_type = CODING_EOL_UNDECIDED;
@@ -4384,10 +4384,10 @@ detect_eol_type (source, src_bytes, skip)
 
 static int
 detect_eol_type_in_2_octet_form (source, src_bytes, skip, big_endian_p)
-     unsigned char *source;
+     const unsigned char *source;
      int src_bytes, *skip, big_endian_p;
 {
-  unsigned char *src = source, *src_end = src + src_bytes;
+  const unsigned char *src = source, *src_end = src + src_bytes;
   unsigned int c1, c2;
   int total = 0;               /* How many end-of-lines are found so far.  */
   int eol_type = CODING_EOL_UNDECIDED;
@@ -7472,6 +7472,8 @@ They may specify a coding system, a cons of coding systems,
 or a function symbol to call.
 In the last case, we call the function with one argument,
 which is a list of all the arguments given to this function.
+If the function can't decide a coding system, it can return
+`undecided' so that the normal code-detection is performed.
 
 If OPERATION is `insert-file-contents', the argument corresponding to
 TARGET may be a cons (FILENAME . BUFFER).  In that case, FILENAME is a
@@ -7480,7 +7482,7 @@ contents (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 ...)  */)
+usage: (find-operation-coding-system OPERATION ARGUMENTS...)  */)
      (nargs, args)
      int nargs;
      Lisp_Object *args;
@@ -7973,7 +7975,9 @@ and the cdr part is used for encoding.
 If VAL is a function symbol, the function must return a coding system
 or a cons of coding systems which are used as above.  The function is
 called with an argument that is a list of the arguments with which
-`find-operation-coding-system' was called.
+`find-operation-coding-system' was called.  If the function can't decide
+a coding system, it can return `undecided' so that the normal
+code-detection is performed.
 
 See also the function `find-operation-coding-system'
 and the variable `auto-coding-alist'.  */);