* lisp/env.el (env--substitute-vars-regexp): Don't use rx (for bootstrap).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3decbd3dac448c934345c38018fdf2d27ad057a..b54a3e281afa8807a45aed52db7a8d501f7c4fc1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * env.el (env--substitute-vars-regexp): Don't use rx (for bootstrap).
+
 2012-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * files.el (hack-one-local-variable--obsolete): New function.

diff --git a/lisp/env.el b/lisp/env.el
index f770dd27d751fa7ad3366bd2b6494b071f8ae012..5f7c61b719a9cd21b2640b2813895afff88645a7 100644 (file)
--- 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.