(image-type-header-regexps): Be more specific detecting `pbm' and `png' files.

Use non-capturing parenthesis for `tiff' regexp.

diff --git a/lisp/image.el b/lisp/image.el
index b388396ded71bfaea202de01ce8f466ce41f5377..c50be757564ab745938b3eba2dfa06b381a6d3b4 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -35,11 +35,11 @@
 
 (defconst image-type-header-regexps
   '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
-    ("\\`P[1-6]" . pbm)
+    ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
     ("\\`GIF8" . gif)
-    ("\\`\211PNG\r\n" . png)
+    ("\\`\x89PNG\r\n\x1a\n" . png)
     ("\\`[\t\n\r ]*#define" . xbm)
-    ("\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff)
+    ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff)
     ("\\`[\t\n\r ]*%!PS" . postscript)
     ("\\`\xff\xd8" . (image-jpeg-p . jpeg)))
   "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types.