Mercurial > emacs
diff lisp/image.el @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Jan 2007 06:16:11 +0000 |
| parents | bc10a33dd40b e3694f1cb928 |
| children | f83d17e1ace6 |
line wrap: on
line diff
--- a/lisp/image.el Fri Jan 26 02:30:28 2007 +0000 +++ b/lisp/image.el Fri Jan 26 06:16:11 2007 +0000 @@ -1,7 +1,7 @@ ;;; image.el --- image API ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: multimedia @@ -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)))