diff options
| author | Karoly Lorentey <[email protected]> | 2004-09-16 13:09:53 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2004-09-16 13:09:53 +0000 |
| commit | 98a92e2d7b1f9993215dd4db3d5810586b3da7d3 (patch) | |
| tree | 36549b6c7ca6056a0e3b5fd72264160953b23f15 /src/fileio.c | |
| parent | aeeb70757cd8c57689a1b3238e9b25a2d422e38f (diff) | |
| parent | 113e270a241bcabe4aae4eb13f0ceb62744ec1f4 (diff) | |
Merged in changes from CVS trunk.
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-547
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-548
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-549
Use symbol-matching for generic-mode keywords
* [email protected]/emacs--cvs-trunk--0--patch-550
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-551
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-246
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index e95205d748..9e86b6a918 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,6 +1,6 @@ /* File IO for GNU Emacs. - Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,03,2004 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -4329,7 +4329,7 @@ actually used. */) /* Replace the chars that we need to replace, and update INSERTED to equal the number of bytes we are taking from the file. */ - inserted -= (Z_BYTE - same_at_end) + (same_at_start - BEG_BYTE); + inserted -= (ZV_BYTE - same_at_end) + (same_at_start - BEGV_BYTE); if (same_at_end != same_at_start) { @@ -4343,7 +4343,7 @@ actually used. */) } /* Insert from the file at the proper position. */ SET_PT_BOTH (temp, same_at_start); - insert_1 (conversion_buffer + same_at_start - BEG_BYTE, inserted, + insert_1 (conversion_buffer + same_at_start - BEGV_BYTE, inserted, 0, 0, 0); if (coding.cmp_data && coding.cmp_data->used) coding_restore_composition (&coding, Fcurrent_buffer ()); |