Mercurial > hg > xemacs-beta
changeset 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 | 0142cb4d1049 |
| children | 49480d838d32 e6dec75ded0e |
| files | lisp/ChangeLog lisp/glyphs.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 09 14:55:13 2010 +0000 +++ b/lisp/ChangeLog Sat Jan 09 17:35:51 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-09 Didier Verna <didier@xemacs.org> + + * glyphs.el (init-glyphs): Recognize bitmaps/ directory as + containing bitmap files. + 2010-01-09 Aidan Kehoe <kehoea@parhasard.net> * subr.el (with-trapping-errors):
--- a/lisp/glyphs.el Sat Jan 09 14:55:13 2010 +0000 +++ b/lisp/glyphs.el Sat Jan 09 17:35:51 2010 +0100 @@ -1142,7 +1142,8 @@ (if (featurep 'x) (set-console-type-image-conversion-list 'x `(,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2))) - ("\\.xbm\\'" [xbm :file nil] 2) + ("\\.xbm\\'" [xbm :file nil] 2) + ("/bitmaps/" [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) @@ -1164,6 +1165,7 @@ 'tty '(("\\.xpm\\'" [string :data nil] 2) ("\\.xbm\\'" [string :data nil] 2) + ("/bitmaps/" [string :data nil] 2) ;; #define could also mean a bitmap as well as a version 1 XPM. Who ;; cares. ("^#define" [string :data "[xpm]"])