From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34827)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e37ha-0002W6-1W
	for guix-patches@gnu.org; Fri, 13 Oct 2017 17:41:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e37hW-00018w-EC
	for guix-patches@gnu.org; Fri, 13 Oct 2017 17:41:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:58090)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1e37hW-00018o-Ak
	for guix-patches@gnu.org; Fri, 13 Oct 2017 17:41:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e37hW-0007dc-54
	for guix-patches@gnu.org; Fri, 13 Oct 2017 17:41:02 -0400
Subject: [bug#28787] [PATCH 2/2] emacs-build-system: Change how patch-el-files
	substitutes commands.
Resent-Message-ID: <handler.28787.B28787.150793086029339@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <20171011144218.26718-1-mail@cbaines.net>
	<20171011144218.26718-2-mail@cbaines.net>
Date: Fri, 13 Oct 2017 23:40:55 +0200
In-Reply-To: <20171011144218.26718-2-mail@cbaines.net> (Christopher Baines's
	message of "Wed, 11 Oct 2017 15:42:18 +0100")
Message-ID: <87wp3yybdk.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Christopher Baines <mail@cbaines.net>
Cc: 28787@debbugs.gnu.org

Christopher Baines <mail@cbaines.net> skribis:

> Previously the regex would match from /bin/ to a closing quote. However, this
> is greedy, so will match up until the last ". This causes problems when there
> are several quotes on the same line, for example:
>
> org-effectiveness.el:
> 196:      (call-process "/bin/bash" nil t nil "-c" strplot)
>
> Therefore, change . to \S so that it doesn't include whitespace
> characters. Changing to a lazy quantifier would be an option, if that were
> supported.
>
> * guix/build/emacs-build-system.scm (patch-el-files): Change the regular
>   expression used.

Good catch, LGTM!

Ludo'.