(nxml-char-name-ignore-case): Change default value.

(nxml-mode): Call nxml-enable-unicode-char-name-sets directly.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e4c616572e..8732275ee38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,16 @@
 2008-01-11  Jason Rumney  <jasonr@gnu.org>
 
+        * nxml/nxml-uchnm.el (nxml-internal-unicode-char-name-sets-enabled):
+        Rename from nxml-enable-unicode-char-name-sets-flag.
+        (nxml-enable-unicode-char-name-sets-1): Merge into
+        nxml-enable-unicode-char-name-sets.
+        (nxml-enable-unicode-char-name-sets): Don't unconditionally set
+        nxml-char-name-ignore-case here.
+
         * nxml/nxml-mode.el (nxml-mode): Call rng-nxml-mode-init directly.
         Update doc string and commentary.
+        (nxml-char-name-ignore-case): Change default value.
+        (nxml-mode): Call nxml-enable-unicode-char-name-sets directly.
 
 2008-01-11  Martin Rudalics  <rudalics@gmx.at>
 
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index d45c1ded786..53c47810a1d 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -554,6 +554,7 @@ Many aspects this mode can be customized using
     (when nxml-auto-insert-xml-declaration-flag
       (nxml-insert-xml-declaration)))
   (rng-nxml-mode-init)
+  (nxml-enable-unicode-char-name-sets)
   (run-hooks 'nxml-mode-hook))
 
 (defun nxml-degrade (context err)
@@ -2432,7 +2433,7 @@ and attempts to find another possible way to do the markup."
 
 ;;; Character names
 
-(defvar nxml-char-name-ignore-case nil)
+(defvar nxml-char-name-ignore-case t)
 
 (defvar nxml-char-name-alist nil
   "Alist of character names.