Mercurial > emacs
diff src/fileio.c @ 83206:b5dee7c1d483
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-547
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-548
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-549
Use symbol-matching for generic-mode keywords
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-550
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-551
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-246
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 16 Sep 2004 13:09:53 +0000 |
| parents | 42acc7fa8a4f 4c14357ffc27 |
| children | f70dc61a797f |
line wrap: on
line diff
--- a/src/fileio.c Mon Sep 13 20:39:27 2004 +0000 +++ b/src/fileio.c Thu Sep 16 13:09:53 2004 +0000 @@ -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 @@ /* 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 @@ } /* 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 ());