From f8ab034e35f9f1acc1ca3f4a2401c67403472b9c Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Thu, 26 May 2005 14:35:47 +0000 Subject: [PATCH] 2005-05-26 Mark A. Hershberger * xml.el (xml-substitute-special): Don't die for undefined xml entities. --- lisp/ChangeLog | 5 +++++ lisp/xml.el | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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 + + * xml.el (xml-substitute-special): Don't die for undefined xml + entities. + 2005-05-26 Lute Kamstra * 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. -- 2.11.4.GIT