aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMark A. Hershberger <[email protected]>2004-10-07 18:13:43 +0000
committerMark A. Hershberger <[email protected]>2004-10-07 18:13:43 +0000
commitf0d494374f2efd77e7c4b8aacc5e9ffedc859471 (patch)
tree9bebf0dea656d235094297d12876afcc7ae2ef93 /lisp
parent8b0d8589d562ed9810e6d6b5a9b33d3a1c86f8fe (diff)
2004-10-07 Mark A. Hershberger <[email protected]>
* xml.el (xml-substitute-special): Limit handling of external entities.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/xml.el11
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/xml.el b/lisp/xml.el
index f1d8cbb1f0..b0d5d45f98 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))