[Emacs-diffs] emacs/lisp ChangeLog image.el

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/11/24 17:22:00

Modified files:
        lisp           : ChangeLog image.el 

Log message:
        (image-type-header-regexps): Recognize more xbm format
        variants.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14848&r2=1.14849
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/image.el?cvsroot=emacs&r1=1.84&r2=1.85

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14848
retrieving revision 1.14849
diff -u -b -r1.14848 -r1.14849
--- ChangeLog   24 Nov 2008 16:30:14 -0000      1.14848
+++ ChangeLog   24 Nov 2008 17:21:57 -0000      1.14849
@@ -1,3 +1,8 @@
+2008-11-24  Andreas Schwab  <address@hidden>
+
+       * image.el (image-type-header-regexps): Recognize more xbm format
+       variants.
+
 2008-11-24  Juanma Barranquero  <address@hidden>
 
        * textmodes/artist.el (artist-charlist-to-string): Simplify.

Index: image.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- image.el    27 Jun 2008 15:58:36 -0000      1.84
+++ image.el    24 Nov 2008 17:22:00 -0000      1.85
@@ -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))