From: Glenn Morris <rgm@gnu.org>
Date: Mon, 23 Apr 2007 01:20:02 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.99~55
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5d0382b4e6e9db656350248d8d7ee1fb46c405d;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed16aa02207..1bb994b754d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):