From fa4354c1178bfabce6b099cc5e502331309621cb Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 24 Nov 2008 17:21:57 +0000 Subject: [PATCH] (image-type-header-regexps): Recognize more xbm format variants. --- lisp/ChangeLog | 5 +++++ lisp/image.el | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e70fd52e23..57a6c8635e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-11-24 Andreas Schwab + + * image.el (image-type-header-regexps): Recognize more xbm format + variants. + 2008-11-24 Juanma Barranquero * textmodes/artist.el (artist-charlist-to-string): Simplify. diff --git a/lisp/image.el b/lisp/image.el index 2633ff28310..f7273ea5f3f 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -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)) -- 2.39.2