Mercurial > emacs
changeset 57367:8f9302e4a35f
2004-10-07 Mark A. Hershberger <mah@everybody.org>
* xml.el (xml-substitute-special): Limit handling of external
entities.
author | Mark A. Hershberger <mah@everybody.org> |
---|---|
date | Thu, 07 Oct 2004 18:13:43 +0000 |
parents | 3a916158d4c3 |
children | 835cdd5d000f |
files | lisp/xml.el |
diffstat | 1 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/xml.el Thu Oct 07 18:07:53 2004 +0000 +++ b/lisp/xml.el Thu Oct 07 18:13:43 2004 +0000 @@ -727,14 +727,9 @@ (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))