comparison lisp/glyphs.el @ 4818:1360b0c147c1

Handle bitmap files in bitmap directory properly
author Didier Verna <didier@lrde.epita.fr>
date Sat, 09 Jan 2010 17:35:51 +0100
parents 1cecc3e9f0a0
children 308d34e9f07d
comparison
equal deleted inserted replaced
4817:0142cb4d1049 4818:1360b0c147c1
1140 (defun init-glyphs () 1140 (defun init-glyphs ()
1141 ;; initialize default image types 1141 ;; initialize default image types
1142 (if (featurep 'x) 1142 (if (featurep 'x)
1143 (set-console-type-image-conversion-list 'x 1143 (set-console-type-image-conversion-list 'x
1144 `(,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2))) 1144 `(,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2)))
1145 ("\\.xbm\\'" [xbm :file nil] 2) 1145 ("\\.xbm\\'" [xbm :file nil] 2)
1146 ("/bitmaps/" [xbm :file nil] 2)
1146 ,@(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2))) 1147 ,@(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2)))
1147 ,@(if (featurep 'xface) '(("\\`X-Face:" [xface :data nil] 2))) 1148 ,@(if (featurep 'xface) '(("\\`X-Face:" [xface :data nil] 2)))
1148 ,@(if (featurep 'gif) '(("\\.gif\\'" [gif :file nil] 2) 1149 ,@(if (featurep 'gif) '(("\\.gif\\'" [gif :file nil] 2)
1149 ("\\`GIF8[79]" [gif :data nil] 2))) 1150 ("\\`GIF8[79]" [gif :data nil] 2)))
1150 ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [jpeg :file nil] 2))) 1151 ,@(if (featurep 'jpeg) '(("\\.jpe?g\\'" [jpeg :file nil] 2)))
1162 (progn 1163 (progn
1163 (set-console-type-image-conversion-list 1164 (set-console-type-image-conversion-list
1164 'tty 1165 'tty
1165 '(("\\.xpm\\'" [string :data nil] 2) 1166 '(("\\.xpm\\'" [string :data nil] 2)
1166 ("\\.xbm\\'" [string :data nil] 2) 1167 ("\\.xbm\\'" [string :data nil] 2)
1168 ("/bitmaps/" [string :data nil] 2)
1167 ;; #define could also mean a bitmap as well as a version 1 XPM. Who 1169 ;; #define could also mean a bitmap as well as a version 1 XPM. Who
1168 ;; cares. 1170 ;; cares.
1169 ("^#define" [string :data "[xpm]"]) 1171 ("^#define" [string :data "[xpm]"])
1170 ("\\`/\\* XPM \\*/" [string :data "[xpm]"]) 1172 ("\\`/\\* XPM \\*/" [string :data "[xpm]"])
1171 ("\\`X-Face:" [string :data "[xface]"]) 1173 ("\\`X-Face:" [string :data "[xface]"])