(Foptimize_char_table): Make sure `ascii' doesn't point to

the previous unoptimized table.

diff --git a/src/ChangeLog b/src/ChangeLog
index 568182595d86ae10f57933a80c73491889654b7c..3dd47c8484bea196fe3a928293232e8d22883f7a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * chartab.c (Foptimize_char_table): Make sure `ascii' doesn't point to
+       the previous unoptimized table.
+
        * window.c (Fset_window_buffer): Undo 2008-10-18 change to re-instate
        the distinction between non-nil and non-t value of `dedicated'.
 

diff --git a/src/chartab.c b/src/chartab.c
index fdce932993f8809bd344b24cdd493ba5cbf47020..f8c1bba85b93db02dd40ae7257100020d17408d2 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -703,6 +703,9 @@ equivalent and can be merged.  It defaults to `equal'.  */)
        XCHAR_TABLE (char_table)->contents[i]
          = optimize_sub_char_table (elt, test);
     }
+  /* Reset the `ascii' cache, in case it got optimized away.  */
+  XCHAR_TABLE (char_table)->ascii = char_table_ascii (char_table);
+
   return Qnil;
 }