# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1251503372 0
# Node ID 669c6df8c8b9d5097df1ac2f84a4db8057e7a15c
# Parent  d3d94e3313862fcc07651991bd474f3a8939aae6
*** empty log message ***

diff -r d3d94e331386 -r 669c6df8c8b9 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 28 23:49:11 2009 +0000
+++ b/lisp/ChangeLog	Fri Aug 28 23:49:32 2009 +0000
@@ -1,3 +1,12 @@
+2009-08-28  Juri Linkov  <juri@jurta.org>
+
+	* files.el (magic-fallback-mode-alist): Add ZIP magic number
+	associated with `archive-mode'.
+
+	* image.el (image-type-header-regexps): Use only JPEG magic number
+	to determine JPEG images, and don't use `image-jpeg-p' because
+	Emacs can display non-JFIF non-Exif JPEG images.
+
 2009-08-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* arc-mode.el (archive-mode):