From 9628fed72164a10758c241c2b220f84668a50b14 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 28 Mar 2009 04:53:04 +0000 Subject: [PATCH] * 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. --- src/ChangeLog | 9 +++++++++ src/editfns.c | 21 +++++++++++---------- src/insdel.c | 5 +++-- src/lisp.h | 10 +++++----- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7ccd3a34c8f..2e2ca792323 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2009-03-28 Stefan Monnier + * 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) diff --git a/src/editfns.c b/src/editfns.c index 0a7473d6d63..9d6ff9be655 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -98,10 +98,11 @@ static Lisp_Object region_limit P_ ((int)); 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 @@ set_time_zone_rule (tzstring) 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; diff --git a/src/insdel.c b/src/insdel.c index 70a6a6618ec..f94f4f0067b 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -2032,7 +2032,8 @@ modify_region (struct buffer *buffer, EMACS_INT start, EMACS_INT end, 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 @@ reset_var_on_error (val) 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; diff --git a/src/lisp.h b/src/lisp.h index a68afeb4388..84252dd8288 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2455,9 +2455,9 @@ extern Lisp_Object Qinhibit_modification_hooks; 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 void del_range_both (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int); 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); -- 2.11.4.GIT