[Emacs-diffs] trunk r118238: Minor fix in bidi.c:bidi_cache_reset_to.

[Eli Zaretskii]

------------------------------------------------------------
revno: 118238
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-30 18:51:53 +0200
message:
  Minor fix in bidi.c:bidi_cache_reset_to.
  
   src/bidi.c (bidi_cache_reset_to): Invalidate bidi_cache_last_idx by
   setting it to -1.
   (bidi_find_bracket_pairs): Pass to bidi_cache_reset_to a relative
   index, not an absolute one, as that's what the function expects.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/bidi.c                     bidi.c-20091231194348-rm8gzug639w0dpq5-1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-30 11:12:21 +0000
+++ b/src/ChangeLog     2014-10-30 16:51:53 +0000
@@ -1,3 +1,10 @@
+2014-10-30  Eli Zaretskii  <address@hidden>
+
+       * bidi.c (bidi_cache_reset_to): Invalidate bidi_cache_last_idx by
+       setting it to -1.
+       (bidi_find_bracket_pairs): Pass to bidi_cache_reset_to a relative
+       index, not an absolute one, as that's what the function expects.
+
 2014-10-30  Dmitry Antipov  <address@hidden>
 
        * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize

=== modified file 'src/bidi.c'
--- a/src/bidi.c        2014-10-24 13:19:21 +0000
+++ b/src/bidi.c        2014-10-30 16:51:53 +0000
@@ -572,7 +572,7 @@
 bidi_cache_reset_to (int n)
 {
   bidi_cache_idx = bidi_cache_start + n;
-  bidi_cache_last_idx = n - 1;
+  bidi_cache_last_idx = -1;
 }
 
 /* Reset the cache state to the empty state.  We only reset the part
@@ -2629,11 +2629,10 @@
          bidi_it->bracket_enclosed_type = embedding_type;
          /* bidi_cache_last_idx is set to the index of the current
             state, because we just called bidi_cache_find above.
-            Force the cache to "forget" all the cached states
-            starting from the one corresponding to the outermost
-            opening bracket, which is what the current state
-            describes.  */
-         bidi_cache_reset_to (bidi_cache_last_idx);
+            That state describes the outermost opening bracket, the
+            one with which we entered this function.  Force the cache
+            to "forget" all the cached states starting from that state.  */
+         bidi_cache_reset_to (bidi_cache_last_idx - bidi_cache_start);
          /* Set up the next_for_neutral member, to help
             bidi_resolve_neutral.  */
          bidi_it->next_for_neutral.type = embedding_type;