Silence nxml-mode.el compilation.

* lisp/nxml/nxml-mode.el: Require rng-nxml.
(rng-nxml-mode-init, nxml-enable-unicode-char-name-sets):
Remove declarations.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0ecd731fa87ad5c2adcf1079bb00a4a0f7b90a5..f8ef108670af8b66aaa2bcbc70745ce72eb949b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-03  Glenn Morris  <rgm@gnu.org>
 
+       * nxml/nxml-mode.el: Require rng-nxml.
+       (rng-nxml-mode-init, nxml-enable-unicode-char-name-sets):
+       Remove declarations.
+
        * nxml/nxml-mode.el, nxml/nxml-outln.el, nxml/rng-loc.el:
        * nxml/rng-nxml.el, nxml/rng-valid.el:
        Remove leading `*' from defcustom docs.

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index df614741c5333bccf163b969967b68059aeb6498..d1cffdd38a276c89ff92f5ae7f274d00b43ccb0c 100644 (file)
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -38,9 +38,10 @@
 (require 'nxml-util)
 (require 'nxml-rap)
 (require 'nxml-outln)
-
-(declare-function rng-nxml-mode-init "rng-nxml")
-(declare-function nxml-enable-unicode-char-name-sets "nxml-uchnm")
+;; nxml-mode calls rng-nxml-mode-init, which is autoloaded from rng-nxml.
+;; So we might as well just require it and silence the compiler.
+(provide 'nxml-mode)                   ; avoid recursive require
+(require 'rng-nxml)
 
 ;;; Customization