(Previous off-list reply said I had already checked in a fix for
this.  I was wrong.)

Katsumi Yamaoka <yamaoka@jpl.org> writes:

> (xml-substitute-special "The chief of Guinea-Bissau's army is killed
> by rebel soldiers in what is described as a &quot;revolt&quot; over
> unpaid wages.")

The following patch backs out some changes I made to deal with xml
entities that expand into XML.  It should fix the problem till I can
get external entities to work.

--- xml.el	05 Oct 2004 20:48:38 -0400	1.37
+++ xml.el	07 Oct 2004 13:49:45 -0400	
@@ -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))
+	       ;; FIXME: If we have an entity that expands into XML, this won't work.
 		     (setq children
-			   (list (concat prev-part (car expansion))
-				 (append (cdr expansion))))
-		   (setq children (append expansion prev-part)))))
+		     (concat prev-part expansion)))
 	      ((stringp children)
 	       (if (stringp expansion)
 		   (setq children (concat children prev-part expansion))

-- 
A choice between one man and a shovel, or a dozen men with teaspoons
is clear to me, and I'm sure it is clear to you also.
    -- Zimran Ahmed <http://www.winterspeak.com/>