From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Claudio Bley Newsgroups: gmane.emacs.devel Subject: [PATCH v2 5/5] Fix file magic for pbm files with comments Date: Wed, 30 Oct 2013 13:44:01 +0100 Message-ID: <871u33ylm6.wl%claudio.bley@gmail.com> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1383137070 14786 80.91.229.3 (30 Oct 2013 12:44:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Oct 2013 12:44:30 +0000 (UTC) To: Emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 30 13:44:36 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VbV8V-000847-2z for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 13:44:35 +0100 Original-Received: from localhost ([::1]:52216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV8U-0007wK-NK for ged-emacs-devel@m.gmane.org; Wed, 30 Oct 2013 08:44:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV86-0007O8-Ev for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:44:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VbV80-0003Rq-2F for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:44:10 -0400 Original-Received: from mail-ee0-x22f.google.com ([2a00:1450:4013:c00::22f]:58710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VbV7z-0003RM-Rc for emacs-devel@gnu.org; Wed, 30 Oct 2013 08:44:03 -0400 Original-Received: by mail-ee0-f47.google.com with SMTP id c13so601599eek.20 for ; Wed, 30 Oct 2013 05:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=date:message-id:from:to:subject:in-reply-to:references:user-agent :mime-version:content-type; bh=oODKJ957jbpFjUPHmCq2wh1ZqN3PAKzxNDIYUH0DuUY=; b=OPfzPczNUAGPd3RvdRkC0xSbfLFZ2HHi21AeRtWVDH2/hw4vSbCkNik/dQogBsouOW lhco1+OdR3GLcreLhQ1qCpGgLdu120WNG97tk52V9VKTHkGM4Y4RBz6NsQXKF4pSq6Pm mFRc4FD/E50w/1Ey1/U6LW5nTbCf0MUrNUQ5gxzEl5mJ4Swd2PAkzkoUG+0/p8koO04A /2nkozv1z5TwYXyzouDN5pzduWZO6cRzMlIPy3WYWaVTNT4fPUmRBU17ebUIH/GXUTxC mQx/81xMPM8ITXn6uR8kk/OEDKF4BJk6QhNY6WwlqTNnflsbVQHaotSUi2Vq0Ny85rvy qQ+Q== X-Received: by 10.14.3.9 with SMTP id 9mr2096311eeg.72.1383137043032; Wed, 30 Oct 2013 05:44:03 -0700 (PDT) Original-Received: from CLAUDIO-PC.localdomain.de (178-24-125-95-dynip.superkabel.de. [178.24.125.95]) by mx.google.com with ESMTPSA id a1sm83114049eem.1.2013.10.30.05.44.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2013 05:44:02 -0700 (PDT) In-Reply-To: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164698 Archived-At: 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