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

[Mark A . Hershberger]

Index: emacs/lisp/xml.el
diff -c emacs/lisp/xml.el:1.36 emacs/lisp/xml.el:1.37
*** emacs/lisp/xml.el:1.36      Fri Jul  9 14:21:12 2004
--- emacs/lisp/xml.el   Wed Oct  6 00:58:29 2004
***************
*** 727,739 ****
                                (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)
--- 727,739 ----
                                (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)
***************
*** 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.
--- 756,770 ----
      (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.