Mercurial > emacs
changeset 99876:e8248a7b666d
(image-type-header-regexps): Recognize more xbm format
variants.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Mon, 24 Nov 2008 17:21:57 +0000 |
| parents | 3658bfd115cd |
| children | d13d7b16a3d5 |
| files | lisp/ChangeLog lisp/image.el |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Nov 24 16:30:14 2008 +0000 +++ b/lisp/ChangeLog Mon Nov 24 17:21:57 2008 +0000 @@ -1,3 +1,8 @@ +2008-11-24 Andreas Schwab <schwab@suse.de> + + * image.el (image-type-header-regexps): Recognize more xbm format + variants. + 2008-11-24 Juanma Barranquero <lekktu@gmail.com> * textmodes/artist.el (artist-charlist-to-string): Simplify.
--- a/lisp/image.el Mon Nov 24 16:30:14 2008 +0000 +++ b/lisp/image.el Mon Nov 24 17:21:57 2008 +0000 @@ -36,9 +36,11 @@ ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm) ("\\`GIF8[79]a" . gif) ("\\`\x89PNG\r\n\x1a\n" . png) - ("\\`[\t\n\r ]*#define \\([a-z0-9]+\\)_width [0-9]+\n\ -#define \\1_height [0-9]+\n\ -static char \\1_bits" . xbm) + ("\\`[\t\n\r ]*#define \\([a-z0-9_]+\\)_width [0-9]+\n\ +#define \\1_height [0-9]+\n\\(\ +#define \\1_x_hot [0-9]+\n\ +#define \\1_y_hot [0-9]+\n\\)?\ +static \\(unsigned \\)?char \\1_bits" . xbm) ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff) ("\\`[\t\n\r ]*%!PS" . postscript) ("\\`\xff\xd8" . (image-jpeg-p . jpeg))