From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2IDx-0007mS-6e for guix-patches@gnu.org; Wed, 11 Oct 2017 10:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2IDu-000127-F2 for guix-patches@gnu.org; Wed, 11 Oct 2017 10:43:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e2IDu-000120-BF for guix-patches@gnu.org; Wed, 11 Oct 2017 10:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e2IDu-0002oe-4f for guix-patches@gnu.org; Wed, 11 Oct 2017 10:43:02 -0400 Subject: [bug#28787] [PATCH 2/2] emacs-build-system: Change how patch-el-files substitutes commands. Resent-Message-ID: From: Christopher Baines Date: Wed, 11 Oct 2017 15:42:18 +0100 Message-Id: <20171011144218.26718-2-mail@cbaines.net> In-Reply-To: <20171011144218.26718-1-mail@cbaines.net> References: <20171011144218.26718-1-mail@cbaines.net> 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: 28787@debbugs.gnu.org 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. --- guix/build/emacs-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 0260f15bb..c1d36766e 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -92,7 +92,7 @@ store in '.el' files." (el-dir (string-append out %install-suffix "/" elpa-name-ver)) (substitute-cmd (lambda () (substitute* (find-files "." "\\.el$") - (("\"/bin/([^.].*)\"" _ cmd) + (("\"/bin/([^.]\\S*)\"" _ cmd) (string-append "\"" (or -- 2.14.2