diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-08 20:31:54 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-11-08 20:31:54 -0500 |
| commit | 67dd8ad119474d5c403e3410b4465baef2647609 (patch) | |
| tree | 10dc9ef1e5c8dc727fc4893e5ac2e79f67beadf5 /lisp/env.el | |
| parent | 53371430cdd6fe4e9d8c4a29f0b1db47165c9868 (diff) | |
| download | emacs-67dd8ad119474d5c403e3410b4465baef2647609.tar.gz | |
* lisp/env.el (env--substitute-vars-regexp): Don't use rx (for bootstrap).
Diffstat (limited to 'lisp/env.el')
| -rw-r--r-- | lisp/env.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/env.el b/lisp/env.el index f770dd27d75..5f7c61b719a 100644 --- a/lisp/env.el +++ b/lisp/env.el @@ -58,10 +58,7 @@ If it is also not t, RET does not exit if it does non-null completion." (defvar setenv-history nil) (defconst env--substitute-vars-regexp - (rx "$" - (or (submatch-n 1 (1+ (regexp "[[:alnum:]_]"))) - (and "{" (submatch-n 1 (minimal-match (0+ anything))) "}") - "$"))) + "\\$\\(?:\\(?1:[[:alnum:]_]+\\)\\|{\\(?1:[^{}]+\\)}\\|\\$\\)") (defun substitute-env-vars (string &optional only-defined) "Substitute environment variables referred to in STRING. |