[Emacs-diffs] emacs/src ChangeLog editfns.c insdel.c lisp.h

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/03/28 04:53:07

Modified files:
        src            : ChangeLog editfns.c insdel.c lisp.h 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7457&r2=1.7458
http://cvs.savannah.gnu.org/viewcvs/emacs/src/editfns.c?cvsroot=emacs&r1=1.468&r2=1.469
http://cvs.savannah.gnu.org/viewcvs/emacs/src/insdel.c?cvsroot=emacs&r1=1.204&r2=1.205
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.654&r2=1.655

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7457
retrieving revision 1.7458
diff -u -b -r1.7457 -r1.7458
--- ChangeLog   28 Mar 2009 02:24:22 -0000      1.7457
+++ ChangeLog   28 Mar 2009 04:53:04 -0000      1.7458
@@ -1,5 +1,14 @@
 2009-03-28  Stefan Monnier  <address@hidden>
 
+       * 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)

Index: editfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/editfns.c,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -b -r1.468 -r1.469
--- editfns.c   24 Mar 2009 17:37:58 -0000      1.468
+++ editfns.c   28 Mar 2009 04:53:06 -0000      1.469
@@ -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;

Index: insdel.c
===================================================================
RCS file: /sources/emacs/emacs/src/insdel.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -b -r1.204 -r1.205
--- insdel.c    28 Mar 2009 02:24:24 -0000      1.204
+++ insdel.c    28 Mar 2009 04:53:06 -0000      1.205
@@ -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;

Index: lisp.h
===================================================================
RCS file: /sources/emacs/emacs/src/lisp.h,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -b -r1.654 -r1.655
--- lisp.h      28 Mar 2009 02:24:24 -0000      1.654
+++ lisp.h      28 Mar 2009 04:53:06 -0000      1.655
@@ -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 *,
+extern EMACS_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 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);