From 07504ca257745293904bfdfd838b3ef8d0638e11 Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 13 Oct 2003 07:10:09 +0000 Subject: [PATCH] (system-char-database-directory): Use "chise-db" instead of "char-db". - When `char-attribute-list' has optional argument `rehash', use `char-attribute-list' to mount each db files. --- lisp/utf-2000/update-cdb.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/utf-2000/update-cdb.el b/lisp/utf-2000/update-cdb.el index efae357..88c1192 100644 --- a/lisp/utf-2000/update-cdb.el +++ b/lisp/utf-2000/update-cdb.el @@ -37,7 +37,7 @@ (cond ((featurep 'chise) (defvar system-char-database-directory - (expand-file-name "char-db" + (expand-file-name "chise-db" (or exec-directory "../lib-src/"))) @@ -76,13 +76,15 @@ (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)) + (if (>= (function-min-args 'char-attribute-list) 1) + (char-attribute-list 'rehash) + (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))) (dolist (ccs (charset-list)) (reset-charset-mapping-table ccs)) ))) -- 1.7.10.4