From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3nMU-00086q-5R for guix-patches@gnu.org; Sun, 15 Oct 2017 14:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3nMR-0005UT-0v for guix-patches@gnu.org; Sun, 15 Oct 2017 14:10:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3nMQ-0005UK-Tm for guix-patches@gnu.org; Sun, 15 Oct 2017 14:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3nMQ-0005I1-Od for guix-patches@gnu.org; Sun, 15 Oct 2017 14:10:02 -0400 Subject: bug#28787: [PATCH 2/2] emacs-build-system: Change how patch-el-files substitutes commands. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Sun, 15 Oct 2017 19:09:07 +0100 From: Christopher Baines Message-ID: <20171015190907.6053e529@cbaines.net> In-Reply-To: <87wp3yybdk.fsf@gnu.org> References: <20171011144218.26718-1-mail@cbaines.net> <20171011144218.26718-2-mail@cbaines.net> <87wp3yybdk.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/HqE19h2BpWOHCRKPN9BRwgx"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28787-done@debbugs.gnu.org --Sig_/HqE19h2BpWOHCRKPN9BRwgx Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 13 Oct 2017 23:40:55 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Christopher Baines skribis: >=20 > > 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 w= ere > > supported. > > > > * guix/build/emacs-build-system.scm (patch-el-files): Change the regular > > expression used. =20 >=20 > Good catch, LGTM! Great :) I've now pushed the updated version of these two patches. --Sig_/HqE19h2BpWOHCRKPN9BRwgx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnjpENfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xfd6A/+JumNi/wU8C30o9hhmU+ZntYp19da3ALqoSciwKFPpnfLpYS2LuesVx7w 4Zagu/TUUx34XdrSdR1kynkBTwROs8B0MSVuBYMnnMr+u0mFEidoXBtePkQUm/s7 7NWFFQqFh8oha2O8NEnOvm26hIqrMOKG42DiNDEVnUUWjaTBBctxYD9JnsNd0ax3 RMY8ZMD8HGkM/i1d2ErN5irJxIS3WkOHM9Z1FvHsf7YYJjHGxc+3iQBNFWvFZxUz DPW9aI2NrC7zsxTIY+yp1RSc5KlotXR83dC4VWQ/rcqSHb9jAE+t9fzxFM2NNbV/ +LBbWJNjzhamEo3gHV61v2UBSjLHPgPiWDpfnyNY3T+DGpkSWNWlmxASXl2RHLsb nH+xqIk7ik+rExFU+NqYZtCE5FflCnf0+ad/aXj7yRqo5sjf0QyTdFnLGPTQl/AI FsKun6i5nMnlcJNR7vDN1E+lGcvD5nltqDW91RLLYca9rI3f6Nizyylg74acBEdc IgkFdFN2N8C4BQw2OiAW/JEbkZU6L573m+dbn5Kpib+sECYpgFEv6VKvnlpobPXw kMHQ84bBiZdycjycs2l15KVfQY/WEEMy5LCEpkf6BR7znxhEdA+NClbdQkG72Mh4 QYpC8YqZmu1LcMhywTyYSugdxGmT30FzB4YjJrEWJyX+xpqpeZU= =t1wF -----END PGP SIGNATURE----- --Sig_/HqE19h2BpWOHCRKPN9BRwgx--