diff options
| author | Eli Zaretskii | 2012-12-21 13:52:18 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-12-21 13:52:18 +0200 |
| commit | bb085aed959358d9f13d568f87507347832beae5 (patch) | |
| tree | c9b6eccd2aa435b690ec9e5eb5d8309511be6e29 /src | |
| parent | 7efa3fb3579fcb105ab84748945638daccdb4761 (diff) | |
| download | emacs-bb085aed959358d9f13d568f87507347832beae5.tar.gz emacs-bb085aed959358d9f13d568f87507347832beae5.zip | |
src/fileio.c (Finsert_file_contents): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/fileio.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6e7f771d220..e1017f3d037 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-12-21 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-12-21 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * fileio.c (Finsert_file_contents): Doc fix. | ||
| 4 | |||
| 3 | * w32proc.c (new_child, delete_child, find_child_pid): For a | 5 | * w32proc.c (new_child, delete_child, find_child_pid): For a |
| 4 | subprocess, consider its slot being in use as long as its process | 6 | subprocess, consider its slot being in use as long as its process |
| 5 | handle (procinfo.hProcess) is not NULL. This avoids reusing the | 7 | 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. | |||
| 3283 | 3283 | ||
| 3284 | This function does code conversion according to the value of | 3284 | This function does code conversion according to the value of |
| 3285 | `coding-system-for-read' or `file-coding-system-alist', and sets the | 3285 | `coding-system-for-read' or `file-coding-system-alist', and sets the |
| 3286 | variable `last-coding-system-used' to the coding system actually used. */) | 3286 | variable `last-coding-system-used' to the coding system actually used. |
| 3287 | |||
| 3288 | In addition, this function decodes the inserted text from known formats | ||
| 3289 | by calling `format-decode', which see. */) | ||
| 3287 | (Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace) | 3290 | (Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace) |
| 3288 | { | 3291 | { |
| 3289 | struct stat st; | 3292 | struct stat st; |