* buffer.c (advance_to_char_boundary): Return EMACS_INT, not int.

diff --git a/src/ChangeLog b/src/ChangeLog
index d16a19e..1929638 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-06-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        * buffer.c (Fgenerate_new_buffer_name): Use EMACS_INT for count, not int.
+       (advance_to_char_boundary): Return EMACS_INT, not int.
 
        * data.c (Qcompiled_function): Now static.
 

diff --git a/src/buffer.c b/src/buffer.c
index 453ea83..8fdd094 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2038,7 +2038,7 @@ validate_region (register Lisp_Object *b, register Lisp_Object *e)
 /* Advance BYTE_POS up to a character boundary
    and return the adjusted position.  */
 
-static int
+static EMACS_INT
 advance_to_char_boundary (EMACS_INT byte_pos)
 {
   int c;