X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2Fupdate-cdb.el;h=8ee1852b0ecef116c54c27359ad0d141f3122af2;hb=af08411166821c8a07e6779d98dbae2d46bcb68c;hp=487eb67e51978b53a167d27f9f15b77675708c40;hpb=afcdd5c84572e7505a4cae7255c8c434d4b57406;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/update-cdb.el b/lisp/utf-2000/update-cdb.el
index 487eb67..8ee1852 100644
--- a/lisp/utf-2000/update-cdb.el
+++ b/lisp/utf-2000/update-cdb.el
@@ -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,6 +73,8 @@
       (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