[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111051: src/fileio.c (Finsert_file_contents): Doc fix.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111051
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-21 13:52:18 +0200
message:
  src/fileio.c (Finsert_file_contents): Doc fix.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-21 11:21:35 +0000
+++ b/src/ChangeLog     2012-12-21 11:52:18 +0000
@@ -1,5 +1,7 @@
 2012-12-21  Eli Zaretskii  <address@hidden>
 
+       * 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

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2012-12-10 23:16:28 +0000
+++ b/src/fileio.c      2012-12-21 11:52:18 +0000
@@ -3283,7 +3283,10 @@
 
 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;