diff options
| author | Kenichi Handa | 2006-02-24 06:46:54 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-02-24 06:46:54 +0000 |
| commit | 77343e1d1c4d26539f48e32754707df15e6e2ad2 (patch) | |
| tree | fad16904c57574f18d46b064c5479bb076a1db7f /src | |
| parent | 5f4264e54bb59b9b0590a113fbd015c3c0920f7a (diff) | |
| download | emacs-77343e1d1c4d26539f48e32754707df15e6e2ad2.tar.gz emacs-77343e1d1c4d26539f48e32754707df15e6e2ad2.zip | |
(Finsert_file_contents): When a text is replaced
partially, be sure to set point before the inserted characters.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fe8b13409ef..d8e0b6fb4e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-02-24 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fileio.c (Finsert_file_contents): When a text is replaced | ||
| 4 | partially, be sure to set point before the inserted characters. | ||
| 5 | |||
| 1 | 2006-02-23 Zhang Wei <id.brep@gmail.com> (tiny change) | 6 | 2006-02-23 Zhang Wei <id.brep@gmail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * xfns.c (Fx_file_dialog): Return a decoded file name. | 8 | * xfns.c (Fx_file_dialog): Return a decoded file name. |
diff --git a/src/fileio.c b/src/fileio.c index 66546b3b556..73dd799f806 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4414,6 +4414,8 @@ actually used. */) | |||
| 4414 | 4414 | ||
| 4415 | /* Set `inserted' to the number of inserted characters. */ | 4415 | /* Set `inserted' to the number of inserted characters. */ |
| 4416 | inserted = PT - temp; | 4416 | inserted = PT - temp; |
| 4417 | /* Set point before the inserted characters. */ | ||
| 4418 | SET_PT_BOTH (temp, same_at_start); | ||
| 4417 | 4419 | ||
| 4418 | xfree (conversion_buffer); | 4420 | xfree (conversion_buffer); |
| 4419 | emacs_close (fd); | 4421 | emacs_close (fd); |