[Emacs-diffs] /srv/bzr/emacs/trunk r105551: Minor changes in bidi.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105551
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-24 10:46:00 +0300
message:
  Minor changes in bidi.c.
  
   src/bidi.c (bidi_check_type): Use xassert.
   (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p
   members.
modified:
  src/ChangeLog
  src/bidi.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-23 14:45:14 +0000
+++ b/src/ChangeLog     2011-08-24 07:46:00 +0000
@@ -1,3 +1,9 @@
+2011-08-24  Eli Zaretskii  <address@hidden>
+
+       * bidi.c (bidi_check_type): Use xassert.
+       (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p
+       members.
+
 2011-08-23  Eli Zaretskii  <address@hidden>
 
        * bidi.c (bidi_get_type): Abort if we get zero as the bidi type of

=== modified file 'src/bidi.c'
--- a/src/bidi.c        2011-08-23 14:45:14 +0000
+++ b/src/bidi.c        2011-08-24 07:46:00 +0000
@@ -146,11 +146,10 @@
     }
 }
 
-static void
+static inline void
 bidi_check_type (bidi_type_t type)
 {
-  if (type < UNKNOWN_BT || type > NEUTRAL_ON)
-    abort ();
+  xassert (UNKNOWN_BT <= type && type <= NEUTRAL_ON);
 }
 
 /* Given a bidi TYPE of a character, return its category.  */
@@ -540,6 +539,8 @@
       bidi_cache[idx].next_for_neutral = bidi_it->next_for_neutral;
       bidi_cache[idx].next_for_ws = bidi_it->next_for_ws;
       bidi_cache[idx].ignore_bn_limit = bidi_it->ignore_bn_limit;
+      bidi_cache[idx].disp_pos = bidi_it->disp_pos;
+      bidi_cache[idx].disp_prop_p = bidi_it->disp_prop_p;
     }
 
   bidi_cache_last_idx = idx;