From bb085aed959358d9f13d568f87507347832beae5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 21 Dec 2012 13:52:18 +0200 Subject: [PATCH] src/fileio.c (Finsert_file_contents): Doc fix. --- src/ChangeLog | 2 ++ src/fileio.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6e7f771d220..e1017f3d037 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-12-21 Eli Zaretskii + * fileio.c (Finsert_file_contents): Doc fix. + * w32proc.c (new_child, delete_child, find_child_pid): For a subprocess, consider its slot being in use as long as its process handle (procinfo.hProcess) is not NULL. This avoids reusing the diff --git a/src/fileio.c b/src/fileio.c index 7e1ba71c822..b0c319cfa62 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3283,7 +3283,10 @@ the number of characters that replace previous buffer contents. This function does code conversion according to the value of `coding-system-for-read' or `file-coding-system-alist', and sets the -variable `last-coding-system-used' to the coding system actually used. */) +variable `last-coding-system-used' to the coding system actually used. + +In addition, this function decodes the inserted text from known formats +by calling `format-decode', which see. */) (Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace) { struct stat st; -- 2.39.2