From: Jason Rumney <jasonr@gnu.org>
Date: Fri, 11 Jan 2008 15:12:17 +0000 (+0000)
Subject: (nxml-mode): Call rng-nxml-mode-init directly.
X-Git-Tag: emacs-pretest-23.0.90~8597
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bd1e22385435e770354764e3c45ee4bac1215fe;p=emacs.git

(nxml-mode): Call rng-nxml-mode-init directly.
Update doc string and commentary.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8836078458..7e4c616572e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-11  Jason Rumney  <jasonr@gnu.org>
+
+	* nxml/nxml-mode.el (nxml-mode): Call rng-nxml-mode-init directly.
+	Update doc string and commentary.
+
 2008-01-11  Martin Rudalics  <rudalics@gmx.at>
 
 	* cus-start.el (all): Add missing version entries.
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 824d52a0102..d45c1ded786 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;; To use this include rng-auto.el in your .emacs.
-
 ;; See nxml-rap.el for description of parsing strategy.
 
 ;; The font locking here is independent of font-lock.el.  We want to
@@ -479,9 +477,9 @@ instead of C-c.
 Validation is provided by the related minor-mode `rng-validate-mode'.
 This also makes completion schema- and context- sensitive.  Element
 names, attribute names, attribute values and namespace URIs can all be
-completed. By default, `rng-validate-mode' is automatically enabled by
-`rng-nxml-mode-init' which is normally added to `nxml-mode-hook'. You
-can toggle it using \\[rng-validate-mode].
+completed. By default, `rng-validate-mode' is automatically enabled. You
+can toggle it using \\[rng-validate-mode] or change the default by
+customizing `rng-nxml-auto-validate-flag'.
 
 \\[indent-for-tab-command] indents the current line appropriately.
 This can be customized using the variable `nxml-child-indent'
@@ -555,6 +553,7 @@ Many aspects this mode can be customized using
       (setq buffer-file-coding-system nxml-default-buffer-file-coding-system))
     (when nxml-auto-insert-xml-declaration-flag
       (nxml-insert-xml-declaration)))
+  (rng-nxml-mode-init)
   (run-hooks 'nxml-mode-hook))
 
 (defun nxml-degrade (context err)