Commit 9628fed7 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* 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.
parent 08c87104
2009-03-28 Stefan Monnier <monnier@iro.umontreal.ca> 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) * insdel.c (move_gap, move_gap_both, gap_left, gap_right)
(adjust_markers_gap_motion, adjust_markers_for_delete) (adjust_markers_gap_motion, adjust_markers_for_delete)
(adjust_markers_for_insert, adjust_point) (adjust_markers_for_insert, adjust_point)
......
...@@ -98,10 +98,11 @@ static Lisp_Object region_limit P_ ((int)); ...@@ -98,10 +98,11 @@ static Lisp_Object region_limit P_ ((int));
int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); int lisp_time_argument P_ ((Lisp_Object, time_t *, int *));
static size_t emacs_memftimeu P_ ((char *, size_t, const char *, static size_t emacs_memftimeu P_ ((char *, size_t, const char *,
size_t, const struct tm *, int)); size_t, const struct tm *, int));
static void general_insert_function P_ ((void (*) (const unsigned char *, int), static void general_insert_function (void (*) (const unsigned char *, EMACS_INT),
void (*) (Lisp_Object, int, int, int, void (*) (Lisp_Object, EMACS_INT,
int, int), EMACS_INT, EMACS_INT,
int, int, Lisp_Object *)); 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 P_ ((Lisp_Object));
static Lisp_Object subst_char_in_region_unwind_1 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)); static void transpose_markers P_ ((int, int, int, int, int, int, int, int));
...@@ -2161,12 +2162,12 @@ set_time_zone_rule (tzstring) ...@@ -2161,12 +2162,12 @@ set_time_zone_rule (tzstring)
INSERT_FROM_STRING_FUNC as the last argument. */ INSERT_FROM_STRING_FUNC as the last argument. */
static void static void
general_insert_function (insert_func, insert_from_string_func, general_insert_function (void (*insert_func)
inherit, nargs, args) (const unsigned char *, EMACS_INT),
void (*insert_func) P_ ((const unsigned char *, int)); void (*insert_from_string_func)
void (*insert_from_string_func) P_ ((Lisp_Object, int, int, int, int, int)); (Lisp_Object, EMACS_INT, EMACS_INT,
int inherit, nargs; EMACS_INT, EMACS_INT, int),
register Lisp_Object *args; int inherit, int nargs, Lisp_Object *args)
{ {
register int argnum; register int argnum;
register Lisp_Object val; register Lisp_Object val;
......
...@@ -2032,7 +2032,8 @@ modify_region (struct buffer *buffer, EMACS_INT start, EMACS_INT end, ...@@ -2032,7 +2032,8 @@ modify_region (struct buffer *buffer, EMACS_INT start, EMACS_INT end,
by holding its value temporarily in a marker. */ by holding its value temporarily in a marker. */
void 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; struct buffer *base_buffer;
...@@ -2146,7 +2147,7 @@ reset_var_on_error (val) ...@@ -2146,7 +2147,7 @@ reset_var_on_error (val)
void void
signal_before_change (EMACS_INT start_int, EMACS_INT end_int, 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, end;
Lisp_Object start_marker, end_marker; Lisp_Object start_marker, end_marker;
......
...@@ -2455,9 +2455,9 @@ extern Lisp_Object Qinhibit_modification_hooks; ...@@ -2455,9 +2455,9 @@ extern Lisp_Object Qinhibit_modification_hooks;
extern void move_gap (EMACS_INT); extern void move_gap (EMACS_INT);
extern void move_gap_both (EMACS_INT, EMACS_INT); extern void move_gap_both (EMACS_INT, EMACS_INT);
extern void make_gap (EMACS_INT); extern void make_gap (EMACS_INT);
extern int copy_text (const unsigned char *, unsigned char *, extern EMACS_INT copy_text (const unsigned char *, unsigned char *,
EMACS_INT, int, int); EMACS_INT, int, int);
extern int count_size_as_multibyte (const unsigned char *, EMACS_INT); extern EMACS_INT count_size_as_multibyte (const unsigned char *, EMACS_INT);
extern int count_combining_before (const unsigned char *, extern int count_combining_before (const unsigned char *,
EMACS_INT, EMACS_INT, EMACS_INT); EMACS_INT, EMACS_INT, EMACS_INT);
extern int count_combining_after (const unsigned char *, 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); ...@@ -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, extern Lisp_Object del_range_2 (EMACS_INT, EMACS_INT,
EMACS_INT, EMACS_INT, int); EMACS_INT, EMACS_INT, int);
extern void modify_region (struct buffer *, 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 prepare_to_modify_buffer (EMACS_INT, EMACS_INT, EMACS_INT *);
extern void signal_before_change (EMACS_INT, EMACS_INT, 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 signal_after_change (EMACS_INT, EMACS_INT, EMACS_INT);
extern void adjust_after_replace (EMACS_INT, EMACS_INT, Lisp_Object, extern void adjust_after_replace (EMACS_INT, EMACS_INT, Lisp_Object,
EMACS_INT, EMACS_INT); EMACS_INT, EMACS_INT);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment