# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1170247531 0
# Node ID c73074a0ea50bcc658bcd3164e927685d9de9ccc
# Parent  36d25325f7ef7198ac03f1affd2684eee3ef9c62
*** empty log message ***

diff -r 36d25325f7ef -r c73074a0ea50 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 31 12:37:29 2007 +0000
+++ b/lisp/ChangeLog	Wed Jan 31 12:45:31 2007 +0000
@@ -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.