--- a/lisp/ChangeLog	Sat Oct 18 21:20:42 2014 +0900
+++ b/lisp/ChangeLog	Sat Oct 18 23:21:30 2014 +0900
@@ -1,3 +1,9 @@
+2014-10-11  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* mule/korea-util.el (korean-key-bindings): 
+	* mule/ethio-util.el (setup-ethiopic-environment-internal):
+	Change invalid GNU-style key definitions to XEmacs format.
+
 2014-10-07  Jerry James  <james@xemacs.org>
 
 	* code-process.el (network-stream-get-response):

--- a/lisp/mule/ethio-util.el	Sat Oct 18 21:20:42 2014 +0900
+++ b/lisp/mule/ethio-util.el	Sat Oct 18 23:21:30 2014 +0900
@@ -39,12 +39,14 @@
 ;;;###autoload
 (defun setup-ethiopic-environment-internal ()
   (let ((key-bindings '((" " . ethio-insert-space)
-			([?\S- ] . ethio-insert-ethio-space)
-			([?\C-'] . ethio-gemination)
+			([(shift space)] . ethio-insert-ethio-space)
+			([(control ?\')] . ethio-gemination)
 
 			;; these old bindings conflict
 			;; with Emacs' binding policy
 
+			;; These are GNU-style bindings that fail in XEmacs
+			;; but I didn't feel like fixing them
 			;; ([f2] . ethio-toggle-space)
 			;; ([S-f2] . ethio-replace-space) ; as requested
 			;; ([f3] . ethio-toggle-punctuation)
@@ -61,17 +63,17 @@
 			;; this is the rewritten bindings
 
 			([f3] . ethio-fidel-to-sera-buffer)
-			([S-f3] . ethio-fidel-to-sera-region)
-			([C-f3] . ethio-fidel-to-sera-mail-or-marker)
+			([(shift f3)] . ethio-fidel-to-sera-region)
+			([(control f3)] . ethio-fidel-to-sera-mail-or-marker)
 			([f4] . ethio-sera-to-fidel-buffer)
-			([S-f4] . ethio-sera-to-fidel-region)
-			([C-f4] . ethio-sera-to-fidel-mail-or-marker)
-			([S-f5] . ethio-toggle-punctuation)
-			([S-f6] . ethio-modify-vowel)
-			([S-f7] . ethio-replace-space)
-			([S-f8] . ethio-input-special-character)
-			([C-f9] . ethio-toggle-space)
-			([S-f9] . ethio-replace-space) ; as requested
+			([(shift f4)] . ethio-sera-to-fidel-region)
+			([(control f4)] . ethio-sera-to-fidel-mail-or-marker)
+			([(shift f5)] . ethio-toggle-punctuation)
+			([(shift f6)] . ethio-modify-vowel)
+			([(shift f7)] . ethio-replace-space)
+			([(shift f8)] . ethio-input-special-character)
+			([(control f9)] . ethio-toggle-space)
+			([(shift f9)] . ethio-replace-space) ; as requested
 			))
 	kb)
     (while key-bindings

--- a/lisp/mule/korea-util.el	Sat Oct 18 21:20:42 2014 +0900
+++ b/lisp/mule/korea-util.el	Sat Oct 18 23:21:30 2014 +0900
@@ -97,11 +97,11 @@
 
 ;; Information for setting and exiting Korean environment.
 (defvar korean-key-bindings
-  `((global [?\S- ] toggle-korean-input-method nil)
-    (global [C-f9] quail-hangul-switch-symbol-ksc nil)
+  `((global [(shift space)] toggle-korean-input-method nil)
+    (global [(control f9)] quail-hangul-switch-symbol-ksc nil)
     (global [f9]  quail-hangul-switch-hanja nil)
-    (,isearch-mode-map [?\S- ] isearch-toggle-korean-input-method nil)
-    (,isearch-mode-map [C-f9] isearch-hangul-switch-symbol-ksc nil)
+    (,isearch-mode-map [(shift space)] isearch-toggle-korean-input-method nil)
+    (,isearch-mode-map [(control f9)] isearch-hangul-switch-symbol-ksc nil)
     (,isearch-mode-map [f9] isearch-hangul-switch-hanja nil)))
 
 ;;;###autoload