# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1177291202 0
# Node ID ce79e069b7983ce6eb3b92f091fe2d18f5d9a9e4
# Parent  d5c29aa724b3788cfae72e68a5f228b83f133324
*** empty log message ***

diff -r d5c29aa724b3 -r ce79e069b798 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 23 00:36:14 2007 +0000
+++ b/lisp/ChangeLog	Mon Apr 23 01:20:02 2007 +0000
@@ -2,6 +2,9 @@
 
 	* button.el (button): Use color for this face on a tty.
 
+	* files.el (magic-mode-alist): Allow for carriage-returns in
+	html-mode entry.
+
 2007-04-22  Richard Stallman  <rms@gnu.org>
 
 	* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):