From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 21 May 2007 16:42:52 +0000 (+0000)
Subject: * image.el (image-type-from-file-name, image-type): Simplify.
X-Git-Tag: emacs-pretest-23.0.90~12603
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b447c934c40f3bbbd08ae7ebd8b2fb71e1afbd37;p=emacs.git

* image.el (image-type-from-file-name, image-type): Simplify.
(image-type-auto-detected-p): Don't scan auto-mode-alist.

* files.el (magic-mode-alist): Remove image-type-auto-detected-p.
(magic-fallback-mode-alist): Add image-type-auto-detected-p.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c39de6bd44e..399a12cab97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-21  Chong Yidong  <cyd@stupidchicken.com>
+
+	* image.el (image-type-from-file-name, image-type): Simplify.
+	(image-type-auto-detected-p): Don't scan auto-mode-alist.
+
+	* files.el (magic-mode-alist): Remove image-type-auto-detected-p.
+	(magic-fallback-mode-alist): Add image-type-auto-detected-p.
+
 2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
 
 	* t-mouse.el (t-mouse-mode): Reset t-mouse-mode to nil if there