diff options
| author | Christopher Baines <mail@cbaines.net> | 2017-10-11 11:51:25 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2017-10-15 19:02:44 +0100 |
| commit | 4cb036d604941ff8d1d9e9b32565bac64884a9ea (patch) | |
| tree | e20afbbee109c32fcf74bb1c37c0570090a4ad9d | |
| parent | dd2de2842344ede8e92459fe66c5a45ca3dc40ff (diff) | |
| download | patches-4cb036d604941ff8d1d9e9b32565bac64884a9ea.tar patches-4cb036d604941ff8d1d9e9b32565bac64884a9ea.tar.gz | |
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.
| -rw-r--r-- | guix/build/emacs-build-system.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 1474c80dd3..bd0d2e0266 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 |