comparison 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
comparison
equal deleted inserted replaced
59:37115eea810c 60:2e6f5e180fb8
594 594
595 (defun init-glyphs () 595 (defun init-glyphs ()
596 ;; initialize default image types 596 ;; initialize default image types
597 (if (featurep 'x) 597 (if (featurep 'x)
598 (set-console-type-image-conversion-list 'x 598 (set-console-type-image-conversion-list 'x
599 `(,@(if (featurep 'xpm) '(("\.xpm$" [xpm :file nil] 2))) 599 `(,@(if (featurep 'xpm) '(("\\.xpm$\\'" [xpm :file nil] 2)))
600 ,@(if (featurep 'xpm) '(("^/\\* XPM \\*/" [xpm :data nil] 2))) 600 ("\\.xbm\\'" [xbm :file nil] 2)
601 ,@(if (featurep 'xface) '(("^X-Face:" [xface :data nil] 2))) 601 ,@(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2)))
602 ,@(if (featurep 'gif) '(("\.gif$" [gif :file nil] 2))) 602 ,@(if (featurep 'xface) '(("\\`X-Face:" [xface :data nil] 2)))
603 ,@(if (featurep 'gif) '(("^GIF8[79]" [gif :data nil] 2))) 603 ,@(if (featurep 'gif) '(("\\.gif\\'" [gif :file nil] 2)))
604 ,@(if (featurep 'jpeg) '(("\.jpeg$" [jpeg :file nil] 2))) 604 ,@(if (featurep 'gif) '(("\\`GIF8[79]" [gif :data nil] 2)))
605 ,@(if (featurep 'jpeg) '(("\.jpg$" [jpeg :file nil] 2))) 605 ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [jpeg :file nil] 2)))
606 ;; all of the JFIF-format JPEG's that I've seen begin with 606 ;; all of the JFIF-format JPEG's that I've seen begin with
607 ;; the following. I have no idea if this is standard. 607 ;; the following. I have no idea if this is standard.
608 ,@(if (featurep 'jpeg) '(("^\377\330\340\000\020JFIF" 608 ,@(if (featurep 'jpeg) '(("\\`\377\330\377\340\000\020JFIF"
609 [jpeg :data nil] 2))) 609 [jpeg :data nil] 2)))
610 ,@(if (featurep 'png) '(("\.png$" [png :file nil] 2))) 610 ,@(if (featurep 'png) '(("\\.png\\'" [png :file nil] 2)))
611 ,@(if (featurep 'png) '(("^\211PNG" [png :data nil] 2))) 611 ,@(if (featurep 'png) '(("\\`\211PNG" [png :data nil] 2)))
612 ("" [autodetect :data nil] 2)))) 612 ("" [autodetect :data nil] 2))))
613 ;; #### this should really be formatted-string, not string but we 613 ;; #### this should really be formatted-string, not string but we
614 ;; don't have it implemented yet 614 ;; don't have it implemented yet
615 ;; 615 ;;
616 ;; #define could also mean a bitmap as well as a version 1 XPM. Who 616 ;; #define could also mean a bitmap as well as a version 1 XPM. Who