diff --git a/src/ChangeLog b/src/ChangeLog
index 47cc7a76d25a24d4cf7b4dd241bbc59553f3f0e6..c0ea0e49819a30451786d6dc3b7829f679450c3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-24  Eli Zaretskii  <eliz@gnu.org>
 
+	* dispextern.h (struct bidi_saved_info): Use EMACS_INT for buffer
+	positions.
+
 	* fns.c (Fcompare_strings, Fstring_lessp, concat)
 	(string_make_unibyte, Fstring_as_unibyte, Fsubstring)
 	(Fsubstring_no_properties, substring_both, Ffillarray)
diff --git a/src/dispextern.h b/src/dispextern.h
index 6fd92ba940d54890daa93e0ada04ec12698e58c5..e4c13b58ce4ad0f34a3d8aedbfc935c55c86abda 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1770,7 +1770,7 @@ typedef enum { NEUTRAL_DIR, L2R, R2L } bidi_dir_t;
 /* Data type for storing information about characters we need to
    remember.  */
 struct bidi_saved_info {
-  int bytepos, charpos;		/* character's buffer position */
+  EMACS_INT bytepos, charpos;	/* character's buffer position */
   bidi_type_t type;		/* character's resolved bidi type */
   bidi_type_t type_after_w1;	/* original type of the character, after W1 */
   bidi_type_t orig_type;	/* type as we found it in the buffer */