* lisp/leim/quail/sisheng.el (sisheng-list): Don't bother with-case-table.

* lisp/eshell/em-smart.el (eshell-smart-scroll-window): Use
with-selected-window.

1 files changed, 32 insertions, 33 deletions

diff --git a/lisp/leim/quail/sisheng.el b/lisp/leim/quail/sisheng.el
index f87204f4db4..324188e88e8 100644
--- a/lisp/leim/quail/sisheng.el
+++ b/lisp/leim/quail/sisheng.el
@@ -250,39 +250,38 @@ Example:  nve5    -> nüe
 ;; Call quail-make-sisheng-rules for all syllables in sisheng-syllable-table.
 ;;
 (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"])))))
+  (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