X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fupdate-cdb.el;h=8ee1852b0ecef116c54c27359ad0d141f3122af2;hb=faba88cde376fa590228a38e38974ce5cdec6722;hp=bce7fd1d3c0b3b73e67790e11d0f18ba3bd99d23;hpb=4325dbbcdcdb80daba5f060ef4bb5c19a6beafe3;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/update-cdb.el b/lisp/utf-2000/update-cdb.el
index bce7fd1..8ee1852 100644
--- a/lisp/utf-2000/update-cdb.el
+++ b/lisp/utf-2000/update-cdb.el
@@ -1,6 +1,6 @@
 ;;; update-cdb.el --- Update and/or setup character attribute database
 
-;; Copyright (C) 2002,2003 MORIOKA Tomohiko.
+;; Copyright (C) 2002,2003,2004 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: Character, Database, CHISE, Unicode, UCS-4, MULE.
@@ -38,8 +38,8 @@
  ((featurep 'chise)
   (defvar system-char-database-directory
     (expand-file-name "chise-db"
-		      (or exec-directory
-			  "../lib-src/")))
+		      (or data-directory
+			  "../etc/")))
 
   (defun file-name-char-attribute-name (filename)
     (let ((i 0)
@@ -73,7 +73,17 @@
       (save-char-attribute-table attribute))
 
     (dolist (ccs (charset-list))
+      (and (fboundp 'save-charset-properties)
+	   (save-charset-properties ccs))
       (save-charset-mapping-table ccs))
+
+    (with-temp-buffer
+      (insert
+       (format
+	"(setq next-defined-char-id #x%X)\n"
+	next-defined-char-id))
+      (write-region (point-min)(point-max)
+		    "../lisp/utf-2000/cid-conf.el"))
     )
    (t
     (if (>= (function-max-args 'char-attribute-list) 1)
@@ -87,6 +97,7 @@
 	       nil nil t t)))
     (dolist (ccs (charset-list))
       (reset-charset-mapping-table ccs))
+    (load "../lisp/utf-2000/cid-conf.el")
     )))
  (t
   (load "dumped-chars.el")