From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 5 Jan 2007 22:54:11 +0000 (+0000)
Subject: (image-type-header-regexps): Recognize xbm more strictly.
X-Git-Tag: emacs-pretest-22.0.93~231
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2dca7106aa894487c6041a45b5af4323363e149b;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2a617e8531..7dac3dee701 100644
--- 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 e70b9ec539e..a98ca87f728 100644
--- 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)))