Commit 4b70e2c9 authored by Stefan Monnier's avatar Stefan Monnier

(Finsert_file_contents): Fix case of replacement in a narrowed buffer.

parent 1b0338f7
2004-09-14 Stefan <monnier@iro.umontreal.ca>
* fileio.c (Finsert_file_contents): Fix case of replacement in a
narrowed buffer.
2004-09-14 Kim F. Storm <storm@cua.dk> 2004-09-14 Kim F. Storm <storm@cua.dk>
* puresize.h (PURESIZE_RATIO): Define based on BITS_PER_EMACS_INT. * puresize.h (PURESIZE_RATIO): Define based on BITS_PER_EMACS_INT.
......
/* File IO for GNU Emacs. /* File IO for GNU Emacs.
Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000,01,03,2004 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
Free Software Foundation, Inc. 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Emacs. This file is part of GNU Emacs.
...@@ -4327,7 +4327,7 @@ actually used. */) ...@@ -4327,7 +4327,7 @@ actually used. */)
/* Replace the chars that we need to replace, /* Replace the chars that we need to replace,
and update INSERTED to equal the number of bytes and update INSERTED to equal the number of bytes
we are taking from the file. */ 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) if (same_at_end != same_at_start)
{ {
...@@ -4341,7 +4341,7 @@ actually used. */) ...@@ -4341,7 +4341,7 @@ actually used. */)
} }
/* Insert from the file at the proper position. */ /* Insert from the file at the proper position. */
SET_PT_BOTH (temp, same_at_start); 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); 0, 0, 0);
if (coding.cmp_data && coding.cmp_data->used) if (coding.cmp_data && coding.cmp_data->used)
coding_restore_composition (&coding, Fcurrent_buffer ()); coding_restore_composition (&coding, Fcurrent_buffer ());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment