[Emacs-diffs] /srv/bzr/emacs/trunk r109396: * xfaces.c: Don't assume buffer size fits in 'int'.

[Paul Eggert]

------------------------------------------------------------
revno: 109396
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-02 02:20:01 -0700
message:
  * xfaces.c: Don't assume buffer size fits in 'int'.
modified:
  src/ChangeLog
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-02 08:47:07 +0000
+++ b/src/ChangeLog     2012-08-02 09:20:01 +0000
@@ -1,6 +1,8 @@
 2012-08-02  Paul Eggert  <address@hidden>
 
        * xfaces.c (face_at_buffer_position): Remove unused local.
+       (face_at_buffer_position, face_for_overlay_string):
+       Don't assume buffer size fits in 'int'.
 
        Use C99-style 'extern inline' if available.
        * buffer.h (BUFFER_INLINE):

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2012-08-02 08:47:07 +0000
+++ b/src/xfaces.c      2012-08-02 09:20:01 +0000
@@ -6101,7 +6101,7 @@
   for (i = 0; i < noverlays; i++)
     {
       Lisp_Object oend;
-      int oendpos;
+      ptrdiff_t oendpos;
 
       prop = Foverlay_get (overlay_vec[i], propname);
       if (!NILP (prop))
@@ -6145,7 +6145,7 @@
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   Lisp_Object prop, position;
   Lisp_Object frame;
-  int endpos;
+  ptrdiff_t endpos;
   Lisp_Object propname = mouse ? Qmouse_face : Qface;
   Lisp_Object limit1, end;
   struct face *default_face;