diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/coding.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1087913f2a8..ed8eee83268 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-06-26 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * coding.c (Ffind_operation_coding_system): Docstring improved. | ||
| 4 | (syms_of_coding): Docstring of `file-coding-system-alist' improved. | ||
| 5 | |||
| 1 | 2007-06-25 David Kastrup <dak@gnu.org> | 6 | 2007-06-25 David Kastrup <dak@gnu.org> |
| 2 | 7 | ||
| 3 | * keymap.c (Fcurrent_active_maps): Add `position' argument. | 8 | * keymap.c (Fcurrent_active_maps): Add `position' argument. |
diff --git a/src/coding.c b/src/coding.c index 6bb9f8225c9..122bb50f972 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -7464,6 +7464,8 @@ They may specify a coding system, a cons of coding systems, | |||
| 7464 | or a function symbol to call. | 7464 | or a function symbol to call. |
| 7465 | In the last case, we call the function with one argument, | 7465 | In the last case, we call the function with one argument, |
| 7466 | which is a list of all the arguments given to this function. | 7466 | which is a list of all the arguments given to this function. |
| 7467 | If the function can't decide a coding system, it can return | ||
| 7468 | `undecided' so that the normal code-detection is performed. | ||
| 7467 | 7469 | ||
| 7468 | If OPERATION is `insert-file-contents', the argument corresponding to | 7470 | If OPERATION is `insert-file-contents', the argument corresponding to |
| 7469 | TARGET may be a cons (FILENAME . BUFFER). In that case, FILENAME is a | 7471 | TARGET may be a cons (FILENAME . BUFFER). In that case, FILENAME is a |
| @@ -7967,7 +7969,9 @@ and the cdr part is used for encoding. | |||
| 7967 | If VAL is a function symbol, the function must return a coding system | 7969 | If VAL is a function symbol, the function must return a coding system |
| 7968 | or a cons of coding systems which are used as above. The function is | 7970 | or a cons of coding systems which are used as above. The function is |
| 7969 | called with an argument that is a list of the arguments with which | 7971 | called with an argument that is a list of the arguments with which |
| 7970 | `find-operation-coding-system' was called. | 7972 | `find-operation-coding-system' was called. If the function can't decide |
| 7973 | a coding system, it can return `undecided' so that the normal | ||
| 7974 | code-detection is performed. | ||
| 7971 | 7975 | ||
| 7972 | See also the function `find-operation-coding-system' | 7976 | See also the function `find-operation-coding-system' |
| 7973 | and the variable `auto-coding-alist'. */); | 7977 | and the variable `auto-coding-alist'. */); |