all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Claudio Bley <claudio.bley@googlemail.com>
To: Emacs-devel <emacs-devel@gnu.org>
Subject: [PATCH v2 5/5] Fix file magic for pbm files with comments
Date: Wed, 30 Oct 2013 13:44:01 +0100	[thread overview]
Message-ID: <871u33ylm6.wl%claudio.bley@gmail.com> (raw)
In-Reply-To: <cover.1383136381.git.claudio.bley@gmail.com>

Comments in NetPBM files are allowed to occur in the middle of a
token.
---
 lisp/image.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/image.el b/lisp/image.el
index 6ce5b82..69d8907 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\
-- 
1.8.4.msysgit.0



      parent reply	other threads:[~2013-10-30 12:44 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1383136381.git.claudio.bley@gmail.com>
2013-10-30 12:43 ` [PATCH v2 1/5] w32: define new jpeglib-version var in order to load the correct DLL at runtime Claudio Bley
2013-11-01  9:16   ` Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 2/5] w32: add support for recent PNG library version >= 1.5 Claudio Bley
2013-11-01  9:16   ` Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 3/5] w32: add support for default library names for libtiff Claudio Bley
2013-11-01  9:19   ` Eli Zaretskii
2013-10-30 12:43 ` [PATCH v2 4/5] Fix parsing of NetPBM file comments Claudio Bley
2013-11-01  9:19   ` Eli Zaretskii
2013-10-30 12:44 ` Claudio Bley [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=871u33ylm6.wl%claudio.bley@gmail.com \
    --to=claudio.bley@googlemail.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.