02/02: emacs-build-system: Change how patch-el-files substitutes commands.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository guix.

commit 4cb036d604941ff8d1d9e9b32565bac64884a9ea
Author: Christopher Baines <address@hidden>
Date:   Wed Oct 11 11:51:25 2017 +0100

    emacs-build-system: Change how patch-el-files substitutes commands.
    
    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 1474c80..bd0d2e0 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-name)
+                             (("\"/bin/([^.]\\S*)\"" _ cmd-name)
                               (let ((cmd (which cmd-name)))
                                 (unless cmd
                                   (error