From: Mark A. Hershberger <mah@everybody.org>
Date: Thu, 26 May 2005 14:35:47 +0000 (+0000)
Subject: 2005-05-26  Mark A. Hershberger  <mah@everybody.org>
X-Git-Tag: emacs-pretest-22.0.90~9536
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8ab034e35f9f1acc1ca3f4a2401c67403472b9c;p=emacs.git

2005-05-26  Mark A. Hershberger  <mah@everybody.org>

	* xml.el (xml-substitute-special): Don't die for undefined xml
	entities.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 852de36e6b9..dbd80ea6f38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-26  Mark A. Hershberger  <mah@everybody.org>
+
+	* xml.el (xml-substitute-special): Don't die for undefined xml
+	entities.
+
 2005-05-26  Lute Kamstra  <lute@gnu.org>
 
 	* arc-mode.el (archive-mode):
diff --git a/lisp/xml.el b/lisp/xml.el
index daf5689c18b..f9527a276b1 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -84,6 +84,9 @@
 ;;**
 ;;*******************************************************************
 
+(defconst xml-undefined-entity "?"
+  "What to substitute for undefined entities")
+
 (defvar xml-entity-alist
   '(("lt"   . "<")
     ("gt"   . ">")
@@ -745,9 +748,10 @@ This follows the rule [28] in the XML specifications."
 		    ((eq (length this-part) 0)
 		     (error "XML: (Not Well-Formed) No entity given"))
 		    (t
-		     (when xml-validating-parser
+		     (if xml-validating-parser
 			 (error "XML: (Validity) Undefined entity `%s'"
-				this-part))))))
+				this-part)
+		       xml-undefined-entity)))))
 
 	(cond ((null children)
 	       ;; FIXME: If we have an entity that expands into XML, this won't work.