Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-57

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-594
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-598
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-600
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-602
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-604
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-609
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-610
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49
   Add {arch}/=commit-merge-make-log

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50
   {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes

1 files changed, 11 insertions, 12 deletions

diff --git a/lisp/xml.el b/lisp/xml.el
index 993ef59b276..b0d5d45f98d 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -598,8 +598,8 @@ This follows the rule [28] in the XML specifications."
               nil)
              (t
               (if xml-validating-parser 
-                  error "XML: (Validity) Invalid element type in the DTD")))
-
+                  (error "XML: (Validity) Invalid element type in the DTD"))))
+            
             ;;  rule [45]: the element declaration must be unique
             (if (and (assoc element dtd)
                      xml-validating-parser)
@@ -727,14 +727,9 @@ This follows the rule [28] in the XML specifications."
                                 (match-string 1 this-part)))))))
 
         (cond ((null children)
-               (if (stringp expansion)
-                   (setq children (concat prev-part expansion))
-                 (if (stringp (car (last expansion)))
-                     (progn 
-                            (setq children
-                                  (list (concat prev-part (car expansion))
-                                        (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))
@@ -756,11 +751,15 @@ This follows the rule [28] in the XML specifications."
     (cond ((stringp children)
            (concat children (substring string point)))
           ((stringp (car (last children)))
-           (concat (car children) (substring string point)))
+           (concat (car (last children)) (substring string point)))
           ((null children)
            string)
           (t
-           (nreverse children)))))
+           (concat (mapconcat 'identity
+                              (nreverse children)
+                              "")
+                   (substring string point))))))
+
 ;;*******************************************************************
 ;;**
 ;;**  Printing a tree.