X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-category.el;h=a7697513cfc6d5857b1cd678e78f515fbf33c15f;hb=170b8b4dc4b57616fbfaf4f99a5758247b74e4a0;hp=254b541f1e6085704a9123e7846a11eb12cc5a43;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-category.el b/lisp/mule/mule-category.el
index 254b541..a769751 100644
--- a/lisp/mule/mule-category.el
+++ b/lisp/mule/mule-category.el
@@ -5,6 +5,7 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
+;; Copyright (C) 2003 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -262,8 +263,10 @@ Each element is a list of a charset, a designator, and maybe a doc string.")
 
 ;;; Setting word boundary.
 
+(unless (featurep 'utf-2000)
 (setq word-combining-categories
       '((?l . ?l)))
+)
 
 (setq word-separating-categories	;  (2-byte character sets)
       '((?A . ?K)			; Alpha numeric - Katakana
@@ -277,8 +280,24 @@ Each element is a list of a charset, a designator, and maybe a doc string.")
 	(?C . ?K)			; Chinese - Katakana
 	))
 
+(when (featurep 'utf-2000)
+  (setq word-separating-categories
+	(list*
+	 '(?l . ?K)			; Latin - Katakana
+	 '(?l . ?C)			; Latin - Chinese
+	 '(?H . ?l)			; Hiragana - Latin
+	 '(?K . ?l)			; Katakana - Latin
+	 '(?C . ?l)			; Chinese - Latin
+	 word-separating-categories)))
+
+
 ;;; At the present, I know Japanese and Chinese text can
 ;;; break line at any point under a restriction of 'kinsoku'.
+;;; #### SJT this needs to be set by language environments and probably should
+;;; be buffer-local---strategy for dealing with this: check all $language.el
+;;; files and also mule-base/$language-utils.el files for variables set;
+;;; these should be made buffer local and some kind of a- or p-list of vars
+;;; to be set for a language environment created. 
 (defvar word-across-newline "\\(\\cj\\|\\cc\\|\\ct\\)"
   "Regular expression of such characters which can be a word across newline.")