(top-level): Adapt for moved unicode files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b2fe96429bfc0ea32c48b77f6efdc354f4f920f..ec3b5cdd686442689802166306ca59b8afa3cab9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,9 @@
        * Makefile.in (maintainer-clean): Depend on bootstrap-clean to
        delete .elc files.
 
+       * nxml/char-name/unicode: Move to etc/nxml/.
+       * nxml/nxml-uchnm.el (top-level): Adapt for moved unicode files.
+
        * nxml/nxml-enc.el (xmltok-get-declared-encoding-position):
        Declare as a function.
 

diff --git a/lisp/nxml/nxml-uchnm.el b/lisp/nxml/nxml-uchnm.el
index 892a81e04acc58bd9bab1faa280fd2965d1f0be8..9514a7de47624e314d2b5d674397eecf7727e0cb 100644 (file)
--- a/lisp/nxml/nxml-uchnm.el
+++ b/lisp/nxml/nxml-uchnm.el
@@ -203,17 +203,15 @@ by a hyphen."
     mathematical-alphanumeric-symbols)
   "Default value for `nxml-enabled-unicode-blocks'.")
 
-(let ((dir (file-name-directory load-file-name)))
-  (mapc (lambda (block)
-          (let ((sym (nxml-unicode-block-char-name-set (car block))))
-            (nxml-autoload-char-name-set
-             sym
-             (expand-file-name
-              (format "char-name/unicode/%05X-%05X"
-                      (nth 1 block)
-                      (nth 2 block))
-              dir))))
-        nxml-unicode-blocks))
+(mapc (lambda (block)
+        (nxml-autoload-char-name-set
+         (nxml-unicode-block-char-name-set (car block))
+         (expand-file-name
+          (format "nxml/%05X-%05X"
+                  (nth 1 block)
+                  (nth 2 block))
+          data-directory)))
+      nxml-unicode-blocks)
 
 (defvar nxml-enable-unicode-char-name-sets-flag nil)