Fix handling of comments in NetPBM image files.

 src/image.c (pbm_next_char): New function.
 (pbm_scan_number): Use it.

 lisp/image.el (image-type-header-regexps): Fix the 'pbm' part to
 allow comments in pbm files.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a73c38bd522..fd8e77c9c53 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-01  Claudio Bley  <claudio.bley@googlemail.com>
 
+        * image.el (image-type-header-regexps): Fix the 'pbm' part to
+        allow comments in pbm files.
+
         * term/w32-win.el (dynamic-library-alist): Support newer versions
         of libjpeg starting with v7: look only for the DLL from the
         version against which Emacs was built.
diff --git a/lisp/image.el b/lisp/image.el
index 6ce5b82ec48..69d890719d2 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -34,7 +34,10 @@
 
 (defconst image-type-header-regexps
   `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
-    ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
+    ("\\`P[1-6]\\\(?:\
+\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\
+\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\
+\\)\\{2\\}" . pbm)
     ("\\`GIF8[79]a" . gif)
     ("\\`\x89PNG\r\n\x1a\n" . png)
     ("\\`[\t\n\r ]*#define \\([a-z0-9_]+\\)_width [0-9]+\n\