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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/02/09 16:49:30

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10668
retrieving revision 1.10669
diff -u -b -r1.10668 -r1.10669
--- ChangeLog   9 Feb 2007 16:23:12 -0000       1.10668
+++ ChangeLog   9 Feb 2007 16:49:29 -0000       1.10669
@@ -1,3 +1,14 @@
+2007-02-09  Chong Yidong  <address@hidden>
+
+       * image-mode.el (image-mode): Revert 2007-01-30 changes.
+
+       * image.el (image-type-auto-detectable): Don't autodetect x[pb]m.
+       (image-type-auto-detected-p): Fail if another match is found in
+       auto-mode-alist.
+
+       * files.el (magic-mode-alist): Call image-mode instead of
+       image-mode-maybe for autodetected images.
+
 2007-02-09  Juanma Barranquero  <address@hidden>
 
        * mail/smtpmail.el (smtpmail-smtp-service, smtpmail-queue-index-file):