From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 24 Sep 2010 13:05:24 +0000 (-0400)
Subject: Really fix int/EMACS_INT use in bidi.c.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61bfec9843db66eff4e5f3dfcb843f0e207da283;p=emacs.git

Really fix int/EMACS_INT use in bidi.c.

 bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer positions.
 (bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer positions.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8c73cf357d9..83295bc5f09 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2010-09-24  Eli Zaretskii  <eliz@gnu.org>
 
+	* bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer
+	positions.
+	(bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer
+	positions.
+
 	* buffer.c (struct sortvec): Use EMACS_INT for buffer positions.
 	(struct sortstrlist, overlay_str_len): Use EMACS_INT for string
 	length.
diff --git a/src/bidi.c b/src/bidi.c
index 224ed552a6d..b7c6fdc2ddd 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -79,10 +79,10 @@ static Lisp_Object bidi_type_table, bidi_mirror_table;
 
 /* What we need to know about the current paragraph.  */
 struct bidi_paragraph_info {
-  int start_bytepos;	/* byte position where it begins */
-  int end_bytepos;	/* byte position where it ends */
-  int embedding_level;	/* its basic embedding level */
-  bidi_dir_t base_dir;	/* its base direction */
+  EMACS_INT start_bytepos;	/* byte position where it begins */
+  EMACS_INT end_bytepos;	/* byte position where it ends */
+  int	    embedding_level;	/* its basic embedding level */
+  bidi_dir_t base_dir;		/* its base direction */
 };
 
 /* Data type for describing the bidirectional character categories.  */
@@ -313,7 +313,7 @@ bidi_cache_fetch_state (int idx, struct bidi_it *bidi_it)
    resolved levels in cached states.  DIR, if non-zero, means search
    in that direction from the last cache hit.  */
 static INLINE int
-bidi_cache_search (int charpos, int level, int dir)
+bidi_cache_search (EMACS_INT charpos, int level, int dir)
 {
   int i, i_start;
 
@@ -462,7 +462,7 @@ bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
 }
 
 static INLINE bidi_type_t
-bidi_cache_find (int charpos, int level, struct bidi_it *bidi_it)
+bidi_cache_find (EMACS_INT charpos, int level, struct bidi_it *bidi_it)
 {
   int i = bidi_cache_search (charpos, level, bidi_it->scan_dir);