From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Dec 2010 03:13:24 +0000 (-0800)
Subject: Silence nxml-mode.el compilation.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=afe272389b0f7ecc92e79dabb91e444c7462a10a;p=emacs.git

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 f0ecd731fa8..f8ef108670a 100644
--- 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 df614741c53..d1cffdd38a2 100644
--- 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