summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-01-11 17:30:52 +0000
committerJason Rumney <jasonr@gnu.org>2008-01-11 17:30:52 +0000
commit669eb5c7eeb6cae1587e8eef6284aad31f59640a (patch)
treefe208deb0f86663803508c7534ce4399a0d3077d
parentb85b660458e1aefb0c84b028234d9c202b2176bc (diff)
downloademacs-669eb5c7eeb6cae1587e8eef6284aad31f59640a.tar.gz
(rng-preferred-prefix-alist): Add some defaults.
(rng-preferred-prefix-alist-default): Remove.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/nxml/rng-nxml.el10
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8732275ee38..3b0c36c0e02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2008-01-11 Jason Rumney <jasonr@gnu.org>
+ * nxml/rng-nxml.el (rng-preferred-prefix-alist): Add some defaults.
+ (rng-preferred-prefix-alist-default): Remove.
+
* nxml/nxml-uchnm.el (nxml-internal-unicode-char-name-sets-enabled):
Rename from nxml-enable-unicode-char-name-sets-flag.
(nxml-enable-unicode-char-name-sets-1): Merge into
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index cb040c96311..a854263752d 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -41,10 +41,12 @@
:type 'boolean
:group 'relax-ng)
-(defvar rng-preferred-prefix-alist-default nil
- "Default value for variable `rng-preferred-prefix-alist'.")
-
-(defcustom rng-preferred-prefix-alist rng-preferred-prefix-alist-default
+(defcustom rng-preferred-prefix-alist
+ '(("http://www.w3.org/1999/XSL/Transform" . "xsl")
+ ("http://www.w3.org/1999/02/22-rdf-syntax-ns#" . "rdf")
+ ("http://www.w3.org/1999/xlink" . "xlink")
+ ("http://www.w3.org/2001/XmlSchema" . "xsd")
+ ("http://www.w3.org/2001/XMLSchema-instance" . "xsi"))
"*Alist of namespaces vs preferred prefixes."
:type '(repeat (cons :tag "With"
(string :tag "this namespace URI")