--- a/src/casetab.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/casetab.c	Mon Aug 13 11:20:41 2007 +0200
@@ -42,13 +42,14 @@
 #include "buffer.h"
 #include "opaque.h"
 
-Lisp_Object Qcase_tablep;
+Lisp_Object Qcase_table_p;
 Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
 Lisp_Object Vascii_canon_table, Vascii_eqv_table;
 #ifdef MULE
 Lisp_Object Vmirror_ascii_downcase_table, Vmirror_ascii_upcase_table;
 Lisp_Object Vmirror_ascii_canon_table, Vmirror_ascii_eqv_table;
 #endif
+Lisp_Object Qtranslate_table;
 
 static void compute_trt_inverse (Lisp_Object trt, Lisp_Object inverse);
 
@@ -80,7 +81,7 @@
   REGISTER Lisp_Object tem;
 
   while (tem = Fcase_table_p (obj), NILP (tem))
-    obj = wrong_type_argument (Qcase_tablep, obj);
+    obj = wrong_type_argument (Qcase_table_p, obj);
   return (obj);
 }
 
@@ -189,8 +190,7 @@
 set_case_table (Lisp_Object table, int standard)
 {
   Lisp_Object down, up, canon, eqv, tail = table;
-  struct buffer *buf =
-    standard ? XBUFFER(Vbuffer_defaults) : current_buffer;
+  struct buffer *buf = current_buffer;
 
   check_case_table (table);
 
@@ -243,17 +243,19 @@
       Vmirror_ascii_eqv_table = make_mirror_trt_table (eqv);
 #endif
     }
-  buf->downcase_table = down;
-  buf->upcase_table = up;
-  buf->case_canon_table = canon;
-  buf->case_eqv_table = eqv;
+  else
+    {
+      buf->downcase_table = down;
+      buf->upcase_table = up;
+      buf->case_canon_table = canon;
+      buf->case_eqv_table = eqv;
 #ifdef MULE
-  buf->mirror_downcase_table = make_mirror_trt_table (down);
-  buf->mirror_upcase_table = make_mirror_trt_table (up);
-  buf->mirror_case_canon_table = make_mirror_trt_table (canon);
-  buf->mirror_case_eqv_table = make_mirror_trt_table (eqv);
+      buf->mirror_downcase_table = make_mirror_trt_table (down);
+      buf->mirror_upcase_table = make_mirror_trt_table (up);
+      buf->mirror_case_canon_table = make_mirror_trt_table (canon);
+      buf->mirror_case_eqv_table = make_mirror_trt_table (eqv);
 #endif
-
+    }
   return table;
 }
 
@@ -287,7 +289,8 @@
 void
 syms_of_casetab (void)
 {
-  defsymbol (&Qcase_tablep, "case-table-p");
+  defsymbol (&Qcase_table_p, "case-table-p");
+  defsymbol (&Qtranslate_table, "translate-table");
 
   DEFSUBR (Fcase_table_p);
   DEFSUBR (Fcurrent_case_table);
@@ -307,13 +310,6 @@
   staticpro (&Vascii_canon_table);
   staticpro (&Vascii_eqv_table);
 
-#ifdef MULE
-  staticpro (&Vmirror_ascii_downcase_table);
-  staticpro (&Vmirror_ascii_upcase_table);
-  staticpro (&Vmirror_ascii_canon_table);
-  staticpro (&Vmirror_ascii_eqv_table);
-#endif
-
   tem = MAKE_TRT_TABLE ();
   Vascii_downcase_table = tem;
   Vascii_canon_table = tem;