From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 26 Oct 2008 04:23:08 +0000 (+0000)
Subject: (Foptimize_char_table): Make sure `ascii' doesn't point to
X-Git-Tag: emacs-pretest-23.0.90~2176
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4d632321c168edf1a079cbf06f18b8ac9c8ba46b;p=emacs.git

(Foptimize_char_table): Make sure `ascii' doesn't point to
the previous unoptimized table.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 568182595d8..3dd47c8484b 100644
--- 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 fdce932993f..f8c1bba85b9 100644
--- 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;
 }