From: Andy Moreton <andrewjmoreton@gmail.com>
Date: Mon, 16 Oct 2017 08:23:32 +0000 (-0700)
Subject: Don't reject PBM header whitespace unnecessarily
X-Git-Tag: emacs-26.0.91~542
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=613db8d35c;p=emacs.git

Don't reject PBM header whitespace unnecessarily

* lisp/image.el (image-type-header-regexps):
Allow two or more CRs or LFs in initial whitespace sequences.  See:
http://netpbm.sourceforge.net/doc/pbm.html
---

diff --git a/lisp/image.el b/lisp/image.el
index 1d0776180b2..32df508bc8d 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -34,8 +34,8 @@
 (defconst image-type-header-regexps
   `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
     ("\\`P[1-6]\\(?:\
-\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\
-\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\
+\\(?:\\(?:#[^\r\n]*[\r\n]\\)*[[:space:]]\\)+\
+\\(?:\\(?:#[^\r\n]*[\r\n]\\)*[0-9]\\)+\
 \\)\\{2\\}" . pbm)
     ("\\`GIF8[79]a" . gif)
     ("\\`\x89PNG\r\n\x1a\n" . png)