CVS update by aidan packages/mule-packages/mule-base ...

  User: aidan   
  Date: 09/09/11 18:50:54

  Modified:    packages/mule-packages/mule-base ChangeLog japan-util.el
Log:
Don't assume the current device is X11 if it's a window system, japan-util.el

Revision  Changes    Path
1.69      +7 -0      XEmacs/packages/mule-packages/mule-base/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- ChangeLog	2009/09/02 10:54:19	1.68
+++ ChangeLog	2009/09/11 16:50:52	1.69
@@ -1,3 +1,10 @@
+2009-09-11  Aidan Kehoe  <[email protected]>
+
+	* japan-util.el (setup-japanese-environment-internal): 
+	Don't check whether the current console--which may be mswindows or
+	something else--provides the X11 keysym `kana_A', rather call
+	#'kana-keyboard-define-keys if we have X11 support at all.
+
 2009-09-02  Norbert Koch  <[email protected]>
 
 	* Makefile (VERSION): XEmacs package 1.54 released.



1.8       +1 -4      XEmacs/packages/mule-packages/mule-base/japan-util.el

Index: japan-util.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/mule-base/japan-util.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- japan-util.el	2003/05/08 16:47:27	1.7
+++ japan-util.el	2009/09/11 16:50:53	1.8
@@ -40,10 +40,7 @@
     (setq default-file-name-coding-system 'euc-jp))
   (setq sentence-end-save sentence-end)
   (setq sentence-end (concat sentence-end "\\|[$B!#!)!*(B]"))
-
-  (when (and (fboundp 'x-keysym-on-keyboard-p)
-	     (console-on-window-system-p)
-	     (x-keysym-on-keyboard-p 'kana_A))
+  (when (memq 'x (device-type-list))
     (kana-keyboard-define-keys)))
 
 (defun exit-japanese-environment ()