[Emacs-diffs] Changes to emacs/lisp/xml.el

[Mark A . Hershberger]

Index: emacs/lisp/xml.el
diff -c emacs/lisp/xml.el:1.38 emacs/lisp/xml.el:1.39
*** emacs/lisp/xml.el:1.38      Wed Oct  6 06:03:54 2004
--- emacs/lisp/xml.el   Thu Oct  7 18:13:43 2004
***************
*** 727,740 ****
                                (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)))))
              ((stringp children)
               (if (stringp expansion)
                   (setq children (concat children prev-part expansion))
--- 727,735 ----
                                (match-string 1 this-part)))))))
  
        (cond ((null children)
!              ;; 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))