[Emacs-diffs] /srv/bzr/emacs/trunk r110850: * lisp/env.el (env--substitute-vars-regexp): Don't use rx (for bootstrap).

[Stefan Monnier]

------------------------------------------------------------
revno: 110850
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-08 20:31:54 -0500
message:
  * lisp/env.el (env--substitute-vars-regexp): Don't use rx (for bootstrap).
modified:
  lisp/ChangeLog
  lisp/env.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-08 19:50:08 +0000
+++ b/lisp/ChangeLog    2012-11-09 01:31:54 +0000
@@ -1,3 +1,7 @@
+2012-11-09  Stefan Monnier  <address@hidden>
+
+       * env.el (env--substitute-vars-regexp): Don't use rx (for bootstrap).
+
 2012-11-08  Stefan Monnier  <address@hidden>
 
        * files.el (hack-one-local-variable--obsolete): New function.

=== modified file 'lisp/env.el'
--- a/lisp/env.el       2012-11-08 15:10:08 +0000
+++ b/lisp/env.el       2012-11-09 01:31:54 +0000
@@ -58,10 +58,7 @@
 (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.