aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2008-01-11 17:30:52 +0000
committerJason Rumney2008-01-11 17:30:52 +0000
commit669eb5c7eeb6cae1587e8eef6284aad31f59640a (patch)
treefe208deb0f86663803508c7534ce4399a0d3077d
parentb85b660458e1aefb0c84b028234d9c202b2176bc (diff)
downloademacs-669eb5c7eeb6cae1587e8eef6284aad31f59640a.tar.gz
emacs-669eb5c7eeb6cae1587e8eef6284aad31f59640a.zip
(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 @@
12008-01-11 Jason Rumney <jasonr@gnu.org> 12008-01-11 Jason Rumney <jasonr@gnu.org>
2 2
3 * nxml/rng-nxml.el (rng-preferred-prefix-alist): Add some defaults.
4 (rng-preferred-prefix-alist-default): Remove.
5
3 * nxml/nxml-uchnm.el (nxml-internal-unicode-char-name-sets-enabled): 6 * nxml/nxml-uchnm.el (nxml-internal-unicode-char-name-sets-enabled):
4 Rename from nxml-enable-unicode-char-name-sets-flag. 7 Rename from nxml-enable-unicode-char-name-sets-flag.
5 (nxml-enable-unicode-char-name-sets-1): Merge into 8 (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 @@
41 :type 'boolean 41 :type 'boolean
42 :group 'relax-ng) 42 :group 'relax-ng)
43 43
44(defvar rng-preferred-prefix-alist-default nil 44(defcustom rng-preferred-prefix-alist
45 "Default value for variable `rng-preferred-prefix-alist'.") 45 '(("http://www.w3.org/1999/XSL/Transform" . "xsl")
46 46 ("http://www.w3.org/1999/02/22-rdf-syntax-ns#" . "rdf")
47(defcustom rng-preferred-prefix-alist rng-preferred-prefix-alist-default 47 ("http://www.w3.org/1999/xlink" . "xlink")
48 ("http://www.w3.org/2001/XmlSchema" . "xsd")
49 ("http://www.w3.org/2001/XMLSchema-instance" . "xsi"))
48 "*Alist of namespaces vs preferred prefixes." 50 "*Alist of namespaces vs preferred prefixes."
49 :type '(repeat (cons :tag "With" 51 :type '(repeat (cons :tag "With"
50 (string :tag "this namespace URI") 52 (string :tag "this namespace URI")