Rename utf-2000/make-cdbs.el -> utf-2000/update-cdb.el.

diff --git a/lisp/dumped-lisp.el b/lisp/dumped-lisp.el
index 6c9693d..c1e7c50 100644 (file)
--- a/lisp/dumped-lisp.el
+++ b/lisp/dumped-lisp.el
@@ -123,7 +123,7 @@
        ;;;;;;;;;;;;;;;;;; MULE support
        (when-feature mule "mule-conf")
        (when-feature mule "arabic")
-       (when-feature utf-2000 "make-cdbs")
+       (when-feature utf-2000 "update-cdb")
        (when-feature mule "mule-charset")
        (when-feature mule "mule-coding")
        ;; All files after this can have extended characters in them.

diff --git a/lisp/utf-2000/make-cdbs.el b/lisp/utf-2000/make-cdbs.el
deleted file mode 100644 (file)
index 93f46c7..0000000
--- a/lisp/utf-2000/make-cdbs.el
+++ /dev/null
@@ -1,63 +0,0 @@
-(defvar system-char-database-directory
-  (expand-file-name "char-db"
-                   (or exec-directory
-                       "../lib-src/")))
-
-
-(defun delete-file-with-children (filename)
-  (if (file-directory-p filename)
-      (let ((files
-            (directory-files filename 'full "^[^.]" 'so-sort)))
-       (if files
-           (dolist (file files)
-             (delete-file-with-children file)))
-       (remove-directory filename))
-    (delete-file filename)))
-
-(when (or load-ignore-elc-files
-         (not (file-exists-p system-char-database-directory)))
-  (load "dumped-chars.el")
-  (dolist (file system-char-db-source-file-list)
-    (pureload file))
-  
-  ;;(condition-case nil
-  ;; (call-process "rm" nil 0 nil
-  ;;               "-rf" system-char-database-directory)
-  ;;(error (princ (format "Can't delete %s\n"
-  ;;             system-char-database-directory))))
-  (if (file-exists-p system-char-database-directory)
-      (delete-file-with-children system-char-database-directory))
-
-  (dolist (attribute (char-attribute-list))
-    (save-char-attribute-table attribute))
-
-  (dolist (ccs (charset-list))
-    (save-charset-mapping-table ccs)))
-
-(defun file-name-char-attribute-name (filename)
-  (let ((i 0)
-       (base 0)
-       (len (length filename))
-       chr dest)
-    (while (< i len)
-      (if (eq (setq chr (aref filename i)) ?%)
-         (setq dest (concat dest
-                            (substring filename base i)
-                            (char-to-string
-                             (int-char
-                              (string-to-int
-                               (substring filename (1+ i) (+ i 3)) 16))))
-               i (+ i 3)
-               base i)
-       (setq i (1+ i))))
-    (concat dest (substring filename base len))))
-
-(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))
-
-(garbage-collect)

diff --git a/lisp/utf-2000/update-cdb.el b/lisp/utf-2000/update-cdb.el
new file mode 100644 (file)
index 0000000..93f46c7
--- /dev/null
+++ b/lisp/utf-2000/update-cdb.el
@@ -0,0 +1,63 @@
+(defvar system-char-database-directory
+  (expand-file-name "char-db"
+                   (or exec-directory
+                       "../lib-src/")))
+
+
+(defun delete-file-with-children (filename)
+  (if (file-directory-p filename)
+      (let ((files
+            (directory-files filename 'full "^[^.]" 'so-sort)))
+       (if files
+           (dolist (file files)
+             (delete-file-with-children file)))
+       (remove-directory filename))
+    (delete-file filename)))
+
+(when (or load-ignore-elc-files
+         (not (file-exists-p system-char-database-directory)))
+  (load "dumped-chars.el")
+  (dolist (file system-char-db-source-file-list)
+    (pureload file))
+  
+  ;;(condition-case nil
+  ;; (call-process "rm" nil 0 nil
+  ;;               "-rf" system-char-database-directory)
+  ;;(error (princ (format "Can't delete %s\n"
+  ;;             system-char-database-directory))))
+  (if (file-exists-p system-char-database-directory)
+      (delete-file-with-children system-char-database-directory))
+
+  (dolist (attribute (char-attribute-list))
+    (save-char-attribute-table attribute))
+
+  (dolist (ccs (charset-list))
+    (save-charset-mapping-table ccs)))
+
+(defun file-name-char-attribute-name (filename)
+  (let ((i 0)
+       (base 0)
+       (len (length filename))
+       chr dest)
+    (while (< i len)
+      (if (eq (setq chr (aref filename i)) ?%)
+         (setq dest (concat dest
+                            (substring filename base i)
+                            (char-to-string
+                             (int-char
+                              (string-to-int
+                               (substring filename (1+ i) (+ i 3)) 16))))
+               i (+ i 3)
+               base i)
+       (setq i (1+ i))))
+    (concat dest (substring filename base len))))
+
+(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))
+
+(garbage-collect)