* lisp/emacs-lisp/cl-lib.el (current-case-table): Remove setter.

* lisp/leim/quail/sisheng.el (sisheng-list): Use with-case-table.

1 files changed, 34 insertions, 36 deletions

diff --git a/lisp/leim/quail/sisheng.el b/lisp/leim/quail/sisheng.el
index 35a5f41f323..f87204f4db4 100644
--- a/lisp/leim/quail/sisheng.el
+++ b/lisp/leim/quail/sisheng.el
@@ -249,42 +249,40 @@ Example:  nve5    -> nüe
 
 ;; Call quail-make-sisheng-rules for all syllables in sisheng-syllable-table.
 ;;
-(let ((case-table-save (current-case-table))
-      sisheng-list)
-  (set-case-table (standard-case-table))
-  (dolist (syllable sisheng-syllable-table)
-    (setq sisheng-list
-	  (append (quail-make-sisheng-rules syllable)
-		  sisheng-list)))
-
-  (dolist (syllable sisheng-syllable-table)
-    (setq sisheng-list
-	  (append (quail-make-sisheng-rules (upcase-initials syllable))
-		  sisheng-list)))
-
-  (dolist (syllable sisheng-syllable-table)
-    (setq sisheng-list
-	  (append (quail-make-sisheng-rules (upcase syllable))
-		  sisheng-list)))
-
-  (eval `(quail-define-rules
-	  ,@sisheng-list
-
-	  ("lv5" ["lü"])
-	  ("lve5" ["lüe"])
-	  ("nv5" ["nü"])
-	  ("nve5" ["nüe"])
-
-	  ("Lv5" ["Lü"])
-	  ("Lve5" ["Lüe"])
-	  ("Nv5" ["Nü"])
-	  ("Nve5" ["Nüe"])
-
-	  ("LV5" ["LÜ"])
-	  ("LVE5" ["LÜE"])
-	  ("NV5" ["NÜ"])
-	  ("NVE5" ["NÜE"])))
-  (set-case-table case-table-save))
+(let (sisheng-list)
+  (with-case-table (standard-case-table) ;FIXME: Why?
+    (dolist (syllable sisheng-syllable-table)
+      (setq sisheng-list
+            (append (quail-make-sisheng-rules syllable)
+                    sisheng-list)))
+
+    (dolist (syllable sisheng-syllable-table)
+      (setq sisheng-list
+            (append (quail-make-sisheng-rules (upcase-initials syllable))
+                    sisheng-list)))
+
+    (dolist (syllable sisheng-syllable-table)
+      (setq sisheng-list
+            (append (quail-make-sisheng-rules (upcase syllable))
+                    sisheng-list)))
+
+    (eval `(quail-define-rules
+            ,@sisheng-list
+
+            ("lv5" ["lü"])
+            ("lve5" ["lüe"])
+            ("nv5" ["nü"])
+            ("nve5" ["nüe"])
+
+            ("Lv5" ["Lü"])
+            ("Lve5" ["Lüe"])
+            ("Nv5" ["Nü"])
+            ("Nve5" ["Nüe"])
+
+            ("LV5" ["LÜ"])
+            ("LVE5" ["LÜE"])
+            ("NV5" ["NÜ"])
+            ("NVE5" ["NÜE"])))))
 
 ;; Local Variables:
 ;; coding: utf-8