From: tomo <tomo>
Date: Wed, 3 Jul 2002 06:05:39 +0000 (+0000)
Subject: Use `mount-char-attribute-table' instead of
X-Git-Tag: r21-2-44-utf-2000-0_19-n11c~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c52533e2b3916f86f43ef6a565f723f2a210ea0c;p=chise%2Fxemacs-chise.git-

Use `mount-char-attribute-table' instead of
`reset-char-attribute-table'; don't reset char-attribute-tables.
---

diff --git a/lisp/utf-2000/update-cdb.el b/lisp/utf-2000/update-cdb.el
index 51b98d2..3eadd0b 100644
--- a/lisp/utf-2000/update-cdb.el
+++ b/lisp/utf-2000/update-cdb.el
@@ -59,8 +59,9 @@
 	  (setq i (1+ i))))
       (concat dest (substring filename base len))))
 
-  (when (or load-ignore-elc-files
-	    (not (file-exists-p system-char-database-directory)))
+  (cond
+   ((or load-ignore-elc-files
+	(not (file-exists-p system-char-database-directory)))
     (if (file-exists-p system-char-database-directory)
 	(delete-file-with-children system-char-database-directory))
 
@@ -72,16 +73,17 @@
       (save-char-attribute-table attribute))
 
     (dolist (ccs (charset-list))
-      (save-charset-mapping-table ccs)))
-
-  (mapcar (lambda (file)
-	    (reset-char-attribute-table
-	     (intern (file-name-char-attribute-name file))))
-	  (directory-files
-	   (expand-file-name "system-char-id"
-			     system-char-database-directory)
-	   nil nil t t))
-  )
+      (save-charset-mapping-table ccs))
+    )
+   (t
+    (mapcar (lambda (file)
+	      (mount-char-attribute-table
+	       (intern (file-name-char-attribute-name file))))
+	    (directory-files
+	     (expand-file-name "system-char-id"
+			       system-char-database-directory)
+	     nil nil t t))
+    )))
  (t
   (load "dumped-chars.el")
   (dolist (file system-char-db-source-file-list)