[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Mark A . Hershberger]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.6421 emacs/lisp/ChangeLog:1.6422
*** emacs/lisp/ChangeLog:1.6421 Tue Oct  5 22:33:40 2004
--- emacs/lisp/ChangeLog        Wed Oct  6 00:48:08 2004
***************
*** 1,3 ****
--- 1,8 ----
+ 2004-10-05  Mark A. Hershberger  <address@hidden>
+ 
+       * xml.el (xml-substitute-special): Return a single string instead
+       of a list of strings if an entity substitution is made.
+ 
  2004-10-05  Ulf Jasper  <address@hidden>
  
        * calendar/icalendar.el: New file.
***************
*** 12,17 ****
--- 17,23 ----
        (Info-build-toc): Don't check for special Info file names.
        Set main-file to nil if Info-find-file returns a symbol.
  
+ >>>>>>> 1.6421
  2004-10-05  Emilio C. Lopes  <address@hidden>:
  
        * calendar/calendar.el (calendar-goto-iso-week): Add autoload.