[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   07/01/31 12:45:32

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10628
retrieving revision 1.10629
diff -u -b -r1.10628 -r1.10629
--- ChangeLog   31 Jan 2007 12:34:01 -0000      1.10628
+++ ChangeLog   31 Jan 2007 12:45:31 -0000      1.10629
@@ -1,3 +1,12 @@
+2007-01-31  Jason Rumney  <address@hidden>
+
+       * 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  <address@hidden>
 
        * faces.el (color-values): Doc fix.