Mercurial > emacs
changeset 102759:ec3ec7f5d54e
* editfns.c (general_insert_function): Adjust to insdel.c changes.
* insdel.c (prepare_to_modify_buffer, signal_before_change):
Some more EMACS_INT.
* lisp.h (copy_text, count_size_as_multibyte): Fix last change.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 28 Mar 2009 04:53:04 +0000 |
| parents | e8910435fe5c |
| children | 385e858f5ec1 |
| files | src/ChangeLog src/editfns.c src/insdel.c src/lisp.h |
| diffstat | 4 files changed, 28 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Mar 28 04:52:28 2009 +0000 +++ b/src/ChangeLog Sat Mar 28 04:53:04 2009 +0000 @@ -1,5 +1,14 @@ 2009-03-28 Stefan Monnier <monnier@iro.umontreal.ca> + * frame.c (delete_frame): Work around compiler bug. + + * editfns.c (general_insert_function): Adjust to insdel.c changes. + * insdel.c (prepare_to_modify_buffer, signal_before_change): + Some more EMACS_INT. + * lisp.h (copy_text, count_size_as_multibyte): Fix last change. + + * xdisp.c (dump_glyph): Fix typo. + * insdel.c (move_gap, move_gap_both, gap_left, gap_right) (adjust_markers_gap_motion, adjust_markers_for_delete) (adjust_markers_for_insert, adjust_point)
--- a/src/editfns.c Sat Mar 28 04:52:28 2009 +0000 +++ b/src/editfns.c Sat Mar 28 04:53:04 2009 +0000 @@ -98,10 +98,11 @@ int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); static size_t emacs_memftimeu P_ ((char *, size_t, const char *, size_t, const struct tm *, int)); -static void general_insert_function P_ ((void (*) (const unsigned char *, int), - void (*) (Lisp_Object, int, int, int, - int, int), - int, int, Lisp_Object *)); +static void general_insert_function (void (*) (const unsigned char *, EMACS_INT), + void (*) (Lisp_Object, EMACS_INT, + EMACS_INT, EMACS_INT, + EMACS_INT, int), + int, int, Lisp_Object *); static Lisp_Object subst_char_in_region_unwind P_ ((Lisp_Object)); static Lisp_Object subst_char_in_region_unwind_1 P_ ((Lisp_Object)); static void transpose_markers P_ ((int, int, int, int, int, int, int, int)); @@ -2161,12 +2162,12 @@ INSERT_FROM_STRING_FUNC as the last argument. */ static void -general_insert_function (insert_func, insert_from_string_func, - inherit, nargs, args) - void (*insert_func) P_ ((const unsigned char *, int)); - void (*insert_from_string_func) P_ ((Lisp_Object, int, int, int, int, int)); - int inherit, nargs; - register Lisp_Object *args; +general_insert_function (void (*insert_func) + (const unsigned char *, EMACS_INT), + void (*insert_from_string_func) + (Lisp_Object, EMACS_INT, EMACS_INT, + EMACS_INT, EMACS_INT, int), + int inherit, int nargs, Lisp_Object *args) { register int argnum; register Lisp_Object val;
--- a/src/insdel.c Sat Mar 28 04:52:28 2009 +0000 +++ b/src/insdel.c Sat Mar 28 04:53:04 2009 +0000 @@ -2032,7 +2032,8 @@ by holding its value temporarily in a marker. */ void -prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end, int *preserve_ptr) +prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end, + EMACS_INT *preserve_ptr) { struct buffer *base_buffer; @@ -2146,7 +2147,7 @@ void signal_before_change (EMACS_INT start_int, EMACS_INT end_int, - int *preserve_ptr) + EMACS_INT *preserve_ptr) { Lisp_Object start, end; Lisp_Object start_marker, end_marker;
--- a/src/lisp.h Sat Mar 28 04:52:28 2009 +0000 +++ b/src/lisp.h Sat Mar 28 04:53:04 2009 +0000 @@ -2455,9 +2455,9 @@ extern void move_gap (EMACS_INT); extern void move_gap_both (EMACS_INT, EMACS_INT); extern void make_gap (EMACS_INT); -extern int copy_text (const unsigned char *, unsigned char *, - EMACS_INT, int, int); -extern int count_size_as_multibyte (const unsigned char *, EMACS_INT); +extern EMACS_INT copy_text (const unsigned char *, unsigned char *, + EMACS_INT, int, int); +extern EMACS_INT count_size_as_multibyte (const unsigned char *, EMACS_INT); extern int count_combining_before (const unsigned char *, EMACS_INT, EMACS_INT, EMACS_INT); extern int count_combining_after (const unsigned char *, @@ -2486,8 +2486,8 @@ extern Lisp_Object del_range_2 (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int); extern void modify_region (struct buffer *, EMACS_INT, EMACS_INT, int); -extern void prepare_to_modify_buffer (EMACS_INT, EMACS_INT, int *); -extern void signal_before_change (EMACS_INT, EMACS_INT, int *); +extern void prepare_to_modify_buffer (EMACS_INT, EMACS_INT, EMACS_INT *); +extern void signal_before_change (EMACS_INT, EMACS_INT, EMACS_INT *); extern void signal_after_change (EMACS_INT, EMACS_INT, EMACS_INT); extern void adjust_after_replace (EMACS_INT, EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT);