(image-type-header-regexps): Recognize more xbm format

variants.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e70fd52e231d4536a416356c6e0395d807eeb89..57a6c8635e0e5a865675222a2b5ec898c0a44eac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/image.el b/lisp/image.el
index 2633ff283100541b847ab4afe8fd924f6e15a8f5..f7273ea5f3ff6082393df855a670d149bde8b08a 100644 (file)
--- 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))