From 6c2453e03861069fc1d891ecd8957545a8044bd9 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 12 Apr 2014 15:30:14 -0400
Subject: [PATCH] * lisp/emacs-lisp/cl-lib.el (current-case-table): Remove
 setter. * lisp/leim/quail/sisheng.el (sisheng-list): Use with-case-table.

---
 lisp/ChangeLog             |  5 +++
 lisp/emacs-lisp/cl-lib.el  |  1 -
 lisp/leim/quail/sisheng.el | 70 ++++++++++++++++++--------------------
 lisp/mail/smtpmail.el      |  2 +-
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eebbe986b..5b221ed994 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/cl-lib.el (current-case-table): Remove setter.
+	* leim/quail/sisheng.el (sisheng-list): Use with-case-table.
+
 2014-04-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* international/characters.el <standard-case-table>: Add entries
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 219d76f85d..b9556b06f5 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -625,7 +625,6 @@ If ALIST is non-nil, the new pairs are prepended to it."
   `(insert (prog1 ,store (erase-buffer))))
 (gv-define-simple-setter buffer-substring cl--set-buffer-substring)
 (gv-define-simple-setter current-buffer set-buffer)
-(gv-define-simple-setter current-case-table set-case-table)
 (gv-define-simple-setter current-column move-to-column t)
 (gv-define-simple-setter current-global-map use-global-map t)
 (gv-define-setter current-input-mode (store)
diff --git a/lisp/leim/quail/sisheng.el b/lisp/leim/quail/sisheng.el
index 35a5f41f32..f87204f4db 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
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 54f4664e6d..3440741f57 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -733,7 +733,7 @@ Returns an error if the server cannot be contacted."
 				(plist-get (cdr result) :capabilities)
 				"\r\n")))
 		  (let ((name
-			 (with-case-table ascii-case-table
+			 (with-case-table ascii-case-table ;FIXME: Why?
 			   (mapcar (lambda (s) (intern (downcase s)))
 				   (split-string (substring line 4) "[ ]")))))
 		    (when (= (length name) 1)
-- 
2.20.1