From f0d494374f2efd77e7c4b8aacc5e9ffedc859471 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Thu, 7 Oct 2004 18:13:43 +0000 Subject: [PATCH] 2004-10-07 Mark A. Hershberger * xml.el (xml-substitute-special): Limit handling of external entities. --- lisp/xml.el | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lisp/xml.el b/lisp/xml.el index f1d8cbb1f00..b0d5d45f98d 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -727,14 +727,9 @@ This follows the rule [28] in the XML specifications." (match-string 1 this-part))))))) (cond ((null children) - (if (and (eq (length expansion) 1) - (stringp (cadr expansion))) - (setq children (concat prev-part expansion)) - (if (stringp (car expansion)) - (setq children - (list (concat prev-part (car expansion)) - (append (cdr expansion)))) - (setq children (append expansion prev-part))))) + ;; FIXME: If we have an entity that expands into XML, this won't work. + (setq children + (concat prev-part expansion))) ((stringp children) (if (stringp expansion) (setq children (concat children prev-part expansion)) -- 2.39.5