changeset 75570:c73074a0ea50

*** empty log message ***
author Jason Rumney <jasonr@gnu.org>
date Wed, 31 Jan 2007 12:45:31 +0000
parents 36d25325f7ef
children 3111750977e3
files lisp/ChangeLog
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.