From 9e02db22e898f1ad81b37aaf9c30cb1d269408c7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 28 Nov 2007 04:55:27 +0000 Subject: [PATCH] (top-level): Adapt for moved unicode files. --- lisp/ChangeLog | 3 +++ lisp/nxml/nxml-uchnm.el | 20 +++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b2fe96429b..ec3b5cdd686 100644 --- 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 892a81e04ac..9514a7de476 100644 --- 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) -- 2.39.2