# HG changeset patch
# User youngs
# Date 1028307265 0
# Node ID c10d0c3f965f2456c56d82f9678f360476eca87c
# Parent  93e076dd78259e18b0ac6bf143a18cf66f4dd340
[xemacs-hg @ 2002-08-02 16:54:11 by youngs]
2002-05-29  Katsumi Yamaoka  <yamaoka@jpl.org>

	* mule/japan-util.el (setup-japanese-environment-internal): Use
	proper coding-systems.

2002-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>

	* mule/japan-util.el: Use `characterp' instead of `integerp' while
	defining char properties for katakana.

	* mule/mule-category.el: Clear the category table before defining
	categories for `predefined-category-list'.

	* mule/mule-cmds.el (finish-set-language-environment): Fit the
	charsets preferences in unicode conversions for the language
	environment.  Suggested by ARISAWA Akihiro <ari@mbf.sphere.ne.jp>.

diff -r 93e076dd7825 -r c10d0c3f965f lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 02 15:35:54 2002 +0000
+++ b/lisp/ChangeLog	Fri Aug 02 16:54:25 2002 +0000
@@ -1,3 +1,20 @@
+2002-05-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mule/japan-util.el (setup-japanese-environment-internal): Use
+	proper coding-systems.
+
+2002-05-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mule/japan-util.el: Use `characterp' instead of `integerp' while
+	defining char properties for katakana.
+
+	* mule/mule-category.el: Clear the category table before defining
+	categories for `predefined-category-list'.
+
+	* mule/mule-cmds.el (finish-set-language-environment): Fit the
+	charsets preferences in unicode conversions for the language
+	environment.  Suggested by ARISAWA Akihiro <ari@mbf.sphere.ne.jp>.
+
 2002-08-02  Ville Skyttä  <ville.skytta@xemacs.org>
 
 	* font-lock.el: Some faces and doc typo fixes from GNU Emacs.
diff -r 93e076dd7825 -r c10d0c3f965f lisp/mule/japan-util.el
--- a/lisp/mule/japan-util.el	Fri Aug 02 15:35:54 2002 +0000
+++ b/lisp/mule/japan-util.el	Fri Aug 02 16:54:25 2002 +0000
@@ -35,9 +35,9 @@
 ;;;###autoload
 (defun setup-japanese-environment-internal ()
   (cond ((eq system-type 'ms-dos)
-	 (prefer-coding-system 'japanese-shift-jis))
+	 (prefer-coding-system 'shift_jis))
 	((eq system-type 'usg-unix-v)
-	 (prefer-coding-system 'japanese-iso-8bit)))
+	 (prefer-coding-system 'euc-jp)))
   (setq sentence-end-save sentence-end)
   (setq sentence-end (concat sentence-end "\\|[$B!#!)!*(B]")))
 
@@ -89,7 +89,7 @@
 			 (get-char-code-property hira 'kana-composition)))))
 	  (put-char-code-property hiragana 'katakana katakana)
 	  (put-char-code-property hiragana 'jisx0201 jisx0201)))
-    (when (integerp katakana)
+    (when (characterp katakana)
       (put-char-code-property katakana 'hiragana hiragana)
       (put-char-code-property katakana 'jisx0201 jisx0201))
     (if jisx0201
diff -r 93e076dd7825 -r c10d0c3f965f lisp/mule/mule-category.el
--- a/lisp/mule/mule-category.el	Fri Aug 02 15:35:54 2002 +0000
+++ b/lisp/mule/mule-category.el	Fri Aug 02 16:54:25 2002 +0000
@@ -266,7 +266,7 @@
     (if (and (nth 2 (car l))
 	     (not (defined-category-p (nth 2 (car l)))))
 	(define-category (nth 1 (car l)) (nth 2 (car l))))
-    (modify-category-entry (car (car l)) (nth 1 (car l)))
+    (modify-category-entry (car (car l)) (nth 1 (car l)) nil t)
     (setq l (cdr l))))
 
 ;;; Setting word boundary.
diff -r 93e076dd7825 -r c10d0c3f965f lisp/mule/mule-cmds.el
--- a/lisp/mule/mule-cmds.el	Fri Aug 02 15:35:54 2002 +0000
+++ b/lisp/mule/mule-cmds.el	Fri Aug 02 16:54:25 2002 +0000
@@ -753,6 +753,11 @@
   (let ((func (get-language-info language-name 'setup-function)))
     (if (fboundp func)
 	(funcall func)))
+
+  ;; Fit the charsets preferences in unicode conversions for the
+  ;; language environment.
+  (set-language-unicode-precedence-list (charset-list))
+
   (run-hooks 'set-language-environment-hook)
   (force-mode-line-update t))