diff options
| -rw-r--r-- | lisp/xml.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/xml.el b/lisp/xml.el index f1d8cbb1f00..b0d5d45f98d 100644 --- a/lisp/xml.el +++ b/lisp/xml.el | |||
| @@ -727,14 +727,9 @@ This follows the rule [28] in the XML specifications." | |||
| 727 | (match-string 1 this-part))))))) | 727 | (match-string 1 this-part))))))) |
| 728 | 728 | ||
| 729 | (cond ((null children) | 729 | (cond ((null children) |
| 730 | (if (and (eq (length expansion) 1) | 730 | ;; FIXME: If we have an entity that expands into XML, this won't work. |
| 731 | (stringp (cadr expansion))) | 731 | (setq children |
| 732 | (setq children (concat prev-part expansion)) | 732 | (concat prev-part expansion))) |
| 733 | (if (stringp (car expansion)) | ||
| 734 | (setq children | ||
| 735 | (list (concat prev-part (car expansion)) | ||
| 736 | (append (cdr expansion)))) | ||
| 737 | (setq children (append expansion prev-part))))) | ||
| 738 | ((stringp children) | 733 | ((stringp children) |
| 739 | (if (stringp expansion) | 734 | (if (stringp expansion) |
| 740 | (setq children (concat children prev-part expansion)) | 735 | (setq children (concat children prev-part expansion)) |