(image-type-header-regexps): Recognize xbm more strictly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2a617e8531e1219bb28e44b8b9e93032f248864..7dac3dee701b2c6d0c94d581a2ca358d7a653706 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-01-05  Richard Stallman  <rms@gnu.org>
 
+       * image.el (image-type-header-regexps): Recognize xbm more strictly.
+
        * simple.el (backward-kill-word): Doc fix.
 
 2007-01-05  Romain Francoise  <romain@orebokech.com>

diff --git a/lisp/image.el b/lisp/image.el
index e70b9ec539eac40e934362210dd6a6a76310486a..a98ca87f7280c9021b41e933c0a485a88cd8bf08 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -38,7 +38,9 @@
     ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
     ("\\`GIF8" . gif)
     ("\\`\x89PNG\r\n\x1a\n" . png)
-    ("\\`[\t\n\r ]*#define" . xbm)
+    ("\\`[\t\n\r ]*#define \\([a-z0-9]+\\)_width [0-9]+\n\
+#define \\1_height [0-9]+\n\
+static char \\1_bits" . xbm)
     ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff)
     ("\\`[\t\n\r ]*%!PS" . postscript)
     ("\\`\xff\xd8" . (image-jpeg-p . jpeg)))