diff options
| author | Andreas Schwab | 2007-12-16 10:54:19 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2007-12-16 10:54:19 +0000 |
| commit | f5bf196677eac15a68b229caf5a8757795cf7477 (patch) | |
| tree | 19de3070b276b6b81110a26b4b6c70e753330ab8 /src | |
| parent | 77a28bbf178de331eda736dad8ce56d65e3d5f6f (diff) | |
| download | emacs-f5bf196677eac15a68b229caf5a8757795cf7477.tar.gz emacs-f5bf196677eac15a68b229caf5a8757795cf7477.zip | |
Undo spurious change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/fileio.c b/src/fileio.c index dbdeef7076a..19558fa332a 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -3694,26 +3694,26 @@ read_non_regular_quit () | |||
| 3694 | DEFUN ("insert-file-contents", Finsert_file_contents, Sinsert_file_contents, | 3694 | DEFUN ("insert-file-contents", Finsert_file_contents, Sinsert_file_contents, |
| 3695 | 1, 5, 0, | 3695 | 1, 5, 0, |
| 3696 | doc: /* Insert contents of file FILENAME after point. | 3696 | doc: /* Insert contents of file FILENAME after point. |
| 3697 | Returns list of absolute file name and number of characters inserted. | 3697 | Returns list of absolute file name and number of characters inserted. |
| 3698 | If second argument VISIT is non-nil, the buffer's visited filename and | 3698 | If second argument VISIT is non-nil, the buffer's visited filename and |
| 3699 | last save file modtime are set, and it is marked unmodified. If | 3699 | last save file modtime are set, and it is marked unmodified. If |
| 3700 | visiting and the file does not exist, visiting is completed before the | 3700 | visiting and the file does not exist, visiting is completed before the |
| 3701 | error is signaled. | 3701 | error is signaled. |
| 3702 | 3702 | ||
| 3703 | The optional third and fourth arguments BEG and END specify what portion | 3703 | The optional third and fourth arguments BEG and END specify what portion |
| 3704 | of the file to insert. These arguments count bytes in the file, not | 3704 | of the file to insert. These arguments count bytes in the file, not |
| 3705 | characters in the buffer. If VISIT is non-nil, BEG and END must be nil. | 3705 | characters in the buffer. If VISIT is non-nil, BEG and END must be nil. |
| 3706 | 3706 | ||
| 3707 | If optional fifth argument REPLACE is non-nil, replace the current | 3707 | If optional fifth argument REPLACE is non-nil, replace the current |
| 3708 | buffer contents (in the accessible portion) with the file contents. | 3708 | buffer contents (in the accessible portion) with the file contents. |
| 3709 | This is better than simply deleting and inserting the whole thing | 3709 | This is better than simply deleting and inserting the whole thing |
| 3710 | because (1) it preserves some marker positions and (2) it puts less data | 3710 | because (1) it preserves some marker positions and (2) it puts less data |
| 3711 | in the undo list. When REPLACE is non-nil, the second return value is | 3711 | in the undo list. When REPLACE is non-nil, the second return value is |
| 3712 | the number of characters that replace previous buffer contents. | 3712 | the number of characters that replace previous buffer contents. |
| 3713 | 3713 | ||
| 3714 | This function does code conversion according to the value of | 3714 | This function does code conversion according to the value of |
| 3715 | `coding-system-for-read' or `file-coding-system-alist', and sets the | 3715 | `coding-system-for-read' or `file-coding-system-alist', and sets the |
| 3716 | variable `last-coding-system-used' to the coding system actually used. */) | 3716 | variable `last-coding-system-used' to the coding system actually used. */) |
| 3717 | (filename, visit, beg, end, replace) | 3717 | (filename, visit, beg, end, replace) |
| 3718 | Lisp_Object filename, visit, beg, end, replace; | 3718 | Lisp_Object filename, visit, beg, end, replace; |
| 3719 | { | 3719 | { |