From: tomo <tomo>
Date: Fri, 10 Aug 2001 11:47:52 +0000 (+0000)
Subject: (char-db-insert-char-spec): Don't use `ucs' for private area of BMP;
X-Git-Tag: r21-2-38-utf-2000-0_17-1~26
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfba06c420667ee96178bd4489be43c14e679dfd;p=chise%2Fxemacs-chise.git-

(char-db-insert-char-spec): Don't use `ucs' for private area of BMP;
use `chinese-big5-cdp' if it is defined; use `find-char' instead of
`define-char'.
(char-db-insert-alist): Use `find-char' instead of `define-char'.
(insert-char-attributes): Likewise.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index caf3da7..def4915 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -122,7 +122,11 @@
   (let (char-spec ret al cal key)
     (cond ((characterp char)
 	   (cond ((setq ret (get-char-attribute char 'ucs))
-		  (setq char-spec (list (cons 'ucs ret)))
+		  (unless (and (<= #xE000 ret)(<= ret #xF8FF))
+		    (setq char-spec (list (cons 'ucs ret))))
+		  (if (setq ret (get-char-attribute char 'chinese-big5-cdp))
+		      (setq char-spec (cons (cons 'chinese-big5-cdp ret)
+					    char-spec)))
 		  (if (setq ret (get-char-attribute char 'name))
 		      (setq char-spec (cons (cons 'name ret) char-spec)))
 		  )
@@ -140,7 +144,7 @@
 	   (setq char nil)))
     (if (or char
 	    (setq char (condition-case nil
-			   (define-char char-spec)
+			   (find-char char-spec)
 			 (error nil))))
 	(progn
 	  (setq al nil
@@ -171,7 +175,7 @@
       (cond ((eq name 'char)
 	     (insert "(char . ")
 	     (if (setq ret (condition-case nil
-			       (define-char value)
+			       (find-char value)
 			     (error nil)))
 		 (progn
 		   (setq al nil
@@ -196,7 +200,7 @@
 	       (if (and (consp cell)
 			(consp (car cell))
 			(setq ret (condition-case nil
-				      (define-char cell)
+				      (find-char cell)
 				    (error nil)))
 			)
 		   (progn
@@ -673,7 +677,7 @@
 		   (if (and (consp cell)
 			    (consp (car cell))
 			    (setq ret (condition-case nil
-					  (define-char cell)
+					  (find-char cell)
 					(error nil))))
 		       (progn
 			 (setq rest cell