[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v |
Date: |
Sun, 16 Dec 2007 10:54:20 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Andreas Schwab <schwab> 07/12/16 10:54:19
Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -b -r1.595 -r1.596
--- fileio.c 16 Dec 2007 10:51:02 -0000 1.595
+++ fileio.c 16 Dec 2007 10:54:19 -0000 1.596
@@ -3694,26 +3694,26 @@
DEFUN ("insert-file-contents", Finsert_file_contents, Sinsert_file_contents,
1, 5, 0,
doc: /* Insert contents of file FILENAME after point.
- Returns list of absolute file name and number of characters
inserted.
- If second argument VISIT is non-nil, the buffer's visited
filename and
- last save file modtime are set, and it is marked unmodified. If
- visiting and the file does not exist, visiting is completed
before the
- error is signaled.
-
- The optional third and fourth arguments BEG and END specify what
portion
- of the file to insert. These arguments count bytes in the file,
not
- characters in the buffer. If VISIT is non-nil, BEG and END must
be nil.
-
- If optional fifth argument REPLACE is non-nil, replace the
current
- buffer contents (in the accessible portion) with the file
contents.
- This is better than simply deleting and inserting the whole thing
- because (1) it preserves some marker positions and (2) it puts
less data
- in the undo list. When REPLACE is non-nil, the second return
value is
- 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. */)
+Returns list of absolute file name and number of characters inserted.
+If second argument VISIT is non-nil, the buffer's visited filename and
+last save file modtime are set, and it is marked unmodified. If
+visiting and the file does not exist, visiting is completed before the
+error is signaled.
+
+The optional third and fourth arguments BEG and END specify what portion
+of the file to insert. These arguments count bytes in the file, not
+characters in the buffer. If VISIT is non-nil, BEG and END must be nil.
+
+If optional fifth argument REPLACE is non-nil, replace the current
+buffer contents (in the accessible portion) with the file contents.
+This is better than simply deleting and inserting the whole thing
+because (1) it preserves some marker positions and (2) it puts less data
+in the undo list. When REPLACE is non-nil, the second return value is
+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. */)
(filename, visit, beg, end, replace)
Lisp_Object filename, visit, beg, end, replace;
{