~ruther/guix-local: emacs-build-system: Change how patch-el-files substitutes commands.

4cb036d604941ff8d1d9e9b32565bac64884a9ea — Christopher Baines 8 years ago dd2de28

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.

patch browse .tar.gz

1 files changed, 1 insertions(+), 1 deletions(-)

M guix/build/emacs-build-system.scm

M guix/build/emacs-build-system.scm => guix/build/emacs-build-system.scm +1 -1

@@ 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