# HG changeset patch
# User Mark A. Hershberger <mah@everybody.org>
# Date 1097172823 0
# Node ID 8f9302e4a35f0019b8a5e2a2ddb071d79a773779
# Parent  3a916158d4c3aa333ddf4d02d616696b4f3f4fcf
2004-10-07  Mark A. Hershberger  <mah@everybody.org>

	* xml.el (xml-substitute-special): Limit handling of external
	entities.

diff -r 3a916158d4c3 -r 8f9302e4a35f lisp/xml.el
--- 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))