* lisp/xml.el: Handle entity and character reference expansion correctly.