diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-12-19 00:55:56 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-12-19 00:55:56 +0000 |
| commit | f98e3afab8b15b5692ff31d2f2d05396495f405b (patch) | |
| tree | ecfa4e63579641003bfd30dd1a44ff0fb0b20118 | |
| parent | fc5377f779f596ef0d04e39e653467512ad0f556 (diff) | |
| download | emacs-f98e3afab8b15b5692ff31d2f2d05396495f405b.tar.gz | |
(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.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/nxml/rng-loc.el | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 73c2ffce9e5..553c188cbff 100644 --- 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 fd56c4bb903..a385fda9263 100644 --- 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) |