aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa1997-07-02 12:53:58 +0000
committerKenichi Handa1997-07-02 12:53:58 +0000
commit789f17002ff1b6efdf04136e95a5b4caa2a1d334 (patch)
tree1cd312d423b00f36ef510084759350178f84ea17 /src
parent51c4025fa5064e0db4344a1421fcf1739671675a (diff)
downloademacs-789f17002ff1b6efdf04136e95a5b4caa2a1d334.tar.gz
emacs-789f17002ff1b6efdf04136e95a5b4caa2a1d334.zip
(Finsert_file_contents): Doc-string fixed. Call
Ffind_operation_coding_system. (Fwrite_region): Call Ffind_operation_coding_system.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c
index ff03046e3ca..f59df5fce97 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3015,8 +3015,9 @@ and (2) it puts less data in the undo list.\n\
3015When REPLACE is non-nil, the value is the number of characters actually read,\n\ 3015When REPLACE is non-nil, the value is the number of characters actually read,\n\
3016which is often less than the number of characters to be read.\n\ 3016which is often less than the number of characters to be read.\n\
3017This does code conversion according to the value of\n\ 3017This does code conversion according to the value of\n\
3018 `coding-system-for-read' or `coding-system-alist', and sets the variable\n\ 3018 `coding-system-for-read' or `file-coding-system-alist',\n\
3019 `last-coding-system-used' to the coding system actually used.") 3019 and sets the variable `last-coding-system-used' to the coding system\n\
3020 actually used.")
3020 (filename, visit, beg, end, replace) 3021 (filename, visit, beg, end, replace)
3021 Lisp_Object filename, visit, beg, end, replace; 3022 Lisp_Object filename, visit, beg, end, replace;
3022{ 3023{
@@ -3071,7 +3072,7 @@ This does code conversion according to the value of\n\
3071 3072
3072 args[0] = Qinsert_file_contents, args[1] = filename, args[2] = visit, 3073 args[0] = Qinsert_file_contents, args[1] = filename, args[2] = visit,
3073 args[3] = beg, args[4] = end, args[5] = replace; 3074 args[3] = beg, args[4] = end, args[5] = replace;
3074 coding_systems = Ffind_coding_system (6, args); 3075 coding_systems = Ffind_operation_coding_system (6, args);
3075 val = CONSP (coding_systems) ? XCONS (coding_systems)->car : Qnil; 3076 val = CONSP (coding_systems) ? XCONS (coding_systems)->car : Qnil;
3076 } 3077 }
3077 setup_coding_system (Fcheck_coding_system (val), &coding); 3078 setup_coding_system (Fcheck_coding_system (val), &coding);
@@ -3818,7 +3819,7 @@ to the file, instead of any buffer contents, and END is ignored.")
3818 args[0] = Qwrite_region, args[1] = start, args[2] = end, 3819 args[0] = Qwrite_region, args[1] = start, args[2] = end,
3819 args[3] = filename, args[4] = append, args[5] = visit, 3820 args[3] = filename, args[4] = append, args[5] = visit,
3820 args[6] = lockname; 3821 args[6] = lockname;
3821 coding_systems = Ffind_coding_system (7, args); 3822 coding_systems = Ffind_operation_coding_system (7, args);
3822 val = (CONSP (coding_systems) 3823 val = (CONSP (coding_systems)
3823 ? XCONS (coding_systems)->cdr 3824 ? XCONS (coding_systems)->cdr
3824 : current_buffer->buffer_file_coding_system); 3825 : current_buffer->buffer_file_coding_system);