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

[Miles Bader]

Index: emacs/lisp/xml.el
diff -c emacs/lisp/xml.el:1.10.2.9 emacs/lisp/xml.el:1.10.2.10
*** emacs/lisp/xml.el:1.10.2.9  Sat Jul 17 02:49:47 2004
--- emacs/lisp/xml.el   Mon Oct 25 04:19:40 2004
***************
*** 598,605 ****
              nil)
             (t
              (if xml-validating-parser 
!                 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)
--- 598,605 ----
              nil)
             (t
              (if xml-validating-parser 
!                 (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,740 ****
                                (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)))))
              ((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))
***************
*** 756,766 ****
      (cond ((stringp children)
           (concat children (substring string point)))
          ((stringp (car (last children)))
!          (concat (car children) (substring string point)))
          ((null children)
           string)
          (t
!          (nreverse children)))))
  ;;*******************************************************************
  ;;**
  ;;**  Printing a tree.
--- 751,765 ----
      (cond ((stringp children)
           (concat children (substring string point)))
          ((stringp (car (last children)))
!          (concat (car (last children)) (substring string point)))
          ((null children)
           string)
          (t
!          (concat (mapconcat 'identity
!                             (nreverse children)
!                             "")
!                  (substring string point))))))
! 
  ;;*******************************************************************
  ;;**
  ;;**  Printing a tree.