Mercurial > emacs
changeset 111802:ec305a5ef324
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 02 Dec 2010 19:13:24 -0800 |
| parents | c06fec785962 |
| children | 6b5648605b51 |
| files | lisp/ChangeLog lisp/nxml/nxml-mode.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 02 19:10:25 2010 -0800 +++ b/lisp/ChangeLog Thu Dec 02 19:13:24 2010 -0800 @@ -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.
--- a/lisp/nxml/nxml-mode.el Thu Dec 02 19:10:25 2010 -0800 +++ b/lisp/nxml/nxml-mode.el Thu Dec 02 19:13:24 2010 -0800 @@ -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