diff options
| author | John Paul Wallington | 2004-10-06 06:04:41 +0000 |
|---|---|---|
| committer | John Paul Wallington | 2004-10-06 06:04:41 +0000 |
| commit | 07f7e9aede707c188ec0e88ac3fade20bc3b4725 (patch) | |
| tree | e0e3a9e1318ba832fa46e2949ae81ee163eddddc /lisp/ChangeLog | |
| parent | a13bc06478c95cec007fb8ec18b1ebb929f2a78b (diff) | |
| download | emacs-07f7e9aede707c188ec0e88ac3fade20bc3b4725.tar.gz emacs-07f7e9aede707c188ec0e88ac3fade20bc3b4725.zip | |
(xml-parse-dtd): Fix `error' call.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b8023859204..b5cfa0640e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-10-06 John Paul Wallington <jpw@gnu.org> | ||
| 2 | |||
| 3 | * xml.el (xml-parse-dtd): Fix `error' call. | ||
| 4 | |||
| 1 | 2004-10-05 Mark A. Hershberger <mah@everybody.org> | 5 | 2004-10-05 Mark A. Hershberger <mah@everybody.org> |
| 2 | 6 | ||
| 3 | * xml.el (xml-substitute-special): Return a single string instead | 7 | * xml.el (xml-substitute-special): Return a single string instead |
| @@ -17,7 +21,6 @@ | |||
| 17 | (Info-build-toc): Don't check for special Info file names. | 21 | (Info-build-toc): Don't check for special Info file names. |
| 18 | Set main-file to nil if Info-find-file returns a symbol. | 22 | Set main-file to nil if Info-find-file returns a symbol. |
| 19 | 23 | ||
| 20 | >>>>>>> 1.6421 | ||
| 21 | 2004-10-05 Emilio C. Lopes <eclig@gmx.net>: | 24 | 2004-10-05 Emilio C. Lopes <eclig@gmx.net>: |
| 22 | 25 | ||
| 23 | * calendar/calendar.el (calendar-goto-iso-week): Add autoload. | 26 | * calendar/calendar.el (calendar-goto-iso-week): Add autoload. |