[Emacs-diffs] /srv/bzr/emacs/trunk r101589: Really fix int/EMACS_INT use in bidi.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101589
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-24 09:05:24 -0400
message:
  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.
modified:
  src/ChangeLog
  src/bidi.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-24 12:45:09 +0000
+++ b/src/ChangeLog     2010-09-24 13:05:24 +0000
@@ -1,5 +1,10 @@
 2010-09-24  Eli Zaretskii  <address@hidden>
 
+       * 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.

=== modified file 'src/bidi.c'
--- a/src/bidi.c        2010-09-18 11:59:53 +0000
+++ b/src/bidi.c        2010-09-24 13:05:24 +0000
@@ -79,10 +79,10 @@
 
 /* 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 @@
    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 @@
 }
 
 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);