diff options
author | Kenichi Handa <handa@m17n.org> | 2007-06-26 00:26:46 +0000 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2007-06-26 00:26:46 +0000 |
commit | 5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69 (patch) | |
tree | dcd9e2b27bd8aef31bce9dba72d55b782348e591 | |
parent | fed082a09c8a870c262ffdff360a4a25b81c400d (diff) | |
download | emacs-5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69.tar.gz emacs-5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69.tar.bz2 emacs-5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69.zip |
(Ffind_operation_coding_system): Docstring improved.
(syms_of_coding): Docstring of `file-coding-system-alist' improved.
-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 @@ +2007-06-26 Kenichi Handa <handa@m17n.org> + + * coding.c (Ffind_operation_coding_system): Docstring improved. + (syms_of_coding): Docstring of `file-coding-system-alist' improved. + 2007-06-25 David Kastrup <dak@gnu.org> * 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, 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 @@ -7967,7 +7969,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'. */); |