Mercurial > hg > xemacs-beta
diff lisp/prim/glyphs.el @ 60:2e6f5e180fb8 r19-16-pre5
Import from CVS: tag r19-16-pre5
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 08:58:59 +0200 |
| parents | c53a95d3c46d |
| children | 131b0175ea99 |
line wrap: on
line diff
--- a/lisp/prim/glyphs.el Mon Aug 13 08:58:38 2007 +0200 +++ b/lisp/prim/glyphs.el Mon Aug 13 08:58:59 2007 +0200 @@ -596,19 +596,19 @@ ;; initialize default image types (if (featurep 'x) (set-console-type-image-conversion-list 'x - `(,@(if (featurep 'xpm) '(("\.xpm$" [xpm :file nil] 2))) - ,@(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) '(("^GIF8[79]" [gif :data nil] 2))) - ,@(if (featurep 'jpeg) '(("\.jpeg$" [jpeg :file nil] 2))) - ,@(if (featurep 'jpeg) '(("\.jpg$" [jpeg :file nil] 2))) + `(,@(if (featurep 'xpm) '(("\\.xpm$\\'" [xpm :file nil] 2))) + ("\\.xbm\\'" [xbm :file nil] 2) + ,@(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) '(("\\`GIF8[79]" [gif :data nil] 2))) + ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [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" + ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF" [jpeg :data nil] 2))) - ,@(if (featurep 'png) '(("\.png$" [png :file nil] 2))) - ,@(if (featurep 'png) '(("^\211PNG" [png :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