diff lisp/prim/glyphs.el @ 98:0d2f883870bc r20-1b1

Import from CVS: tag r20-1b1
author cvs
date Mon, 13 Aug 2007 09:13:56 +0200
parents 54cc21c15cbb
children 8619ce7e4c50
line wrap: on
line diff
--- a/lisp/prim/glyphs.el	Mon Aug 13 09:12:43 2007 +0200
+++ b/lisp/prim/glyphs.el	Mon Aug 13 09:13:56 2007 +0200
@@ -599,13 +599,15 @@
        ,@(if (featurep 'xpm) '(("^/\\* XPM \\*/" [xpm :data nil] 2)))
        ,@(if (featurep 'xface) '(("^X-Face:" [xface :data nil] 2)))
        ,@(if (featurep 'gif) '(("\.gif$" [gif :file nil] 2)))
-       ,@(if (featurep 'gif) '(("^GIF87" [gif :data nil] 2)))
+       ,@(if (featurep 'gif) '(("^GIF8[79]" [gif :data nil] 2)))
        ,@(if (featurep 'jpeg) '(("\.jpeg$" [jpeg :file nil] 2)))
        ,@(if (featurep 'jpeg) '(("\.jpg$" [jpeg :file nil] 2)))
        ;; all of the JFIF-format JPEG's that I've seen begin with
        ;; the following.  I have no idea if this is standard.
        ,@(if (featurep 'jpeg) '(("^\377\330\340\000\020JFIF"
 				 [jpeg :data nil] 2)))
+       ,@(if (featurep 'png) '(("\.png$" [png :file nil] 2)))
+       ,@(if (featurep 'png) '(("^\211PNG" [png :data nil] 2)))
        ("" [autodetect :data nil] 2))))
   ;; #### this should really be formatted-string, not string but we
   ;; don't have it implemented yet