From 28ed185c9a185f7f9c28d6d8317efbaf466c3ab4 Mon Sep 17 00:00:00 2001
From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 31 Jan 2007 12:45:31 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8deacbb1957..3d6f2e235fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-31  Jason Rumney  <jasonr@gnu.org>
+
+	* files.el (magic-mode-alist): Use image-mode-maybe rather than
+	image-mode.
+
+	* image-mode.el (image-mode-maybe): Prevent magic-mode-alist from
+	interfering with attempt to set major mode from modified
+	auto-mode-alist.
+
 2007-01-31  Juanma Barranquero  <lekktu@gmail.com>
 
 	* faces.el (color-values): Doc fix.
-- 
2.39.2