* lisp/case-table.el (case-table-get-table): New function.

* lisp/case-table.el: Use lexical-binding.
(case-table-get-table): New function.
(get-upcase-table): Use it.  Mark as obsolete.  Adjust callers.
* src/casetab.c (init_casetab_once): Don't abuse the ascii eqv table for
the upcase table.

2 files changed, 15 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b25fb54441..6698cfe0fcf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * casetab.c (init_casetab_once): Don't abuse the ascii eqv table for
+        the upcase table.
+
 2013-03-27  rzl24ozi  <rzl24ozi@gmail.com>  (tiny changes)
 
         * image.c [WINDOWSNT]: Fix calls to DEF_IMGLIB_FN for SVG function.
diff --git a/src/casetab.c b/src/casetab.c
index 76f72b26db3..13bed64e4b2 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -246,7 +246,7 @@ void
 init_casetab_once (void)
 {
   register int i;
-  Lisp_Object down, up;
+  Lisp_Object down, up, eqv;
   DEFSYM (Qcase_table, "case-table");
 
   /* Intern this now in case it isn't already done.
@@ -275,13 +275,21 @@ init_casetab_once (void)
 
   for (i = 0; i < 128; i++)
     {
+      int c = (i >= 'a' && i <= 'z') ? i + ('A' - 'a') : i;
+      CHAR_TABLE_SET (up, i, make_number (c));
+    }
+
+  eqv = Fmake_char_table (Qcase_table, Qnil);
+
+   for (i = 0; i < 128; i++)
+     {
       int c = ((i >= 'A' && i <= 'Z') ? i + ('a' - 'A')
                : ((i >= 'a' && i <= 'z') ? i + ('A' - 'a')
                   : i));
       CHAR_TABLE_SET (up, i, make_number (c));
     }
 
-  set_char_table_extras (down, 2, Fcopy_sequence (up));
+  set_char_table_extras (down, 2, eqv);
 
   /* Fill in what isn't filled in.  */
   set_case_table (down, 1);