aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2007-06-26 00:26:46 +0000
committerKenichi Handa2007-06-26 00:26:46 +0000
commit5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69 (patch)
treedcd9e2b27bd8aef31bce9dba72d55b782348e591 /src
parentfed082a09c8a870c262ffdff360a4a25b81c400d (diff)
downloademacs-5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69.tar.gz
emacs-5a0bbd9ae9cc9f1c5c8d85dfd79f00d76ea16b69.zip
(Ffind_operation_coding_system): Docstring improved.
(syms_of_coding): Docstring of `file-coding-system-alist' improved.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/coding.c6
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 @@
12007-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
12007-06-25 David Kastrup <dak@gnu.org> 62007-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,
7464or a function symbol to call. 7464or a function symbol to call.
7465In the last case, we call the function with one argument, 7465In the last case, we call the function with one argument,
7466which is a list of all the arguments given to this function. 7466which is a list of all the arguments given to this function.
7467If the function can't decide a coding system, it can return
7468`undecided' so that the normal code-detection is performed.
7467 7469
7468If OPERATION is `insert-file-contents', the argument corresponding to 7470If OPERATION is `insert-file-contents', the argument corresponding to
7469TARGET may be a cons (FILENAME . BUFFER). In that case, FILENAME is a 7471TARGET may be a cons (FILENAME . BUFFER). In that case, FILENAME is a
@@ -7967,7 +7969,9 @@ and the cdr part is used for encoding.
7967If VAL is a function symbol, the function must return a coding system 7969If VAL is a function symbol, the function must return a coding system
7968or a cons of coding systems which are used as above. The function is 7970or a cons of coding systems which are used as above. The function is
7969called with an argument that is a list of the arguments with which 7971called 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
7973a coding system, it can return `undecided' so that the normal
7974code-detection is performed.
7971 7975
7972See also the function `find-operation-coding-system' 7976See also the function `find-operation-coding-system'
7973and the variable `auto-coding-alist'. */); 7977and the variable `auto-coding-alist'. */);