aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-12-02 19:13:24 -0800
committerGlenn Morris2010-12-02 19:13:24 -0800
commitafe272389b0f7ecc92e79dabb91e444c7462a10a (patch)
tree242bf150ffdc4570c315cb1f860cf2ccbbb2bd15
parent65beee52435bba0a8789f0589978a3291f734f54 (diff)
downloademacs-afe272389b0f7ecc92e79dabb91e444c7462a10a.tar.gz
emacs-afe272389b0f7ecc92e79dabb91e444c7462a10a.zip
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.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/nxml/nxml-mode.el7
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0ecd731fa8..f8ef108670a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12010-12-03 Glenn Morris <rgm@gnu.org> 12010-12-03 Glenn Morris <rgm@gnu.org>
2 2
3 * nxml/nxml-mode.el: Require rng-nxml.
4 (rng-nxml-mode-init, nxml-enable-unicode-char-name-sets):
5 Remove declarations.
6
3 * nxml/nxml-mode.el, nxml/nxml-outln.el, nxml/rng-loc.el: 7 * nxml/nxml-mode.el, nxml/nxml-outln.el, nxml/rng-loc.el:
4 * nxml/rng-nxml.el, nxml/rng-valid.el: 8 * nxml/rng-nxml.el, nxml/rng-valid.el:
5 Remove leading `*' from defcustom docs. 9 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 @@
38(require 'nxml-util) 38(require 'nxml-util)
39(require 'nxml-rap) 39(require 'nxml-rap)
40(require 'nxml-outln) 40(require 'nxml-outln)
41 41;; nxml-mode calls rng-nxml-mode-init, which is autoloaded from rng-nxml.
42(declare-function rng-nxml-mode-init "rng-nxml") 42;; So we might as well just require it and silence the compiler.
43(declare-function nxml-enable-unicode-char-name-sets "nxml-uchnm") 43(provide 'nxml-mode) ; avoid recursive require
44(require 'rng-nxml)
44 45
45;;; Customization 46;;; Customization
46 47