Mercurial > emacs
comparison src/insdel.c @ 109358:a9586dc942d5
Merge from mainline.
author | Katsumi Yamaoka <katsumi@flagship2> |
---|---|
date | Mon, 12 Jul 2010 13:21:11 +0000 |
parents | e856a274549b |
children | 14830418f9fc |
comparison
equal
deleted
inserted
replaced
109240:6f0915b37828 | 109358:a9586dc942d5 |
---|---|
1626 prepare_to_modify_buffer and never call signal_after_change. */ | 1626 prepare_to_modify_buffer and never call signal_after_change. */ |
1627 | 1627 |
1628 void | 1628 void |
1629 replace_range_2 (EMACS_INT from, EMACS_INT from_byte, | 1629 replace_range_2 (EMACS_INT from, EMACS_INT from_byte, |
1630 EMACS_INT to, EMACS_INT to_byte, | 1630 EMACS_INT to, EMACS_INT to_byte, |
1631 char *ins, EMACS_INT inschars, EMACS_INT insbytes, | 1631 const char *ins, EMACS_INT inschars, EMACS_INT insbytes, |
1632 int markers) | 1632 int markers) |
1633 { | 1633 { |
1634 EMACS_INT nbytes_del, nchars_del; | 1634 EMACS_INT nbytes_del, nchars_del; |
1635 Lisp_Object temp; | 1635 Lisp_Object temp; |
1636 | 1636 |