(rng-schema-locating-files-default)

(rng-schema-locating-file-schema-file): Use files in etc/schemas.
(rng-schema-loader-alist): Use rng-c-load-schema to load rnc files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73c2ffce9e51b51f6b896e3b142abd6dbff7797e..553c188cbff9f616449013f7c8aada2c7dc3ba01 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-19  Jason Rumney  <jasonr@gnu.org>
+
+       * nxml/rng-maint.el (rng-update-autoloads, rng-byte-compile-load)
+       (rng-format-manual, rng-write-version): Do not autoload.
+
+       * nxml/rng-loc.el (rng-schema-locating-files-default)
+       (rng-schema-locating-file-schema-file): Use files in etc/schemas.
+       (rng-schema-loader-alist): Use rng-c-load-schema to load rnc files.
+
 2007-12-18  Michael Albinus  <michael.albinus@gmx.de>
 
        * files.el (cd-absolute): Set `list-buffers-directory' in order to

diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index fd56c4bb90315afb3c6ca87429ecca00e6d8272a..a385fda926392d4814c3063993ec2ec2807da5a6 100644 (file)
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -38,10 +38,12 @@
 Nil if using a vacuous schema.")
 (make-variable-buffer-local 'rng-current-schema-file-name)
 
-(defvar rng-schema-locating-files-default nil
+(defvar rng-schema-locating-files-default
+  (list (expand-file-name "schema/schemas.xml" data-directory))
   "Default value for variable `rng-schema-locating-files'.")
 
-(defvar rng-schema-locating-file-schema-file nil
+(defvar rng-schema-locating-file-schema-file
+  (list (expand-file-name "schema/locate.rnc" data-directory))
   "File containing schema for schema locating files.")
 
 (defvar rng-schema-locating-file-schema nil
@@ -52,7 +54,7 @@ Nil if using a vacuous schema.")
   :type '(repeat file)
   :group 'relax-ng)
 
-(defvar rng-schema-loader-alist nil
+(defvar rng-schema-loader-alist '(("rnc" . rng-c-load-schema))
   "Alist of schema extensions vs schema loader functions.")
 
 (defvar rng-cached-document-element nil)