(insert, insert_and_inherit, insert_before_markers)

(insert_before_markers_and_inherit): Make sure FROM is correct when
`after-change-functions' are called.
This commit is contained in:
Eli Zaretskii 2005-12-23 17:37:50 +00:00
parent 1fafa158b4
commit bab3eee156
2 changed files with 22 additions and 14 deletions

View file

@ -1,3 +1,9 @@
2005-12-23 Martin Rudalics <rudalics@gmx.at> (tiny change)
* insdel.c (insert, insert_and_inherit, insert_before_markers)
(insert_before_markers_and_inherit): Make sure FROM is correct
when `after-change-functions' are called.
2005-12-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xfns.c (Fx_uses_old_gtk_dialog): New function.

View file

@ -749,9 +749,10 @@ insert (string, nbytes)
{
if (nbytes > 0)
{
int opoint = PT;
insert_1 (string, nbytes, 0, 1, 0);
signal_after_change (opoint, 0, PT - opoint);
int len = chars_in_text (string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
update_compositions (opoint, PT, CHECK_BORDER);
}
}
@ -765,9 +766,10 @@ insert_and_inherit (string, nbytes)
{
if (nbytes > 0)
{
int opoint = PT;
insert_1 (string, nbytes, 1, 1, 0);
signal_after_change (opoint, 0, PT - opoint);
int len = chars_in_text (string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 0);
opoint = PT - len;
signal_after_change (opoint, 0, len);
update_compositions (opoint, PT, CHECK_BORDER);
}
}
@ -813,10 +815,10 @@ insert_before_markers (string, nbytes)
{
if (nbytes > 0)
{
int opoint = PT;
insert_1 (string, nbytes, 0, 1, 1);
signal_after_change (opoint, 0, PT - opoint);
int len = chars_in_text (string, nbytes), opoint;
insert_1_both (string, len, nbytes, 0, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
update_compositions (opoint, PT, CHECK_BORDER);
}
}
@ -830,10 +832,10 @@ insert_before_markers_and_inherit (string, nbytes)
{
if (nbytes > 0)
{
int opoint = PT;
insert_1 (string, nbytes, 1, 1, 1);
signal_after_change (opoint, 0, PT - opoint);
int len = chars_in_text (string, nbytes), opoint;
insert_1_both (string, len, nbytes, 1, 1, 1);
opoint = PT - len;
signal_after_change (opoint, 0, len);
update_compositions (opoint, PT, CHECK_BORDER);
}
}