diff options
| author | Glenn Morris | 2012-12-21 11:32:43 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-12-21 11:32:43 -0800 |
| commit | a4b0cca119b01dc55bad802ef696c857fe014482 (patch) | |
| tree | f2df86b3d472d15d3bbb69274325a7c0090f65b3 /src/fileio.c | |
| parent | 0e9c7693712014196946a83709a83c08a7dfea25 (diff) | |
| parent | 160b3852018831b830a7451f29f770fb49810342 (diff) | |
| download | emacs-a4b0cca119b01dc55bad802ef696c857fe014482.tar.gz emacs-a4b0cca119b01dc55bad802ef696c857fe014482.zip | |
Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 45f3b77d721..50fbaa7ff04 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3417,7 +3417,10 @@ the number of characters that replace previous buffer contents. | |||
| 3417 | 3417 | ||
| 3418 | This function does code conversion according to the value of | 3418 | This function does code conversion according to the value of |
| 3419 | `coding-system-for-read' or `file-coding-system-alist', and sets the | 3419 | `coding-system-for-read' or `file-coding-system-alist', and sets the |
| 3420 | variable `last-coding-system-used' to the coding system actually used. */) | 3420 | variable `last-coding-system-used' to the coding system actually used. |
| 3421 | |||
| 3422 | In addition, this function decodes the inserted text from known formats | ||
| 3423 | by calling `format-decode', which see. */) | ||
| 3421 | (Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace) | 3424 | (Lisp_Object filename, Lisp_Object visit, Lisp_Object beg, Lisp_Object end, Lisp_Object replace) |
| 3422 | { | 3425 | { |
| 3423 | struct stat st; | 3426 | struct stat st; |