From: Juri Linkov <juri@jurta.org>
Date: Fri, 28 Aug 2009 23:49:32 +0000 (+0000)
Subject: (image-type-header-regexps): Use only JPEG magic number
X-Git-Tag: emacs-pretest-23.1.90~1616
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d30a05d164446adde5d3c00798b2945891f09df6;p=emacs.git

(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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7a132584ac..0784ea8cc2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):
diff --git a/lisp/image.el b/lisp/image.el
index 076a969a363..92e7560a9ca 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -43,7 +43,7 @@
 static \\(unsigned \\)?char \\1_bits" . xbm)
     ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff)
     ("\\`[\t\n\r ]*%!PS" . postscript)
-    ("\\`\xff\xd8" . (image-jpeg-p . jpeg))
+    ("\\`\xff\xd8" . jpeg)    ; used to be (image-jpeg-p . jpeg)
     (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)")
 	     (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\r\n]*<\\)")))
 	(concat "\\(?:<\\?xml[ \t\r\n]+[^>]*>\\)?[ \t\r\n]*<"