diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-09-15 00:28:04 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-09-15 00:28:04 +0000 |
| commit | 4b70e2c95f4f6b383905f06d86f2d19faf4d774c (patch) | |
| tree | 7fa12b124b59a249208a5895bd79e775567702cb /src/fileio.c | |
| parent | 1b0338f79465c40fb01621a8b83167d6c8de32f0 (diff) | |
| download | emacs-4b70e2c95f4f6b383905f06d86f2d19faf4d774c.tar.gz | |
(Finsert_file_contents): Fix case of replacement in a narrowed buffer.
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 e9a6c558e33..56dbae6f877 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. @@ -4327,7 +4327,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) { @@ -4341,7 +4341,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 ()); |